[qdox-scm] [1386] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Move AbstractJavaModel to separate package

Sun, 09 Oct 2011 03:09:39 -0700

Title: [1386] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Move AbstractJavaModel to separate package

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseJavaEntity.java (1385 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseJavaEntity.java	2011-10-09 10:05:41 UTC (rev 1385)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseJavaEntity.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -24,6 +24,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import com.thoughtworks.qdox.model.impl.AbstractJavaModel;
+
 public abstract class AbstractBaseJavaEntity extends AbstractJavaModel implements Serializable {
 
 	private List<JavaAnnotation> annotations = Collections.emptyList();

Deleted: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractJavaModel.java (1385 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractJavaModel.java	2011-10-09 10:05:41 UTC (rev 1385)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractJavaModel.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -1,66 +0,0 @@
-package com.thoughtworks.qdox.model;
-
-import com.thoughtworks.qdox.writer.DefaultModelWriter;
-import com.thoughtworks.qdox.writer.ModelWriter;
-import com.thoughtworks.qdox.writer.ModelWriterFactory;
-
-/**
- * Every element of a class, including the class itself is a javaModel.
- * While being constructed by a ModelBuilder, they all <strong>must</strong> have a reference to the same source.
- * If a ModelWriterFactory is set, it <strong>must</strong> be the same for every element of this source, otherwise the defaultModelWriter is used.
- * 
- * @author Robert Scholte
- *
- */
-public abstract class AbstractJavaModel implements JavaModel {
-
-    private ModelWriterFactory modelWriterFactory;
-    private JavaSource source;
-    
-	private int lineNumber = -1;
-
-	public AbstractJavaModel() {
-		super();
-	}
-
-	public int getLineNumber() {
-		return lineNumber;
-	}
-	
-	public void setLineNumber(int lineNumber) {
-	    this.lineNumber = lineNumber;
-	}
-
-	public JavaSource getSource() {
-		return source;
-	}
-	
-	public void setSource(JavaSource source) {
-		this.source = source;
-	}
-	
-	/**
-     * 
-     * @param modelWriterFactory
-     * @since 2.0
-     */
-    public void setModelWriterFactory( ModelWriterFactory modelWriterFactory )
-    {
-        this.modelWriterFactory = modelWriterFactory;
-    }
-    
-    /* (non-Javadoc)
-     * @see com.thoughtworks.qdox.model.JavaSource#getModelWriter()
-     */
-    public ModelWriter getModelWriter()
-    {
-        ModelWriter result; 
-        if (modelWriterFactory != null) {
-            result = modelWriterFactory.newInstance();
-        }
-        else {
-            result = new DefaultModelWriter();
-        }
-        return result;
-    }
-}
\ No newline at end of file

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Annotation.java (1385 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Annotation.java	2011-10-09 10:05:41 UTC (rev 1385)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Annotation.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -27,6 +27,7 @@
 
 import com.thoughtworks.qdox.model._expression_.AnnotationValue;
 import com.thoughtworks.qdox.model._expression_.AnnotationVisitor;
+import com.thoughtworks.qdox.model.impl.AbstractJavaModel;
 
 /**
  *

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultDocletTagFactory.java (1385 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultDocletTagFactory.java	2011-10-09 10:05:41 UTC (rev 1385)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultDocletTagFactory.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -1,5 +1,6 @@
 package com.thoughtworks.qdox.model;
 
+import com.thoughtworks.qdox.model.impl.AbstractJavaModel;
 import com.thoughtworks.qdox.model.impl.DefaultDocletTag;
 
 /*

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTag.java (1385 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTag.java	2011-10-09 10:05:41 UTC (rev 1385)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTag.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.thoughtworks.qdox.model.impl.AbstractJavaModel;
+
 /**
  * @author Joe Walnes
  * @author Aslak Helles&oslash;y

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTagFactory.java (1385 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTagFactory.java	2011-10-09 10:05:41 UTC (rev 1385)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTagFactory.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -21,6 +21,8 @@
 
 import java.io.Serializable;
 
+import com.thoughtworks.qdox.model.impl.AbstractJavaModel;
+
 /**
  * @author Aslak Helles&oslash;y
  * @version $Revision$

Copied: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/AbstractJavaModel.java (from rev 1303, trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractJavaModel.java) (0 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/AbstractJavaModel.java	                        (rev 0)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/AbstractJavaModel.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -0,0 +1,68 @@
+package com.thoughtworks.qdox.model.impl;
+
+import com.thoughtworks.qdox.model.JavaModel;
+import com.thoughtworks.qdox.model.JavaSource;
+import com.thoughtworks.qdox.writer.DefaultModelWriter;
+import com.thoughtworks.qdox.writer.ModelWriter;
+import com.thoughtworks.qdox.writer.ModelWriterFactory;
+
+/**
+ * Every element of a class, including the class itself is a javaModel.
+ * While being constructed by a ModelBuilder, they all <strong>must</strong> have a reference to the same source.
+ * If a ModelWriterFactory is set, it <strong>must</strong> be the same for every element of this source, otherwise the defaultModelWriter is used.
+ * 
+ * @author Robert Scholte
+ *
+ */
+public abstract class AbstractJavaModel implements JavaModel {
+
+    private ModelWriterFactory modelWriterFactory;
+    private JavaSource source;
+    
+	private int lineNumber = -1;
+
+	public AbstractJavaModel() {
+		super();
+	}
+
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	
+	public void setLineNumber(int lineNumber) {
+	    this.lineNumber = lineNumber;
+	}
+
+	public JavaSource getSource() {
+		return source;
+	}
+	
+	public void setSource(JavaSource source) {
+		this.source = source;
+	}
+	
+	/**
+     * 
+     * @param modelWriterFactory
+     * @since 2.0
+     */
+    public void setModelWriterFactory( ModelWriterFactory modelWriterFactory )
+    {
+        this.modelWriterFactory = modelWriterFactory;
+    }
+    
+    /* (non-Javadoc)
+     * @see com.thoughtworks.qdox.model.JavaSource#getModelWriter()
+     */
+    public ModelWriter getModelWriter()
+    {
+        ModelWriter result; 
+        if (modelWriterFactory != null) {
+            result = modelWriterFactory.newInstance();
+        }
+        else {
+            result = new DefaultModelWriter();
+        }
+        return result;
+    }
+}
\ No newline at end of file

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultDocletTag.java (1385 => 1386)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultDocletTag.java	2011-10-09 10:05:41 UTC (rev 1385)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultDocletTag.java	2011-10-09 10:09:33 UTC (rev 1386)
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.thoughtworks.qdox.model.AbstractJavaModel;
 import com.thoughtworks.qdox.model.DocletTag;
 import com.thoughtworks.qdox.model.util.TagParser;

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to