Update of /cvsroot/xdoclet/xjavadoc/src/xjavadoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20024/src/xjavadoc
Modified Files:
XClass.java AbstractClass.java
Log Message:
Add support for transformed class name; add tests for same
Index: XClass.java
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/src/xjavadoc/XClass.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** XClass.java 10 Jun 2003 13:25:54 -0000 1.42
--- XClass.java 19 Apr 2004 14:14:27 -0000 1.43
***************
*** 27,30 ****
--- 27,37 ----
/**
+ * Returns the containing class, if this is an inner class.
+ *
+ * @return the containing class.
+ */
+ public XClass getContainingClass();
+
+ /**
* Returns true if this class is a primitive. That is, one of the following:
*
***************
*** 69,72 ****
--- 76,93 ----
/**
+ * Gets the transformed class name, for example: <code>Character$Subset</code>
+ *
+ * @return the transformed class name.
+ */
+ String getTransformedName();
+
+ /**
+ * Gets the transformed qualified class name, for example:
<code>java.lang.Character$Subset</code>
+ *
+ * @return the transformed qualified class name.
+ */
+ String getTransformedQualifiedName();
+
+ /**
* Gets the type, e.g. <code>java.lang.String.class</code> or
<code>java.lang.Integer.TYPE</code>
* .
Index: AbstractClass.java
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/src/xjavadoc/AbstractClass.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** AbstractClass.java 10 Jun 2003 13:25:52 -0000 1.67
--- AbstractClass.java 19 Apr 2004 14:14:27 -0000 1.68
***************
*** 49,53 ****
--- 49,55 ----
private List _extendingInterfaces;
private String _name;
+ private String _transformedName;
private String _qualifiedName;
+ private String _transformedQualifiedName;
protected AbstractClass( AbstractClass containingClass, XTagFactory tagFactory )
***************
*** 292,295 ****
--- 294,317 ----
/**
+ * Gets the transformed class name, for example: <code>Character$Subset</code>
+ *
+ * @return the transformed class name.
+ */
+ public String getTransformedName()
+ {
+ return _transformedName;
+ }
+
+ /**
+ * Gets the transformed qualified class name, for example:
<code>java.lang.Character$Subset</code>
+ *
+ * @return the transformed qualified class name.
+ */
+ public String getTransformedQualifiedName()
+ {
+ return _transformedQualifiedName;
+ }
+
+ /**
* Returns all the implemented interfaces (if this is a class) or all the
* extended interfaces (if this is an interface)
***************
*** 642,646 ****
--- 664,670 ----
}
_qualifiedName = qualifiedName;
+ _transformedQualifiedName = qualifiedName;
_name = Util.classNameFromQualifiedClassName( _qualifiedName );
+ _transformedName = _name;
}
***************
*** 735,738 ****
--- 759,766 ----
String realName = getContainingClass().getName() + '.' + name;
+ // The *transformed* name is the containing class' transformed name +
'$' + the name
+
+ String transformedName = getContainingClass().getTransformedName() +
'$' + name;
+
if( _name != null && !_name.equals( realName ) )
{
***************
*** 740,751 ****
--- 768,782 ----
}
_name = realName;
+ _transformedName = transformedName;
if( getContainingPackage().getName().equals( "" ) )
{
_qualifiedName = _name;
+ _transformedQualifiedName = _transformedName;
}
else
{
_qualifiedName = getContainingPackage().getName() + '.' +
_name;
+ _transformedQualifiedName = getContainingPackage().getName() +
'.' + _transformedName;
}
if( _qualifiedName.startsWith( "." ) )
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
