You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2007/02/12 16:15:02 UTC

svn commit: r506476 - in /incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo: architecture/PropertyDescription.java handlers/configuration/ConfigurationHandler.java

Author: rickhall
Date: Mon Feb 12 07:15:01 2007
New Revision: 506476

URL: http://svn.apache.org/viewvc?view=rev&rev=506476
Log:
Applied patch (FELIX-214) to fix a bug that was not updating the 
component type model properly.

Modified:
    incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
    incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java

Modified: incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java?view=diff&rev=506476&r1=506475&r2=506476
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java (original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java Mon Feb 12 07:15:01 2007
@@ -71,7 +71,7 @@
      */
     public String toString() {
         if (m_value != null) { return getName() + " - " + getType() + " - " + getValue(); }
-        else { return getName() + " - " + getType() + " - CONFIGURABLE"; }
+        else { return getName() + " - " + getType() + " - REQUIRED"; }
     }
 
 }

Modified: incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java?view=diff&rev=506476&r1=506475&r2=506476
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java (original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java Mon Feb 12 07:15:01 2007
@@ -125,7 +125,7 @@
             ConfigurableProperty cp = new ConfigurableProperty(name, fieldName, value, type, this);
             
             if (cp.getValue() != null) { cd.addProperty(new PropertyDescription(name, type, cp.getValue().toString())); }
-            else { cd.addProperty(new PropertyDescription(name, type, "")); }
+            else { cd.addProperty(new PropertyDescription(name, type, null)); }
 
             addProperty(cp);
         }