The MappingLoader of this XMLClassDescriptorResolver
@@ -481,7 +478,7 @@
*
* If any of these resources yield an XMLClassDescriptor it is added to the
* internal cache and returned as result.
- *
+ *
* @param className
* The class to get the descriptor for.
* @param loader
@@ -521,6 +518,15 @@
// try loading the descriptor from .class file
descriptor = this.loadDescriptorClass(className, loader);
+ if (descriptor == null) {
+ // If we didn't find the descriptor, look in a lower package
+ int offset = className.lastIndexOf(".");
+ if (offset > 0 && !className.endsWith(".")) {
+ String newClassName = className.substring(0, offset+1)
+ + XMLConstants.DESCRIPTOR_PACKAGE + className.substring(offset);
+ descriptor = this.loadDescriptorClass(newClassName, loader);
+ }
+ }
if (descriptor != null) {
return descriptor;
}
@@ -530,7 +536,7 @@
/**
* Gets the package name of the given class name.
- *
+ *
* @param className
* The class name to retrieve the package name from.
* @return The package name or the empty String if className
@@ -547,7 +553,7 @@
}
return "";
}
-
+
/**
* Internal cache for Class objects.
@@ -554,7 +560,7 @@
*
* The cache keeps a list of classes that could not be loaded to prevent
* loading those classes again.
- *
+ *
* @author Steven Dolg
*/
private class ClassCache {
@@ -571,7 +577,7 @@
* If the requested class could not be loaded its name is stored in the
* list of missing classes. Further requests to load such classes will
* prevent asking the class loader again.
- *
+ *
* @param className
* The name of the class to be loaded. This must be a fully
* qualified name (i.e. including the package).
@@ -614,10 +620,10 @@
* mapping files and CDR lists that have been loaded. Just like the
* ClassCache it also has a list of missing descriptors to avoid trying to
* load those descriptors again.
- *
+ *
* The cached descriptors are available via the name of the classes they
* describe or via their XML name from a mapping file.
- *
+ *
* @author Steven Dolg
*/
private class DescriptorCache {
@@ -650,7 +656,7 @@
private List _loadedCDRLists;
/**
* Flag indicating whether package mappings should be loaded or not.
- *
+ *
* @see XMLClassDescriptorResolverImpl#setLoadPackageMappings(boolean)
*/
private boolean _loadPackageMappings = true;
@@ -673,15 +679,15 @@
/**
* Adds a descriptor to this caches maps.
* The descriptor is mapped both with the class name and its XML name.
- *
+ *
* The descriptor will not be mapped with its XML name is
* null, the empty string (""), or has the value of the
* constant INTERNAL_CONTAINER_NAME.
- *
+ *
* If there already is a descriptor for the given className
* and/or the descriptor's XML name the previously cached descriptor is
* replaced.
- *
+ *
* @param className
* The class name to be used for mapping the given
* descriptor.
@@ -687,7 +693,7 @@
* descriptor.
* @param descriptor
* The descriptor to be mapped.
- *
+ *
* @see #INTERNAL_CONTAINER_NAME
*/
private void addDescriptor(String className, XMLClassDescriptor descriptor) {
@@ -713,9 +719,9 @@
/**
* Adds the given descriptor to this DescriptorCache.
* The descriptor will be mapped to its class name and its XML name.
- *
+ *
* @see #addDescriptor(String, XMLClassDescriptor) for details.
- *
+ *
* @param descriptor
* The XMLClassDescriptor to be added.
*/
@@ -726,10 +732,10 @@
/**
* Adds the given class name to the list of classes a descriptor is
* unavailable for.
- *
+ *
* @param className
* The class name to be added.
- *
+ *
* @see #isMissingDescriptor(String)
*/
public void addMissingDescriptor(String className) {
@@ -738,7 +744,7 @@
/**
* Gets the descriptor that is mapped to the given class name.
- *
+ *
* @param className
* The class name to get a descriptor for.
* @return The descriptor mapped to the given name or null
@@ -753,7 +759,7 @@
*
* This method will return all previously cached descriptors with the
* given XML name regardless of their namespace.
- *
+ *
* @param xmlName
* The XML name of the descriptors to get.
* @return A list of descriptors with the given XML name or an empty
@@ -780,7 +786,7 @@
* NOTE: If an descriptor with the XML name in question is added to this
* cache, the iterator will fail due to an
* ConcurrentModificationException
- *
+ *
* @param xmlName
* The XML name of the descriptors to get.
* @return An iterator over descriptors with the given XML name. If no
@@ -788,7 +794,7 @@
* the iterator will never return an object (.hasNext() will
* immediately return false). This method will
* never return null!
- *
+ *
* @see ConcurrentModificationException
* @see List#iterator()
*/
@@ -805,7 +811,7 @@
* XMLClassDescriptorResolverImpl found to have no descriptor. The cache
* itself has no means of determining that this is the case and thus
* will never add/remove class names to/from it.
- *
+ *
* @param className
* The class name to be checked.
* @return true If the given class name was stated to
@@ -812,7 +818,7 @@
* have no descriptor by a previous call to
* addMissingDescriptor with exactly the same
* class name. false otherwise.
- *
+ *
* @see #addMissingDescriptor(String)
*/
public boolean isMissingDescriptor(String className) {
@@ -825,17 +831,17 @@
*
* If the CDR file is available and could be loaded properly the
* descriptors listed in it are added to this cache.
- *
+ *
* If a descriptor is listed in the CDR file for the given package but
* could not be loaded (e.g. because the reference class file is not
* available) the descriptor is ignored but no exception is thrown.
- *
+ *
* If a CDR file is not available for the given package this method will
* not load any descriptors and not throw any exceptions.
- *
+ *
* Further calls to this method with the same package name will not be
* processed.
- *
+ *
* @param packageName
* The package to load the CDR file for.
* @param loader
@@ -891,7 +897,7 @@
*
* Further calls to this method with the same package name will not be
* processed.
- *
+ *
* @param packageName
* The name of the package to load the mapping file for.
* @param loader
@@ -924,7 +930,7 @@
/**
* Enables or disabled the loading of package mapping files.
- *
+ *
* @param loadPackageMappings
* true if package mapping files should be
* loaded. false if not.
@@ -938,7 +944,7 @@
* the given URL.
* The provided URL must exist and be suitable for loading properties
* from.
- *
+ *
* @param url
* The URL to load the properties from. This must not be
* null!
@@ -945,7 +951,7 @@
* @return The loaded properties.
* @throws IOException
* If loading the properties from the given ULR failed.
- *
+ *
* @see Properties
* @see Properties#load(InputStream)
*/
@@ -964,7 +970,7 @@
* packageName and returns the resulting file path.
* If packageName is null or a zero-length
* String, this method will return fileName.
- *
+ *
* @param fileName
* The file name to be qualified.
* @param packageName
@@ -986,7 +992,7 @@
/**
* Loads a package mapping file for the given package name using the
* provided ClassLoader.
- *
+ *
* @param packageName
* The name of the package to load the mapping file for.
* @param loader
@@ -1030,7 +1036,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.exolab.castor.xml.ClassDescriptorEnumeration#getNext()
*/
public XMLClassDescriptor getNext() {
@@ -1039,7 +1045,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.exolab.castor.xml.ClassDescriptorEnumeration#hasNext()
*/
public boolean hasNext() {
Index: /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JCompUnit.java
===================================================================
--- /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JCompUnit.java (revision 6550)
+++ /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JCompUnit.java (working copy)
@@ -68,7 +68,8 @@
* 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 {
@@ -81,7 +82,7 @@
/**
* JavaDoc comment for this compilation unit.
*/
- private JComment _header = null;
+ private JComment _header = null;
/**
* The package for this JCompUnit.
@@ -86,7 +87,7 @@
/**
* The package for this JCompUnit.
*/
- private String _packageName = null;
+ private String _packageName = null;
/**
* The file to which this JCompUnit will be written.
@@ -91,7 +92,7 @@
/**
* The file to which this JCompUnit will be written.
*/
- private String _fileName = null;
+ private String _fileName = null;
/**
* The set of top-level classes that live in this compilation unit.
@@ -96,7 +97,7 @@
/**
* The set of top-level classes that live in this compilation unit.
*/
- private Vector _classes = null;
+ private Vector _classes = null;
/**
* The set of top-level interfaces that live in this compilation unit.
@@ -101,7 +102,7 @@
/**
* The set of top-level interfaces that live in this compilation unit.
*/
- private Vector _interfaces = null;
+ private Vector _interfaces = null;
/**
* Creates a new JCompUnit.
@@ -106,17 +107,17 @@
/**
* Creates a new JCompUnit.
*
- * @param packageName the name of the package for this JCompUnit. If
- * packageName is null or empty, no 'package' line will be
- * generated.
- * @param fileName the name of the file to which this JCompUnit will be
- * written
+ * @param packageName
+ * the name of the package for this JCompUnit. If packageName is
+ * null or empty, no 'package' line will be generated.
+ * @param fileName
+ * the name of the file to which this JCompUnit will be written
*/
public JCompUnit(final String packageName, final String fileName) {
this._packageName = packageName;
- this._fileName = fileName;
+ this._fileName = fileName;
init();
- } //-- JCompUnit
+ } // -- JCompUnit
/**
* Creates a new JCompUnit with the given JClass (which must have been
@@ -123,7 +124,8 @@
* created with either a full class name or package/local name) as the
* public class. Package and file name are taken from jClass.
*
- * @param jClass the public class for this JCompUnit
+ * @param jClass
+ * the public class for this JCompUnit
*/
public JCompUnit(final JClass jClass) {
this._packageName = jClass.getPackageName();
@@ -129,21 +131,21 @@
this._packageName = jClass.getPackageName();
// The outer name is the package plus the simple name of the
- // outermost enclosing class. The file name is just the
+ // outermost enclosing class. The file name is just the
// simple name of the outermost enclosing class, so the
// package name part must be stripped off.
-// Commented out until inner-class support has been added.
-// kvisco - 20021211
-//
-// String outer = jClass.getOuterName();
-// int lastDot = outer.lastIndexOf(".");
-// String filePrefix;
-// if (lastDot != -1) {
-// filePrefix = outer.substring (lastDot + 1);
-// } else {
-// filePrefix = outer;
-// }
+ // Commented out until inner-class support has been added.
+ // kvisco - 20021211
+ //
+ // String outer = jClass.getOuterName();
+ // int lastDot = outer.lastIndexOf(".");
+ // String filePrefix;
+ // if (lastDot != -1) {
+ // filePrefix = outer.substring (lastDot + 1);
+ // } else {
+ // filePrefix = outer;
+ // }
String filePrefix = jClass.getLocalName();
@@ -151,7 +153,7 @@
init();
_classes.add(jClass);
- } //-- JCompUnit
+ } // -- JCompUnit
/**
* Creates a new JCompUnit with the given JInterface as public interface.
@@ -157,14 +159,15 @@
* Creates a new JCompUnit with the given JInterface as public interface.
* Package and file name are taken from jInterface.
*
- * @param jInterface the public interface for this JCompUnit.
+ * @param jInterface
+ * the public interface for this JCompUnit.
*/
public JCompUnit(final JInterface jInterface) {
this._packageName = jInterface.getPackageName();
- this._fileName = jInterface.getLocalName() + ".java";
+ this._fileName = jInterface.getLocalName() + ".java";
init();
_interfaces.add(jInterface);
- } //-- JCompUnit
+ } // -- JCompUnit
/**
* Common initialization code.
@@ -170,8 +173,8 @@
* Common initialization code.
*/
private void init() {
- _classes = new Vector();
- _interfaces = new Vector();
+ _classes = new Vector();
+ _interfaces = new Vector();
}
/**
@@ -178,7 +181,8 @@
* Adds the given JStructure (either a JInterface or a JClass) to this
* JCompUnit.
*
- * @param jStructure the JStructure to add
+ * @param jStructure
+ * the JStructure to add
*/
public void addStructure(final JStructure jStructure) {
if (jStructure instanceof JInterface) {
@@ -187,11 +191,11 @@
addClass((JClass) jStructure);
} else {
String err = "Unknown JStructure subclass '"
- + jStructure.getClass().getName() + "'.";
+ + jStructure.getClass().getName() + "'.";
throw new IllegalArgumentException(err);
}
- } //-- addStructure
+ } // -- addStructure
/**
* Adds a JClass to be printed in this file.
@@ -196,11 +200,12 @@
/**
* Adds a JClass to be printed in this file.
*
- * @param jClass the JClass to be printed in this file
+ * @param jClass
+ * the JClass to be printed in this file
*/
public void addClass(final JClass jClass) {
_classes.add(jClass);
- } //-- addClass
+ } // -- addClass
/**
* Adds a JInterface to be printed in this file.
@@ -205,11 +210,12 @@
/**
* Adds a JInterface to be printed in this file.
*
- * @param jInterface the JInterface to be printed in this file
+ * @param jInterface
+ * the JInterface to be printed in this file
*/
public void addInterface(final JInterface jInterface) {
_interfaces.add(jInterface);
- } //-- addInterface
+ } // -- addInterface
/**
* Returns a array of String containing all imported classes/packages, also
@@ -247,13 +253,14 @@
* given a call to {@link #print(String, String)}, or if destDir is null, a
* call to {@link #print()}.
*
- * @param destDir the destination directory. This may be null.
+ * @param destDir
+ * the destination directory. This may be null.
* @return the name of the file that this JCompUnit would be printed to
*/
public String getFilename(final String destDir) {
- String filename = new String (_fileName);
+ String filename = new String(_fileName);
- //-- Convert Java package to path string
+ // -- Convert Java package to path string
String javaPackagePath = "";
if ((_packageName != null) && (_packageName.length() > 0)) {
javaPackagePath = _packageName.replace('.', File.separatorChar);
@@ -259,7 +266,7 @@
javaPackagePath = _packageName.replace('.', File.separatorChar);
}
- //-- Create fully qualified path (including 'destDir') to file
+ // -- Create fully qualified path (including 'destDir') to file
File pathFile;
if (destDir == null) {
pathFile = new File(javaPackagePath);
@@ -270,7 +277,7 @@
pathFile.mkdirs();
}
- //-- Prefix filename with path
+ // -- Prefix filename with path
if (pathFile.toString().length() > 0) {
filename = pathFile.toString() + File.separator + filename;
}
@@ -276,7 +283,7 @@
}
return filename;
- } //-- getFilename
+ } // -- getFilename
/**
* Returns the name of the package that this JCompUnit is a member of.
@@ -286,18 +293,7 @@
*/
public String getPackageName() {
return this._packageName;
- } //-- getPackageName
-
- /**
- * Returns the package name of the provided class name.
- * @param className name from which to extract the package
- * @return the package name of the provided class name.
- */
- protected static String getPackageFromClassName(final String className) {
- int idx = className.lastIndexOf('.');
- if (idx > 0) { return className.substring(0, idx); }
- return null;
- } //-- getPackageFromClassName
+ } // -- getPackageName
/**
* Prints the source code for this JClass in the current directory with the
@@ -307,7 +303,7 @@
*/
public void print() {
print(null, null);
- } //-- print
+ } // -- print
/**
* Prints the source code for this JClass with the default line seperator of
@@ -313,7 +309,8 @@
* Prints the source code for this JClass with the default line seperator of
* the the runtime platform.
*
- * @param destDir the destination directory to use as the root directory for
+ * @param destDir
+ * the destination directory to use as the root directory for
* source generation
* @see #print(String, String)
*/
@@ -319,7 +316,7 @@
*/
public void print(final String destDir) {
print(destDir, null);
- } //-- print
+ } // -- print
/**
* Prints the source code for this JCompUnit using the provided root
@@ -325,14 +322,16 @@
* Prints the source code for this JCompUnit using the provided root
* directory and line separator.
*
- * @param destDir the destination directory to use as the root directory for
+ * @param destDir
+ * the destination directory to use as the root directory for
* source generation
- * @param lineSeparator the line separator to use at the end of each line.
- * If null, then the default line separator for the runtime
- * platform will be used.
+ * @param lineSeparator
+ * the line separator to use at the end of each line. If null,
+ * then the default line separator for the runtime platform will
+ * be used.
*/
public void print(final String destDir, final String lineSeparator) {
- //-- open output file
+ // -- open output file
String filename = getFilename(destDir);
File file = new File(filename);
@@ -340,7 +339,8 @@
try {
jsw = new JSourceWriter(new FileWriter(file));
} catch (java.io.IOException ioe) {
- System.out.println("unable to create compilation unit file: " + filename);
+ System.out.println("unable to create compilation unit file: "
+ + filename);
return;
}
@@ -352,7 +352,7 @@
print(jsw);
jsw.flush();
jsw.close();
- } //-- print
+ } // -- print
/**
* Prints the source code for this JClass to the provided JSourceWriter.
@@ -357,7 +357,8 @@
/**
* Prints the source code for this JClass to the provided JSourceWriter.
*
- * @param jsw the JSourceWriter to print to
+ * @param jsw
+ * the JSourceWriter to print to
*/
public void print(final JSourceWriter jsw) {
// Traverse the nested class and interface heirarchy and
@@ -363,10 +364,10 @@
// Traverse the nested class and interface heirarchy and
// update the names to match the compilation unit.
- resolveNames ();
+ resolveNames();
StringBuffer buffer = new StringBuffer();
- //-- write file header
+ // -- write file header
if (_header != null) {
_header.print(jsw);
} else {
@@ -377,7 +378,7 @@
jsw.writeln();
jsw.flush();
- //-- print package name
+ // -- print package name
if ((_packageName != null) && (_packageName.length() > 0)) {
buffer.setLength(0);
buffer.append("package ");
@@ -387,7 +388,7 @@
jsw.writeln();
}
- //-- print imports
+ // -- print imports
jsw.writeln(" //---------------------------------------------/");
jsw.writeln(" //- Imported classes, interfaces and packages -/");
jsw.writeln("//---------------------------------------------/");
@@ -396,8 +397,9 @@
String compUnitPackage = getPackageName();
for (Iterator iter = allImports.iterator(); iter.hasNext(); ) {
String importName = (String) iter.next();
- String importsPackage = JStructure.getPackageFromClassName(importName);
- if ((importsPackage != null) && !importsPackage.equals(compUnitPackage)) {
+ String importsPackage = JNaming.getPackageFromClassName(importName);
+ if ((importsPackage != null)
+ && !importsPackage.equals(compUnitPackage)) {
jsw.write("import ");
jsw.write(importName);
jsw.writeln(';');
@@ -414,7 +416,7 @@
printStructures(jsw, false);
jsw.flush();
- } //-- print
+ } // -- print
/**
* Print the source code for the contained JClass objects.
@@ -419,18 +421,21 @@
/**
* Print the source code for the contained JClass objects.
*
- * @param jsw the JSourceWriter to print to.
- * @param printPublic if true, print only public classes; if false, print
- * only non-public classes.
+ * @param jsw
+ * the JSourceWriter to print to.
+ * @param printPublic
+ * if true, print only public classes; if false, print only
+ * non-public classes.
*/
- public void printStructures(final JSourceWriter jsw, final boolean printPublic) {
+ public void printStructures(final JSourceWriter jsw,
+ final boolean printPublic) {
- //-- print class information
- //-- we need to add some JavaDoc API adding comments
+ // -- print class information
+ // -- we need to add some JavaDoc API adding comments
boolean isFirst = true;
- //SortedSet interfaceList = interfaces.sortedOnFullName();
+ // SortedSet interfaceList = interfaces.sortedOnFullName();
for (Enumeration e = _interfaces.elements(); e.hasMoreElements(); ) {
JInterface jInterface = (JInterface) e.nextElement();
if (jInterface.getModifiers().isPublic() == printPublic) {
@@ -443,7 +448,7 @@
}
}
- //SortedSet classList = classes.sortedOnFullName();
+ // SortedSet classList = classes.sortedOnFullName();
for (Enumeration e = _classes.elements(); e.hasMoreElements(); ) {
JClass jClass = (JClass) e.nextElement();
if (jClass.getModifiers().isPublic() == printPublic) {
@@ -455,7 +460,7 @@
jsw.writeln();
}
}
- } //-- printElements(JSourceWriter, int)
+ } // -- printElements(JSourceWriter, int)
/**
* Sets the header comment for this JCompUnit.
@@ -460,7 +465,8 @@
/**
* Sets the header comment for this JCompUnit.
*
- * @param comment the comment to display at the top of the source file when
+ * @param comment
+ * the comment to display at the top of the source file when
* printed
*/
public void setHeader(final JComment comment) {
@@ -465,11 +471,11 @@
*/
public void setHeader(final JComment comment) {
this._header = comment;
- } //-- setHeader
+ } // -- setHeader
- //-------------------/
- //- Private Methods -/
- //-------------------/
+ // -------------------/
+ // - Private Methods -/
+ // -------------------/
/**
* Update the names of nested classes and interfaces.
@@ -474,60 +480,53 @@
/**
* Update the names of nested classes and interfaces.
*/
- private void resolveNames() {
-// Commented out until support for inner-classes is added
-// kvisco - 20021211
-//
-// for (int i = 0; i < classes.size(); i++) {
-// JClass jClass = (JClass) classes.get(i);
-// jClass.resolveNames(packageName, null);
-// }
-// for (int i = 0; i < interfaces.size(); i++) {
-// JInterface jInterface = (JInterface) interfaces.get(i);
-// jInterface.resolveNames(packageName, null);
-// }
- } //-- resolveNames
+ private void resolveNames() {
+ // Commented out until support for inner-classes is added
+ // kvisco - 20021211
+ //
+ // for (int i = 0; i < classes.size(); i++) {
+ // JClass jClass = (JClass) classes.get(i);
+ // jClass.resolveNames(packageName, null);
+ // }
+ // for (int i = 0; i < interfaces.size(); i++) {
+ // JInterface jInterface = (JInterface) interfaces.get(i);
+ // jInterface.resolveNames(packageName, null);
+ // }
+ } // -- resolveNames
/**
- * Test drive method...to be removed or commented out
- **
- public static void main(String[] args) {
- JCompUnit unit = new JCompUnit("com.acme", "Test.java");
-
- JClass testClass = new JClass("Test");
-
- testClass.addImport("java.util.Vector");
- testClass.addMember(new JField(JType.Int, "x"));
-
- JField field = null;
- field = new JField(JType.Int, "_z");
- field.getModifiers().setStatic(true);
- testClass.addField(field);
-
- testClass.getStaticInitializationCode().add("_z = 75;");
-
- JClass jcString = new JClass("String");
- field = new JField(jcString, "myString");
- field.getModifiers().makePrivate();
- testClass.addMember(field);
-
- //-- create constructor
- JConstructor cons = testClass.createConstructor();
- testClass.addConstructor(cons);
- cons.getSourceCode().add("this.x = 6;");
-
- JMethod jMethod = new JMethod(JType.Int, "getX");
- jMethod.setSourceCode("return this.x;");
- testClass.addMethod(jMethod);
-
- unit.addClass (testClass);
-
- unit.print();
+ * Test drive method...to be removed or commented out * public static void
+ * main(String[] args) { JCompUnit unit = new JCompUnit("com.acme",
+ * "Test.java");
+ *
+ * JClass testClass = new JClass("Test");
+ *
+ * testClass.addImport("java.util.Vector"); testClass.addMember(new
+ * JField(JType.Int, "x"));
+ *
+ * JField field = null; field = new JField(JType.Int, "_z");
+ * field.getModifiers().setStatic(true); testClass.addField(field);
+ *
+ * testClass.getStaticInitializationCode().add("_z = 75;");
+ *
+ * JClass jcString = new JClass("String"); field = new JField(jcString,
+ * "myString"); field.getModifiers().makePrivate();
+ * testClass.addMember(field);
+ *
+ * //-- create constructor JConstructor cons =
+ * testClass.createConstructor(); testClass.addConstructor(cons);
+ * cons.getSourceCode().add("this.x = 6;");
+ *
+ * JMethod jMethod = new JMethod(JType.Int, "getX");
+ * jMethod.setSourceCode("return this.x;"); testClass.addMethod(jMethod);
+ *
+ * unit.addClass (testClass);
+ *
+ * unit.print();
+ * } //-- main /*
+ */
- } //-- main
- /* */
-
-} //-- JCompUnit
+} // -- JCompUnit
/**
* Print the headers delineating the public and non-public elements of the
@@ -538,11 +537,10 @@
/**
* Public header.
*/
- private static final String[] PUBLIC_HEADER = {
- " //-----------------------------/",
- " //- Public Class / Interface -/",
- "//-----------------------------/",
- };
+ private static final String[] PUBLIC_HEADER = {
+ " //-----------------------------/",
+ " //- Public Class / Interface -/",
+ "//-----------------------------/", };
/**
* Private header.
@@ -548,10 +546,9 @@
* Private header.
*/
private static final String[] NON_PUBLIC_HEADER = {
- " //-------------------------------------/",
- " //- Non-Public Classes / Interfaces -/",
- "//-------------------------------------/",
- };
+ " //-------------------------------------/",
+ " //- Non-Public Classes / Interfaces -/",
+ "//-------------------------------------/", };
/**
* Print the specified header to the given Writer.
@@ -556,11 +553,14 @@
/**
* Print the specified header to the given Writer.
*
- * @param jsw an open JSourceWriter
- * @param printPublic if true print the public header, otherwise print the
+ * @param jsw
+ * an open JSourceWriter
+ * @param printPublic
+ * if true print the public header, otherwise print the
* non-public header.
*/
- protected static void print (final JSourceWriter jsw, final boolean printPublic) {
+ protected static void print(final JSourceWriter jsw,
+ final boolean printPublic) {
String[] header = printPublic ? PUBLIC_HEADER : NON_PUBLIC_HEADER;
for (int j = 0; j < header.length; ++j) {
jsw.writeln(header[j]);
@@ -575,4 +575,4 @@
// Nothing to do here
}
-} //-- Header
+} // -- Header
Index: /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JNaming.java
===================================================================
--- /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JNaming.java (revision 6550)
+++ /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JNaming.java (working copy)
@@ -247,6 +247,14 @@
* Field names used within Castor that prevent a user from using the same
* name as an element without using a mapping file. Some fields that Castor
* uses depend on the contents of the schema, so we only warn.
+ *
+ * Reserved:
+ *
+ * _items -- might be fetched using getXXXXItems where XXX == class name
+ * _content
+ * _choiceValue
+ * _anyObject
+ *
*/
private static final String[] CASTOR_RESERVED = {
"Content",
@@ -411,4 +419,38 @@
return true;
} //-- isValidJavaIdentifier
+ /**
+ * Returns the package name from the given class name.
+ *
+ * @param className an arbitrary class name, optionally including a package
+ * @return the package name from the given class name.
+ */
+ public static String getPackageFromClassName(final String className) {
+ if (className == null) {
+ return null;
+ }
+ int idx = className.lastIndexOf('.');
+ if (idx > 0) {
+ return className.substring(0, idx);
+ }
+ return null;
+ } //-- getPackageFromClassName
+
+ /**
+ * Returns the local class name from the given fully qualified class name.
+ *
+ * @param className an arbitrary class name, optionally including a package
+ * @return the local name from the given class name.
+ */
+ public static String getLocalNameFromClassName(final String className) {
+ if (className == null) {
+ return null;
+ }
+ int idx = className.lastIndexOf('.');
+ if (idx > 0) {
+ return className.substring(idx + 1);
+ }
+ return className;
+ } //-- getLocalNameFromClassName
+
} //-- JNaming
Index: /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JStructure.java
===================================================================
--- /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JStructure.java (revision 6550)
+++ /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JStructure.java (working copy)
@@ -137,7 +137,7 @@
}
throw new IllegalArgumentException(err);
}
- this._packageName = getPackageFromClassName(name);
+ this._packageName = JNaming.getPackageFromClassName(name);
_imports = new Vector();
_interfaces = new Vector();
_jdc = new JDocComment();
@@ -170,7 +170,8 @@
public abstract void addMember(JMember jMember);
/**
- * Adds the given import to this JStructure.
+ * Adds the given import to this JStructure. Note: You cannot import
+ * from the "default package," so imports with no package are ignored.
*
* @param className name of the class to import.
*/
@@ -178,7 +179,7 @@
if (className == null || className.length() == 0) { return; }
//-- getPackageName
- String pkgName = getPackageFromClassName(className);
+ String pkgName = JNaming.getPackageFromClassName(className);
if (pkgName != null) {
if (pkgName.equals(this._packageName) || pkgName.equals("java.lang")) {
@@ -492,8 +493,7 @@
public final String getName(final boolean stripPackage) {
String name = super.getName();
if (stripPackage) {
- int period = name.lastIndexOf(".");
- if (period > 0) { name = name.substring(period + 1); }
+ name = JNaming.getLocalNameFromClassName(name);
}
return name;
} //-- getName
@@ -542,10 +542,7 @@
}
//-- ignore package information, for now
- int period = name.lastIndexOf(".");
- if (period > 0) {
- name = name.substring(period + 1);
- }
+ name = JNaming.getLocalNameFromClassName(name);
return JNaming.isValidJavaIdentifier(name);
} //-- isValidClassName
@@ -880,16 +877,4 @@
jsw.writeln();
} //-- printlnWithPrefix
- /**
- * Returns the package name from the given class name.
- *
- * @param className an arbitrary class name, optionally including a package
- * @return the package name from the given class name.
- */
- protected static String getPackageFromClassName(final String className) {
- int idx = className.lastIndexOf('.');
- if (idx > 0) { return className.substring(0, idx); }
- return null;
- } //-- getPackageFromClassName
-
} //-- JStructure
Index: /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JType.java
===================================================================
--- /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JType.java (revision 6550)
+++ /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JType.java (working copy)
@@ -138,16 +138,7 @@
*/
public final String getLocalName() {
// -- use getName method in case it's been overloaded
- String name = getName();
-
- if (name == null) {
- return null;
- }
- int idx = name.lastIndexOf('.');
- if (idx >= 0) {
- name = name.substring(idx + 1);
- }
- return name;
+ return JNaming.getLocalNameFromClassName(getName());
}
/**
@@ -199,14 +190,14 @@
}
/**
- * Change the package this JType belongs to. This method is protected to
+ * 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
- * Note: The package name cannot be changed on a
- * primitive type.
+ * the new package to which this JType belongs
*/
protected final void changePackage(final String newPackage) {
if (this._name == null || this.isPrimitive()) {
@@ -213,15 +204,9 @@
return;
}
- String localName = null;
- int idx = _name.lastIndexOf('.');
- if (idx >= 0) {
- localName = this._name.substring(idx + 1);
- } else {
- localName = this._name;
- }
+ String localName = JNaming.getLocalNameFromClassName(_name);
- if ((newPackage == null) || (newPackage.length() == 0)) {
+ if (newPackage == null || newPackage.length() == 0) {
this._name = localName;
} else {
this._name = newPackage + "." + localName;
Index: /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JTypeName.java
===================================================================
--- /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JTypeName.java (revision 6550)
+++ /home/ekuns/workspace/castor-1/src/main/java/org/exolab/javasource/JTypeName.java (working copy)
@@ -156,14 +156,9 @@
_localName = null;
_package = null;
} else {
- _qName = name;
- _localName = name;
-
- int idx = name.lastIndexOf('.');
- if (idx > 0) {
- _package = name.substring(0, idx);
- _localName = name.substring(idx + 1);
- }
+ _qName = name;
+ _localName = JNaming.getLocalNameFromClassName(name);
+ _package = JNaming.getPackageFromClassName(name);
}
} //-- init