[jboss-svn-commits] JBL Code SVN: r34689 - in labs/jbossrules/branches/5.1.x: drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable and 1 other directories.

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

Author: tsurdilovic
Date: 2010-08-12 17:25:04 -0400 (Thu, 12 Aug 2010)
New Revision: 34689

Modified:
   labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java
   labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
   labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
   labs/jbossrules/branches/5.1.x/pom.xml
Log:
GUVNOR-592

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java	2010-08-12 20:31:56 UTC (rev 34688)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java	2010-08-12 21:25:04 UTC (rev 34689)
@@ -222,8 +222,8 @@
                         return;
                     }
                     if ( null == editingCol.operator || "".equals( editingCol.operator ) ) {
-                        Window.alert( constants.PleaseSelectAnOperator() );
-                        return;
+                    	// Operator field optional
+                        Window.alert( constants.NotifyNoSelectedOperator() );
                     }
 
                 }

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-08-12 20:31:56 UTC (rev 34688)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-08-12 21:25:04 UTC (rev 34689)
@@ -1749,8 +1749,12 @@
     String HideThisColumn();
 
     String PleaseSelectOrEnterField();
+    
+    String NotifyNoSelectedOrEnteredField();
 
     String PleaseSelectAnOperator();
+    
+    String NotifyNoSelectedOperator();
 
     String January();
 

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-08-12 20:31:56 UTC (rev 34688)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-08-12 21:25:04 UTC (rev 34689)
@@ -861,7 +861,9 @@
 DefaultValue=Default value:
 HideThisColumn=Hide this column
 PleaseSelectOrEnterField=Please select or enter field
+NotifyNoSelectedOrEnteredField=Field has not been selected or entered
 PleaseSelectAnOperator=Please select an operator
+NotifyNoSelectedOperator=Operator has not been selected
 January=January
 February=February
 March=March

Modified: labs/jbossrules/branches/5.1.x/pom.xml
===================================================================
--- labs/jbossrules/branches/5.1.x/pom.xml	2010-08-12 20:31:56 UTC (rev 34688)
+++ labs/jbossrules/branches/5.1.x/pom.xml	2010-08-12 21:25:04 UTC (rev 34689)
@@ -338,7 +338,7 @@
          </activation>
          <modules>
             <module>drools-clips</module>
-            <module>drools-planner</module>	
+            <!-- <module>drools-planner</module> -->	
             <module>drools-pipeline</module>
             <module>drools-simulator</module>
             <module>osgi-bundles</module>		
@@ -358,7 +358,7 @@
                            <descriptor>src/main/assembly/src.xml</descriptor>
                            <descriptor>src/main/assembly/eclipse.xml</descriptor>
                            <descriptor>src/main/assembly/examples.xml</descriptor>
-                           <descriptor>src/main/assembly/planner.xml</descriptor>
+                           <!-- <descriptor>src/main/assembly/planner.xml</descriptor> -->
                            <descriptor>src/main/assembly/gwt-console.xml</descriptor>
                            <descriptor>src/main/assembly/docs.xml</descriptor>
                            <descriptor>src/main/assembly/javadocs.xml</descriptor>
@@ -448,7 +448,7 @@
                            <descriptor>src/main/assembly/src_soaversion.xml</descriptor>
                            <descriptor>src/main/assembly/eclipse.xml</descriptor>
                            <descriptor>src/main/assembly/examples.xml</descriptor>
-                           <descriptor>src/main/assembly/planner.xml</descriptor>
+                           <!-- <descriptor>src/main/assembly/planner.xml</descriptor> -->
                            <descriptor>src/main/assembly/docs_soaversion.xml</descriptor>
                            <descriptor>src/main/assembly/javadocs_soaversion.xml</descriptor>
                            <descriptor>src/main/assembly/soa.xml</descriptor>