User: pathoss
Date: 02/05/12 04:58:03
Modified: core/src/xdoclet/loader Tag: MODULE_REFACTORING_BRANCH
ModuleFinder.java SubTaskDefinition.java
TagHandlerDefinition.java XDocletModule.java
XDocletXmlParser.java XDocletXmlParserTest.java
Log:
1. use jakarta commons logging (and LogUtil)
2. coding conventions (voted, applied pretty.settings)
3. minor refactorings
Revision Changes Path
No revision
No revision
1.3.2.5 +1 -4 xdoclet/core/src/xdoclet/loader/ModuleFinder.java
Index: ModuleFinder.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/ModuleFinder.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -w -r1.3.2.4 -r1.3.2.5
--- ModuleFinder.java 9 May 2002 16:42:52 -0000 1.3.2.4
+++ ModuleFinder.java 12 May 2002 11:58:02 -0000 1.3.2.5
@@ -13,17 +13,14 @@
import java.util.jar.JarFile;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.log4j.Category;
import org.apache.tools.ant.Project;
-import xdoclet.util.Log;
-
/**
* Finds xdoclet modules.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created 7. april 2002
- * @version $Revision: 1.3.2.4 $
+ * @version $Revision: 1.3.2.5 $
*/
public class ModuleFinder
{
1.1.2.2 +12 -10 xdoclet/core/src/xdoclet/loader/SubTaskDefinition.java
Index: SubTaskDefinition.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/SubTaskDefinition.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- SubTaskDefinition.java 27 Apr 2002 23:54:32 -0000 1.1.2.1
+++ SubTaskDefinition.java 12 May 2002 11:58:02 -0000 1.1.2.2
@@ -3,6 +3,7 @@
* All rights reserved.
*/
package xdoclet.loader;
+
/**
* @created 7. april 2002
*/
@@ -11,6 +12,7 @@
public final String name;
public final String implementationClass;
public final String parentTaskClass;
+
public SubTaskDefinition( String name, String implementationClass, String
parentTaskClass )
{
this.name = name;
1.2.2.3 +14 -25 xdoclet/core/src/xdoclet/loader/TagHandlerDefinition.java
Index: TagHandlerDefinition.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/TagHandlerDefinition.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -w -r1.2.2.2 -r1.2.2.3
--- TagHandlerDefinition.java 28 Apr 2002 22:40:27 -0000 1.2.2.2
+++ TagHandlerDefinition.java 12 May 2002 11:58:02 -0000 1.2.2.3
@@ -4,21 +4,13 @@
*/
package xdoclet.loader;
-
-
/**
* @author Aslak Helles�y
* @created 7. april 2002
*/
public class TagHandlerDefinition
{
- /**
- * @todo-javadoc Describe the field
- */
public final String namespace;
- /**
- * @todo-javadoc Describe the field
- */
public final String className;
/**
@@ -26,9 +18,6 @@
*
* @param namespace Describe what the parameter does
* @param className Describe what the parameter does
- * @todo-javadoc Write javadocs for constructor
- * @todo-javadoc Write javadocs for method parameter
- * @todo-javadoc Write javadocs for method parameter
*/
public TagHandlerDefinition( String namespace, String className )
{
1.5.2.5 +5 -5 xdoclet/core/src/xdoclet/loader/XDocletModule.java
Index: XDocletModule.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/XDocletModule.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -w -r1.5.2.4 -r1.5.2.5
--- XDocletModule.java 9 May 2002 16:42:52 -0000 1.5.2.4
+++ XDocletModule.java 12 May 2002 11:58:02 -0000 1.5.2.5
@@ -7,17 +7,17 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
import xdoclet.template.TemplateTagHandler;
-import xdoclet.util.Log;
+import xdoclet.util.LogUtil;
/**
* This is an object view of the data in xdoclet.xml
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created 7. april 2002
- * @version $Revision: 1.5.2.4 $
+ * @version $Revision: 1.5.2.5 $
*/
public class XDocletModule
{
@@ -40,10 +40,10 @@
public void addTagHandler(String namespace, String clazz)
{
- Category cat = Log.getCategory(getClass(), "addTagHandler");
+ Log log = LogUtil.getLog(getClass(), "addTagHandler");
try {
- cat.debug("registering tag tandler " + clazz + " to namespace " +
namespace + ".");
+ log.debug("registering tag tandler " + clazz + " to namespace " +
namespace + ".");
TagHandlerDefinition thd = new TagHandlerDefinition(namespace, clazz);
1.3.2.2 +70 -76 xdoclet/core/src/xdoclet/loader/XDocletXmlParser.java
Index: XDocletXmlParser.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/XDocletXmlParser.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -w -r1.3.2.1 -r1.3.2.2
--- XDocletXmlParser.java 28 Apr 2002 22:40:27 -0000 1.3.2.1
+++ XDocletXmlParser.java 12 May 2002 11:58:02 -0000 1.3.2.2
@@ -4,22 +4,23 @@
*/
package xdoclet.loader;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
+import java.io.IOException;
+import java.io.InputStream;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import java.io.IOException;
-import java.io.InputStream;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
/**
* Parses xdoclet.xml deployment descriptor
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created 7. april 2002
- * @version $Revision: 1.3.2.1 $
+ * @version $Revision: 1.3.2.2 $
*/
class XDocletXmlParser extends DefaultHandler
{
@@ -39,29 +40,24 @@
*/
public XDocletModule parse( InputStream in )
{
- try
- {
+ try {
SAXParser parser = _factory.newSAXParser();
parser.parse( in, this );
}
- catch( IOException e )
- {
+ catch (IOException e) {
_module = null;
e.printStackTrace();
}
- catch( IllegalArgumentException e )
- {
+ catch (IllegalArgumentException e) {
_module = null;
e.printStackTrace();
}
- catch( ParserConfigurationException e )
- {
+ catch (ParserConfigurationException e) {
_module = null;
e.printStackTrace();
}
- catch( SAXException e )
- {
+ catch (SAXException e) {
_module = null;
e.printStackTrace();
}
@@ -76,16 +72,14 @@
public void startElement( String namespaceURI, String localName, String qName,
Attributes attributes )
{
- if( qName.equals( "taghandler" ) )
- {
+ if (qName.equals("taghandler")) {
_module.addTagHandler(
attributes.getValue( "namespace" ),
attributes.getValue( "class" )
);
}
else
- if( qName.equals( "subtask" ) )
- {
+ if (qName.equals("subtask")) {
_module.addSubTask(
attributes.getValue( "name" ),
attributes.getValue( "implementation-class" ),
1.1.2.2 +16 -15 xdoclet/core/src/xdoclet/loader/XDocletXmlParserTest.java
Index: XDocletXmlParserTest.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/XDocletXmlParserTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- XDocletXmlParserTest.java 28 Apr 2002 22:40:27 -0000 1.1.2.1
+++ XDocletXmlParserTest.java 12 May 2002 11:58:02 -0000 1.1.2.2
@@ -4,13 +4,14 @@
*/
package xdoclet.loader;
-import junit.framework.TestCase;
-
import java.io.FileInputStream;
+import junit.framework.TestCase;
+
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
- * @version $Revision: 1.1.2.1 $
+ * @created 4 mei 2002
+ * @version $Revision: 1.1.2.2 $
*/
public class XDocletXmlParserTest extends TestCase
{
_______________________________________________________________
Have big pipes? SourceForge.net is looking for download mirrors. We supply
the hardware. You get the recognition. Email Us: [EMAIL PROTECTED]
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
