[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences ...
Christian Bauer
christian at hibernate.org
Tue Dec 18 23:29:32 EST 2007
User: cbauer
Date: 07/12/18 23:29:32
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/preferences
WikiPreferenceProvider.java
WikiPreferenceValue.java
Log:
Major rewrite of the most of the application
Revision Changes Path
1.7 +20 -16 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiPreferenceProvider.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- WikiPreferenceProvider.java 14 Nov 2007 10:19:44 -0000 1.6
+++ WikiPreferenceProvider.java 19 Dec 2007 04:29:32 -0000 1.7
@@ -1,17 +1,21 @@
package org.jboss.seam.wiki.core.preferences;
-import org.jboss.seam.annotations.*;
-import org.jboss.seam.wiki.core.model.User;
-import org.jboss.seam.wiki.core.model.Node;
-import org.jboss.seam.wiki.preferences.*;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.log.Log;
import org.hibernate.Session;
import org.hibernate.validator.InvalidValue;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.*;
+import org.jboss.seam.log.Log;
+import org.jboss.seam.wiki.core.model.User;
+import org.jboss.seam.wiki.core.model.WikiDocument;
+import org.jboss.seam.wiki.core.model.WikiNode;
+import org.jboss.seam.wiki.preferences.PreferenceComponent;
+import org.jboss.seam.wiki.preferences.PreferenceProperty;
+import org.jboss.seam.wiki.preferences.PreferenceProvider;
+import org.jboss.seam.wiki.preferences.PreferenceValue;
import javax.persistence.EntityManager;
-import java.util.*;
import java.io.Serializable;
+import java.util.*;
/**
* Implementation for the wiki, loads and stores <tt>WikiPreferenceValue</tt> objects.
@@ -46,8 +50,8 @@
currentValueMap.put(component, new TreeSet<PreferenceValue>());
// Only load and instance preferences if there actually can be instance preferences
- if (instance != null && ((Node)instance).getId() != null && component.allowsInstanceOverride())
- loadInstanceValues(currentValueMap.get(component), component, (Node)instance);
+ if (instance != null && ((WikiNode)instance).getId() != null && component.allowsInstanceOverride())
+ loadInstanceValues(currentValueMap.get(component), component, (WikiNode)instance);
// Only load and user preferences if there actually can be user preferences
if (user != null && component.allowsUserOverride())
@@ -76,7 +80,7 @@
log.trace("New preference value object at INSTANCE level for property: " + valueHolder.getPreferenceProperty());
WikiPreferenceValue newValueHolder = new WikiPreferenceValue(valueHolder.getPreferenceProperty());
- newValueHolder.setNode((Node) instance);
+ newValueHolder.setDocument((WikiDocument) instance);
newValueHolder.setValue(valueHolder.getValue());
newValueHolder.setDirty(false); // New object is not "dirty"
@@ -110,14 +114,14 @@
public void deleteUserPreferences(Object user) {
log.debug("Deleting all preference values of user '" + user + "'");
- entityManager.createQuery("delete from WikiPreferenceValue wp where wp.user = :user and wp.node is null")
+ entityManager.createQuery("delete from WikiPreferenceValue wp where wp.user = :user and wp.document is null")
.setParameter("user", user)
.executeUpdate();
}
public void deleteInstancePreferences(Object instance) {
log.debug("Deleting all preference values of instance '" + instance + "'");
- entityManager.createQuery("delete from WikiPreferenceValue wp where wp.user is null and wp.node = :node")
+ entityManager.createQuery("delete from WikiPreferenceValue wp where wp.user is null and wp.document = :node")
.setParameter("node", instance)
.executeUpdate();
}
@@ -163,7 +167,7 @@
List<WikiPreferenceValue> values =
entityManager.createQuery(
"select wp from WikiPreferenceValue wp" +
- " where wp.componentName = :name and wp.user is null and wp.node is null"
+ " where wp.componentName = :name and wp.user is null and wp.document is null"
).setParameter("name", preferenceComponent.getName())
.setHint("org.hibernate.cacheable", true).getResultList();
@@ -185,7 +189,7 @@
List<WikiPreferenceValue> values =
entityManager.createQuery(
"select wp from WikiPreferenceValue wp" +
- " where wp.componentName = :name and wp.user = :user and wp.node is null"
+ " where wp.componentName = :name and wp.user = :user and wp.document is null"
)
.setParameter("name", preferenceComponent.getName())
.setParameter("user", user)
@@ -197,12 +201,12 @@
}
}
- private void loadInstanceValues(Set<PreferenceValue> loadedValues, PreferenceComponent preferenceComponent, Node node) {
+ private void loadInstanceValues(Set<PreferenceValue> loadedValues, PreferenceComponent preferenceComponent, WikiNode node) {
//noinspection unchecked
List<WikiPreferenceValue> values =
entityManager.createQuery(
"select wp from WikiPreferenceValue wp" +
- " where wp.componentName = :name and wp.user is null and wp.node = :node"
+ " where wp.componentName = :name and wp.user is null and wp.document = :node"
)
.setParameter("name", preferenceComponent.getName())
.setParameter("node", node)
1.8 +13 -13 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiPreferenceValue.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WikiPreferenceValue.java 14 Nov 2007 10:19:44 -0000 1.7
+++ WikiPreferenceValue.java 19 Dec 2007 04:29:32 -0000 1.8
@@ -6,12 +6,12 @@
*/
package org.jboss.seam.wiki.core.preferences;
-import org.hibernate.annotations.TypeDefs;
import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.TypeDefs;
import org.jboss.seam.wiki.core.model.User;
-import org.jboss.seam.wiki.core.model.Node;
-import org.jboss.seam.wiki.preferences.PreferenceValue;
+import org.jboss.seam.wiki.core.model.WikiDocument;
import org.jboss.seam.wiki.preferences.PreferenceProperty;
+import org.jboss.seam.wiki.preferences.PreferenceValue;
import javax.persistence.*;
import java.io.Serializable;
@@ -69,10 +69,10 @@
private User user;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "NODE_ID", nullable = true, updatable = false)
- @org.hibernate.annotations.ForeignKey(name = "FK_PREFERENCE_NODE_ID")
+ @JoinColumn(name = "WIKI_DOCUMENT_ID", nullable = true, updatable = false)
+ @org.hibernate.annotations.ForeignKey(name = "FK_PREFERENCE_WIKI_DOCUMENT_ID")
@org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
- private Node node;
+ private WikiDocument document;
@org.hibernate.annotations.Type(type = "preference_value_usertype")
@org.hibernate.annotations.Columns(
@@ -126,12 +126,12 @@
this.user = user;
}
- public Node getNode() {
- return node;
+ public WikiDocument getDocument() {
+ return document;
}
- public void setNode(Node node) {
- this.node = node;
+ public void setDocument(WikiDocument document) {
+ this.document = document;
}
public Object getValue() {
@@ -149,15 +149,15 @@
}
public boolean isSystemAssigned() {
- return getNode() == null && getUser() == null;
+ return getDocument() == null && getUser() == null;
}
public boolean isUserAssigned() {
- return getNode() == null && getUser() != null;
+ return getDocument() == null && getUser() != null;
}
public boolean isInstanceAssigned() {
- return getNode() != null && getUser() == null;
+ return getDocument() != null && getUser() == null;
}
// Useful for provider
More information about the jboss-cvs-commits
mailing list