[jboss-svn-commits] JBL Code SVN: r36368 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Dec 11 03:38:08 EST 2010


Author: Rikkola
Date: 2010-12-11 03:38:07 -0500 (Sat, 11 Dec 2010)
New Revision: 36368

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.ui.xml
Log:
Small AssetTable refactoring.

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-11 08:09:39 UTC (rev 36367)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.java	2010-12-11 08:38:07 UTC (rev 36368)
@@ -23,18 +23,8 @@
 import java.util.List;
 import java.util.Set;
 
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.Hyperlink;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.ToggleButton;
-import com.google.gwt.user.client.ui.Widget;
 import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.resources.Images;
 import org.drools.guvnor.client.resources.RuleFormatImageResource;
 import org.drools.guvnor.client.rpc.AssetPageRequest;
 import org.drools.guvnor.client.rpc.AssetPageResponse;
@@ -52,15 +42,22 @@
 import com.google.gwt.cell.client.DateCell;
 import com.google.gwt.cell.client.FieldUpdater;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.i18n.client.DateTimeFormat;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.cellview.client.CellTable;
 import com.google.gwt.user.cellview.client.Column;
 import com.google.gwt.user.cellview.client.SimplePager;
 import com.google.gwt.user.cellview.client.TextColumn;
 import com.google.gwt.user.cellview.client.TextHeader;
 import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.ToggleButton;
+import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.view.client.AsyncDataProvider;
 import com.google.gwt.view.client.HasData;
 import com.google.gwt.view.client.MultiSelectionModel;
@@ -73,7 +70,6 @@
 public class AssetTable extends Composite {
 
     private static final Constants constants = GWT.create(Constants.class);
-    private static Images images = GWT.create( Images.class );
 
     interface AssetTableBinder extends UiBinder<Widget, AssetTable> {}
 
@@ -90,16 +86,11 @@
     private Set<Command> unloadListenerSet = new HashSet<Command>();
 
     @UiField(provided=true)
-    Button refreshButton;
-    @UiField(provided=true)
-    Button openSelectedButton;
-    @UiField(provided=true)
-    Button openSelectedToSingleTabButton;
-    @UiField(provided=true)
     ToggleButton columnPickerButton;
-    @UiField(provided=true)
-    HTML feedHTML;
 
+    @UiField()
+    Image feedImage;
+
     @UiField(provided = true)
     CellTable<AssetPageRow> cellTable;
     private AsyncDataProvider<AssetPageRow> dataProvider;
@@ -120,6 +111,9 @@
         this.feedURL = feedURL;
         doCellTable();
         initWidget(uiBinder.createAndBindUi(this));
+        if (feedURL == null) {
+            feedImage.setVisible(false);
+        }
     }
 
     private void doCellTable() {
@@ -272,50 +266,46 @@
         };
         dataProvider.addDataDisplay(cellTable);
 
-        refreshButton = new Button(constants.refreshList());
-        refreshButton.addClickHandler(new ClickHandler() {
-            public void onClick(ClickEvent e) {
-                refresh();
-            }
-        });
-        openSelectedButton = new Button(constants.openSelected());
-        openSelectedButton.addClickHandler(new ClickHandler() {
-            public void onClick(ClickEvent e) {
-                Set<AssetPageRow> selectedSet = selectionModel.getSelectedSet();
-                for (AssetPageRow selected : selectedSet) {
-                    // TODO directly push the selected AssetPageRow
-                    editEvent.open(selected.getUuid());
-                }
-            }
-        });
-        openSelectedToSingleTabButton = new Button(constants.openSelectedToSingleTab());
-        openSelectedToSingleTabButton.addClickHandler(new ClickHandler() {
-            public void onClick(ClickEvent e) {
-                Set<AssetPageRow> selectedSet = selectionModel.getSelectedSet();
-                // TODO directly push the selected AssetPageRows
-                List<MultiViewRow> multiViewRowList = new ArrayList<MultiViewRow>(selectedSet.size());
-                for (AssetPageRow selected : selectedSet) {
-                    MultiViewRow row = new MultiViewRow();
-                    row.uuid = selected.getUuid();
-                    row.format = selected.getFormat();
-                    row.name = selected.getName();
-                    multiViewRowList.add(row);
-                }
-                editEvent.open(multiViewRowList.toArray(new MultiViewRow[multiViewRowList.size()]));
-            }
-        });
         columnPickerButton = columnPicker.createToggleButton();
