- Revision
- 117
- Author
- gjoseph
- Date
- 2009-04-24 14:05:28 -0500 (Fri, 24 Apr 2009)
Log Message
XDOCLET-63 Upgraded to QDox 1.9 (as per GRA-15)
Modified Paths
- trunk/xdoclet/src/main/java/org/xdoclet/ExpanderConfigurableDocletTagFactory.java
- trunk/xdoclet/src/main/java/org/xdoclet/ModelCheckerTagFactory.java
- trunk/xdoclet/src/main/java/org/xdoclet/QDoxMetadataProvider.java
- trunk/xdoclet/src/main/java/org/xdoclet/XDocletTag.java
- trunk/xdoclet/src/test/java/org/xdoclet/ModelCheckerTagFactoryTestCase.java
- trunk/xdoclet/src/test/java/org/xdoclet/plugin/DummyClassTagImpl.java
Diff
Modified: trunk/xdoclet/src/main/java/org/xdoclet/ExpanderConfigurableDocletTagFactory.java (116 => 117)
--- trunk/xdoclet/src/main/java/org/xdoclet/ExpanderConfigurableDocletTagFactory.java 2009-01-06 20:00:14 UTC (rev 116) +++ trunk/xdoclet/src/main/java/org/xdoclet/ExpanderConfigurableDocletTagFactory.java 2009-04-24 19:05:28 UTC (rev 117) @@ -8,8 +8,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import java.net.URL; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -19,10 +17,9 @@ import org.generama.ConfigurableDocletTagFactory; -import com.thoughtworks.qdox.model.AbstractJavaEntity; import com.thoughtworks.qdox.model.DefaultDocletTag; import com.thoughtworks.qdox.model.DocletTag; -import com.thoughtworks.qdox.model.JavaClass; +import com.thoughtworks.qdox.model.AbstractBaseJavaEntity; /** * A copy of ConfigurableDocletTagFactory that permits construction with an @@ -61,7 +58,7 @@ throw new UnsupportedOperationException(); } - public DocletTag createDocletTag(String tag, String text, AbstractJavaEntity context, int lineNumber) { + public DocletTag createDocletTag(String tag, String text, AbstractBaseJavaEntity context, int lineNumber) { if (registeredTags == null) { registeredTags = new HashMap(); } @@ -74,8 +71,8 @@ } Class[][] constructors = { - {String.class, String.class, AbstractJavaEntity.class, Integer.TYPE, QDoxPropertyExpander.class}, - {String.class, String.class, AbstractJavaEntity.class, Integer.TYPE} + {String.class, String.class, AbstractBaseJavaEntity.class, Integer.TYPE, QDoxPropertyExpander.class}, + {String.class, String.class, AbstractBaseJavaEntity.class, Integer.TYPE} }; Object[][] constructorArgs = { {tag, text, context, new Integer(lineNumber), expander}, @@ -115,7 +112,7 @@ } // Could not find a suitable constructor - throw new RuntimeException("No (String, String, AbstractJavaEntity, int) constructor in " + tagClass.getName()); + throw new RuntimeException("No (String, String, AbstractBaseJavaEntity, int) constructor in " + tagClass.getName()); /* try { Constructor newTag = tagClass.getConstructor(new Class[] {String.class, String.class, AbstractJavaEntity.class, Integer.TYPE}); @@ -171,27 +168,4 @@ docletTag.getLineNumber() + ")"); } } - - public static String getLocation(DocletTag tag) { - String location = null; - URL sourceURL = tag.getContext().getSource().getURL(); - - if (sourceURL != null) { - location = sourceURL.toExternalForm(); - } else { - // dunno what file it is (might be from a reader). - JavaClass clazz; - - if (tag.getContext() instanceof JavaClass) { - // it's on a class (outer class) - clazz = (JavaClass) tag.getContext(); - } else { - clazz = (JavaClass) tag.getContext().getParent(); - } - - location = clazz.getFullyQualifiedName(); - } - - return location; - } }
Modified: trunk/xdoclet/src/main/java/org/xdoclet/ModelCheckerTagFactory.java (116 => 117)
--- trunk/xdoclet/src/main/java/org/xdoclet/ModelCheckerTagFactory.java 2009-01-06 20:00:14 UTC (rev 116) +++ trunk/xdoclet/src/main/java/org/xdoclet/ModelCheckerTagFactory.java 2009-04-24 19:05:28 UTC (rev 117) @@ -12,7 +12,7 @@ import org.apache.commons.collections.CollectionUtils; import org.generama.ConfigurableDocletTagFactory; -import com.thoughtworks.qdox.model.AbstractJavaEntity; +import com.thoughtworks.qdox.model.AbstractBaseJavaEntity; import com.thoughtworks.qdox.model.DocletTag; import com.thoughtworks.qdox.model.DocletTagFactory; @@ -36,7 +36,7 @@ return retVal; } - public DocletTag createDocletTag(String tag, String text, AbstractJavaEntity context, int lineNumber) { + public DocletTag createDocletTag(String tag, String text, AbstractBaseJavaEntity context, int lineNumber) { DocletTag retVal = docletTagFactory.createDocletTag(tag, text, context, lineNumber); if (retVal instanceof XDocletTag) { tagLst.add(retVal);
Modified: trunk/xdoclet/src/main/java/org/xdoclet/QDoxMetadataProvider.java (116 => 117)
--- trunk/xdoclet/src/main/java/org/xdoclet/QDoxMetadataProvider.java 2009-01-06 20:00:14 UTC (rev 116) +++ trunk/xdoclet/src/main/java/org/xdoclet/QDoxMetadataProvider.java 2009-04-24 19:05:28 UTC (rev 117) @@ -179,8 +179,8 @@ public String getOriginalPackageName(Object metadata) { if (metadata instanceof JavaClass) { - JavaClass javaClass = (JavaClass) metadata; - return javaClass.getPackage(); + JavaClass javaClass = (JavaClass) metadata; + return javaClass.getPackage().getName(); } return ""; }
Modified: trunk/xdoclet/src/main/java/org/xdoclet/XDocletTag.java (116 => 117)
--- trunk/xdoclet/src/main/java/org/xdoclet/XDocletTag.java 2009-01-06 20:00:14 UTC (rev 116) +++ trunk/xdoclet/src/main/java/org/xdoclet/XDocletTag.java 2009-04-24 19:05:28 UTC (rev 117) @@ -11,7 +11,7 @@ import java.util.Map.Entry; -import com.thoughtworks.qdox.model.AbstractJavaEntity; +import com.thoughtworks.qdox.model.AbstractBaseJavaEntity; import com.thoughtworks.qdox.model.DefaultDocletTag; import com.thoughtworks.qdox.model.JavaField; import com.thoughtworks.qdox.model.JavaMethod; @@ -35,12 +35,12 @@ private String[] parametersExpanded; - protected XDocletTag(String name, String value, AbstractJavaEntity context, + protected XDocletTag(String name, String value, AbstractBaseJavaEntity context, int lineNumber) { this(name, value, context, lineNumber, null); } - protected XDocletTag(String name, String value, AbstractJavaEntity context, + protected XDocletTag(String name, String value, AbstractBaseJavaEntity context, int lineNumber, QDoxPropertyExpander expander) { super(name, value, context, lineNumber); if (JavaMethod.class.isAssignableFrom(getContext().getClass())) {
Modified: trunk/xdoclet/src/test/java/org/xdoclet/ModelCheckerTagFactoryTestCase.java (116 => 117)
--- trunk/xdoclet/src/test/java/org/xdoclet/ModelCheckerTagFactoryTestCase.java 2009-01-06 20:00:14 UTC (rev 116) +++ trunk/xdoclet/src/test/java/org/xdoclet/ModelCheckerTagFactoryTestCase.java 2009-04-24 19:05:28 UTC (rev 117) @@ -17,7 +17,7 @@ import org.picocontainer.MutablePicoContainer; import org.picocontainer.defaults.DefaultPicoContainer; -import com.thoughtworks.qdox.model.AbstractJavaEntity; +import com.thoughtworks.qdox.model.AbstractBaseJavaEntity; import com.thoughtworks.qdox.model.JavaField; /** @@ -83,7 +83,7 @@ public static class TestTag extends XDocletTag { private boolean called; - public TestTag(String name, String value, AbstractJavaEntity context, int lineNumber) { + public TestTag(String name, String value, AbstractBaseJavaEntity context, int lineNumber) { super(name, value, context, lineNumber); this.called = false; } @@ -106,7 +106,7 @@ public static class TagOne extends TestTag { private static TagOne singleton; - public TagOne(String name, String value, AbstractJavaEntity context, int lineNumber) { + public TagOne(String name, String value, AbstractBaseJavaEntity context, int lineNumber) { super(name, value, context, lineNumber); singleton = this; } @@ -119,7 +119,7 @@ public static class TagTwo extends TestTag { private static TagTwo singleton; - public TagTwo(String name, String value, AbstractJavaEntity context, int lineNumber) { + public TagTwo(String name, String value, AbstractBaseJavaEntity context, int lineNumber) { super(name, value, context, lineNumber); singleton = this; }
Modified: trunk/xdoclet/src/test/java/org/xdoclet/plugin/DummyClassTagImpl.java (116 => 117)
--- trunk/xdoclet/src/test/java/org/xdoclet/plugin/DummyClassTagImpl.java 2009-01-06 20:00:14 UTC (rev 116) +++ trunk/xdoclet/src/test/java/org/xdoclet/plugin/DummyClassTagImpl.java 2009-04-24 19:05:28 UTC (rev 117) @@ -11,12 +11,12 @@ private static final java.util.List ALLOWED_PARAMETERS = java.util.Arrays.asList(new String[] {"name", "value", "extra", ""}); private static final java.util.List ALLOWED_VALUES = java.util.Arrays.asList(new String[] {""}); - public DummyClassTagImpl(String name, String value, com.thoughtworks.qdox.model.AbstractJavaEntity entity, + public DummyClassTagImpl(String name, String value, com.thoughtworks.qdox.model.AbstractBaseJavaEntity entity, int lineNumber, org.xdoclet.QDoxPropertyExpander expander) { super(name, value, entity, lineNumber, expander); } - public DummyClassTagImpl(String name, String value, com.thoughtworks.qdox.model.AbstractJavaEntity entity, + public DummyClassTagImpl(String name, String value, com.thoughtworks.qdox.model.AbstractBaseJavaEntity entity, int lineNumber) { super(name, value, entity, lineNumber); } @@ -47,7 +47,7 @@ } // check uniqueness - if (getContext().getTagsByName(NAME).length > 1) { + if (((com.thoughtworks.qdox.model.AbstractJavaEntity) getContext()).getTagsByName(NAME).length > 1) { bomb("is allowed only once"); }
To unsubscribe from this list please visit:
