geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r462937 - in /geronimo/xbean/sandbox/xbean-factory/src: main/java/org/apache/xbean/factory/model/ main/java/org/apache/xbean/factory/model/factory/ test/java/org/apache/xbean/factory/
Date Wed, 11 Oct 2006 20:47:53 GMT
Author: chirino
Date: Wed Oct 11 13:47:52 2006
New Revision: 462937

URL: http://svn.apache.org/viewvc?view=rev&rev=462937
Log:
Trying to use inheritance.

Modified:
    geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/ArrayDataType.java
    geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/Column.java
    geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java
    geronimo/xbean/sandbox/xbean-factory/src/test/java/org/apache/xbean/factory/JaxbColumnTest.java

Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/ArrayDataType.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/ArrayDataType.java?view=diff&rev=462937&r1=462936&r2=462937
==============================================================================
--- geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/ArrayDataType.java
(original)
+++ geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/ArrayDataType.java
Wed Oct 11 13:47:52 2006
@@ -34,4 +34,8 @@
 		this.dimensions = dimensions;
 	}
 
+    public String toString() {
+        return "DataType[name: " + getName() +", dimensions"+dimensions+"]";
+    }
+
 }

Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/Column.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/Column.java?view=diff&rev=462937&r1=462936&r2=462937
==============================================================================
--- geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/Column.java
(original)
+++ geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/Column.java
Wed Oct 11 13:47:52 2006
@@ -68,7 +68,7 @@
     }
 
     public String toString() {
-        return "Column[name: " + name + ", dataType: " + dataType + "]";
+        return "Column[name: " + name + ", dataType: " + dataType + ", secondDataType: "
+ secondDataType + "]";
     }
 
 	public DataType getSecondDataType() {

Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java?view=diff&rev=462937&r1=462936&r2=462937
==============================================================================
--- geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java
(original)
+++ geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java
Wed Oct 11 13:47:52 2006
@@ -82,6 +82,7 @@
         this.name = name;
     }
 
+    @XmlElement
 	public CustomDataTypeFactory getSecondDataType() {
 		return secondDataType;
 	}

Modified: geronimo/xbean/sandbox/xbean-factory/src/test/java/org/apache/xbean/factory/JaxbColumnTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/test/java/org/apache/xbean/factory/JaxbColumnTest.java?view=diff&rev=462937&r1=462936&r2=462937
==============================================================================
--- geronimo/xbean/sandbox/xbean-factory/src/test/java/org/apache/xbean/factory/JaxbColumnTest.java
(original)
+++ geronimo/xbean/sandbox/xbean-factory/src/test/java/org/apache/xbean/factory/JaxbColumnTest.java
Wed Oct 11 13:47:52 2006
@@ -17,6 +17,8 @@
 package org.apache.xbean.factory;
 
 import junit.framework.TestCase;
+
+import org.apache.xbean.factory.model.ArrayDataType;
 import org.apache.xbean.factory.model.Column;
 import org.apache.xbean.factory.model.DataType;
 import org.apache.xbean.factory.model.factory.CustomColumnFactory;
@@ -60,8 +62,9 @@
         DataType dataType = new DataType();
         dataType.setName("String");
         column.setDataType(dataType);
-        DataType secondDataType = new DataType();
+        ArrayDataType secondDataType = new ArrayDataType();
         secondDataType.setName("Integer");
+        secondDataType.setDimensions(50);
         column.setSecondDataType(secondDataType);
         return column;
     }



Mime
View raw message