Lior Vernia has uploaded a new change for review. Change subject: webadmin: Render NetworkItemPanel generic ......................................................................
webadmin: Render NetworkItemPanel generic And remove unnecessary casts. Change-Id: Icdc0081ec4a0d2b663055c0a502a2534df49d125 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.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/NetworkLabelPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java 8 files changed, 39 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/38772/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java index c999e38..0e206fe 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java @@ -13,7 +13,7 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -public class BondPanel extends NicPanel { +public class BondPanel extends NicPanel<BondNetworkInterfaceModel> { public BondPanel(BondNetworkInterfaceModel item, NetworkPanelsStyle style) { super(item, style, true); @@ -48,11 +48,11 @@ vPanel.add(titleRow); getElement().addClassName(style.bondPanel()); - List<NetworkInterfaceModel> bonded = ((BondNetworkInterfaceModel) item).getBonded(); + List<NetworkInterfaceModel> bonded = item.getBonded(); Collections.sort(bonded); for (NetworkInterfaceModel networkInterfaceModel : bonded) { - NicPanel nicPanel = new NicPanel(networkInterfaceModel, style); + NicPanel<NetworkInterfaceModel> nicPanel = new NicPanel<>(networkInterfaceModel, style); nicPanel.parentPanel = this; nicPanel.actionButton.setVisible(false); vPanel.add(nicPanel); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java index 61cd734..ec5b0bd 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java @@ -48,7 +48,7 @@ requiredPanel.add(requiredTitlePanel); nonRequiredPanel.add(nonRequiredTitlePanel); for (NetworkPanel networkPanel : list) { - LogicalNetworkModel networkModel = (LogicalNetworkModel) networkPanel.getItem(); + LogicalNetworkModel networkModel = networkPanel.getItem(); boolean isRequired = networkModel.getNetwork().getCluster() == null ? false : networkModel.getNetwork() .getCluster() diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java index 234aa8c..ee64214 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java @@ -55,7 +55,7 @@ getElement().getStyle().setZIndex(1); } - public void showItem(NetworkItemModel<?> item, NetworkItemPanel panel) { + public void showItem(NetworkItemModel<?> item, NetworkItemPanel<?> panel) { if (item instanceof LogicalNetworkModel) { showNetwork((LogicalNetworkModel) item); } else if (item instanceof NetworkInterfaceModel) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java index cacce68..5594534 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java @@ -71,7 +71,7 @@ if (nicModel instanceof BondNetworkInterfaceModel) { table.setWidget(0, 0, new BondPanel((BondNetworkInterfaceModel) nicModel, style)); } else { - table.setWidget(0, 0, new NicPanel(nicModel, style)); + table.setWidget(0, 0, new NicPanel<NetworkInterfaceModel>(nicModel, style)); } // connector 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..4f27437 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 @@ -36,7 +36,7 @@ import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.Widget; -public abstract class NetworkItemPanel extends FocusPanel { +public abstract class NetworkItemPanel<T extends NetworkItemModel<?>> extends FocusPanel { public static final String SETUP_NETWORKS_DATA = "SetupNetworksData"; //$NON-NLS-1$ public static final String SETUP_NETWORKS_TYPE = "SetupNetworksType"; //$NON-NLS-1$ @@ -44,11 +44,11 @@ final ApplicationMessages messages = ClientGinjectorProvider.getApplicationMessages(); final Image dragImage = new Image(resources.itemDraggable()); final PushButton actionButton; - final NetworkItemModel<?> item; + final T item; final private boolean draggable; final protected NetworkPanelsStyle style; - protected NetworkItemPanel parentPanel; + protected NetworkItemPanel<?> parentPanel; private MenuBar menu; // statics @@ -58,7 +58,7 @@ private static String lastDragData = ""; //$NON-NLS-1$ - public NetworkItemPanel(NetworkItemModel<?> item, NetworkPanelsStyle style, boolean draggable) { + public NetworkItemPanel(T item, NetworkPanelsStyle style, boolean draggable) { this.draggable = draggable; getElement().setDraggable(draggable ? Element.DRAGGABLE_TRUE : Element.DRAGGABLE_FALSE); @@ -127,7 +127,7 @@ @Override public void onContextMenu(ContextMenuEvent event) { - NetworkItemPanel sourcePanel = (NetworkItemPanel) event.getSource(); + NetworkItemPanel<?> sourcePanel = (NetworkItemPanel<?>) event.getSource(); NativeEvent nativeEvent = event.getNativeEvent(); showContextMenu(sourcePanel, nativeEvent.getClientX(), nativeEvent.getClientY()); event.stopPropagation(); @@ -141,7 +141,7 @@ addBitlessDomHandler(new DragStartHandler() { @Override public void onDragStart(DragStartEvent event) { - NetworkItemPanel sourcePanel = (NetworkItemPanel) event.getSource(); + NetworkItemPanel<?> sourcePanel = (NetworkItemPanel<?>) event.getSource(); // Required: set data for the event. lastDragData = sourcePanel.item.getType() + " " + sourcePanel.item.getName(); //$NON-NLS-1$ event.setData("Text", lastDragData); //$NON-NLS-1$ @@ -205,7 +205,7 @@ return menuBar; } - private void showContextMenu(NetworkItemPanel panel, int clientX, int clientY) { + private void showContextMenu(NetworkItemPanel<?> panel, int clientX, int clientY) { if (!menu.isEmpty()){ menuPopup.setWidget(menu); menuPopup.setPopupPosition(clientX, clientY); @@ -218,7 +218,7 @@ return menuBar; } - public NetworkItemModel<?> getItem() { + public T getItem() { return item; } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java index e0544b3..917dc4e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java @@ -13,7 +13,7 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -public class NetworkLabelPanel extends NetworkItemPanel { +public class NetworkLabelPanel extends NetworkItemPanel<NetworkLabelModel> { public NetworkLabelPanel(NetworkLabelModel item, NetworkPanelsStyle style) { super(item, style, false); @@ -46,7 +46,7 @@ vPanel.add(titleRow); getElement().addClassName(style.bondPanel()); - List<LogicalNetworkModel> networks = ((NetworkLabelModel) item).getNetworks(); + List<LogicalNetworkModel> networks = item.getNetworks(); Collections.sort(networks); for (LogicalNetworkModel network : networks) { 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 fd0caff..ffcceed 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 @@ -16,7 +16,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.Widget; -public abstract class NetworkPanel extends NetworkItemPanel { +public abstract class NetworkPanel extends NetworkItemPanel<LogicalNetworkModel> { Label titleLabel; @@ -39,8 +39,6 @@ @Override protected Widget getContents() { - LogicalNetworkModel network = (LogicalNetworkModel) item; - Image mgmtNetworkImage; Image vmImage; Image monitorImage; @@ -48,7 +46,7 @@ Image notSyncImage; Image alertImage; - if (!network.isManaged()) { + if (!item.isManaged()) { monitorImage = null; mgmtNetworkImage = null; vmImage = null; @@ -56,38 +54,38 @@ notSyncImage = null; alertImage = null; } else { - monitorImage = network.getNetwork().getCluster().isDisplay() ? + monitorImage = item.getNetwork().getCluster().isDisplay() ? new Image(resources.networkMonitor()) : null; - mgmtNetworkImage = network.isManagement() ? new Image(resources.mgmtNetwork()) : null; - vmImage = network.getNetwork().isVmNetwork() ? new Image(resources.networkVm()) : null; - migrationImage = network.getNetwork().getCluster().isMigration() ? + mgmtNetworkImage = item.isManagement() ? new Image(resources.mgmtNetwork()) : null; + vmImage = item.getNetwork().isVmNetwork() ? new Image(resources.networkVm()) : null; + migrationImage = item.getNetwork().getCluster().isMigration() ? new Image(resources.migrationNetwork()) : null; - notSyncImage = !network.isInSync() ? new Image(resources.networkNotSyncImage()) : null; - alertImage = network.getErrorMessage() != null ? new Image(resources.alertImage()) : null; + notSyncImage = !item.isInSync() ? new Image(resources.networkNotSyncImage()) : null; + alertImage = item.getErrorMessage() != null ? new Image(resources.alertImage()) : null; - if (network.isManagement()) { + if (item.isManagement()) { mgmtNetworkImage.setStylePrimaryName(style.networkImageBorder()); } - if (network.getNetwork().isVmNetwork()) { + if (item.getNetwork().isVmNetwork()) { vmImage.setStylePrimaryName(style.networkImageBorder()); } - if (network.getNetwork().getCluster().isDisplay()) { + if (item.getNetwork().getCluster().isDisplay()) { monitorImage.setStylePrimaryName(style.networkImageBorder()); } - if (network.getNetwork().getCluster().isMigration()) { + if (item.getNetwork().getCluster().isMigration()) { migrationImage.setStylePrimaryName(style.networkImageBorder()); } - if (!network.isInSync()) { + if (!item.isInSync()) { notSyncImage.setStylePrimaryName(style.networkImageBorder()); } } - actionButton.setVisible(network.getAttachedToNic() != null - && (network.isManaged() || !network.isAttachedViaLabel())); + actionButton.setVisible(item.getAttachedToNic() != null + && (item.isManaged() || !item.isAttachedViaLabel())); Grid rowPanel = new Grid(1, 9); rowPanel.setCellSpacing(0); @@ -124,13 +122,12 @@ } private Panel createTitlePanel() { - LogicalNetworkModel networkModel = (LogicalNetworkModel) item; - titleLabel = new Label(networkModel.getName()); + titleLabel = new Label(item.getName()); titleLabel.getElement().addClassName(style.titleLabel()); Panel titlePanel = new HorizontalPanel(); titlePanel.add(titleLabel); - if (networkModel.hasVlan()) { - Label vlanLabel = new Label(messages.vlanNetwork(networkModel.getVlanId())); + if (item.hasVlan()) { + Label vlanLabel = new Label(messages.vlanNetwork(item.getVlanId())); vlanLabel.getElement().addClassName(style.vlanLabel()); titlePanel.add(vlanLabel); } @@ -141,8 +138,7 @@ @Override protected void onAction() { - LogicalNetworkModel network = (LogicalNetworkModel) item; - if (network.isManaged()) { + if (item.isManaged()) { item.edit(); } else { OperationMap operationMap = item.getSetupModel().commandsFor(item); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java index 46b4030..f9305c5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java @@ -9,13 +9,13 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; -public class NicPanel extends NetworkItemPanel { +public class NicPanel<T extends NetworkInterfaceModel> extends NetworkItemPanel<T> { - public NicPanel(NetworkInterfaceModel item, NetworkPanelsStyle style) { + public NicPanel(T item, NetworkPanelsStyle style) { this(item, style, true); } - public NicPanel(NetworkInterfaceModel item, NetworkPanelsStyle style, boolean draggable) { + public NicPanel(T item, NetworkPanelsStyle style, boolean draggable) { super(item, style, draggable); getElement().addClassName(style.nicPanel()); this.actionButton.setStyleName(style.actionButtonNetwork()); @@ -52,7 +52,7 @@ } private ImageResource getStatusImage() { - switch (((NetworkInterfaceModel) item).getStatus()) { + switch (item.getStatus()) { case UP: return resources.nicUp(); case DOWN: -- To view, visit https://gerrit.ovirt.org/38772 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icdc0081ec4a0d2b663055c0a502a2534df49d125 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
