[jboss-svn-commits] JBL Code SVN: r34746 - in labs/jbossrules/trunk: drools-guvnor/src/main/java/org/drools/guvnor/client/messages and 2 other directories.

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

Author: tsurdilovic
Date: 2010-08-16 23:09:07 -0400 (Mon, 16 Aug 2010)
New Revision: 34746

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java
   labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/dt/DTColumnConfig.java
Log:
GUVNOR-605

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java	2010-08-17 01:38:29 UTC (rev 34745)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java	2010-08-17 03:09:07 UTC (rev 34746)
@@ -516,7 +516,7 @@
             } );
             // GUVNOR-605
             if(at.attr.equals(RuleAttributeWidget.SALIENCE_ATTR)) {
-            	hp.add( new HTML( "    " ) );
+            	hp.add( new HTML( "  " ) );
             	final CheckBox useRowNumber = new CheckBox();
             	useRowNumber.setChecked(at.useRowNumber);
             	useRowNumber.addClickListener( new ClickListener() {
@@ -525,7 +525,18 @@
                     }
                 } );
                 hp.add( useRowNumber );
-            	hp.add( new SmallLabel( constants.UseRowNumber() ) );       	
+            	hp.add( new SmallLabel( constants.UseRowNumber() ) );
+            	hp.add( new SmallLabel( "(" ) );
+            	final CheckBox reverseOrder = new CheckBox();
+            	reverseOrder.setChecked(at.reverseOrder);
+            	reverseOrder.addClickListener( new ClickListener() {
+                    public void onClick(Widget sender) {
+                        at.reverseOrder = reverseOrder.isChecked();
+                    }
+                } );
+            	hp.add(reverseOrder);
+            	hp.add( new SmallLabel( constants.ReverseOrder() ) );
+            	hp.add( new SmallLabel( ")" ) );
             }
             hp.add( new HTML( "    " ) ); //NON-NLS
             hp.add( new SmallLabel( constants.DefaultValue() ) );
@@ -1260,12 +1271,16 @@
     private void renumberSalience(Record[] rs) {
     	List<AttributeCol> attcols =  dt.attributeCols;
     	for(AttributeCol ac : attcols) {
-    		if(ac.useRowNumber == true) {
+    		if(ac.useRowNumber) {
     			for(int i=0; i<rs.length;i++) {
     	    		Record nextrecord = rs[i];
     	    		List<String> allFields = Arrays.asList(nextrecord.getFields());
     	        	if(allFields.contains("salience")) {
-    	        		rs[i].set( "salience", "" + (i + 1) ); //NON-NLS
+    	        		if(ac.reverseOrder) {
+    	        			rs[i].set( "salience", "" + (rs.length - i) ); //NON-NLS
+    	        		} else {
+    	        		   rs[i].set( "salience", "" + (i + 1) ); //NON-NLS
+    	        		}
     	        	}
     	    	}
     		}

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-08-17 01:38:29 UTC (rev 34745)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-08-17 03:09:07 UTC (rev 34746)
@@ -616,6 +616,8 @@
     
     String UseRowNumber();
     
+    String ReverseOrder();
+    
     String Metadata1();
 
     String Attribute();

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-08-17 01:38:29 UTC (rev 34745)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-08-17 03:09:07 UTC (rev 34746)
@@ -859,7 +859,8 @@
 Browse=Browse
 KnowledgeBases=Knowledge Bases
 DefaultValue=Default value:
-UseRowNumber=Use Row Number
+UseRowNumber=Use row number
+ReverseOrder=Reverse order
 HideThisColumn=Hide this column
 PleaseSelectOrEnterField=Please select or enter field
 NotifyNoSelectedOrEnteredField=Field has not been selected or entered

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java	2010-08-17 01:38:29 UTC (rev 34745)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java	2010-08-17 03:09:07 UTC (rev 34746)
@@ -65,7 +65,7 @@
     /**
      * These are the names of all of the rule attributes for this widget
      */
-    public static final String SALIENCE_ATTR = "salience";
+    public static final String SALIENCE_ATTR = "salience"; // needs to be public
     private static final String ENABLED_ATTR = "enabled";
     private static final String DATE_EFFECTIVE_ATTR = "date-effective";
     private static final String DATE_EXPIRES_ATTR = "date-expires";

Modified: labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/dt/DTColumnConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/dt/DTColumnConfig.java	2010-08-17 01:38:29 UTC (rev 34745)
+++ labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/dt/DTColumnConfig.java	2010-08-17 03:09:07 UTC (rev 34746)
@@ -40,5 +40,10 @@
      * to use the row number as number for the salience attribute.
      */
     public boolean useRowNumber = false;
+    
+    /**
+     * to use the reverse order of the row number as the salience attribute.
+     */
+    public boolean reverseOrder = false;
 
 }