[jboss-svn-commits] JBL Code SVN: r30284 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: qa and 1 other directory.

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

Author: nheron
Date: 2009-11-22 13:42:53 -0500 (Sun, 22 Nov 2009)
New Revision: 30284

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FieldDataConstraintEditor.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java
Log:
Added 
https://jira.jboss.org/jira/browse/JBDS-894
and
Make an upgrade software for the new QA Gui pojo class model
https://jira.jboss.org/jira/browse/GUVNOR-337
In fact, the update model is in the widget so no need to modify the mortage example 
https://jira.jboss.org/jira/browse/GUVNOR-336


Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java	2009-11-22 17:16:15 UTC (rev 30283)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java	2009-11-22 18:42:53 UTC (rev 30284)
@@ -1,14 +1,9 @@
 package org.drools.guvnor.client.modeldriven.ui;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.drools.guvnor.client.common.DirtyableComposite;
-import org.drools.guvnor.client.common.FieldEditListener;
-import org.drools.guvnor.client.common.FormStylePopup;
-import org.drools.guvnor.client.common.InfoPopup;
-import org.drools.guvnor.client.common.SmallLabel;
-import org.drools.guvnor.client.common.ValueChanged;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.*;
+import org.drools.guvnor.client.common.*;
 import org.drools.guvnor.client.messages.Constants;
 import org.drools.guvnor.client.modeldriven.DropDownData;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
@@ -16,19 +11,7 @@
 import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
 import org.drools.guvnor.client.modeldriven.brl.FactPattern;
 
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.KeyboardListener;
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.Widget;
+import java.util.List;
 
 /**
  * This provides for editing of fields in the RHS of a rule.
@@ -90,6 +73,14 @@
 			// bons editeurs suivant le type
 			// si la valeur vaut 0 il faut mettre un stylo (
 
+            if (value.value != null && value.value.length() > 0 && value.nature == ActionFieldValue.TYPE_UNDEFINED ){
+                ///JBDS-894
+                if (value.value.charAt(0)=='='){
+                    value.nature = ActionFieldValue.TYPE_VARIABLE;
+                } else {
+                    value.nature =ActionFieldValue.TYPE_LITERAL;
+                }
+            }
 			if (value.nature == ActionFieldValue.TYPE_UNDEFINED) {
 				// we have a blank slate..
 				// have to give them a choice

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FieldDataConstraintEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FieldDataConstraintEditor.java	2009-11-22 17:16:15 UTC (rev 30283)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FieldDataConstraintEditor.java	2009-11-22 18:42:53 UTC (rev 30284)
@@ -69,7 +69,7 @@
 						callback, DropDownData.create(enums)));
 
 			} else {
-                if (field.value != null && field.nature == FieldData.TYPE_UNDEFINED ){
+                if (field.value != null && field.value.length() > 0 && field.nature == FieldData.TYPE_UNDEFINED ){
                     //  GUVNOR-337
                     if (field.value.charAt(0)=='='){
                        field.nature = FieldData.TYPE_VARIABLE;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java	2009-11-22 17:16:15 UTC (rev 30283)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java	2009-11-22 18:42:53 UTC (rev 30284)
@@ -70,7 +70,7 @@
 						callback, DropDownData.create(enums)));
 
 			} else {
-                if (field.expected != null && field.nature == FieldData.TYPE_UNDEFINED ){
+                if (field.expected != null && field.expected.length() > 0 && field.nature == FieldData.TYPE_UNDEFINED ){
                     //  GUVNOR-337
                     if (field.expected.charAt(0)=='='){
                        field.nature = FieldData.TYPE_VARIABLE;