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

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

Author: ge0ffrey
Date: 2010-12-02 14:06:20 -0500 (Thu, 02 Dec 2010)
New Revision: 36169

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesTree.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/TabOpener.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
Log:
fix "other assets" view

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesTree.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesTree.java	2010-12-02 16:48:44 UTC (rev 36168)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesTree.java	2010-12-02 19:06:20 UTC (rev 36169)
@@ -208,7 +208,8 @@
                 opener.openPackageViewAssets( packageConfigData.uuid,
                                               packageConfigData.name,
                                               key,
-                                              Arrays.asList(formats),
+                                              formats.length == 0 ? null : Arrays.asList(formats),
+                                              formats.length == 0 ? Boolean.TRUE : null,
                                               node.getText() );
             } else {
                 throw new IllegalArgumentException("The userObject (" + userObject + ") is not supported.");

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.java	2010-12-02 16:48:44 UTC (rev 36168)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.java	2010-12-02 19:06:20 UTC (rev 36169)
@@ -83,6 +83,7 @@
 
     private final String packageUuid;
     private final List<String> formatInList;
+    private final Boolean formatIsRegistered;
     private final EditItemEvent editEvent;
     private int pageSize = 25; // TODO might need to be configurable, or a constant
     private String feedURL;
@@ -106,13 +107,15 @@
     SimplePager pager;
     private MultiSelectionModel<AssetPageRow> selectionModel;
 
-    public AssetTable(String packageUuid, List<String> formatInList, EditItemEvent event) {
-        this(packageUuid, formatInList, event, null);
+    public AssetTable(String packageUuid, List<String> formatInList, Boolean formatIsRegistered, EditItemEvent event) {
+        this(packageUuid, formatInList, formatIsRegistered, event, null);
     }
 
-    public AssetTable(String packageUuid, List<String> formatInList, final EditItemEvent event, String feedURL) {
+    public AssetTable(String packageUuid, List<String> formatInList, Boolean formatIsRegistered,
+            final EditItemEvent event, String feedURL) {
         this.packageUuid = packageUuid;
         this.formatInList = formatInList;
+        this.formatIsRegistered = formatIsRegistered;
         this.editEvent = event;
         this.feedURL = feedURL;
         doCellTable();
@@ -255,6 +258,7 @@
                 AssetPageRequest request = new AssetPageRequest();
                 request.setPackageUuid(packageUuid);
                 request.setFormatInList(formatInList);
+                request.setFormatIsRegistered(formatIsRegistered);
                 request.setStartRowIndex(pager.getPageStart());
                 request.setPageSize(pageSize);
                 repositoryService.findAssetPage(request,

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/TabOpener.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/TabOpener.java	2010-12-02 16:48:44 UTC (rev 36168)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/TabOpener.java	2010-12-02 19:06:20 UTC (rev 36169)
@@ -501,13 +501,13 @@
     public void openPackageViewAssets(final String packageUuid,
                                       final String packageName,
                                       String key,
-                                      final List<String> formatInList,
+                                      final List<String> formatInList, Boolean formatIsRegistered,
                                       final String itemName) {
         if ( !explorerViewCenterPanel.showIfOpen( key ) ) {
 
             String feedUrl = GWT.getModuleBaseURL() + "feed/package?name=" + packageName + "&viewUrl=" + Util.getSelfURL() + "&status=*";
             final AssetTable table = new AssetTable( packageUuid,
-                                                     formatInList,
+                                                     formatInList, formatIsRegistered,
                                                      new EditItemEvent() {
                                                          public void open(String uuid) {
                                                              openAsset( uuid );

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2010-12-02 16:48:44 UTC (rev 36168)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2010-12-02 19:06:20 UTC (rev 36169)
@@ -502,7 +502,7 @@
 
             }
 
-            if ( seekArchived == false ) {
+            if (!seekArchived) {
                 sql += " AND " + AssetItem.CONTENT_PROPERTY_ARCHIVE_FLAG + " = 'false'";
             }