cedric 02/05/24 03:15:44
Modified: contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition
XmlParser.java I18nFactorySet.java
DefinitionsFactory.java
contrib/tiles/src/share/org/apache/struts/tiles/beans
SimpleMenuItem.java
Log:
Allow serialization of I18nFactorySet
Allow default classtype for attribute <item classtype="" >
Update documentation
Add automatic date in manifest.mf (set by build).
Revision Changes Path
1.6 +4 -2
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java
Index: XmlParser.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XmlParser.java 15 Apr 2002 08:22:09 -0000 1.5
+++ XmlParser.java 24 May 2002 10:15:44 -0000 1.6
@@ -94,6 +94,7 @@
/**
* Init digester for components syntax.
+ * This is an old set of rules, left for backward compatibilities.
*
*/
private void initDigesterForComponentsDefinitionsSyntax( Digester digester )
@@ -177,13 +178,14 @@
digester.addSetNext( ADD_LIST_ELE_TAG, "add", putAttributeHandlerClass);
digester.addSetProperties( ADD_LIST_ELE_TAG);
digester.addCallMethod( ADD_LIST_ELE_TAG, "setBody", 0);
- // list elements rules
+ // bean elements rules
// We use Attribute class to avoid rewriting a new class.
// Name part can't be used in listElement attribute.
//String ADD_WILDCARD = LIST_TAG + "/addItem";
// non String ADD_WILDCARD = LIST_TAG + "/addx*";
String ADD_WILDCARD = "*/item";
- digester.addObjectCreate( ADD_WILDCARD, putAttributeHandlerClass,
"classtype");
+ String menuItemDefaultClass = "org.apache.struts.tiles.beans.SimpleMenuItem";
+ digester.addObjectCreate( ADD_WILDCARD, menuItemDefaultClass, "classtype");
digester.addSetNext( ADD_WILDCARD, "add", "java.lang.Object");
digester.addSetProperties( ADD_WILDCARD);
}
1.6 +5 -2
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java
Index: I18nFactorySet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- I18nFactorySet.java 15 Apr 2002 08:21:31 -0000 1.5
+++ I18nFactorySet.java 24 May 2002 10:15:44 -0000 1.6
@@ -61,8 +61,11 @@
"/WEB-INF/instanceDefinitions.xml"};
/** Default factory */
protected DefinitionsFactory defaultFactory;
- /** Xml parser used */
- protected XmlParser xmlParser;
+ /** Xml parser used.
+ * Attribute is transient to allow serialization. In this implementaiton,
+ * xmlParser is created each time we need it ;-(.
+ */
+ protected transient XmlParser xmlParser;
/** Does we want validating parser ? Default is false.
* Can be set from servlet config file
*/
1.4 +2 -1
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java
Index: DefinitionsFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefinitionsFactory.java 27 Dec 2001 17:35:38 -0000 1.3
+++ DefinitionsFactory.java 24 May 2002 10:15:44 -0000 1.4
@@ -11,6 +11,7 @@
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.io.Serializable;
import javax.servlet.ServletContext;
import javax.servlet.ServletConfig;
@@ -21,7 +22,7 @@
* A factory for definitions.
* This factory allows to retrieve definitions by their keys.
*/
-public class DefinitionsFactory
+public class DefinitionsFactory implements Serializable
{
/** */
protected Map definitions;
1.2 +21 -1
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/beans/SimpleMenuItem.java
Index: SimpleMenuItem.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/beans/SimpleMenuItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleMenuItem.java 27 Dec 2001 17:41:35 -0000 1.1
+++ SimpleMenuItem.java 24 May 2002 10:15:44 -0000 1.2
@@ -84,4 +84,24 @@
{
return tooltip;
}
-}
\ No newline at end of file
+
+ /**
+ * toString method
+ */
+ public String toString()
+ {
+ StringBuffer buff = new StringBuffer();
+
+ buff.append( "SimpleMenuItem[");
+ if( getValue() != null )
+ buff.append( "value=" ).append(getValue()).append( ", " );
+ if( getLink() != null )
+ buff.append( "link=" ).append(getLink()).append( ", " );
+ if( getTooltip() != null )
+ buff.append( "tooltip=" ).append(getTooltip()).append( ", " );
+ if( getIcon() != null )
+ buff.append( "icon=" ).append(getIcon()).append( ", " );
+ buff.append( "]");
+ return buff.toString();
+ }
+}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
