[jboss-svn-commits] JBL Code SVN: r33944 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui.

[jboss-svn-commits at lists.jboss.org]

Author: eaa
Date: 2010-07-16 10:52:08 -0400 (Fri, 16 Jul 2010)
New Revision: 33944

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
Log:
GUVNOR-570: "Inser Fact" Action widget is always shown as read only
	- modified ActionSetWidget's condition to be read only
	- RuleModeller was adding the "Remove widget" image in RHS widgets even when they were read only.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java	2010-07-16 13:06:28 UTC (rev 33943)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java	2010-07-16 14:52:08 UTC (rev 33944)
@@ -97,8 +97,8 @@
         }
         
         if (readOnly == null) {
-            this.readOnly = !completions.containsFactType(this.variableClass)
-            	|| !mod.getModel().getBoundFacts().contains(this.variableClass);
+            this.readOnly = !completions.containsFactType(this.variableClass);
+            	//|| !mod.getModel().getBoundFacts().contains(this.variableClass);
         } else {
             this.readOnly = readOnly;
         }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-07-16 13:06:28 UTC (rev 33943)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-07-16 14:52:08 UTC (rev 33944)
@@ -406,7 +406,7 @@
                 horiz.setWidth("100%");
             }
 
-            if (!lockRHS()) {
+            if (!(this.lockRHS() || w.isReadOnly())) {
                 horiz.add(remove);
             }
 
@@ -1281,4 +1281,10 @@
 	public boolean isTemplate() {
 		return widgetFactory.isTemplate();
 	}
+
+    public RuleAsset getAsset() {
+        return asset;
+    }
+
+        
 }