+    }
 
-        if (feedURL != null) {
-            feedHTML = new HTML("<a href='" + feedURL + "' target='_blank'>" +
-                    "<img src='" + images.feed().getURL() + "'/></a>");
-        } else {
-            feedHTML = new HTML();
-            feedHTML.setVisible(false);
+    @UiHandler("feedImage")
+    void openFeed(ClickEvent e) {
+        Window.open( feedURL,
+                     "_blank",
+                     null );
+    }
+
+    @UiHandler("refreshButton")
+    void refresh(ClickEvent e) {
+        refresh();
+    }
+
+    @UiHandler("openSelectedButton")
+    void openSelected(ClickEvent e) {
+        Set<AssetPageRow> selectedSet = selectionModel.getSelectedSet();
+        for ( AssetPageRow selected : selectedSet ) {
+            // TODO directly push the selected AssetPageRow
+            editEvent.open( selected.getUuid() );
         }
     }
 
-    /**
+    @UiHandler("openSelectedToSingleTabButton")
+    public void openSelectedToSingleTab(ClickEvent e) {
+        Set<AssetPageRow> selectedSet = selectionModel.getSelectedSet();
+        // TODO directly push the selected AssetPageRows
+        List<MultiViewRow> multiViewRowList = new ArrayList<MultiViewRow>( selectedSet.size() );
+        for ( AssetPageRow selected : selectedSet ) {
+            MultiViewRow row = new MultiViewRow();
+            row.uuid = selected.getUuid();
+            row.format = selected.getFormat();
+            row.name = selected.getName();
+            multiViewRowList.add( row );
+        }
+        editEvent.open( multiViewRowList.toArray( new MultiViewRow[multiViewRowList.size()] ) );
+    }
+
+     /**
      * Refreshes the data. Does not rebuild the GUI.
      */
     public void refresh() {

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.ui.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.ui.xml	2010-12-11 08:09:39 UTC (rev 36367)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetTable.ui.xml	2010-12-11 08:38:07 UTC (rev 36368)
@@ -16,19 +16,23 @@
   -->
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
-    xmlns:g="urn:import:com.google.gwt.user.client.ui"
+    xmlns:gwt="urn:import:com.google.gwt.user.client.ui"
     xmlns:cellview="urn:import:com.google.gwt.user.cellview.client">
 
-  <g:VerticalPanel>
-    <g:HorizontalPanel>
-      <g:Button ui:field="refreshButton"/>
-      <g:Button ui:field="openSelectedButton"/>
-      <g:Button ui:field="openSelectedToSingleTabButton"/>
-      <g:ToggleButton ui:field="columnPickerButton"/>
-      <g:HTML ui:field="feedHTML"/>
-    </g:HorizontalPanel>
+  <ui:with field='images' type='org.drools.guvnor.client.resources.Images'/>
+	
+  <ui:with field="i18n" type="org.drools.guvnor.client.messages.Constants" />
+
+  <gwt:VerticalPanel>
+    <gwt:HorizontalPanel>
+      <gwt:Button ui:field="refreshButton" text='{i18n.refreshList}'/>
+      <gwt:Button ui:field="openSelectedButton" text='{i18n.openSelected}'/>
+      <gwt:Button ui:field="openSelectedToSingleTabButton" text='{i18n.openSelectedToSingleTab}'/>
+      <gwt:ToggleButton ui:field="columnPickerButton"/>
+      <gwt:Image ui:field="feedImage" resource='{images.feed}'></gwt:Image>
+    </gwt:HorizontalPanel>
     <cellview:CellTable ui:field="cellTable"/>
     <cellview:SimplePager ui:field="pager"/>
-  </g:VerticalPanel>
+  </gwt:VerticalPanel>
 
 </ui:UiBinder>



More information about the jboss-svn-commits mailing list