Alona Kaplan has uploaded a new change for review.
Change subject: webadmin: Extract code of network role columns
......................................................................
webadmin: Extract code of network role columns
NetworkRoleColumnHelper is introduced to re-use the construction of
value and tool tip in various network role columns (Network Main tab,
Network Cluster sub tab and Cluster Network sub tab).
Change-Id: I36ea65cce1ec3718838d5d2f8252adcc996b2fa7
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
A
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkRoleColumnHelper.java
4 files changed, 108 insertions(+), 68 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/13256/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
index 9b922f6..914894e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
@@ -1,5 +1,10 @@
package org.ovirt.engine.ui.webadmin.section.main.view.tab;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
import org.ovirt.engine.core.common.businessentities.network.NetworkView;
import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
@@ -15,6 +20,7 @@
import
org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabNetworkPresenter;
import
org.ovirt.engine.ui.webadmin.section.main.view.AbstractMainTabWithDetailsTableView;
import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
+import
org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper;
import com.google.gwt.core.client.GWT;
import com.google.gwt.safehtml.shared.SafeHtml;
@@ -88,46 +94,38 @@
@Override
public SafeHtml getValue(NetworkView networkView) {
- String images = ""; //$NON-NLS-1$
+ List<SafeHtml> images = new LinkedList<SafeHtml>();
if (ENGINE_NETWORK_NAME.equals(networkView.getName()))
{
- images = images.concat(mgmtImage.asString());
+ images.add(mgmtImage);
} else {
- images = images.concat(emptyImage.asString());
+ images.add(emptyImage);
}
if (networkView.isVmNetwork()) {
- images = images.concat(vmImage.asString());
+ images.add(vmImage);
} else {
- images = images.concat(emptyImage.asString());
+ images.add(emptyImage);
}
- return
templates.image(SafeHtmlUtils.fromTrustedString(images));
+ return NetworkRoleColumnHelper.getValue(images);
}
@Override
public SafeHtml getTooltip(NetworkView networkView) {
- String tooltip = ""; //$NON-NLS-1$
+ Map<SafeHtml, String> imagesToText = new
LinkedHashMap<SafeHtml, String>();
if (ENGINE_NETWORK_NAME.equals(networkView.getName()))
{
- tooltip =
-
tooltip.concat(templates.imageTextSetupNetwork(mgmtImage,
-
constants.managementItemInfo()).asString());
+ imagesToText.put(mgmtImage,
constants.managementItemInfo());
}
if (networkView.isVmNetwork()) {
- if (!"".equals(tooltip)) //$NON-NLS-1$
- {
- tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$
- }
- tooltip =
-
tooltip.concat(templates.imageTextSetupNetwork(vmImage, constants.vmItemInfo())
- .asString());
+ imagesToText.put(vmImage, constants.vmItemInfo());
}
- return SafeHtmlUtils.fromTrustedString(tooltip);
+ return
NetworkRoleColumnHelper.getTooltip(imagesToText);
}
};
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java
index e60a607..0eda288 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java
@@ -1,6 +1,9 @@
package org.ovirt.engine.ui.webadmin.section.main.view.tab.cluster;
-import javax.inject.Inject;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.network.Network;
@@ -19,12 +22,14 @@
import
org.ovirt.engine.ui.webadmin.section.main.presenter.tab.cluster.SubTabClusterNetworkPresenter;
import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView;
import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
+import
org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper;
import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkStatusColumn;
import com.google.gwt.core.client.GWT;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.user.client.ui.AbstractImagePrototype;
+import com.google.inject.Inject;
public class SubTabClusterNetworkView extends
AbstractSubTabTableView<VDSGroup, Network, ClusterListModel,
ClusterNetworkListModel>
implements SubTabClusterNetworkPresenter.ViewDef {
@@ -77,46 +82,42 @@
@Override
public SafeHtml getValue(Network network) {
- String images = ""; //$NON-NLS-1$
+ List<SafeHtml> images = new LinkedList<SafeHtml>();
- if (network.getCluster() != null &&
network.getCluster().isDisplay()) {
+ if (network.getCluster() != null)
+ {
+ if (network.getCluster().isDisplay()) {
- images = images.concat(displayImage.asString());
- } else {
- images = images.concat(emptyImage.asString());
+ images.add(displayImage);
+ } else {
+ images.add(emptyImage);
+ }
+
+ if (network.getCluster().isMigration()) {
+ images.add(migrationImage);
+ } else {
+ images.add(emptyImage);
+ }
}
- if (network.getCluster() != null &&
network.getCluster().isMigration()) {
- images = images.concat(migrationImage.asString());
- } else {
- images = images.concat(emptyImage.asString());
- }
-
- return
templates.image(SafeHtmlUtils.fromTrustedString(images));
+ return NetworkRoleColumnHelper.getValue(images);
}
@Override
public SafeHtml getTooltip(Network network) {
- String tooltip = ""; //$NON-NLS-1$
- if (network.getCluster() != null &&
network.getCluster().isDisplay()) {
- tooltip =
-
tooltip.concat(templates.imageTextSetupNetwork(displayImage,
-
constants.displayItemInfo()).asString());
- }
-
- if (network.getCluster() != null &&
network.getCluster().isMigration()) {
- if (!"".equals(tooltip)) //$NON-NLS-1$
- {
- tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$
+ Map<SafeHtml, String> imagesToText = new
LinkedHashMap<SafeHtml, String>();
+ if (network.getCluster() != null)
+ {
+ if (network.getCluster().isDisplay()) {
+ imagesToText.put(displayImage,
constants.displayItemInfo());
}
- tooltip =
-
tooltip.concat(templates.imageTextSetupNetwork(migrationImage,
- constants.migrationItemInfo())
- .asString());
+ if (network.getCluster().isMigration()) {
+ imagesToText.put(migrationImage,
constants.migrationItemInfo());
+
+ }
}
-
- return SafeHtmlUtils.fromTrustedString(tooltip);
+ return
NetworkRoleColumnHelper.getTooltip(imagesToText);
}
};
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
index 8c2aa20..0da3dbc 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
@@ -1,6 +1,9 @@
package org.ovirt.engine.ui.webadmin.section.main.view.tab.network;
-import javax.inject.Inject;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
@@ -20,10 +23,12 @@
import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView;
import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
import
org.ovirt.engine.ui.webadmin.widget.table.column.NetworkClusterStatusColumn;
+import
org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.user.client.ui.AbstractImagePrototype;
+import com.google.inject.Inject;
public class SubTabNetworkClusterView extends
AbstractSubTabTableView<NetworkView, PairQueryable<VDSGroup, NetworkCluster>,
NetworkListModel, NetworkClusterListModel>
@@ -108,43 +113,39 @@
@Override
public SafeHtml getValue(PairQueryable<VDSGroup,
NetworkCluster> object) {
- String images = ""; //$NON-NLS-1$
+ List<SafeHtml> images = new LinkedList<SafeHtml>();
if (object.getSecond() != null) {
if (object.getSecond().isDisplay()) {
- images =
images.concat(displayImage.asString());
+ images.add(displayImage);
} else {
- images = images.concat(emptyImage.asString());
+ images.add(emptyImage);
}
if (object.getSecond().isMigration()) {
- images =
images.concat(migrationImage.asString());
+ images.add(migrationImage);
} else {
- images = images.concat(emptyImage.asString());
+ images.add(emptyImage);
}
}
- return
templates.image(SafeHtmlUtils.fromTrustedString(images));
+ return NetworkRoleColumnHelper.getValue(images);
}
@Override
public SafeHtml getTooltip(PairQueryable<VDSGroup,
NetworkCluster> object) {
- String tooltip = ""; //$NON-NLS-1$
- if (object.getSecond() != null &&
object.getSecond().isDisplay()) {
- tooltip =
tooltip.concat(templates.imageTextSetupNetwork(displayImage,
- constants.displayItemInfo()).asString());
- }
-
- if (object.getSecond() != null &&
object.getSecond().isMigration()) {
- if (!"".equals(tooltip)) //$NON-NLS-1$
- {
- tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$
+ Map<SafeHtml, String> imagesToText = new
LinkedHashMap<SafeHtml, String>();
+ if (object.getSecond() != null) {
+ if (object.getSecond().isDisplay()) {
+ imagesToText.put(displayImage,
constants.displayItemInfo());
}
- tooltip =
tooltip.concat(templates.imageTextSetupNetwork(migrationImage,
- constants.migrationItemInfo()).asString());
+
+ if (object.getSecond().isMigration()) {
+ imagesToText.put(migrationImage,
constants.migrationItemInfo());
+ }
}
- return SafeHtmlUtils.fromTrustedString(tooltip);
+ return
NetworkRoleColumnHelper.getTooltip(imagesToText);
}
};
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkRoleColumnHelper.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkRoleColumnHelper.java
new file mode 100644
index 0000000..985a6de
--- /dev/null
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkRoleColumnHelper.java
@@ -0,0 +1,40 @@
+package org.ovirt.engine.ui.webadmin.widget.table.column;
+
+import java.util.List;
+import java.util.Map;
+
+import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
+
+public class NetworkRoleColumnHelper {
+
+ private static final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+
+ public static SafeHtml getValue(List<SafeHtml> imagesHtml) {
+ String images = ""; //$NON-NLS-1$
+
+ for (SafeHtml imageHtml : imagesHtml) {
+ images = images.concat(imageHtml.asString());
+ }
+
+ return templates.image(SafeHtmlUtils.fromTrustedString(images));
+ }
+
+ public static SafeHtml getTooltip(Map<SafeHtml, String> imagesToText) {
+ String tooltip = ""; //$NON-NLS-1$
+
+ for (Map.Entry<SafeHtml, String> imageToText :
imagesToText.entrySet()) {
+ if (!tooltip.isEmpty()) {
+ tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$
+ }
+ tooltip =
tooltip.concat(templates.imageTextSetupNetwork(imageToText.getKey(),
+ imageToText.getValue()).asString());
+ }
+
+ return SafeHtmlUtils.fromTrustedString(tooltip);
+ }
+
+}
--
To view, visit http://gerrit.ovirt.org/13256
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36ea65cce1ec3718838d5d2f8252adcc996b2fa7
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
