You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by dg...@apache.org on 2003/09/28 19:02:22 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles AttributeToScopeTag.java
dgraham 2003/09/28 10:02:22
Modified: src/share/org/apache/struts/tiles/xmlDefinition
XmlListAttribute.java XmlDefinitionsSet.java
FactorySet.java XmlDefinition.java
I18nFactorySet.java DefinitionsFactory.java
src/share/org/apache/struts/tiles ControllerSupport.java
ComponentDefinitionsFactory.java
src/share/org/apache/struts/tiles/definition
ReloadableDefinitionsFactory.java
ComponentDefinitionsFactoryWrapper.java
src/share/org/apache/struts/tiles/actions
ReloadDefinitionsAction.java
ViewDefinitionsAction.java
src/share/org/apache/struts/taglib/tiles
AttributeToScopeTag.java
Log:
Organized imports for PR# 23378.
Revision Changes Path
1.3 +4 -4 jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlListAttribute.java
Index: XmlListAttribute.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlListAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlListAttribute.java 27 Feb 2003 19:19:42 -0000 1.2
+++ XmlListAttribute.java 28 Sep 2003 17:02:22 -0000 1.3
@@ -62,8 +62,8 @@
package org.apache.struts.tiles.xmlDefinition;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
1.3 +6 -6 jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlDefinitionsSet.java
Index: XmlDefinitionsSet.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlDefinitionsSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlDefinitionsSet.java 27 Feb 2003 19:19:42 -0000 1.2
+++ XmlDefinitionsSet.java 28 Sep 2003 17:02:22 -0000 1.3
@@ -62,11 +62,11 @@
package org.apache.struts.tiles.xmlDefinition;
-import org.apache.struts.tiles.NoSuchDefinitionException;
-
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.struts.tiles.NoSuchDefinitionException;
/**
* A set of definitions read from XML definitions file.
1.3 +12 -11 jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/FactorySet.java
Index: FactorySet.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/FactorySet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FactorySet.java 27 Feb 2003 19:19:42 -0000 1.2
+++ FactorySet.java 28 Sep 2003 17:02:22 -0000 1.3
@@ -62,17 +62,18 @@
package org.apache.struts.tiles.xmlDefinition;
-import org.apache.struts.tiles.ComponentDefinitionsFactory;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.NoSuchDefinitionException;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.FactoryNotFoundException;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+
+import org.apache.struts.tiles.ComponentDefinition;
+import org.apache.struts.tiles.ComponentDefinitionsFactory;
+import org.apache.struts.tiles.DefinitionsFactoryException;
+import org.apache.struts.tiles.FactoryNotFoundException;
+import org.apache.struts.tiles.NoSuchDefinitionException;
/**
* Component Definitions factory.
1.4 +7 -7 jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java
Index: XmlDefinition.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XmlDefinition.java 27 Feb 2003 19:19:42 -0000 1.3
+++ XmlDefinition.java 28 Sep 2003 17:02:22 -0000 1.4
@@ -62,12 +62,12 @@
package org.apache.struts.tiles.xmlDefinition;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+import java.util.Iterator;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.Iterator;
+import org.apache.struts.tiles.ComponentDefinition;
+import org.apache.struts.tiles.NoSuchDefinitionException;
/**
*A definition read from an XML definitions file.
1.11 +4 -5 jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java
Index: I18nFactorySet.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- I18nFactorySet.java 31 Jul 2003 03:47:55 -0000 1.10
+++ I18nFactorySet.java 28 Sep 2003 17:02:22 -0000 1.11
@@ -79,10 +79,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts.taglib.tiles.ComponentConstants;
import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.DefinitionsUtil;
import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.taglib.tiles.ComponentConstants;
import org.xml.sax.SAXException;
/**
1.4 +9 -9 jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java
Index: DefinitionsFactory.java
===================================================================
RCS file: /home/cvs/jakarta-struts/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 Feb 2003 19:19:42 -0000 1.3
+++ DefinitionsFactory.java 28 Sep 2003 17:02:22 -0000 1.4
@@ -62,17 +62,17 @@
package org.apache.struts.tiles.xmlDefinition;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
-
-import java.util.Map;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
-import java.io.Serializable;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
+
+import org.apache.struts.tiles.ComponentDefinition;
+import org.apache.struts.tiles.DefinitionsFactoryException;
+import org.apache.struts.tiles.NoSuchDefinitionException;
/**
* A factory for definitions.
1.5 +5 -4 jakarta-struts/src/share/org/apache/struts/tiles/ControllerSupport.java
Index: ControllerSupport.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ControllerSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ControllerSupport.java 13 Sep 2003 18:40:34 -0000 1.4
+++ ControllerSupport.java 28 Sep 2003 17:02:22 -0000 1.5
@@ -62,10 +62,11 @@
package org.apache.struts.tiles;
import java.io.IOException;
+
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
/**
* Basic implementation of Controller. Implementations can extend this class
1.4 +6 -5 jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinitionsFactory.java
Index: ComponentDefinitionsFactory.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinitionsFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentDefinitionsFactory.java 5 Jan 2003 01:24:48 -0000 1.3
+++ ComponentDefinitionsFactory.java 28 Sep 2003 17:02:22 -0000 1.4
@@ -62,10 +62,11 @@
package org.apache.struts.tiles;
-import java.util.Map;
import java.io.Serializable;
-import javax.servlet.ServletRequest;
+import java.util.Map;
+
import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
/**
* Component repository interface.
1.10 +4 -5 jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
Index: ReloadableDefinitionsFactory.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ReloadableDefinitionsFactory.java 12 Aug 2003 15:03:42 -0000 1.9
+++ ReloadableDefinitionsFactory.java 28 Sep 2003 17:02:22 -0000 1.10
@@ -75,7 +75,6 @@
import org.apache.struts.tiles.DefinitionsFactoryException;
import org.apache.struts.tiles.FactoryNotFoundException;
import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
-import org.apache.struts.tiles.TilesUtil;
import org.apache.struts.util.RequestUtils;
/**
1.9 +3 -4 jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java
Index: ComponentDefinitionsFactoryWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComponentDefinitionsFactoryWrapper.java 9 Jul 2003 00:14:01 -0000 1.8
+++ ComponentDefinitionsFactoryWrapper.java 28 Sep 2003 17:02:22 -0000 1.9
@@ -73,7 +73,6 @@
import org.apache.struts.tiles.DefinitionsFactoryConfig;
import org.apache.struts.tiles.DefinitionsFactoryException;
import org.apache.struts.tiles.NoSuchDefinitionException;
-import org.apache.struts.tiles.TilesUtil;
import org.apache.struts.util.RequestUtils;
/**
1.6 +9 -9 jakarta-struts/src/share/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java
Index: ReloadDefinitionsAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ReloadDefinitionsAction.java 31 Jul 2003 03:43:13 -0000 1.5
+++ ReloadDefinitionsAction.java 28 Sep 2003 17:02:22 -0000 1.6
@@ -62,19 +62,19 @@
package org.apache.struts.tiles.actions;
-import org.apache.struts.tiles.DefinitionsUtil;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.DefinitionsFactory;
-import org.apache.struts.tiles.TilesUtil;
-
import java.io.PrintWriter;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.tiles.DefinitionsFactory;
+import org.apache.struts.tiles.DefinitionsFactoryException;
+import org.apache.struts.tiles.TilesUtil;
1.7 +7 -6 jakarta-struts/src/share/org/apache/struts/tiles/actions/ViewDefinitionsAction.java
Index: ViewDefinitionsAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/actions/ViewDefinitionsAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ViewDefinitionsAction.java 16 May 2003 10:06:45 -0000 1.6
+++ ViewDefinitionsAction.java 28 Sep 2003 17:02:22 -0000 1.7
@@ -62,17 +62,18 @@
package org.apache.struts.tiles.actions;
-import org.apache.struts.tiles.TilesUtil;
-import org.apache.struts.tiles.DefinitionsFactory;
-
import java.io.PrintWriter;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.tiles.DefinitionsFactory;
+import org.apache.struts.tiles.TilesUtil;
1.6 +8 -8 jakarta-struts/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java
Index: AttributeToScopeTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributeToScopeTag.java 8 Mar 2003 19:23:49 -0000 1.5
+++ AttributeToScopeTag.java 28 Sep 2003 17:02:22 -0000 1.6
@@ -62,12 +62,12 @@
package org.apache.struts.taglib.tiles;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.taglib.tiles.util.TagUtils;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.struts.taglib.tiles.util.TagUtils;
+import org.apache.struts.tiles.ComponentContext;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org