[qdox-scm] [1372] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: To complete it all: Change BeanProprty to an interface

[rfscholte]

Title: [1372] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: To complete it all: Change BeanProprty to an interface

Revision

1372

Author

rfscholte

Date

2011-10-03 16:42:27 -0500 (Mon, 03 Oct 2011)

Log Message

To complete it all: Change BeanProprty to an interface

Modified Paths

• trunk/qdox/src/main/java/com/thoughtworks/qdox/model/BeanProperty.java
• trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java

Added Paths

trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultBeanProperty.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/BeanProperty.java (1371 => 1372)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/BeanProperty.java	2011-10-03 19:51:52 UTC (rev 1371)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/BeanProperty.java	2011-10-03 21:42:27 UTC (rev 1372)
@@ -24,42 +24,13 @@
  * @author Aslak Hellesøy
  * @version $Revision$
  */
-public class BeanProperty {
+public interface BeanProperty {
     
-    private final String name;
-    private JavaMethod accessor;
-    private JavaMethod mutator;
-    private JavaType type;
+    String getName();
+    
+    JavaType getType();
 
-    public BeanProperty(String name) {
-        this.name = name;
-    }
+    JavaMethod getAccessor();
 
-    public String getName() {
-        return name;
-    }
-
-    public void setType(JavaType type) {
-        this.type = type;
-    }
-
-    public JavaType getType() {
-        return type;
-    }
-
-    public JavaMethod getAccessor() {
-        return accessor;
-    }
-
-    public void setAccessor(JavaMethod accessor) {
-        this.accessor = accessor;
-    }
-
-    public JavaMethod getMutator() {
-        return mutator;
-    }
-
-    public void setMutator(JavaMethod mutator) {
-        this.mutator = mutator;
-    }
+    JavaMethod getMutator();
 }

Added: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultBeanProperty.java (0 => 1372)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultBeanProperty.java	                        (rev 0)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultBeanProperty.java	2011-10-03 21:42:27 UTC (rev 1372)
@@ -0,0 +1,42 @@
+package com.thoughtworks.qdox.model;
+
+public class DefaultBeanProperty implements BeanProperty
+{
+
+    private final String name;
+    private JavaMethod accessor;
+    private JavaMethod mutator;
+    private JavaType type;
+
+    public DefaultBeanProperty(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setType(JavaType type) {
+        this.type = type;
+    }
+
+    public JavaType getType() {
+        return type;
+    }
+
+    public JavaMethod getAccessor() {
+        return accessor;
+    }
+
+    public void setAccessor(JavaMethod accessor) {
+        this.accessor = accessor;
+    }
+
+    public JavaMethod getMutator() {
+        return mutator;
+    }
+
+    public void setMutator(JavaMethod mutator) {
+        this.mutator = mutator;
+    }
+}

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java (1371 => 1372)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java	2011-10-03 19:51:52 UTC (rev 1371)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java	2011-10-03 21:42:27 UTC (rev 1372)
@@ -762,7 +762,7 @@
     private Map<String, BeanProperty> getBeanPropertyMap( boolean superclasses )
     {
         List<JavaMethod> superMethods = getMethods( superclasses );
-        Map<String, BeanProperty> beanPropertyMap = new LinkedHashMap<String, BeanProperty>();
+        Map<String, DefaultBeanProperty> beanPropertyMap = new LinkedHashMap<String, DefaultBeanProperty>();
 
         // loop over the methods.
         for ( JavaMethod superMethod : superMethods )
@@ -770,7 +770,7 @@
             if ( superMethod.isPropertyAccessor() )
             {
                 String propertyName = superMethod.getPropertyName();
-                BeanProperty beanProperty = getOrCreateProperty( beanPropertyMap, propertyName );
+                DefaultBeanProperty beanProperty = getOrCreateProperty( beanPropertyMap, propertyName );
 
                 beanProperty.setAccessor( superMethod );
                 beanProperty.setType( superMethod.getPropertyType() );
@@ -778,23 +778,22 @@
             else if ( superMethod.isPropertyMutator() )
             {
                 String propertyName = superMethod.getPropertyName();
-                BeanProperty beanProperty = getOrCreateProperty( beanPropertyMap, propertyName );
+                DefaultBeanProperty beanProperty = getOrCreateProperty( beanPropertyMap, propertyName );
 
                 beanProperty.setMutator( superMethod );
                 beanProperty.setType( superMethod.getPropertyType() );
             }
         }
-
-        return beanPropertyMap;
+        return new LinkedHashMap<String, BeanProperty>( beanPropertyMap );
     }
 
-    private BeanProperty getOrCreateProperty( Map<String, BeanProperty> beanPropertyMap, String propertyName )
+    private DefaultBeanProperty getOrCreateProperty( Map<String, DefaultBeanProperty> beanPropertyMap, String propertyName )
     {
-        BeanProperty result = beanPropertyMap.get( propertyName );
+        DefaultBeanProperty result = beanPropertyMap.get( propertyName );
 
         if ( result == null )
         {
-            result = new BeanProperty( propertyName );
+            result = new DefaultBeanProperty( propertyName );
             beanPropertyMap.put( propertyName, result );
         }
 

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email