User: pathoss
Date: 02/04/28 15:40:27
Modified: core/src/xdoclet Tag: MODULE_REFACTORING_BRANCH
ConfigParamIntrospector.java DocletContext.java
DocletSupport.java DocletTask.java
GenerationManager.java NoInnerClassSubTask.java
SubTask.java TemplateSubTask.java
XDocletException.java XDocletMain.java
XDocletTagSupport.java XmlSubTask.java
Log:
Cleanup of import statements.
Revision Changes Path
No revision
No revision
1.7.2.2 +7 -11 xdoclet/core/src/xdoclet/ConfigParamIntrospector.java
Index: ConfigParamIntrospector.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ConfigParamIntrospector.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -w -r1.7.2.1 -r1.7.2.2
--- ConfigParamIntrospector.java 28 Apr 2002 22:24:23 -0000 1.7.2.1
+++ ConfigParamIntrospector.java 28 Apr 2002 22:40:26 -0000 1.7.2.2
@@ -4,20 +4,16 @@
*/
package xdoclet;
+import xdoclet.util.Log;
+
import org.apache.log4j.Category;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Map;
+import java.beans.Introspector;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.lang.reflect.InvocationTargetException;
-import java.io.Serializable;
-import java.beans.Introspector;
-
-import xdoclet.util.Log;
-import xdoclet.tagshandler.ConfigTagsHandler;
+import java.util.HashMap;
/**
* Used by DocletTask. Creates and returns a HashMap of config params for a
@@ -25,7 +21,7 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Jan 19, 2002
- * @version $Revision: 1.7.2.1 $
+ * @version $Revision: 1.7.2.2 $
*/
public final class ConfigParamIntrospector {
/**
1.15.2.1 +3 -3 xdoclet/core/src/xdoclet/DocletContext.java
Index: DocletContext.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/DocletContext.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -w -r1.15 -r1.15.2.1
--- DocletContext.java 18 Apr 2002 06:16:02 -0000 1.15
+++ DocletContext.java 28 Apr 2002 22:40:26 -0000 1.15.2.1
@@ -4,15 +4,15 @@
*/
package xdoclet;
-import java.util.Hashtable;
-import java.util.HashMap;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Map;
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created June 19, 2001
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.15.2.1 $
*/
public class DocletContext implements java.io.Serializable
{
1.11.2.1 +2 -4 xdoclet/core/src/xdoclet/DocletSupport.java
Index: DocletSupport.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/DocletSupport.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -w -r1.11 -r1.11.2.1
--- DocletSupport.java 19 Apr 2002 16:36:46 -0000 1.11
+++ DocletSupport.java 28 Apr 2002 22:40:26 -0000 1.11.2.1
@@ -5,20 +5,18 @@
package xdoclet;
import xjavadoc.XClass;
+import xjavadoc.XConstructor;
import xjavadoc.XField;
import xjavadoc.XMethod;
import xjavadoc.XPackage;
-import xjavadoc.XConstructor;
import xjavadoc.XTag;
-import org.apache.log4j.Category;
-
import java.util.Stack;
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 13, 2001
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.11.2.1 $
*/
public abstract class DocletSupport
{
1.39.2.2 +15 -16 xdoclet/core/src/xdoclet/DocletTask.java
Index: DocletTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/DocletTask.java,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -w -r1.39.2.1 -r1.39.2.2
--- DocletTask.java 27 Apr 2002 23:54:31 -0000 1.39.2.1
+++ DocletTask.java 28 Apr 2002 22:40:26 -0000 1.39.2.2
@@ -4,30 +4,29 @@
*/
package xdoclet;
-import org.apache.tools.ant.DynamicConfigurator;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.log4j.Category;
-
-import xdoclet.util.Translator;
-import xdoclet.util.XmlValidator;
-import xdoclet.util.Log;
+import xdoclet.loader.ModuleFinder;
+import xdoclet.loader.SubTaskDefinition;
+import xdoclet.loader.TagHandlerDefinition;
+import xdoclet.loader.XDocletModule;
+import xdoclet.template.TemplateEngine;
import xdoclet.template.TemplateException;
import xdoclet.template.TemplateTagHandler;
-import xdoclet.template.TemplateEngine;
-import xdoclet.loader.*;
+import xdoclet.util.Translator;
import xjavadoc.SourceSet;
import xjavadoc.XJavaDoc;
import xjavadoc.ant.XJavadocTask;
-import java.io.*;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DynamicConfigurator;
+
+import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* A base class for all Tasks. It can also be used directly, useful for the case
@@ -37,7 +36,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created June 19, 2001
- * @version $Revision: 1.39.2.1 $
+ * @version $Revision: 1.39.2.2 $
*/
public class DocletTask extends XJavadocTask implements DynamicConfigurator
{
1.11.2.3 +10 -14 xdoclet/core/src/xdoclet/GenerationManager.java
Index: GenerationManager.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/GenerationManager.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -w -r1.11.2.2 -r1.11.2.3
--- GenerationManager.java 28 Apr 2002 22:24:23 -0000 1.11.2.2
+++ GenerationManager.java 28 Apr 2002 22:40:26 -0000 1.11.2.3
@@ -4,30 +4,26 @@
*/
package xdoclet;
+import xdoclet.loader.ModuleFinder;
import xdoclet.tagshandler.AbstractProgramElementTagsHandler;
-import xdoclet.tagshandler.PackageTagsHandler;
import xdoclet.tagshandler.ClassTagsHandler;
+import xdoclet.tagshandler.PackageTagsHandler;
import xdoclet.template.TemplateException;
import xdoclet.util.Log;
-import xdoclet.loader.ModuleFinder;
+
+import xjavadoc.XClass;
+
+import org.apache.log4j.Category;
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.FileInputStream;
import java.net.URL;
import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.List;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
-import java.util.Arrays;
-
-import xjavadoc.XClass;
-
-import org.apache.log4j.Category;
/**
* Verify if the generation is needed for Java files and Xml files based
@@ -35,7 +31,7 @@
*
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created March 30, 2002
- * @version $Revision: 1.11.2.2 $
+ * @version $Revision: 1.11.2.3 $
*/
public class GenerationManager implements java.io.Serializable
{
1.5.2.1 +0 -2 xdoclet/core/src/xdoclet/NoInnerClassSubTask.java
Index: NoInnerClassSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/NoInnerClassSubTask.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -w -r1.5 -r1.5.2.1
--- NoInnerClassSubTask.java 4 Apr 2002 01:03:07 -0000 1.5
+++ NoInnerClassSubTask.java 28 Apr 2002 22:40:26 -0000 1.5.2.1
@@ -5,8 +5,6 @@
package xdoclet;
import xjavadoc.XClass;
-import xdoclet.TemplateSubTask;
-import xdoclet.XDocletException;
/**
* This subtask only matches regular classes, not inner classes. It was written
1.66.2.1 +3 -3 xdoclet/core/src/xdoclet/SubTask.java
Index: SubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/SubTask.java,v
retrieving revision 1.66
retrieving revision 1.66.2.1
diff -u -w -r1.66 -r1.66.2.1
--- SubTask.java 10 Apr 2002 22:51:31 -0000 1.66
+++ SubTask.java 28 Apr 2002 22:40:26 -0000 1.66.2.1
@@ -4,14 +4,14 @@
*/
package xdoclet;
+import xdoclet.util.Log;
+
import org.apache.log4j.Category;
import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
-import xdoclet.util.Log;
-
/**
* <p>
*
@@ -26,7 +26,7 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created June 16, 2001
- * @version $Revision: 1.66 $
+ * @version $Revision: 1.66.2.1 $
*/
public abstract class SubTask extends DocletSupport implements Serializable
{
1.41.2.3 +10 -11 xdoclet/core/src/xdoclet/TemplateSubTask.java
Index: TemplateSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/TemplateSubTask.java,v
retrieving revision 1.41.2.2
retrieving revision 1.41.2.3
diff -u -w -r1.41.2.2 -r1.41.2.3
--- TemplateSubTask.java 28 Apr 2002 22:24:23 -0000 1.41.2.2
+++ TemplateSubTask.java 28 Apr 2002 22:40:26 -0000 1.41.2.3
@@ -4,27 +4,26 @@
*/
package xdoclet;
-import xjavadoc.XJavaDoc;
-import xjavadoc.XClass;
-import xjavadoc.XPackage;
-import xjavadoc.XJavaDocException;
-import org.apache.log4j.Category;
-import xdoclet.tagshandler.ClassTagsHandler;
import xdoclet.tagshandler.PackageTagsHandler;
import xdoclet.tagshandler.TypeTagsHandler;
-import xdoclet.tagshandler.AbstractProgramElementTagsHandler;
import xdoclet.template.TemplateEngine;
import xdoclet.template.TemplateException;
import xdoclet.template.TemplateParser;
-
import xdoclet.util.Log;
import xdoclet.util.Translator;
+import xjavadoc.XClass;
+import xjavadoc.XJavaDoc;
+import xjavadoc.XJavaDocException;
+import xjavadoc.XPackage;
+
+import org.apache.log4j.Category;
+
import java.io.File;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
/**
* Generates The template file specified in templateFile configuration
@@ -32,7 +31,7 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Sep 25, 2001
- * @version $Revision: 1.41.2.2 $
+ * @version $Revision: 1.41.2.3 $
*/
public class TemplateSubTask extends SubTask
{
1.5.2.1 +5 -5 xdoclet/core/src/xdoclet/XDocletException.java
Index: XDocletException.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/XDocletException.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -w -r1.5 -r1.5.2.1
--- XDocletException.java 4 Apr 2002 01:03:08 -0000 1.5
+++ XDocletException.java 28 Apr 2002 22:40:27 -0000 1.5.2.1
@@ -4,17 +4,17 @@
*/
package xdoclet;
-import java.io.PrintWriter;
+import xdoclet.template.TemplateException;
+
import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
import java.io.IOException;
-
-import xdoclet.template.TemplateException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 14, 2001
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.5.2.1 $
*/
public class XDocletException extends TemplateException {
1.7.2.1 +8 -5 xdoclet/core/src/xdoclet/XDocletMain.java
Index: XDocletMain.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/XDocletMain.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -w -r1.7 -r1.7.2.1
--- XDocletMain.java 21 Apr 2002 20:40:14 -0000 1.7
+++ XDocletMain.java 28 Apr 2002 22:40:27 -0000 1.7.2.1
@@ -4,14 +4,17 @@
*/
package xdoclet;
-import java.io.IOException;
-import xdoclet.util.Translator;
-import xdoclet.util.Log;
-import xdoclet.template.TemplateException;
import xdoclet.loader.ModuleFinder;
-import xjavadoc.ant.XJavaDocMain;
+import xdoclet.template.TemplateException;
+import xdoclet.util.Log;
+import xdoclet.util.Translator;
+
import xjavadoc.XJavaDocException;
+import xjavadoc.ant.XJavaDocMain;
+
import org.apache.log4j.Category;
+
+import java.io.IOException;
/**
* This class serves as an entry-point for starting XDoclet. Whether or not
1.43.2.2 +12 -17 xdoclet/core/src/xdoclet/XDocletTagSupport.java
Index: XDocletTagSupport.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/XDocletTagSupport.java,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -u -w -r1.43.2.1 -r1.43.2.2
--- XDocletTagSupport.java 28 Apr 2002 22:24:23 -0000 1.43.2.1
+++ XDocletTagSupport.java 28 Apr 2002 22:40:27 -0000 1.43.2.2
@@ -4,33 +4,28 @@
*/
package xdoclet;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Map;
+import xdoclet.template.TemplateTagHandler;
+import xdoclet.util.Log;
+import xdoclet.util.Translator;
+import xdoclet.util.TypeConversionUtil;
import xjavadoc.XClass;
+import xjavadoc.XConstructor;
import xjavadoc.XDoc;
import xjavadoc.XField;
import xjavadoc.XMethod;
import xjavadoc.XPackage;
-import xjavadoc.XConstructor;
import xjavadoc.XProgramElement;
import xjavadoc.XTag;
import org.apache.log4j.Category;
-import org.apache.tools.ant.ProjectHelper;
-import xdoclet.template.TemplateEngine;
-import xdoclet.template.TemplateTagHandler;
-
-import xdoclet.util.Log;
-import xdoclet.util.Translator;
-import xdoclet.util.TypeConversionUtil;
-import xdoclet.tagshandler.ConfigTagsHandler;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
/**
* Derives from TemplateTagHandler and adds handy support methods for working
@@ -38,7 +33,7 @@
*
* @author Dmitri Colebatch ([EMAIL PROTECTED])
* @created October 12, 2001
- * @version $Revision: 1.43.2.1 $
+ * @version $Revision: 1.43.2.2 $
*/
public abstract class XDocletTagSupport extends TemplateTagHandler
{
1.13.2.2 +4 -3 xdoclet/core/src/xdoclet/XmlSubTask.java
Index: XmlSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/XmlSubTask.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -w -r1.13.2.1 -r1.13.2.2
--- XmlSubTask.java 28 Apr 2002 22:24:23 -0000 1.13.2.1
+++ XmlSubTask.java 28 Apr 2002 22:40:27 -0000 1.13.2.2
@@ -4,15 +4,16 @@
*/
package xdoclet;
-import xdoclet.util.XmlValidator;
-import xdoclet.util.Log;
import xdoclet.tagshandler.IdTagsHandler;
+import xdoclet.util.Log;
+import xdoclet.util.XmlValidator;
+
import org.apache.log4j.Category;
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 13, 2001
- * @version $Revision: 1.13.2.1 $
+ * @version $Revision: 1.13.2.2 $
*/
public class XmlSubTask extends TemplateSubTask
{
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
