dgraham 2003/02/27 18:50:23
Modified: resources/src/java/org/apache/commons/resources/impl
ResourcesFactoryBase.java BasicMessageList.java
WebappPropertyResourcesFactory.java
WebappXMLResourcesFactory.java
WebappXMLResources.java PropertyResources.java
ResourceBundleResources.java ResourcesBase.java
ResourceBundleResourcesFactory.java
XMLResources.java WebappPropertyResources.java
BasicMessage.java PropertyResourcesFactory.java
XMLResourcesFactory.java
CollectionResourcesBase.java
Log:
Fixed bad imports.
Revision Changes Path
1.4 +5 -4
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java
Index: ResourcesFactoryBase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourcesFactoryBase.java 5 Jan 2003 03:29:57 -0000 1.3
+++ ResourcesFactoryBase.java 28 Feb 2003 02:50:22 -0000 1.4
@@ -66,6 +66,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
import org.apache.commons.resources.ResourcesFactory;
1.2 +12 -7
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessageList.java
Index: BasicMessageList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessageList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicMessageList.java 14 Jan 2003 22:13:36 -0000 1.1
+++ BasicMessageList.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -63,11 +63,16 @@
package org.apache.commons.resources.impl;
-import org.apache.commons.resources.MessageList;
-import org.apache.commons.resources.Message;
-
import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.resources.Message;
+import org.apache.commons.resources.MessageList;
/**
* A basic implementation of a MessageList.
1.2 +4 -4
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java
Index: WebappPropertyResourcesFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebappPropertyResourcesFactory.java 7 Jan 2003 02:40:52 -0000 1.1
+++ WebappPropertyResourcesFactory.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -64,9 +64,9 @@
import javax.servlet.ServletContext;
+
import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
-import org.apache.commons.resources.ResourcesFactory;
/**
1.2 +4 -4
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java
Index: WebappXMLResourcesFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebappXMLResourcesFactory.java 7 Jan 2003 02:40:52 -0000 1.1
+++ WebappXMLResourcesFactory.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -64,9 +64,9 @@
import javax.servlet.ServletContext;
+
import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
-import org.apache.commons.resources.ResourcesFactory;
/**
1.2 +8 -9
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResources.java
Index: WebappXMLResources.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebappXMLResources.java 7 Jan 2003 02:40:52 -0000 1.1
+++ WebappXMLResources.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -64,18 +64,17 @@
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
-import java.net.URL;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Properties;
+
import javax.servlet.ServletContext;
+
+import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.resources.Resources;
import org.xml.sax.SAXException;
1.3 +6 -6
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResources.java
Index: PropertyResources.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResources.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyResources.java 6 Jan 2003 20:41:35 -0000 1.2
+++ PropertyResources.java 28 Feb 2003 02:50:22 -0000 1.3
@@ -64,15 +64,15 @@
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.resources.Resources;
/**
1.6 +5 -7
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java
Index: ResourceBundleResources.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceBundleResources.java 5 Jan 2003 03:29:57 -0000 1.5
+++ ResourceBundleResources.java 28 Feb 2003 02:50:22 -0000 1.6
@@ -63,10 +63,8 @@
package org.apache.commons.resources.impl;
-import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.Reader;
-import java.io.StringReader;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
@@ -74,9 +72,9 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.TimeZone;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
import org.apache.commons.resources.ResourcesKeyException;
1.4 +5 -6
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesBase.java
Index: ResourcesBase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourcesBase.java 5 Jan 2003 03:29:57 -0000 1.3
+++ ResourcesBase.java 28 Feb 2003 02:50:22 -0000 1.4
@@ -67,10 +67,9 @@
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
+
import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
1.5 +4 -7
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java
Index: ResourceBundleResourcesFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceBundleResourcesFactory.java 5 Jan 2003 03:29:57 -0000 1.4
+++ ResourceBundleResourcesFactory.java 28 Feb 2003 02:50:22 -0000 1.5
@@ -63,11 +63,8 @@
package org.apache.commons.resources.impl;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
-import org.apache.commons.resources.ResourcesFactory;
/**
1.2 +5 -7
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResources.java
Index: XMLResources.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLResources.java 6 Jan 2003 20:41:35 -0000 1.1
+++ XMLResources.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -64,18 +64,16 @@
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Properties;
+
import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.Rule;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.resources.Resources;
import org.xml.sax.SAXException;
1.2 +7 -7
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResources.java
Index: WebappPropertyResources.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebappPropertyResources.java 7 Jan 2003 02:40:52 -0000 1.1
+++ WebappPropertyResources.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -64,16 +64,16 @@
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
-import java.net.URL;
+import java.io.InputStream;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
+
import javax.servlet.ServletContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.resources.Resources;
/**
1.2 +5 -5
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessage.java
Index: BasicMessage.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicMessage.java 14 Jan 2003 22:13:36 -0000 1.1
+++ BasicMessage.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -63,9 +63,9 @@
package org.apache.commons.resources.impl;
-import org.apache.commons.resources.Message;
-
import java.io.Serializable;
+
+import org.apache.commons.resources.Message;
/**
* A basic implementation of the Message interface.
1.2 +4 -5
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java
Index: PropertyResourcesFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyResourcesFactory.java 5 Jan 2003 03:29:57 -0000 1.1
+++ PropertyResourcesFactory.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -65,7 +65,6 @@
import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
-import org.apache.commons.resources.ResourcesFactory;
/**
1.2 +3 -4
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResourcesFactory.java
Index: XMLResourcesFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResourcesFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLResourcesFactory.java 6 Jan 2003 20:41:35 -0000 1.1
+++ XMLResourcesFactory.java 28 Feb 2003 02:50:22 -0000 1.2
@@ -65,7 +65,6 @@
import org.apache.commons.resources.Resources;
import org.apache.commons.resources.ResourcesException;
-import org.apache.commons.resources.ResourcesFactory;
/**
1.3 +5 -9
jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java
Index: CollectionResourcesBase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CollectionResourcesBase.java 9 Jan 2003 03:25:24 -0000 1.2
+++ CollectionResourcesBase.java 28 Feb 2003 02:50:22 -0000 1.3
@@ -63,17 +63,13 @@
package org.apache.commons.resources.impl;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.commons.resources.Resources;
+
import org.apache.commons.resources.ResourcesException;
import org.apache.commons.resources.ResourcesKeyException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
