Alona Kaplan has uploaded a new change for review.
Change subject: webadmin: make networkItemPanel.item generic
......................................................................
webadmin: make networkItemPanel.item generic
Change-Id: I8398db46c0c4b6f46d963221aeffa29e9360ce16
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.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
5 files changed, 37 insertions(+), 39 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/41523/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
index 8952558..5ac2c0d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
@@ -22,7 +22,7 @@
@Override
protected ImageResource getStatusImage() {
- NetworkStatus netStatus = ((LogicalNetworkModel) item).getStatus();
+ NetworkStatus netStatus = item.getStatus();
if (netStatus == NetworkStatus.OPERATIONAL) {
return resources.upImage();
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 be9486a..9be9bad 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
@@ -37,7 +37,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$
@@ -46,11 +46,11 @@
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;
private WidgetTooltip tooltip;
@@ -62,7 +62,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);
@@ -130,7 +130,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();
@@ -144,7 +144,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$
@@ -215,7 +215,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);
@@ -228,7 +228,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 5f593c5..d09e16d 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
@@ -15,7 +15,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> {
private final static ApplicationResources resources =
AssetProvider.getResources();
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 9fda27e..00eb6eb 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
@@ -19,7 +19,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> {
private final static ApplicationResources resources =
AssetProvider.getResources();
private final static ApplicationMessages messages =
AssetProvider.getMessages();
@@ -45,7 +45,6 @@
@Override
protected Widget getContents() {
- LogicalNetworkModel network = (LogicalNetworkModel) item;
Image mgmtNetworkImage;
Image vmImage;
@@ -55,7 +54,7 @@
Image alertImage;
Image glusterNwImage;
- if (!network.isManaged()) {
+ if (!item.isManaged()) {
monitorImage = null;
mgmtNetworkImage = null;
vmImage = null;
@@ -64,44 +63,44 @@
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;
- glusterNwImage = network.getNetwork().getCluster().isGluster() ?
+ glusterNwImage = item.getNetwork().getCluster().isGluster() ?
new Image(resources.glusterNetwork()) : 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.getNetwork().getCluster().isGluster()) {
+ if (item.getNetwork().getCluster().isGluster()) {
glusterNwImage.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, 10);
rowPanel.setCellSpacing(0);
@@ -139,13 +138,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);
}
@@ -156,8 +154,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 06c3552..b7d00ea 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
@@ -11,15 +11,15 @@
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> {
private final static ApplicationResources resources =
AssetProvider.getResources();
- 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,15 +52,16 @@
rowPanel.setWidget(0, 2, nicImage);
rowPanel.setWidget(0, 3, titleLabel);
rowPanel.setWidget(0, 4, actionButton);
+
return rowPanel;
}
private ImageResource getNicIcon() {
- return ((NetworkInterfaceModel) item).isSriovEnabled() ?
resources.nicSriov() : resources.nicIcon();
+ return item.isSriovEnabled() ? resources.nicSriov() :
resources.nicIcon();
}
private ImageResource getStatusImage() {
- switch (((NetworkInterfaceModel) item).getStatus()) {
+ switch (item.getStatus()) {
case UP:
return resources.nicUp();
case DOWN:
--
To view, visit https://gerrit.ovirt.org/41523
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8398db46c0c4b6f46d963221aeffa29e9360ce16
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
