[Engine-patches] Change in ovirt-engine[master]: webadmin: Housekeeping in ProviderNetworksListModel

[lvernia]

Lior Vernia has uploaded a new change for review.

Change subject: webadmin: Housekeeping in ProviderNetworksListModel
......................................................................

webadmin: Housekeeping in ProviderNetworksListModel

Some general cleaning up; mainly moving methods around to fit the code
in ProviderListModel.

Change-Id: I855775745206c21515be048107b9c7dabffcfc2c
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNetworkListModel.java
1 file changed, 39 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/15032/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNetworkListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNetworkListModel.java
index ea60154..9ebabe8 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNetworkListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNetworkListModel.java
@@ -12,6 +12,10 @@
 
 public class ProviderNetworkListModel extends SearchableListModel {
 
+    private static final String CMD_DISCOVER = "Discover"; //$NON-NLS-1$
+    private static final String CMD_ADD = "Add"; //$NON-NLS-1$
+    private static final String CMD_REMOVE = "Remove"; //$NON-NLS-1$
+
     private UICommand privateDiscoverCommand;
     private UICommand privateAddCommand;
     private UICommand privateRemoveCommand;
@@ -21,9 +25,9 @@
         
setTitle(ConstantsManager.getInstance().getConstants().providerNetworksTitle());
         setHashName("networks"); //$NON-NLS-1$
 
-        setDiscoverCommand(new UICommand("Discover", this)); //$NON-NLS-1$
-        setAddCommand(new UICommand("Add", this)); //$NON-NLS-1$
-        setRemoveCommand(new UICommand("Remove", this)); //$NON-NLS-1$
+        setDiscoverCommand(new UICommand(CMD_DISCOVER, this));
+        setAddCommand(new UICommand(CMD_ADD, this));
+        setRemoveCommand(new UICommand(CMD_REMOVE, this));
 
         updateActionAvailability();
     }
@@ -53,6 +57,16 @@
     }
 
     @Override
+    protected String getListName() {
+        return "ProviderNetworkListModel"; //$NON-NLS-1$
+    }
+
+    @Override
+    public Provider getEntity() {
+        return (Provider) super.getEntity();
+    }
+
+    @Override
     protected void onEntityChanged() {
         super.onEntityChanged();
 
@@ -61,6 +75,27 @@
         }
 
         updateActionAvailability();
+    }
+
+    @Override
+    protected void selectedItemsChanged() {
+        super.selectedItemsChanged();
+        updateActionAvailability();
+    }
+
+    @Override
+    protected void onSelectedItemChanged()
+    {
+        super.onSelectedItemChanged();
+        updateActionAvailability();
+    }
+
+    @SuppressWarnings("rawtypes")
+    private void updateActionAvailability() {
+        List tempVar = getSelectedItems();
+        List selectedItems = (tempVar != null) ? tempVar : new ArrayList();
+
+        getRemoveCommand().setIsExecutionAllowed(selectedItems.size() > 0);
     }
 
     @Override
@@ -87,26 +122,11 @@
         setWindow(new ProviderNewNetworkModel(this));
     }
 
-    public void remove()
-    {
+    public void remove() {
         if (getConfirmWindow() != null) {
             return;
         }
         setConfirmWindow(new ProviderRemoveNetworkModel(this));
-    }
-
-    @Override
-    protected void selectedItemsChanged() {
-        super.selectedItemsChanged();
-        updateActionAvailability();
-    }
-
-    private void updateActionAvailability() {
-        List tempVar = getSelectedItems();
-        ArrayList selectedItems =
-                (ArrayList) ((tempVar != null) ? tempVar : new ArrayList());
-
-        getRemoveCommand().setIsExecutionAllowed(selectedItems.size() > 0);
     }
 
     @Override
@@ -122,24 +142,4 @@
         }
     }
 
-    public void cancel() {
-        setWindow(null);
-        setConfirmWindow(null);
-    }
-
-    @Override
-    protected String getListName() {
-        return "ProviderNetworkListModel"; //$NON-NLS-1$
-    }
-
-    @Override
-    protected void onSelectedItemChanged() {
-        super.onSelectedItemChanged();
-        updateActionAvailability();
-    }
-
-    @Override
-    public Provider getEntity() {
-        return (Provider) super.getEntity();
-    }
 }


--
To view, visit http://gerrit.ovirt.org/15032
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I855775745206c21515be048107b9c7dabffcfc2c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches