[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Christian Bauer
christian at hibernate.org
Thu Mar 22 08:16:07 EDT 2007
User: cbauer
Date: 07/03/22 08:16:07
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
Authenticator.java NodeBrowser.java Menu.java
DocumentHome.java NodeHome.java
Log:
Cleaned up wiki core link engine
Revision Changes Path
1.3 +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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Authenticator.java 18 Mar 2007 15:44:37 -0000 1.2
+++ Authenticator.java 22 Mar 2007 12:16:07 -0000 1.3
@@ -6,7 +6,7 @@
import org.jboss.seam.wiki.core.dao.UserRoleAccessFactory;
import org.jboss.seam.wiki.core.model.*;
import org.jboss.seam.wiki.core.model.Role;
-import org.jboss.seam.wiki.core.ui.WikiUtil;
+import org.jboss.seam.wiki.util.WikiUtil;
import org.jboss.seam.wiki.util.Hash;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Component;
1.8 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeBrowser.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NodeBrowser.java 21 Mar 2007 20:08:03 -0000 1.7
+++ NodeBrowser.java 22 Mar 2007 12:16:07 -0000 1.8
@@ -8,7 +8,7 @@
import org.jboss.seam.security.Identity;
import org.jboss.seam.wiki.core.dao.NodeDAO;
import org.jboss.seam.wiki.core.model.*;
-import org.jboss.seam.wiki.core.ui.WikiUtil;
+import org.jboss.seam.wiki.util.WikiUtil;
import java.util.*;
import java.io.Serializable;
1.5 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Menu.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Menu.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Menu.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Menu.java 21 Mar 2007 20:08:03 -0000 1.4
+++ Menu.java 22 Mar 2007 12:16:07 -0000 1.5
@@ -6,7 +6,7 @@
import org.jboss.seam.security.Identity;
import org.jboss.seam.wiki.core.model.Node;
import org.jboss.seam.wiki.core.model.Directory;
-import org.jboss.seam.wiki.core.ui.WikiUtil;
+import org.jboss.seam.wiki.util.WikiUtil;
import java.util.List;
import java.util.ArrayList;
1.6 +12 -14 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DocumentHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- DocumentHome.java 20 Mar 2007 02:38:15 -0000 1.5
+++ DocumentHome.java 22 Mar 2007 12:16:07 -0000 1.6
@@ -1,9 +1,8 @@
package org.jboss.seam.wiki.core.action;
import org.jboss.seam.annotations.*;
-import org.jboss.seam.wiki.core.links.WikiLinkResolver;
import org.jboss.seam.wiki.core.model.*;
-import org.jboss.seam.core.Events;
+import org.jboss.seam.wiki.core.links.WikiLinkResolver;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.contexts.Contexts;
@@ -38,6 +37,10 @@
// Make a copy
historicalCopy = new Document(getInstance());
+
+ // Wiki text parser needs it
+ Contexts.getConversationContext().set("currentDocument", getInstance());
+ Contexts.getConversationContext().set("currentDirectory", getParentDirectory());
}
/* -------------------------- Custom CUD ------------------------------ */
@@ -84,27 +87,22 @@
// Update view
syncFormToInstance(oldParent); // Resolve existing links in old directory
syncInstanceToForm(newParent); // Now update the form, effectively re-rendering the links
+ Contexts.getConversationContext().set("currentDirectory", newParent);
}
/* -------------------------- Internal Methods ------------------------------ */
- private void syncFormToInstance(Directory area) {
- // Outject instances required for WikiLinkResolver
- Contexts.getEventContext().set("currentDocument", getInstance());
- Contexts.getEventContext().set("currentDirectory", area);
-
+ private void syncFormToInstance(Directory dir) {
WikiLinkResolver wikiLinkResolver = (WikiLinkResolver)Component.getInstance("wikiLinkResolver");
- getInstance().setContent(wikiLinkResolver.convertToWikiLinks(area, formContent));
+ getInstance().setContent(
+ wikiLinkResolver.convertToWikiProtocol(dir.getAreaNumber(), formContent)
+ );
}
- private void syncInstanceToForm(Directory parentDirectory) {
- // Outject instances required for WikiLinkResolver
- Contexts.getEventContext().set("currentDocument", getInstance());
- Contexts.getEventContext().set("currentDirectory", parentDirectory);
-
+ private void syncInstanceToForm(Directory dir) {
WikiLinkResolver wikiLinkResolver = (WikiLinkResolver)Component.getInstance("wikiLinkResolver");
- formContent = wikiLinkResolver.convertFromWikiLinks(parentDirectory, getInstance().getContent());
+ formContent = wikiLinkResolver.convertFromWikiProtocol(dir.getAreaNumber(), getInstance().getContent());
}
1.9 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NodeHome.java 21 Mar 2007 01:24:48 -0000 1.8
+++ NodeHome.java 22 Mar 2007 12:16:07 -0000 1.9
@@ -8,7 +8,7 @@
import org.jboss.seam.wiki.core.model.User;
import org.jboss.seam.wiki.core.model.Directory;
import org.jboss.seam.wiki.core.model.Node;
-import org.jboss.seam.wiki.core.ui.WikiUtil;
+import org.jboss.seam.wiki.util.WikiUtil;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.RequestParameter;
import org.jboss.seam.annotations.Out;
More information about the jboss-cvs-commits
mailing list