- fixed issues with editing spaces

- made topic pages consistent with 1.2
- added ability to force properties to render even if they are not present in the node
- changed warnings about missing properties to debug but added a log label to turn it on easily

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/config/PropertySheetConfigElement.java

@@ -139,13 +139,16 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
     *        sheet is in view mode
     * @param inEdit Sets whether the property should be shown when the property 
     *        sheet is in edit mode
-    * @parm compGenerator The name of a bean that can be used as a component generator
+    * @param compGenerator The name of a bean that can be used as a component generator
+    * @param ignoreIfMissing Sets whether the property should be rendered if it is not
+    *        found in the data dictionary or the node itself
     */
    /*package*/ void addProperty(String name, String displayLabel, String displayLabelId, String readOnly, 
-                                String converter, String inView, String inEdit, String compGenerator)
+                                String converter, String inView, String inEdit, String compGenerator,
+                                String ignoreIfMissing)
    {
       addItem(new PropertyConfig(name, displayLabel, displayLabelId, Boolean.parseBoolean(readOnly), 
-            converter, inView, inEdit, compGenerator));
+            converter, inView, inEdit, compGenerator, ignoreIfMissing));
    }
    
    /**
@@ -160,7 +163,7 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
     *        sheet is in view mode
     * @param inEdit Sets whether the property should be shown when the property 
     *        sheet is in edit mode
-    * @parm compGenerator The name of a bean that can be used as a component generator
+    * @param compGenerator The name of a bean that can be used as a component generator
     */
    /*package*/ void addAssociation(String name, String displayLabel, String displayLabelId, String readOnly, 
                                    String converter, String inView, String inEdit, String compGenerator)
@@ -181,7 +184,7 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
     *        sheet is in view mode
     * @param inEdit Sets whether the property should be shown when the property 
     *        sheet is in edit mode
-    * @parm compGenerator The name of a bean that can be used as a component generator
+    * @param compGenerator The name of a bean that can be used as a component generator
     */
    /*package*/ void addChildAssociation(String name, String displayLabel, String displayLabelId, String readOnly, 
                                         String converter, String inView, String inEdit, String compGenerator)
@@ -257,10 +260,11 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
       private boolean readOnly;
       private boolean showInViewMode = true;
       private boolean showInEditMode = true;
+      private boolean ignoreIfMissing = true;
       
       public ItemConfig(String name, String displayLabel, String displayLabelId, 
             boolean readOnly, String converter, String inView, String inEdit, 
-            String compGenerator)
+            String compGenerator, String ignoreIfMissing)
       {
          this.name = name;
          this.displayLabel = displayLabel;
@@ -277,6 +281,10 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
          {
             this.showInEditMode = Boolean.parseBoolean(inEdit);
          }
+         if (ignoreIfMissing != null)
+         {
+            this.ignoreIfMissing = Boolean.parseBoolean(ignoreIfMissing);
+         }
       }
       
       /**
@@ -343,6 +351,15 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
          return this.componentGenerator;
       }
       
+      /**
+       * @return Whether the property should be rendered if it is not found in the
+       *         data dictionary or the node itself. 
+       */
+      public boolean getIgnoreIfMissing()
+      {
+         return this.ignoreIfMissing;
+      }  
+      
       /**
        * @see java.lang.Object#toString()
        */
@@ -356,6 +373,7 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
          buffer.append(" read-only=").append(this.readOnly);
          buffer.append(" show-in-view-mode=").append(this.showInViewMode);
          buffer.append(" show-in-edit-mode=").append(this.showInEditMode);
+         buffer.append(" ignore-if-missing=").append(this.ignoreIfMissing);
          buffer.append(" component-generator=").append(this.componentGenerator).append(")");
          return buffer.toString();
       }
@@ -368,10 +386,10 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
    {
       public PropertyConfig(String name, String displayLabel, String displayLabelId, 
             boolean readOnly, String converter, String inView, String inEdit, 
-            String compGenerator)
+            String compGenerator, String ignoreIfMissing)
       {
          super(name, displayLabel, displayLabelId, readOnly, converter, 
-               inView, inEdit, compGenerator);
+               inView, inEdit, compGenerator, ignoreIfMissing);
       }
    }
    
@@ -385,7 +403,7 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
             String compGenerator)
       {
          super(name, displayLabel, displayLabelId, readOnly, converter, 
-               inView, inEdit, compGenerator);
+               inView, inEdit, compGenerator, null);
       }
    }
    
@@ -399,7 +417,7 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
             String compGenerator)
       {
          super(name, displayLabel, displayLabelId, readOnly, converter, 
-               inView, inEdit, compGenerator);
+               inView, inEdit, compGenerator, null);
       }
    }
 }