From b69088b85ac5ec56591a15bde55608b8317586d7 Mon Sep 17 00:00:00 2001
From: jervisliu <jervisliu@gmail.com>
Date: Sun, 11 Aug 2013 21:10:05 +0800
Subject: [PATCH] bz-973574: Button 'Delete selected jar' does not work in
 Guvnor M2 repository tab

---
 .../m2repo/client/editor/JarListEditor.java   | 24 ++-----------------
 .../m2repo/client/editor/PagedJarTable.java   | 19 ++++++++++++++-
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/JarListEditor.java b/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/JarListEditor.java
index bad6713e25..d65cc07206 100644
--- a/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/JarListEditor.java
+++ b/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/JarListEditor.java
@@ -16,7 +16,6 @@
 
 package org.guvnor.m2repo.client.editor;
 
-import java.util.Set;
 
 import com.google.gwt.cell.client.ButtonCell;
 import com.google.gwt.cell.client.FieldUpdater;
@@ -31,7 +30,6 @@
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 import org.guvnor.m2repo.client.resources.i18n.Constants;
 import org.guvnor.m2repo.model.JarListPageRow;
@@ -65,8 +63,6 @@ interface JarListEditorBinder
 
     private static JarListEditorBinder uiBinder = GWT.create( JarListEditorBinder.class );
 
-    protected MultiSelectionModel<JarListPageRow> selectionModel;
-
     private Caller<M2RepoService> m2RepoService;
 
     public JarListEditor( Caller<M2RepoService> repoService ) {
@@ -102,7 +98,7 @@ public void update( int index,
 
     @UiHandler("deleteSelectedJarButton")
     void deleteSelectedJar( ClickEvent e ) {
-        if ( getSelectedJars() == null ) {
+        if ( pagedJarTable.getSelectedJars() == null ) {
             Window.alert( "Please Select A Jar To Delete" );
             return;
         }
@@ -115,23 +111,7 @@ public void callback( Void v ) {
                 Window.alert( "Deleted successfully" );
                 pagedJarTable.refresh();
             }
-        } ).deleteJar( getSelectedJars() );
-    }
-
-    public String[] getSelectedJars() {
-        Set<JarListPageRow> selectedRows = selectionModel.getSelectedSet();
-        // Compatibility with existing API
-        if ( selectedRows.size() == 0 ) {
-            return null;
-        }
-
-        // Create the array of paths
-        String[] paths = new String[ selectedRows.size() ];
-        int rowCount = 0;
-        for ( JarListPageRow row : selectedRows ) {
-            paths[ rowCount++ ] = row.getPath();
-        }
-        return paths;
+        } ).deleteJar( pagedJarTable.getSelectedJars() );
     }
 
     @UiHandler("refreshButton")
diff --git a/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/PagedJarTable.java b/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/PagedJarTable.java
index 57e7ff179d..c39491f316 100644
--- a/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/PagedJarTable.java
+++ b/guvnor-m2repo-editor/guvnor-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/editor/PagedJarTable.java
@@ -1,6 +1,7 @@
 package org.guvnor.m2repo.client.editor;
 
 import java.util.Date;
+import java.util.Set;
 
 import com.github.gwtbootstrap.client.ui.CellTable;
 import com.google.gwt.cell.client.ButtonCell;
@@ -111,7 +112,23 @@ public void refresh() {
         cellTable.setVisibleRangeAndClearData( cellTable.getVisibleRange(),
                                                true );
     }
-
+    
+    public String[] getSelectedJars() {
+        Set<JarListPageRow> selectedRows = selectionModel.getSelectedSet();
+        // Compatibility with existing API
+        if ( selectedRows.size() == 0 ) {
+            return null;
+        }
+
+        // Create the array of paths
+        String[] paths = new String[ selectedRows.size() ];
+        int rowCount = 0;
+        for ( JarListPageRow row : selectedRows ) {
+            paths[ rowCount++ ] = row.getPath();
+        }
+        return paths;
+    }
+    
     @Override
     protected void addAncillaryColumns( ColumnPicker<JarListPageRow> columnPicker,
                                         SortableHeaderGroup<JarListPageRow> sortableHeaderGroup ) {