Lior Vernia has uploaded a new change for review. Change subject: webadmin: Cleanup around Setup Networks events ......................................................................
webadmin: Cleanup around Setup Networks events * Removed NetworksChanged event that wasn't used for anything. * Parameterized generic events. * Fixed typo in OperationCandidateEventArgs name. Change-Id: I23945cb33eea895b216ab78fbbca5a6a26300c7c Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java R frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCandidateEventArgs.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java 3 files changed, 23 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/31509/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 3aff6a7..45e3317 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 @@ -45,7 +45,7 @@ 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.OperationCadidateEventArgs; +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; import org.ovirt.engine.ui.uicompat.Event; @@ -107,17 +107,13 @@ private static final EventDefinition NICS_CHANGED_EVENT_DEFINITION = new EventDefinition("NicsChanged", //$NON-NLS-1$ HostSetupNetworksModel.class); - private static final EventDefinition NETWORKS_CHANGED_EVENT_DEFINITION = new EventDefinition("NetworksChanged", //$NON-NLS-1$ - HostSetupNetworksModel.class); private static final EventDefinition OPERATION_CANDIDATE_EVENT_DEFINITION = new EventDefinition("OperationCandidate", NetworkOperationFactory.class); //$NON-NLS-1$ - private Event operationCandidateEvent; + private Event<OperationCandidateEventArgs> operationCandidateEvent; - private Event nicsChangedEvent; - - private Event networksChangedEvent; + private Event<EventArgs> nicsChangedEvent; private List<VdsNetworkInterface> allNics; @@ -162,9 +158,8 @@ networkToLastDetachParams = new HashMap<String, NetworkParameters>(); netTodcParams = new HashMap<String, DcNetworkParams>(); netToBeforeSyncParams = new HashMap<String, NetworkParameters>(); - setNicsChangedEvent(new Event(NICS_CHANGED_EVENT_DEFINITION)); - setNetworksChangedEvent(new Event(NETWORKS_CHANGED_EVENT_DEFINITION)); - setOperationCandidateEvent(new Event(OPERATION_CANDIDATE_EVENT_DEFINITION)); + setNicsChangedEvent(new Event<EventArgs>(NICS_CHANGED_EVENT_DEFINITION)); + setOperationCandidateEvent(new Event<OperationCandidateEventArgs>(OPERATION_CANDIDATE_EVENT_DEFINITION)); setCheckConnectivity(new EntityModel<Boolean>()); getCheckConnectivity().setEntity(true); setConnectivityTimeout(new EntityModel<Integer>()); @@ -226,7 +221,7 @@ currentCandidate = candidate; currentOp1 = op1; currentOp2 = op2; - getOperationCandidateEvent().raise(this, new OperationCadidateEventArgs(candidate, op1, op2)); + getOperationCandidateEvent().raise(this, new OperationCandidateEventArgs(candidate, op1, op2)); } return !candidate.isNullOperation(); } @@ -243,19 +238,15 @@ return new ArrayList<LogicalNetworkModel>(networkMap.values()); } - public Event getNetworksChangedEvent() { - return networksChangedEvent; - } - public List<NetworkInterfaceModel> getNics() { return new ArrayList<NetworkInterfaceModel>(nicMap.values()); } - public Event getNicsChangedEvent() { + public Event<EventArgs> getNicsChangedEvent() { return nicsChangedEvent; } - public Event getOperationCandidateEvent() { + public Event<OperationCandidateEventArgs> getOperationCandidateEvent() { return operationCandidateEvent; } @@ -582,7 +573,6 @@ protected void onNicsChanged() { operationFactory = new NetworkOperationFactory(getNetworks(), getNics()); validate(); - getNetworksChangedEvent().raise(this, EventArgs.EMPTY); } private LogicalNetworkModel createUnmanagedNetworkModel(String networkName, VdsNetworkInterface nic) { @@ -921,11 +911,6 @@ private void setNetworks(Map<String, LogicalNetworkModel> networks) { networkMap = networks; - getNetworksChangedEvent().raise(this, EventArgs.EMPTY); - } - - private void setNetworksChangedEvent(Event value) { - networksChangedEvent = value; } private void setNics(Map<String, NetworkInterfaceModel> nics) { @@ -934,11 +919,11 @@ getNicsChangedEvent().raise(this, EventArgs.EMPTY); } - private void setNicsChangedEvent(Event value) { + private void setNicsChangedEvent(Event<EventArgs> value) { nicsChangedEvent = value; } - private void setOperationCandidateEvent(Event event) { + private void setOperationCandidateEvent(Event<OperationCandidateEventArgs> event) { operationCandidateEvent = event; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCandidateEventArgs.java similarity index 85% rename from frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java rename to frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCandidateEventArgs.java index 8d96256..a320f33 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCandidateEventArgs.java @@ -5,7 +5,7 @@ /** * Arguments for an OperationCadidateEvent, triggered when a new Network Operation Candidate is created */ -public class OperationCadidateEventArgs extends EventArgs { +public class OperationCandidateEventArgs extends EventArgs { private final NetworkOperation candidate; @@ -13,7 +13,7 @@ private final NetworkItemModel<?> op2; - public OperationCadidateEventArgs(NetworkOperation candidate, + public OperationCandidateEventArgs(NetworkOperation candidate, NetworkItemModel<?> op1, NetworkItemModel<?> op2) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java index 4ea9aec..83c0f00 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java @@ -14,7 +14,7 @@ import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkInterfaceModel; 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.OperationCadidateEventArgs; +import org.ovirt.engine.ui.uicommonweb.models.hosts.network.OperationCandidateEventArgs; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; @@ -129,9 +129,9 @@ @Override public void edit(HostSetupNetworksModel uicommonModel) { driver.edit(uicommonModel); - uicommonModel.getNicsChangedEvent().addListener(new IEventListener() { + uicommonModel.getNicsChangedEvent().addListener(new IEventListener<EventArgs>() { @Override - public void eventRaised(Event ev, Object sender, EventArgs args) { + public void eventRaised(Event<EventArgs> ev, Object sender, EventArgs args) { // this is called after both networks and nics were retrieved HostSetupNetworksModel model = (HostSetupNetworksModel) sender; List<LogicalNetworkModel> networks = model.getNetworks(); @@ -147,13 +147,15 @@ } }); - uicommonModel.getOperationCandidateEvent().addListener(new IEventListener() { + uicommonModel.getOperationCandidateEvent().addListener(new IEventListener<OperationCandidateEventArgs>() { @Override - public void eventRaised(Event ev, Object sender, EventArgs args) { - OperationCadidateEventArgs evtArgs = (OperationCadidateEventArgs) args; - NetworkOperation candidate = evtArgs.getCandidate(); - NetworkItemModel<?> op1 = evtArgs.getOp1(); - NetworkItemModel<?> op2 = evtArgs.getOp2(); + public void eventRaised(Event<OperationCandidateEventArgs> ev, + Object sender, + OperationCandidateEventArgs args) { + + NetworkOperation candidate = args.getCandidate(); + NetworkItemModel<?> op1 = args.getOp1(); + NetworkItemModel<?> op2 = args.getOp2(); if (candidate == null) { setErrorStatus(constants.noValidActionSetupNetwork()); -- To view, visit http://gerrit.ovirt.org/31509 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23945cb33eea895b216ab78fbbca5a6a26300c7c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
