Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotatedElement.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotatedElement.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotatedElement.java (working copy)
@@ -39,14 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id: JAnnotatedElement.java
- *
- * Contributors:
- * --------------
- * Andrew Fawcett (andrew.fawcett@coda.com) - Original Author
*/
-
package org.exolab.javasource;
/**
@@ -113,7 +106,9 @@
* @SuppressWarnings()
* private DocumentHandler documentHandler;
*
- * @author Andrew Fawcett
+ *
+ * @author Andrew Fawcett
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public interface JAnnotatedElement {
/**
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotatedElementHelper.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotatedElementHelper.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotatedElementHelper.java (working copy)
@@ -53,7 +53,8 @@
* Implements JAnnotatedElement interface on behalf of other classes in this
* package that implement this interface.
*
- * @author Andrew Fawcett
+ * @author Andrew Fawcett
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public class JAnnotatedElementHelper implements JAnnotatedElement {
// NOTE: Removed references to LinkedHashMap as we are trying to maintain
@@ -348,7 +349,8 @@
}
private static JAnnotation makeTestRFEAnnotation() {
- JAnnotationType requestForEnhancementType = new JAnnotationType("org.xyz.RequestForEnhancement");
+ JAnnotationType requestForEnhancementType;
+ requestForEnhancementType = new JAnnotationType("org.xyz.RequestForEnhancement");
JAnnotation requestForEnhancement = new JAnnotation(requestForEnhancementType);
requestForEnhancement.setElementValue("id", "2868724");
requestForEnhancement.setElementValue("synopsis", "\"Provide time-travel functionality\"");
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotation.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotation.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotation.java (working copy)
@@ -39,12 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id: JAnnotation.java
- *
- * Contributors:
- * --------------
- * Andrew Fawcett (andrew.fawcett@coda.com) - Original Author
*/
package org.exolab.javasource;
@@ -137,7 +131,8 @@
* setValue methods taking String values can be used to output this construct
* literally if desired.
*
- * @author Andrew Fawcett
+ * @author Andrew Fawcett
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public final class JAnnotation {
/**
@@ -497,7 +492,7 @@
jsw.flush();
}
- private static void test1(JSourceWriter jsw) {
+ private static void test1(final JSourceWriter jsw) {
JAnnotationType requestForEnhancementType1 = new JAnnotationType("RequestForEnhancement");
JAnnotation requestForEnhancement1 = new JAnnotation(requestForEnhancementType1);
requestForEnhancement1.setElementValue("id", "2868724");
@@ -507,7 +502,7 @@
requestForEnhancement1.print(jsw);
}
- private static void test2(JSourceWriter jsw) {
+ private static void test2(final JSourceWriter jsw) {
JAnnotationType webMethodType2 = new JAnnotationType("WebMethod");
JAnnotation webMethod2 = new JAnnotation(webMethodType2);
webMethod2.print(jsw);
@@ -513,7 +508,7 @@
webMethod2.print(jsw);
}
- private static void test3(JSourceWriter jsw) {
+ private static void test3(final JSourceWriter jsw) {
JAnnotationType copyrightType3 = new JAnnotationType("Copyright");
JAnnotation copyright3 = new JAnnotation(copyrightType3);
copyright3.setValue("\"2002 Yoyodyne Propulsion Systems, Inc., All rights reserved.\"");
@@ -520,7 +515,7 @@
copyright3.print(jsw);
}
- private static void test4(JSourceWriter jsw) {
+ private static void test4(final JSourceWriter jsw) {
JAnnotationType endorsersType4 = new JAnnotationType("Endorsers");
JAnnotation endorsers4 = new JAnnotation(endorsersType4);
endorsers4.setValue(new String[] {"\"Children\"", "\"Unscrupulous dentists\""});
@@ -527,7 +522,7 @@
endorsers4.print(jsw);
}
- private static void test5(JSourceWriter jsw) {
+ private static void test5(final JSourceWriter jsw) {
JAnnotationType endorsersType5 = new JAnnotationType("Endorsers");
JAnnotation endorsers5 = new JAnnotation(endorsersType5);
endorsers5.setValue(new String[] {"\"Epicurus\"" });
@@ -534,7 +529,7 @@
endorsers5.print(jsw);
}
- private static void test6(JSourceWriter jsw) {
+ private static void test6(final JSourceWriter jsw) {
JAnnotationType nameType6 = new JAnnotationType("Name");
JAnnotationType authorType6 = new JAnnotationType("Author");
JAnnotation author6 = new JAnnotation(authorType6);
@@ -545,7 +540,7 @@
author6.print(jsw);
}
- private static void test7(JSourceWriter jsw) {
+ private static void test7(final JSourceWriter jsw) {
JAnnotationType nameType7 = new JAnnotationType("Name");
JAnnotationType authorType7 = new JAnnotationType("Author");
JAnnotation author7 = new JAnnotation(authorType7);
@@ -557,7 +552,7 @@
author7.print(jsw);
}
- private static void test8(JSourceWriter jsw) {
+ private static void test8(final JSourceWriter jsw) {
JAnnotationType nameType8 = new JAnnotationType("Name");
JAnnotationType authorType8 = new JAnnotationType("Author");
JAnnotation author8 = new JAnnotation(authorType8);
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotationType.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotationType.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotationType.java (working copy)
@@ -39,12 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id: JAnnotationType.java
- *
- * Contributors:
- * --------------
- * Andrew Fawcett (andrew.fawcett@coda.com) - Original Author
*/
package org.exolab.javasource;
@@ -78,7 +72,8 @@
* }
*
*
- * @author Andrew Fawcett
+ * @author Andrew Fawcett
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public final class JAnnotationType extends JStructure {
/**
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotationTypeElement.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotationTypeElement.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JAnnotationTypeElement.java (working copy)
@@ -39,12 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id: JAnnotationTypeElement.java
- *
- * Contributors:
- * --------------
- * Andrew Fawcett (andrew.fawcett@coda.com) - Original Author
*/
package org.exolab.javasource;
@@ -53,7 +47,8 @@
/**
* Holds information about a given annotation type element.
*
- * @author Andrew Fawcett
+ * @author Andrew Fawcett
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public final class JAnnotationTypeElement implements JMember {
private String _name;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JArrayType.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JArrayType.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JArrayType.java (working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2006 Werner Guttmann
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.exolab.javasource;
/**
@@ -2,6 +17,9 @@
/**
* JType sub-class for Arrays.
+ *
+ * @author Werner Guttman
+ * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
* @since 1.0.4
*/
public class JArrayType extends JComponentizedType {
@@ -16,8 +34,7 @@
}
/**
- * Returns true if this type represents an Array.
- * @return true if this type represents an Array.
+ * {@inheritDoc}
*/
public final boolean isArray() {
return true;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JClass.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JClass.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JClass.java (working copy)
@@ -39,25 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
- *
- * This file was originally developed by Keith Visco during the
- * course of employment at Intalio Inc.
- * All portions of this file developed by Keith Visco after Jan 19 2005 are
- * Copyright (C) 2005 Keith Visco. All Rights Reserverd.
- *
- * Contributors:
- * --------------
- * Keith Visco (keith AT kvisco DOT com)
- * - Original Author
- *
- * Martin Skopp (skopp AT riege DOT de)
- * - Moved some core code into JStructure and revised to
- * extend JStructure
- *
*/
-
package org.exolab.javasource;
import java.util.Enumeration;
@@ -74,35 +56,23 @@
*/
public class JClass extends JStructure {
- /**
- * The list of constructors for this JClass.
- */
- protected Vector _constructors = null;
+ /** The list of constructors for this JClass. */
+ private Vector _constructors = null;
- /**
- * The list of member variables (fields) of this JClass.
- */
- protected JNamedMap _fields = null;
+ /** The list of member variables (fields) of this JClass. */
+ private JNamedMap _fields = null;
- /**
- * A collection of inner classes for this JClass.
- */
- protected Vector _innerClasses = null;
+ /** A collection of inner classes for this JClass. */
+ private Vector _innerClasses = null;
- /**
- * The list of methods of this JClass.
- */
- protected Vector _methods = null;
+ /** The list of methods of this JClass. */
+ private Vector _methods = null;
- /**
- * The superclass for this JClass.
- */
- private JTypeName _superClass = null;
+ /** The superclass for this JClass. */
+ private JTypeName _superClass = null;
- /**
- * The source code for static initialization.
- */
- protected JSourceCode _staticInitializer = new JSourceCode();
+ /** The source code for static initialization. */
+ private JSourceCode _staticInitializer = new JSourceCode();
/**
* Creates a new JClass with the given name.
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JCollectionType.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JCollectionType.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JCollectionType.java (working copy)
@@ -1,8 +1,25 @@
+/*
+ * Copyright 2006 Werner Guttmann
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.exolab.javasource;
-
/**
* JType sub-class for collections.
+ *
+ * @author Werner Guttman
+ * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
* @since 1.0.4
*/
public class JCollectionType extends JComponentizedType {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JComment.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JComment.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JComment.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
/**
@@ -100,11 +97,12 @@
*/
private StringBuffer _comment = null;
- /**
- * The maximum number of characters per line.
- */
+ /** The maximum number of characters per line. */
protected static final int MAX_LENGTH = 65;
+ /** The maximum number of characters to indent comments. */
+ protected static final int MAX_INDENT = 17;
+
/**
* Creates a new Java Comment.
*/
@@ -145,9 +143,8 @@
short currentIndent = jsw.getIndentSize();
int maxLength = MAX_LENGTH - currentIndent;
- //-- a simple to check to make sure we have some room
- //-- to print the comment
- if (maxLength <= 17) { maxLength = MAX_LENGTH / 2; }
+ //-- a simple check to make sure we have some room to print the comment
+ if (maxLength <= MAX_INDENT) { maxLength = MAX_LENGTH / 2; }
short resolvedStyle = _style;
@@ -237,7 +234,7 @@
private String _comment = null;
- private int _maxLength = 65;
+ private int _maxLength = JComment.MAX_LENGTH;
private int _offset = 0;
private int _length = 0;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JCompUnit.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JCompUnit.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JCompUnit.java (working copy)
@@ -39,17 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 2001-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * Contributors:
- * --------------
- * Gary Shea (shea AT gtsdesign DOT com)
- * - Original Author
- *
- * Keith Visco
- * - Changed JCompElement references to JStructure, some additional
- * tweaking to get it working with the current Javasource package.
- *
- * $Id$
*/
package org.exolab.javasource;
@@ -68,8 +57,7 @@
* learning curve.
*
* @author Gary Shea
- * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar
- * 2005) $
+ * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $
*/
public final class JCompUnit {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JComponentizedType.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JComponentizedType.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JComponentizedType.java (working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2006 Werner Guttmann
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.exolab.javasource;
/**
@@ -2,18 +17,16 @@
/**
* JType sub-class for componentized types, such as array as collections.
+ *
+ * @author Werner Guttman
+ * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
* @since 1.0.4
*/
public class JComponentizedType extends JType {
-
- /**
- * Indicates the data type contained in this collection.
- */
+ /** Indicates the data type contained in this collection. */
private JType _componentType;
- /**
- * Indicates whether Java 5.0 compliant code is required.
- */
+ /** Indicates whether Java 5.0 compliant code is required. */
private boolean _useJava50;
/**
@@ -18,6 +31,7 @@
/**
* Creates an instance of a componentized type, of type 'name'.
+ *
* @param name Type name for this componentized type.
* @param componentType Component type.
* @param useJava50 true if Java 5.0 should be used.
@@ -25,16 +39,9 @@
public JComponentizedType(final String name, final JType componentType,
final boolean useJava50) {
super (name);
- setComponentType(componentType);
- this._useJava50 = useJava50;
- }
- /**
- * Sets the component type.
- * @param componentType The component type.
- */
- private void setComponentType(final JType componentType) {
- this._componentType = componentType;
+ _componentType = componentType;
+ _useJava50 = useJava50;
}
/**
@@ -39,10 +46,11 @@
/**
* Returns the component type.
+ *
* @return the component type.
*/
- public JType getComponentType() {
- return this._componentType;
+ public final JType getComponentType() {
+ return _componentType;
}
/**
@@ -47,10 +55,10 @@
/**
* Indicates whether Java 5.0 is used.
+ *
* @return True if Java 5.0 is used
*/
- public boolean isUseJava50() {
- return this._useJava50;
+ public final boolean isUseJava50() {
+ return _useJava50;
}
-
}
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JConstructor.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JConstructor.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JConstructor.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JDocComment.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JDocComment.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JDocComment.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2003 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JDocDescriptor.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JDocDescriptor.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JDocDescriptor.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
/**
@@ -48,7 +45,7 @@
/**
* A descriptor for a JavaDoc comment.
*
- * @author Keith Visco
+ * @author Keith Visco
* @version $Revision$ $Date: 2003-03-03 00:05:44 -0700 (Mon, 03 Mar 2003) $
*/
public final class JDocDescriptor {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JEnum.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JEnum.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JEnum.java (working copy)
@@ -39,12 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id: JEnum.java
- *
- * Contributors:
- * --------------
- * Andrew Fawcett (andrew.fawcett@coda.com) - Original Author
*/
package org.exolab.javasource;
@@ -55,7 +49,8 @@
/**
* Describes the definition of a enum type class.
*
- * @author Andrew Fawcett
+ * @author Andrew Fawcett
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public final class JEnum extends JClass {
/**
@@ -149,7 +144,6 @@
if (jsw == null) {
throw new IllegalArgumentException("argument 'jsw' should not be null.");
}
- StringBuffer buffer = new StringBuffer();
printHeader(jsw);
printPackageDeclaration(jsw);
@@ -155,11 +149,12 @@
printPackageDeclaration(jsw);
//-- get imports from inner-classes
+ JClass[] innerClasses = getInnerClasses();
Vector removeImports = null;
- if ((_innerClasses != null) && (_innerClasses.size() > 0)) {
+ if (innerClasses.length > 0) {
removeImports = new Vector();
- for (int i = 0; i < _innerClasses.size(); i++) {
- JClass iClass = (JClass) _innerClasses.elementAt(i);
+ for (int i = 0; i < innerClasses.length; i++) {
+ JClass iClass = innerClasses[i];
Enumeration enumeration = iClass.getImports();
while (enumeration.hasMoreElements()) {
String classname = (String) enumeration.nextElement();
@@ -188,6 +183,7 @@
//-- print class information
//-- we need to add some JavaDoc API adding comments
+ StringBuffer buffer = new StringBuffer();
buffer.setLength(0);
//-- print annotations
@@ -264,7 +260,9 @@
}
private void printMemberVariables(final JSourceWriter jsw) {
- if (_fields.size() > 0) {
+ JField[] fields = getFields();
+
+ if (fields.length > 0) {
jsw.writeln();
jsw.writeln(" //--------------------------/");
jsw.writeln(" //- Class/Member Variables -/");
@@ -272,8 +270,8 @@
jsw.writeln();
}
- for (int i = 0; i < _fields.size(); i++) {
- JField jField = (JField) _fields.get(i);
+ for (int i = 0; i < fields.length; i++) {
+ JField jField = fields[i];
//-- print Java comment
JDocComment comment = jField.getComment();
@@ -312,10 +310,10 @@
//- Static Initializer -/
//----------------------/
- if (!_staticInitializer.isEmpty()) {
+ if (!getStaticInitializationCode().isEmpty()) {
jsw.writeln();
jsw.writeln("static {");
- jsw.writeln(_staticInitializer.toString());
+ jsw.writeln(getStaticInitializationCode().toString());
jsw.writeln("};");
jsw.writeln();
}
@@ -322,7 +320,9 @@
}
private void printConstructors(final JSourceWriter jsw) {
- if (_constructors.size() > 0) {
+ JConstructor[] constructors = getConstructors();
+
+ if (constructors.length > 0) {
jsw.writeln();
jsw.writeln(" //----------------/");
jsw.writeln(" //- Constructors -/");
@@ -330,8 +330,8 @@
jsw.writeln();
}
- for (int i = 0; i < _constructors.size(); i++) {
- JConstructor jConstructor = (JConstructor) _constructors.elementAt(i);
+ for (int i = 0; i < constructors.length; i++) {
+ JConstructor jConstructor = constructors[i];
jConstructor.print(jsw);
jsw.writeln();
}
@@ -338,7 +338,9 @@
}
private void printMethods(final JSourceWriter jsw) {
- if (_methods.size() > 0) {
+ JMethod[] methods = getMethods();
+
+ if (methods.length > 0) {
jsw.writeln();
jsw.writeln(" //-----------/");
jsw.writeln(" //- Methods -/");
@@ -346,8 +348,8 @@
jsw.writeln();
}
- for (int i = 0; i < _methods.size(); i++) {
- JMethod jMethod = (JMethod) _methods.elementAt(i);
+ for (int i = 0; i < methods.length; i++) {
+ JMethod jMethod = methods[i];
jMethod.print(jsw);
jsw.writeln();
}
@@ -354,7 +356,9 @@
}
private void printInnerClasses(final JSourceWriter jsw) {
- if ((_innerClasses != null) && (_innerClasses.size() > 0)) {
+ JClass[] innerClasses = getInnerClasses();
+
+ if (innerClasses.length > 0) {
jsw.writeln();
jsw.writeln(" //-----------------/");
jsw.writeln(" //- Inner Classes -/");
@@ -361,8 +365,8 @@
jsw.writeln("//-----------------/");
jsw.writeln();
- for (int i = 0; i < _innerClasses.size(); i++) {
- JClass jClass = (JClass) _innerClasses.elementAt(i);
+ for (int i = 0; i < innerClasses.length; i++) {
+ JClass jClass = innerClasses[i];
jClass.print(jsw, true);
jsw.writeln();
}
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JEnumConstant.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JEnumConstant.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JEnumConstant.java (working copy)
@@ -39,12 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id: JEnum.java
- *
- * Contributors:
- * --------------
- * Andrew Fawcett (andrew.fawcett@coda.com) - Original Author
*/
package org.exolab.javasource;
@@ -54,7 +48,8 @@
/**
* Describes the definition of a enum constant.
*
- * @author Andrew Fawcett
+ * @author Andrew Fawcett
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public final class JEnumConstant extends JAnnotatedElementHelper implements JMember {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JField.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JField.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JField.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
/**
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JInterface.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JInterface.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JInterface.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 2001-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
@@ -58,9 +56,12 @@
* @version $Revision$ $Date: 2005-02-26 17:30:28 -0700 (Sat, 26 Feb 2005) $
*/
public final class JInterface extends JStructure {
-
+ /** Default size of the map for fields. */
+ private static final int DEFAULT_FIELD_MAP_SIZE = 3;
+
/** The fields for this JInterface. */
private JNamedMap _fields = null;
+
/** The list of methods of this JInterface. */
private Vector _methods = null;
@@ -113,7 +114,7 @@
//-- only initialize fields if we need it, many interfaces
//-- don't contain any fields, no need to waste space
if (_fields == null) {
- _fields = new JNamedMap(3);
+ _fields = new JNamedMap(DEFAULT_FIELD_MAP_SIZE);
}
_fields.put(name, jField);
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMember.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMember.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMember.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
/**
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethod.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethod.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethod.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
import java.util.Vector;
@@ -52,7 +49,7 @@
* closely after the Java Reflection API. This class is part of package which
* is used to create source code.
*
- * @author Keith Visco
+ * @author Keith Visco
* @version $Revision$ $Date: 2004-12-03 11:57:33 -0700 (Fri, 03 Dec 2004) $
*/
public final class JMethod implements JMember, JAnnotatedElement {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethodSignature.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethodSignature.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethodSignature.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
@@ -51,11 +49,13 @@
* this package was modelled after the Java Reflection API as much as possible
* to reduce the learning curve.
*
- * @author Keith Visco
+ * @author Keith Visco
* @version $Revision$ $Date: 2004-12-03 11:57:33 -0700 (Fri, 03 Dec 2004) $
*/
public final class JMethodSignature extends JAnnotatedElementHelper {
-
+ /** Default size of the map for method parameters. */
+ private static final int DEFAULT_PARAM_MAP_SIZE = 3;
+
/** The set of modifiers for this JMethodSignature. */
private JModifiers _modifiers = null;
/** The return type of this method. */
@@ -84,7 +84,7 @@
this._returnType = null;
this._name = name;
this._modifiers = new JModifiers();
- this._params = new JNamedMap(3);
+ this._params = new JNamedMap(DEFAULT_PARAM_MAP_SIZE);
this._exceptions = new Vector(1);
} //-- JMethodSignature
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JModifiers.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JModifiers.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JModifiers.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
/**
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JNamedMap.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JNamedMap.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JNamedMap.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
@@ -48,10 +46,11 @@
/**
* A simple String to Object mapping which preserves order.
- *
+ *
* Note: This class is not synchronized. So be careful. :-)
*
- * @author Keith Visco
+ * @author Keith Visco
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public final class JNamedMap {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JNaming.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JNaming.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JNaming.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
/**
@@ -48,7 +45,7 @@
/**
* A utility class used to validate identifiers and class names.
*
- * @author Keith Visco
+ * @author Keith Visco
* @version $Revision$ $Date: 2003-03-03 00:05:44 -0700 (Mon, 03 Mar 2003) $
*/
public final class JNaming {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JParameter.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JParameter.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JParameter.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JSourceCode.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JSourceCode.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JSourceCode.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999-2001 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
import java.util.Vector;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JSourceWriter.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JSourceWriter.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JSourceWriter.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
@@ -49,7 +47,7 @@
/**
* The writer used by the javasource classes.
*
- * @author Keith Visco
+ * @author Keith Visco
* @version $Revision$ $Date: 2005-03-30 03:29:24 -0700 (Wed, 30 Mar 2005) $
*/
public final class JSourceWriter extends Writer {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JStructure.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JStructure.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JStructure.java (working copy)
@@ -39,8 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 2001-2002 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
package org.exolab.javasource;
@@ -53,7 +51,7 @@
/**
* This class represents the basic Java "structure" for a Java source file. This
* is the base class for JClass and JInterface.
- *
+ *
* This is a useful utility when creating in memory source code. The code in
* this package was modelled after the Java Reflection API as much as possible
* to reduce the learning curve.
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JType.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JType.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JType.java (working copy)
@@ -39,10 +39,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 1999 (C) Intalio, Inc. All Rights Reserved.
- *
- * $Id$
*/
-
package org.exolab.javasource;
/**
@@ -53,56 +50,35 @@
* @version $Revision$ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $
*/
public class JType {
-
- /**
- * JType for a boolean (Boolean).
- */
+ /** JType for a boolean (Boolean). */
public static final JType BOOLEAN = new JType("boolean", "java.lang.Boolean");
- /**
- * JType instance for a byte (Byte).
- */
+ /** JType instance for a byte (Byte). */
public static final JType BYTE = new JType("byte", "java.lang.Byte");
- /**
- * JType instance for a char (Char).
- */
+ /** JType instance for a char (Char). */
public static final JType CHAR = new JType("char", "java.lang.Character");
- /**
- * JType instance for a double (Double).
- */
+ /** JType instance for a double (Double). */
public static final JType DOUBLE = new JType("double", "java.lang.Double");
- /**
- * JType instance for a float (Float).
- */
+ /** JType instance for a float (Float). */
public static final JType FLOAT = new JType("float", "java.lang.Float");
- /**
- * JType instance for a int (Integer).
- */
+ /** JType instance for a int (Integer). */
public static final JType INT = new JType("int", "java.lang.Integer");
- /**
- * JType instance for a long (Long).
- */
+ /** JType instance for a long (Long). */
public static final JType LONG = new JType("long", "java.lang.Long");
- /**
- * JType instance for a short (Short).
- */
+ /** JType instance for a short (Short). */
public static final JType SHORT = new JType("short", "java.lang.Short");
- /**
- * Fully qualified of the Java type represented.
- */
+ /** Fully qualified of the Java type represented. */
private String _name = null;
- /**
- * Only populated for primitive types and indicates the wrapper Object class
- * name for this primitive type.
- */
+ /** Only populated for primitive types and indicates the wrapper Object class
+ * name for this primitive type. */
private String _wrapperName = null;
/**
@@ -108,13 +84,13 @@
/**
* Creates a new JType with the given name.
*
- * @param name
- * the name of the type
+ * @param name The name of the type.
*/
protected JType(final String name) {
super();
- this._name = name;
- } // -- JType
+
+ _name = name;
+ }
/**
* Creates a new JType for a primitive with the given name and wrapper name.
@@ -121,14 +97,13 @@
* This constructor is private so it can only be used by the primitives
* defined here.
*
- * @param name
- * the name of the type
- * @param wrapperName
- * the name of the wrapper Object type for this primitive type
+ * @param name The name of the type.
+ * @param wrapperName The name of the wrapper Object type for this primitive type.
*/
private JType(final String name, final String wrapperName) {
this(name);
- this._wrapperName = wrapperName;
+
+ _wrapperName = wrapperName;
}
/**
@@ -134,7 +109,7 @@
/**
* Returns the unqualified Java type name (i.e. without package).
*
- * @return the unqualified Java type name.
+ * @return The unqualified Java type name.
*/
public final String getLocalName() {
// -- use getName method in case it's been overloaded
@@ -144,10 +119,10 @@
/**
* Returns the qualified Java type name.
*
- * @return the qualified Java type name.
+ * @return The qualified Java type name.
*/
public final String getName() {
- return this._name;
+ return _name;
}
/**
@@ -154,11 +129,11 @@
* Return the name of the wrapper object for a primitive type, null for
* non-primitive types.
*
- * @return the name of the wrapper object for a primitive type, null for
+ * @return The name of the wrapper object for a primitive type, null for
* non-primitive types.
*/
public final String getWrapperName() {
- return this._wrapperName;
+ return _wrapperName;
}
/**
@@ -173,6 +148,7 @@
/**
* Returns true if this type represents an Array. Always returns false
* unless overridden by an extending class.
+ *
* @return true if this type represents an Array.
*/
public boolean isArray() {
@@ -183,10 +159,10 @@
* Returns the String representation of this JType, which is simply the name
* of this type.
*
- * @return the String representation of this JType.
+ * @return The String representation of this JType.
*/
public String toString() {
- return this._name;
+ return _name;
}
/**
@@ -193,16 +169,13 @@
* Changes the package this JType belongs to. This method is protected to
* allow subtypes, such as JClass to alter the package to which this JType
* belongs.
- *
+ *
* Note: The package name cannot be changed on a primitive type.
*
- * @param newPackage
- * the new package to which this JType belongs
+ * @param newPackage The new package to which this JType belongs.
*/
protected final void changePackage(final String newPackage) {
- if (this._name == null || this.isPrimitive()) {
- return;
- }
+ if (_name == null || isPrimitive()) { return; }
String localName = JNaming.getLocalNameFromClassName(_name);
@@ -207,10 +180,9 @@
String localName = JNaming.getLocalNameFromClassName(_name);
if (newPackage == null || newPackage.length() == 0) {
- this._name = localName;
+ _name = localName;
} else {
- this._name = newPackage + "." + localName;
+ _name = newPackage + "." + localName;
}
}
-
}
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JTypeName.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JTypeName.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JTypeName.java (working copy)
@@ -39,10 +39,6 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 2005 (C) Keith Visco. All Rights Reserved.
- *
- * Created on Feb 26, 2005
- *
- * $Id$
*/
package org.exolab.javasource;
@@ -49,8 +45,8 @@
/**
* Represents a class name.
*
- * @author Keith Visco
- * @version $Revision$ $Date: $
+ * @author Keith Visco
+ * @version $Revision$ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
*/
public final class JTypeName {
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/Java5HacksHelper.java
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/Java5HacksHelper.java (revision 6665)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/Java5HacksHelper.java (working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2006 Werner Guttmann
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.exolab.javasource;
import java.util.HashMap;
@@ -8,10 +23,14 @@
* extends the appropriate class. We only check the class of the arguments. This
* class may not be generically useful, but is useful with the code generated by
* Castor.
- *
+ *
* Our one public method, {@link #addOverrideAnnotations(JMethodSignature)},
* should only be called when you already know that you are generating Java-5
* style code.
+ *
+ * @author Werner Guttman
+ * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
+ * @since 1.0.4
*/
public final class Java5HacksHelper {
@@ -23,10 +42,26 @@
}
private static class MethodSpec {
- public String _methodName = null;
- public int _paramCount = 0;
- public String _param1ClassName = null;
- public String _param2ClassName = null;
+ private String _methodName;
+ private int _paramCount;
+ private String _param1ClassName;
+ private String _param2ClassName;
+
+ public MethodSpec(final String methodName, final int paramCount,
+ final String param1ClassName, final String param2ClassName) {
+ _methodName = methodName;
+ _paramCount = paramCount;
+ _param1ClassName = param1ClassName;
+ _param2ClassName = param2ClassName;
+ }
+
+ public String getMethodName() { return _methodName; }
+
+ public int getParamCount() { return _paramCount; }
+
+ public String getParam1ClassName() { return _param1ClassName; }
+
+ public String getParam2ClassName() { return _param2ClassName; }
}
private static final HashMap DEFINED_SPECS = new HashMap();
@@ -33,11 +68,7 @@
private static void createMethodSpec(final String methodName, final int paramCount,
final String param1ClassName, final String param2ClassName) {
- MethodSpec temp = new MethodSpec();
- temp._methodName = methodName;
- temp._paramCount = paramCount;
- temp._param1ClassName = param1ClassName;
- temp._param2ClassName = param2ClassName;
+ MethodSpec temp = new MethodSpec(methodName, paramCount, param1ClassName, param2ClassName);
DEFINED_SPECS.put(methodName, temp);
}
@@ -43,24 +74,23 @@
}
static {
- createMethodSpec("getAccessMode", 0, "", "");
- createMethodSpec("getExtends", 0, "", "");
- createMethodSpec("getIdentity", 0, "", "");
- createMethodSpec("getJavaClass", 0, "", "");
- createMethodSpec("getNameSpacePrefix", 0, "", "");
- createMethodSpec("getNameSpaceURI", 0, "", "");
- createMethodSpec("getValidator", 0, "", "");
- createMethodSpec("getXMLName", 0, "", "");
- createMethodSpec("getXTransients", 0, "", "");
- createMethodSpec("newInstance", 1, "java.lang.Object", "");
- createMethodSpec("setValue", 1, "java.lang.Object", "");
- createMethodSpec("equals", 1, "java.lang.Object", "");
- createMethodSpec("getValue", 1, "java.lang.Object", "");
- createMethodSpec("marshal", 1, "java.io.Writer", "");
- createMethodSpec("newInstance", 1, "java.lang.Object", "");
- createMethodSpec("setValue", 2, "java.lang.Object", "java.lang.Object");
+ createMethodSpec("getAccessMode", 0, "", "");
+ createMethodSpec("getExtends", 0, "", "");
+ createMethodSpec("getIdentity", 0, "", "");
+ createMethodSpec("getJavaClass", 0, "", "");
+ createMethodSpec("getNameSpacePrefix", 0, "", "");
+ createMethodSpec("getNameSpaceURI", 0, "", "");
+ createMethodSpec("getValidator", 0, "", "");
+ createMethodSpec("getXMLName", 0, "", "");
+ createMethodSpec("getXTransients", 0, "", "");
+ createMethodSpec("newInstance", 1, "java.lang.Object", "");
+ createMethodSpec("setValue", 1, "java.lang.Object", "");
+ createMethodSpec("equals", 1, "java.lang.Object", "");
+ createMethodSpec("getValue", 1, "java.lang.Object", "");
+ createMethodSpec("marshal", 1, "java.io.Writer", "");
+ createMethodSpec("newInstance", 1, "java.lang.Object", "");
+ createMethodSpec("setValue", 2, "java.lang.Object", "java.lang.Object");
createMethodSpec("setXTransients", 1, "org.openmrm.core.data.castor.XTransients", "");
-// createMethodSpec("getAttributeId", 0, "", "");
};
/** An override annotation we use to see if we can get others of its type. */
@@ -91,7 +121,7 @@
// If the number of parameters isn't what we're prepared for, then jump out
int paramCount = jms.getParameters().length;
- if (paramCount != methodSpec._paramCount) {
+ if (paramCount != methodSpec.getParamCount()) {
return;
}
@@ -102,7 +132,7 @@
break;
case 1:
String incomingClassName1 = jms.getParameter(0).getType().getName();
- if (incomingClassName1.equalsIgnoreCase(methodSpec._param1ClassName)) {
+ if (incomingClassName1.equalsIgnoreCase(methodSpec.getParam1ClassName())) {
addOverrideAnnotation = true;
}
break;
@@ -109,8 +139,8 @@
case 2:
String className1 = jms.getParameter(0).getType().getName();
String className2 = jms.getParameter(1).getType().getName();
- if (className1.equalsIgnoreCase(methodSpec._param1ClassName)
- && className2.equalsIgnoreCase(methodSpec._param2ClassName)) {
+ if (className1.equalsIgnoreCase(methodSpec.getParam1ClassName())
+ && className2.equalsIgnoreCase(methodSpec.getParam2ClassName())) {
addOverrideAnnotation = true;
}
break;
Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/package.html
===================================================================
--- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/package.html (revision 0)
+++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/package.html (revision 0)
@@ -0,0 +1,21 @@
+
+
+ Java Source classes for Castor XML code generator
+
+
+ This package contains classes that represent Java Source objects for Castor XML
+ code generator.
+
+ - Author:
+ - Keith Visco
+ - Author:
+ - Martin Skopp
+ - Author:
+ - Gary Shea
+ - Author:
+ - Andrew Fawcett
+ - Author:
+ - Werner Guttmann
+
+
+
Index: C:/Java/castor-1/src/doc/release-notes.xml
===================================================================
--- C:/Java/castor-1/src/doc/release-notes.xml (revision 6666)
+++ C:/Java/castor-1/src/doc/release-notes.xml (working copy)
@@ -34,6 +34,26 @@
+
+
+ Cleaned up checkstyle warnings/infos at javasource package of codegen module.
+
+
+ Ralf Joachim
+ ralf.joachim@syscon-world.de
+
+
+ Ralf Joachim
+ ralf.joachim@syscon-world.de
+
+
+ Ralf Joachim
+ ralf.joachim@syscon-world.de
+
+ Enh.
+ XML
+ 20070101
+
Cleaned up checkstyle warnings at anttask module and introduce new
Index: C:/Java/castor-1/src/etc/CHANGELOG
===================================================================
--- C:/Java/castor-1/src/etc/CHANGELOG (revision 6666)
+++ C:/Java/castor-1/src/etc/CHANGELOG (working copy)
@@ -1,6 +1,11 @@
SVN
-------------------------------
+XML: Resolved issue CASTOR-1789 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de]
+ Cleaned up checkstyle warnings/infos at javasource package of codegen module.
+ Details: http://jira.codehaus.org/browse/CASTOR-1789
+ (Ralf - 20070101)
+
XML: Resolved issue CASTOR-1776 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de]
Cleaned up checkstyle warnings at anttask module and introduce new CastorCodeGenTask.
Details: http://jira.codehaus.org/browse/CASTOR-1776