[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Christian Bauer
christian at hibernate.org
Thu Jan 10 03:37:45 EST 2008
User: cbauer
Date: 08/01/10 03:37:45
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
UserHome.java WikiRequestResolver.java
PluginPreferenceEditor.java UploadHome.java
CommentNodeRemover.java UploadNodeRemover.java
UserPasswordReset.java DirectoryNodeRemover.java
Authenticator.java DocumentNodeRemover.java
AdminHome.java
Log:
Better getInstance() calls
Revision Changes Path
1.22 +4 -4 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- UserHome.java 9 Jan 2008 15:59:24 -0000 1.21
+++ UserHome.java 10 Jan 2008 08:37:45 -0000 1.22
@@ -91,7 +91,7 @@
if (roles == null) roles = getInstance().getRoles();
if (oldUsername == null) oldUsername = getInstance().getUsername();
- uploader = (Uploader)Component.getInstance("uploader");
+ uploader = (Uploader)Component.getInstance(Uploader.class);
} else {
if (!prefs.getEnableRegistration() &&
@@ -132,7 +132,7 @@
// Set activation code (unique user in time)
String seed = getInstance().getUsername() + System.currentTimeMillis() + prefs.getActivationCodeSalt();
- getInstance().setActivationCode( ((Hash)Component.getInstance("hashUtil")).hash(seed) );
+ getInstance().setActivationCode( ((Hash)Component.getInstance(Hash.class)).hash(seed) );
String outcome = super.persist();
if (outcome != null) {
@@ -325,7 +325,7 @@
@Restrict("#{s:hasPermission('User', 'isAdmin', currentUser)}")
public void createHomeDirectory() {
- Authenticator auth = (Authenticator)Component.getInstance("authenticator");
+ Authenticator auth = (Authenticator)Component.getInstance(Authenticator.class);
auth.createHomeDirectory(getInstance());
facesMessages.addFromResourceBundleOrDefault(
@@ -415,7 +415,7 @@
@Factory("userPreferenceEntities")
public void initPreferencesEditor() {
- preferenceEditor = (PreferenceEditor)Component.getInstance("prefEditor");
+ preferenceEditor = (PreferenceEditor)Component.getInstance(PreferenceEditor.class);
preferenceEditor.setVisibilities(new PreferenceVisibility[] {PreferenceVisibility.USER});
preferenceEditor.setUser(getInstance());
userPreferenceEntities = preferenceEditor.getPreferenceEntities();
1.5 +3 -3 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiRequestResolver.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiRequestResolver.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiRequestResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WikiRequestResolver.java 19 Dec 2007 04:29:25 -0000 1.4
+++ WikiRequestResolver.java 10 Jan 2008 08:37:45 -0000 1.5
@@ -157,7 +157,7 @@
boolean foundMatches = false;
if (areaName != null && areaName.length() > 0) {
log.debug("searching for unknown area name: " + areaName);
- WikiSearch wikiSearch = (WikiSearch) Component.getInstance("wikiSearch");
+ WikiSearch wikiSearch = (WikiSearch) Component.getInstance(WikiSearch.class);
wikiSearch.setSimpleQuery(areaName);
wikiSearch.search();
foundMatches = wikiSearch.getTotalCount() > 0;
@@ -183,14 +183,14 @@
}
if (currentDocument != null) {
- DocumentHome documentHome = (DocumentHome)Component.getInstance("documentHome");
+ DocumentHome documentHome = (DocumentHome)Component.getInstance(DocumentHome.class);
documentHome.setNodeId(currentDocument.getId());
documentHome.setInstance(currentDocument);
documentHome.afterNodeFound(currentDocument);
log.debug("displaying document: " + currentDocument);
return "docDisplay";
} else {
- DirectoryHome directoryHome = (DirectoryHome)Component.getInstance("directoryHome");
+ DirectoryHome directoryHome = (DirectoryHome)Component.getInstance(DirectoryHome.class);
directoryHome.setNodeId(currentDirectory.getId());
directoryHome.setInstance(currentDirectory);
directoryHome.afterNodeFound(currentDirectory);
1.8 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PluginPreferenceEditor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PluginPreferenceEditor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PluginPreferenceEditor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PluginPreferenceEditor.java 30 Dec 2007 02:33:25 -0000 1.7
+++ PluginPreferenceEditor.java 10 Jan 2008 08:37:45 -0000 1.8
@@ -45,7 +45,7 @@
this.pluginPreferenceName = pluginPreferenceName;
// Load the preference component
- PreferenceRegistry registry = (PreferenceRegistry) Component.getInstance("preferenceRegistry");
+ PreferenceRegistry registry = (PreferenceRegistry) Component.getInstance(PreferenceRegistry.class);
preferenceComponent = registry.getPreferenceComponentsByName().get(pluginPreferenceName);
if (preferenceComponent != null) {
1.3 +0 -5 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UploadHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UploadHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UploadHome.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- UploadHome.java 9 Jan 2008 15:59:24 -0000 1.2
+++ UploadHome.java 10 Jan 2008 08:37:45 -0000 1.3
@@ -79,11 +79,6 @@
/* -------------------------- Custom CUD ------------------------------ */
@Override
- protected boolean preparePersist() {
- return uploadEditor.preparePersist();
- }
-
- @Override
protected boolean beforePersist() {
// Set createdOn date _now_
getInstance().setCreatedOn(new Date());
1.3 +2 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CommentNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentNodeRemover.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CommentNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
+++ CommentNodeRemover.java 10 Jan 2008 08:37:45 -0000 1.3
@@ -11,13 +11,14 @@
import org.jboss.seam.wiki.core.model.WikiComment;
import java.util.List;
+import java.io.Serializable;
/**
* @author Christian Bauer
*/
@Name("commentNodeRemover")
@AutoCreate
-public class CommentNodeRemover extends NodeRemover<WikiComment> {
+public class CommentNodeRemover extends NodeRemover<WikiComment> implements Serializable {
public boolean isRemovable(WikiComment comment) {
return true;
1.3 +2 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UploadNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UploadNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UploadNodeRemover.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- UploadNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
+++ UploadNodeRemover.java 10 Jan 2008 08:37:45 -0000 1.3
@@ -11,12 +11,13 @@
import org.jboss.seam.Component;
import java.util.List;
+import java.io.Serializable;
/**
* @author Christian Bauer
*/
@Name("uploadNodeRemover")
-public class UploadNodeRemover extends NodeRemover<WikiUpload> {
+public class UploadNodeRemover extends NodeRemover<WikiUpload> implements Serializable {
public boolean isRemovable(WikiUpload upload) {
return true;
1.2 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserPasswordReset.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserPasswordReset.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserPasswordReset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UserPasswordReset.java 2 Jan 2008 05:36:15 -0000 1.1
+++ UserPasswordReset.java 10 Jan 2008 08:37:45 -0000 1.2
@@ -96,7 +96,7 @@
// Set activation code (unique user in time)
String seed = user.getUsername() + System.currentTimeMillis() + prefs.getActivationCodeSalt();
- user.setActivationCode( ((Hash) Component.getInstance("hashUtil")).hash(seed) );
+ user.setActivationCode( ((Hash) Component.getInstance(Hash.class)).hash(seed) );
// TODO: Flush by side effect?
try {
1.3 +2 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DirectoryNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryNodeRemover.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DirectoryNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
+++ DirectoryNodeRemover.java 10 Jan 2008 08:37:45 -0000 1.3
@@ -13,12 +13,13 @@
import org.jboss.seam.Component;
import java.util.List;
+import java.io.Serializable;
/**
* @author Christian Bauer
*/
@Name("directoryNodeRemover")
-public class DirectoryNodeRemover extends NodeRemover<WikiDirectory> {
+public class DirectoryNodeRemover extends NodeRemover<WikiDirectory> implements Serializable {
public boolean isRemovable(WikiDirectory dir) {
if (getWikiNodeDAO().findChildrenCount(dir) > 0) {
1.17 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Authenticator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Authenticator.java 9 Jan 2008 15:59:24 -0000 1.16
+++ Authenticator.java 10 Jan 2008 08:37:45 -0000 1.17
@@ -133,7 +133,7 @@
public void createHomeDirectory(User user) {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)Component.getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)Component.getInstance(WikiNodeDAO.class);
// Create home directory
WikiDirectory memberArea = (WikiDirectory)Component.getInstance("memberArea");
1.3 +2 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentNodeRemover.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DocumentNodeRemover.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentNodeRemover.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DocumentNodeRemover.java 9 Jan 2008 18:12:01 -0000 1.2
+++ DocumentNodeRemover.java 10 Jan 2008 08:37:45 -0000 1.3
@@ -12,12 +12,13 @@
import org.jboss.seam.Component;
import java.util.List;
+import java.io.Serializable;
/**
* @author Christian Bauer
*/
@Name("documentNodeRemover")
-public class DocumentNodeRemover extends NodeRemover<WikiDocument> {
+public class DocumentNodeRemover extends NodeRemover<WikiDocument> implements Serializable {
@In
CommentNodeRemover commentNodeRemover;
1.15 +3 -3 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AdminHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- AdminHome.java 30 Dec 2007 02:33:25 -0000 1.14
+++ AdminHome.java 10 Jan 2008 08:37:45 -0000 1.15
@@ -87,7 +87,7 @@
@Factory("systemPreferenceEntities")
public void initPreferencesEditor() {
- preferenceEditor = (PreferenceEditor)Component.getInstance("prefEditor");
+ preferenceEditor = (PreferenceEditor)Component.getInstance(PreferenceEditor.class);
preferenceEditor.setVisibilities(new PreferenceVisibility[] {PreferenceVisibility.SYSTEM});
systemPreferenceEntities = preferenceEditor.getPreferenceEntities();
Contexts.getConversationContext().set("preferenceEditor", preferenceEditor);
@@ -148,7 +148,7 @@
@Factory("indexedEntities")
public void loadIndexedEntities() throws Exception {
- SearchRegistry registry = (SearchRegistry)Component.getInstance("searchRegistry");
+ SearchRegistry registry = (SearchRegistry)Component.getInstance(SearchRegistry.class);
indexedEntities = registry.getSearchableEntities();
EntityManager em = (EntityManager) Component.getInstance("entityManager");
@@ -180,7 +180,7 @@
public void resetSearchIndex() throws Exception {
- IndexManager indexMgr = (IndexManager)Component.getInstance("indexManager");
+ IndexManager indexMgr = (IndexManager)Component.getInstance(IndexManager.class);
Progress progress = new Progress(selectedIndexedEntity.getClazz().getName());
indexMgr.rebuildIndex(selectedIndexedEntity.getClazz(), progress);
More information about the jboss-cvs-commits
mailing list