[xdoclet-scm] [CVS xdoclet] fix for xdoclet-47

[ko5tik]

Commit in xdoclet/src/main/java/org/xdoclet on MAIN
QDoxMetadataProvider.java	+4	-2	1.13 -> 1.14
XDocletTag.java	+3	-2	1.8 -> 1.9
	+7	-4

2 modified files

fix for xdoclet-47

---

xdoclet/src/main/java/org/xdoclet

QDoxMetadataProvider.java 1.13 -> 1.14

diff -u -r1.13 -r1.14
--- QDoxMetadataProvider.java	18 Apr 2005 17:50:50 -0000	1.13
+++ QDoxMetadataProvider.java	3 May 2006 18:33:16 -0000	1.14
@@ -18,7 +18,7 @@

 /**
  * This MetadataProvider provides QDox [EMAIL PROTECTED] JavaClass} objects.
  * @author Aslak Hellesøy

- * @version $Revision: 1.13 $

+ * @version $Revision: 1.14 $

  */
 public class QDoxMetadataProvider implements QDoxCapableMetadataProvider, Startable {
     private final ConfigurableDocletTagFactory docletTagFactory = new ConfigurableDocletTagFactory();

@@ -81,7 +81,8 @@

      */
     public Collection getMetadata() {
         try {

-            JavaDocBuilder builder = new JavaDocBuilder(docletTagFactory);

+            ModelCheckerTagFactory modelChecker = new ModelCheckerTagFactory(docletTagFactory);
+            JavaDocBuilder builder = new JavaDocBuilder(modelChecker);

             if (urlProvider != null) {
                 builder.setEncoding(urlProvider.getEncoding());
                 addSourcesFromJavaSourceProvider(builder);

@@ -92,6 +93,7 @@

                     builder.addSource(singleSourceOrDirectory);
                 }
             }

+            modelChecker.validateModel();

             List result = Arrays.asList(builder.getClasses());
             Collections.sort(result);
             return result;

---

xdoclet/src/main/java/org/xdoclet

XDocletTag.java 1.8 -> 1.9

diff -u -r1.8 -r1.9
--- XDocletTag.java	5 Jun 2005 09:02:16 -0000	1.8
+++ XDocletTag.java	3 May 2006 18:33:16 -0000	1.9
@@ -7,7 +7,7 @@

 
 /**
  * @author Aslak Hellesøy

- * @version $Revision: 1.8 $

+ * @version $Revision: 1.9 $

  */
 public abstract class XDocletTag extends DefaultDocletTag {
     protected boolean isOnConstructor;

@@ -30,7 +30,8 @@

     }
 
     protected abstract void validateLocation();

-

+    
+    public abstract void validateModel();

     public final void bomb(String message) {
         throw new RuntimeException("@" + getName() + " " + getValue() + "\n in " + org.generama.ConfigurableDocletTagFactory.getLocation(this) + " (line " + getLineNumber() + "):\n" + message);
     }

CVSspam 0.2.8