dlestrat 2004/06/05 09:19:19
Modified: portal/src/java/org/apache/jetspeed/tools/pamanager/rules
LocalizedFieldRule.java MetadataRuleSet.java
PortletRule.java
Log:
Clean up. See http://nagoya.apache.org/jira/browse/JS2-65
Revision Changes Path
1.5 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java
Index: LocalizedFieldRule.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalizedFieldRule.java 11 Mar 2004 23:12:08 -0000 1.4
+++ LocalizedFieldRule.java 5 Jun 2004 16:19:19 -0000 1.5
@@ -33,11 +33,11 @@
public class LocalizedFieldRule extends Rule
{
protected final static Log log = LogFactory.getLog(LocalizedFieldRule.class);
+
/**
* Handle the beginning of an XML element.
*
* @param attributes The attributes of this element
- *
* @exception Exception if a processing error occurs
*/
public void begin(String namespace, String name, Attributes attributes)
1.2 +2 -20
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/MetadataRuleSet.java
Index: MetadataRuleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/MetadataRuleSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MetadataRuleSet.java 11 Mar 2004 23:18:20 -0000 1.1
+++ MetadataRuleSet.java 5 Jun 2004 16:19:19 -0000 1.2
@@ -36,7 +36,7 @@
this.prefix = prefix;
}
- /* (non-Javadoc)
+ /**
* @see
org.apache.commons.digester.RuleSet#addRuleInstances(org.apache.commons.digester.Digester)
*/
public void addRuleInstances(Digester digester)
@@ -58,24 +58,6 @@
digester.addRule(prefix + "subject", fieldRule);
digester.addRule(prefix + "type", fieldRule);
digester.addRule(prefix + "metadata", fieldRule);
- /*
- digester.addRule(prefix + "title", new LocalizedFieldRule());
- digester.addRule(prefix + "contributor", new LocalizedFieldRule());
- digester.addRule(prefix + "creator", new LocalizedFieldRule());
- digester.addRule(prefix + "coverage", new LocalizedFieldRule());
- digester.addRule(prefix + "description", new LocalizedFieldRule());
- digester.addRule(prefix + "format", new LocalizedFieldRule());
- digester.addRule(prefix + "identifier", new LocalizedFieldRule());
- digester.addRule(prefix + "language", new LocalizedFieldRule());
- digester.addRule(prefix + "publisher", new LocalizedFieldRule());
- digester.addRule(prefix + "relation", new LocalizedFieldRule());
- digester.addRule(prefix + "right", new LocalizedFieldRule());
- digester.addRule(prefix + "source", new LocalizedFieldRule());
- digester.addRule(prefix + "subject", new LocalizedFieldRule());
- digester.addRule(prefix + "type", new LocalizedFieldRule());
- digester.addRule(prefix + "metadata", new LocalizedFieldRule());
- */
-
}
}
1.3 +14 -21
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java
Index: PortletRule.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletRule.java 11 Mar 2004 23:15:15 -0000 1.2
+++ PortletRule.java 5 Jun 2004 16:19:19 -0000 1.3
@@ -21,17 +21,16 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
-
/**
* This class helps load the portlet's metadata onto the digester stack
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Ford</a>
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Ford </a>
* @version $Id$
*/
public class PortletRule extends Rule
{
protected final static Log log = LogFactory.getLog(PortletRule.class);
-
+
private MutablePortletApplication app;
public PortletRule(MutablePortletApplication app)
@@ -39,23 +38,17 @@
this.app = app;
}
- public void body(String namespace, String name, String text)
- throws Exception
+ public void body(String namespace, String name, String text) throws Exception
{
- //PortletDefinitionComposite def = (PortletDefinitionComposite)
digester.peek(0);
- //if(def == null)
+ log.debug("Found portlet name " + name);
+ PortletDefinitionComposite def = (PortletDefinitionComposite)
app.getPortletDefinitionByName(text);
+ if (def != null)
+ {
+ digester.push(def.getMetadata());
+ }
+ else
{
- log.debug("Found portlet name " +name);
- PortletDefinitionComposite def =
(PortletDefinitionComposite)app.getPortletDefinitionByName(text);
- if(def != null)
- {
- digester.push(def.getMetadata());
- }
- else
- {
- //push a null object onto the stack to prevent fields being placed
onto another metadata object
- digester.push(null);
- }
+ digester.push(null);
}
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
