Martin Mucha has uploaded a new change for review. Change subject: userportal,webadmin: removed useless class. ......................................................................
userportal,webadmin: removed useless class. Change-Id: I7fb82f9390633bd33cb067d7df7f7bf95caff70e Signed-off-by: Martin Mucha <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java 4 files changed, 25 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/37640/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index a651270..4b4807f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -46,7 +46,6 @@ import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkLabelModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperation; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperationFactory; -import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperationFactory.OperationMap; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.OperationCandidateEventArgs; import org.ovirt.engine.ui.uicommonweb.models.vms.key_value.KeyValueModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; @@ -223,7 +222,7 @@ return !candidate.isNullOperation(); } - public OperationMap commandsFor(NetworkItemModel<?> item) { + public Map<NetworkOperation, List<NetworkCommand>> commandsFor(NetworkItemModel<?> item) { return operationFactory.commandsFor(item, allNics); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java index 9d50f6b..c4272d9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; @@ -14,23 +15,6 @@ * */ public class NetworkOperationFactory { - - @SuppressWarnings("serial") - public static class OperationMap extends HashMap<NetworkOperation, List<NetworkCommand>> { - protected void addCommand(NetworkOperation operation, NetworkCommand command) { - List<NetworkCommand> menuItems = getItems(operation); - menuItems.add(command); - } - - private List<NetworkCommand> getItems(NetworkOperation operation) { - if (containsKey(operation)) { - return get(operation); - } - List<NetworkCommand> menuItems = new ArrayList<NetworkCommand>(); - put(operation, menuItems); - return menuItems; - } - } /** * Gets the valid Operation involving the two operands.<BR> @@ -199,14 +183,14 @@ * @param allNics * @return */ - public OperationMap commandsFor(NetworkItemModel<?> item, List<VdsNetworkInterface> allNics) { - OperationMap operations = new OperationMap(); + public Map<NetworkOperation, List<NetworkCommand>> commandsFor(NetworkItemModel<?> item, List<VdsNetworkInterface> allNics) { + Map<NetworkOperation, List<NetworkCommand>> operations = new HashMap<>(); // with nics for (NetworkInterfaceModel nic : nics) { NetworkOperation operation = operationFor(item, nic); if (!operation.isNullOperation()) { assertBinary(item, nic, operation); - operations.addCommand(operation, operation.getCommand(item, nic, allNics)); + addToOperationMultiMap(operations, operation, operation.getCommand(item, nic, allNics)); } } // with networks @@ -214,7 +198,7 @@ NetworkOperation operation = operationFor(item, network); if (!operation.isNullOperation()) { assertBinary(item, network, operation); - operations.addCommand(operation, operation.getCommand(item, network, allNics)); + addToOperationMultiMap(operations, operation, operation.getCommand(item, network, allNics)); } } @@ -223,13 +207,25 @@ if (!operation.isNullOperation()) { assert operation.isUnary() : "Operation " + operation.name() //$NON-NLS-1$ + " is Binary, while a Uniary Operation is expected for " + item.getName(); //$NON-NLS-1$ - operations.addCommand(operation, operation.getCommand(item, null, allNics)); + addToOperationMultiMap(operations, operation, operation.getCommand(item, null, allNics)); } return operations; } + private void addToOperationMultiMap(Map<NetworkOperation, List<NetworkCommand>> operationsMap, + NetworkOperation operation, + NetworkCommand command) { + + List<NetworkCommand> menuItems = operationsMap.get(operation); + if (menuItems == null) { + menuItems = new ArrayList<>(); + operationsMap.put(operation, menuItems); + } + menuItems.add(command); + } + private void assertBinary(NetworkItemModel<?> op1, NetworkItemModel<?> op2, NetworkOperation operation) { assert !operation.isUnary() : "Operation " + operation.name() //$NON-NLS-1$ + " is Unary, while a Binary Operation is expected for: " + op1.getName() + " and " + op2.getName(); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java index cb61326..af1ea1c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map; import java.util.Map.Entry; import org.ovirt.engine.core.common.businessentities.comparators.LexoNumericComparator; @@ -11,7 +12,6 @@ import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkCommand; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkItemModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperation; -import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperationFactory.OperationMap; import org.ovirt.engine.ui.webadmin.ApplicationMessages; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider; @@ -165,7 +165,7 @@ */ private MenuBar menuFor(NetworkItemModel<?> item) { MenuBar menu = rootMenu(item); - OperationMap operationMap = item.getSetupModel().commandsFor(item); + Map<NetworkOperation, List<NetworkCommand>> operationMap = item.getSetupModel().commandsFor(item); for (final Entry<NetworkOperation, List<NetworkCommand>> entry : operationMap.entrySet()) { final List<NetworkCommand> commands = entry.getValue(); if (entry.getKey().isUnary()) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java index c3a2ee4..30be3e2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java @@ -1,10 +1,12 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.host.panels; +import java.util.List; +import java.util.Map; + import org.ovirt.engine.ui.common.utils.ElementUtils; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.LogicalNetworkModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkCommand; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperation; -import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperationFactory.OperationMap; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.resources.client.ImageResource; @@ -145,7 +147,7 @@ if (network.isManaged()) { item.edit(); } else { - OperationMap operationMap = item.getSetupModel().commandsFor(item); + Map<NetworkOperation, List<NetworkCommand>> operationMap = item.getSetupModel().commandsFor(item); final NetworkCommand detach = operationMap.get(NetworkOperation.REMOVE_UNMANAGED_NETWORK).get(0); item.getSetupModel().onOperation(NetworkOperation.REMOVE_UNMANAGED_NETWORK, detach); } -- To view, visit http://gerrit.ovirt.org/37640 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fb82f9390633bd33cb067d7df7f7bf95caff70e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
