[jboss-svn-commits] JBL Code SVN: r32058 - in labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main: resources and 1 other directory.

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

Author: jervisliu
Date: 2010-03-12 10:04:31 -0500 (Fri, 12 Mar 2010)
New Revision: 32058

Modified:
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/resources/archivedrulelist.properties
Log:
Merged BRMS-97(Category table includes 2 "undefined" columns - displays category UUID and name),guvnor-279(Archived assets table includes "undefined" column - displays asset UUID) 
Merge log: 
1. Updated AssetItemGrid.java with necessary changes.
2. Updated archivedrulelist.properties with r31180


Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java	2010-03-12 14:36:24 UTC (rev 32057)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java	2010-03-12 15:04:31 UTC (rev 32058)
@@ -356,6 +356,7 @@
         cfgs[0] = new ColumnConfig() {
             {
                 setHidden( true );
+                setHeader( "uuid" );
                 setDataIndex( "uuid" );   //NON-NLS
             }
         };
@@ -367,8 +368,6 @@
 
             cfgs[i + 1] = new ColumnConfig() {
                 {
-                    if ( !header.equals( "Description" ) ) {
-
                         setupHeader();
                         setSortable( true );
                         setDataIndex( header );
@@ -402,12 +401,12 @@
                                     return format.format( (Date) value  );
                                 }
                             } );
+                        } else if ( header.equals( "Description" ) ) {
+                            setHidden( true ); //don't want to show a separate description
                         }
-                    } else {
-                        setHidden( true ); //don't want to show a separate description
-                    }
+                } 
 
-                }
+              
 
                 /**
                  * This dirty hack is needed to cope with keys that may not be localised.

Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/resources/archivedrulelist.properties
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/resources/archivedrulelist.properties	2010-03-12 14:36:24 UTC (rev 32057)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/resources/archivedrulelist.properties	2010-03-12 15:04:31 UTC (rev 32058)
@@ -8,8 +8,8 @@
 #
 # @author Michael Neale
 #
-*=getFormat
+Name=getName
+Format=getFormat
 Package Name=getPackageName
-Name=getName
 LastContributor=getLastContributor
-LastModified=getLastModified
+LastModified=getLastModified
\ No newline at end of file