[Engine-patches] Change in ovirt-engine[master]: webadmin: exception on remove network from main tab.

[alkaplan]

Alona Kaplan has uploaded a new change for review.

Change subject: webadmin: exception on remove network from main tab.
......................................................................

webadmin: exception on remove network from main tab.

ClassCastException when removing network from Network Main tab.
Tried to cast NetworkView to Network.

Change-Id: I43cea740c8d3c104b7c3ae43772b7fad473ad7fe
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
1 file changed, 27 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/9210/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
index 987588e..79e69a9 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
@@ -9,13 +9,12 @@
 import org.ovirt.engine.core.common.businessentities.NetworkView;
 import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.ui.frontend.Frontend;
-import org.ovirt.engine.ui.uicommonweb.Linq;
 import org.ovirt.engine.ui.uicommonweb.UICommand;
 import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel;
 import org.ovirt.engine.ui.uicommonweb.models.ListModel;
 import org.ovirt.engine.ui.uicompat.ConstantsManager;
 
-public class RemoveNetworksModel extends ConfirmationModel{
+public class RemoveNetworksModel extends ConfirmationModel {
 
     private final ListModel sourceListModel;
 
@@ -29,15 +28,22 @@
         ArrayList<String> list = new ArrayList<String>();
         for (Object a : sourceListModel.getSelectedItems())
         {
-            if (a instanceof NetworkView){
+            if (a instanceof NetworkView) {
                 NetworkView netView = (NetworkView) a;
-                if (netView.getNetwork().getdescription() == null || 
netView.getNetwork().getdescription().trim().equalsIgnoreCase("")){ 
//$NON-NLS-1$
-                    
list.add(ConstantsManager.getInstance().getMessages().networkDc(netView.getNetwork().getname(),
 netView.getStoragePoolName()));
-                }else{
-                    
list.add(ConstantsManager.getInstance().getMessages().networkDcDescription(netView.getNetwork().getname(),
 netView.getStoragePoolName(), netView.getNetwork().getdescription()));
+                if (netView.getNetwork().getdescription() == null
+                        || 
netView.getNetwork().getdescription().trim().equalsIgnoreCase("")) { 
//$NON-NLS-1$
+                    list.add(ConstantsManager.getInstance()
+                            .getMessages()
+                            .networkDc(netView.getNetwork().getname(), 
netView.getStoragePoolName()));
+                } else {
+                    list.add(ConstantsManager.getInstance()
+                            .getMessages()
+                            
.networkDcDescription(netView.getNetwork().getname(),
+                                    netView.getStoragePoolName(),
+                                    netView.getNetwork().getdescription()));
                 }
 
-            }else if (a instanceof Network){
+            } else if (a instanceof Network) {
                 Network network = (Network) a;
                 list.add(network.getdescription());
             }
@@ -57,20 +63,29 @@
     public void onRemove()
     {
         ArrayList<VdcActionParametersBase> pb = new 
ArrayList<VdcActionParametersBase>();
-        for (Network a : Linq.<Network> 
Cast(sourceListModel.getSelectedItems()))
+
+        for (Object a : sourceListModel.getSelectedItems())
         {
-            pb.add(new 
AddNetworkStoragePoolParameters(a.getstorage_pool_id().getValue(), a));
+            if (a instanceof NetworkView) {
+                NetworkView netView = (NetworkView) a;
+                pb.add(new AddNetworkStoragePoolParameters(netView.getNetwork()
+                        .getstorage_pool_id()
+                        .getValue(), netView.getNetwork()));
+            } else if (a instanceof Network) {
+                Network network = (Network) a;
+                pb.add(new 
AddNetworkStoragePoolParameters(network.getstorage_pool_id().getValue(), 
network));
+            }
         }
         Frontend.RunMultipleAction(VdcActionType.RemoveNetwork, pb);
 
         sourceListModel.setConfirmWindow(null);
     }
 
-    private void cancel(){
+    private void cancel() {
         sourceListModel.setConfirmWindow(null);
     }
 
- @Override
+    @Override
     public void ExecuteCommand(UICommand command) {
         super.ExecuteCommand(command);
         if (StringHelper.stringsEqual(command.getName(), "onRemove")) 
//$NON-NLS-1$


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

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