Yaniv Bronhaim has uploaded a new change for review.
Change subject: ui: Adding base class for external entity objects
......................................................................
ui: Adding base class for external entity objects
Change-Id: Ieedfa9efcd062c3a4a41250fee0a8b1a22844ff6
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
6 files changed, 58 insertions(+), 53 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/29372/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
index ab70e88..892ddf1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
@@ -1,8 +1,6 @@
package org.ovirt.engine.core.common.businessentities;
-import java.io.Serializable;
-
-public class ExternalComputeResource implements Serializable {
+public class ExternalComputeResource implements ExternalEntityBase {
private static final long serialVersionUID = -6951116030464852526L;
private String name;
private int id;
@@ -14,12 +12,6 @@
public void setProvider(String provider) { this.provider = provider; }
public String getUser() { return user; }
public void setUser(String user) { this.user = user; }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
public String getUrl() {
return url;
}
@@ -31,6 +23,15 @@
this.id = id;
}
+ @Override
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
public String getDescription() {
return "URL: " + url +
" | Provider: " + provider + "\n" +
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
index c2d7d73..3163c98 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
@@ -1,8 +1,6 @@
package org.ovirt.engine.core.common.businessentities;
-import java.io.Serializable;
-
-public class ExternalDiscoveredHost implements Serializable {
+public class ExternalDiscoveredHost implements ExternalEntityBase {
private static final long serialVersionUID = -6900772579678185173L;
private String ip;
private String mac;
@@ -26,6 +24,8 @@
public void setIp(String ip) {
this.ip = ip;
}
+
+ @Override
public String getName() {
return name;
}
@@ -33,6 +33,7 @@
this.name = name;
}
+ @Override
public String getDescription() {
return "MAC: " + mac + "\n" +
" | DiscoverTime : " + lastReport + "\n" +
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
new file mode 100644
index 0000000..0a4813f
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
@@ -0,0 +1,8 @@
+package org.ovirt.engine.core.common.businessentities;
+
+import java.io.Serializable;
+
+public interface ExternalEntityBase extends Serializable {
+ public abstract String getDescription();
+ public abstract String getName();
+}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
index 12255b9..d0ebff6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
@@ -1,9 +1,8 @@
package org.ovirt.engine.core.common.businessentities;
-import java.io.Serializable;
import java.util.Map;
-public class ExternalHostGroup implements Serializable {
+public class ExternalHostGroup implements ExternalEntityBase {
private static final long serialVersionUID = -3099054972843803212L;
private String name;
@@ -35,12 +34,6 @@
}
public void setHostgroupId(int id) {
this.hostgroupId = id;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
}
public int getOsId() {
return osId;
@@ -91,10 +84,19 @@
this.architectureId = architectureId;
}
+ @Override
public String getDescription() {
return "OS: " + operatingsystemName + "\n" +
" | Subnet: " + subnetName + "\n" +
" | Domain: " + domainName + "\n" +
" | Arch: " + architectureName;
}
+
+ @Override
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index b478d9d..6dd2745 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -337,6 +337,7 @@
<include name="common/businessentities/VdsNumaNode.java" />
<include name="common/businessentities/VmNumaNode.java" />
<!-- Foreman Objects -->
+ <include name="common/businessentities/ExternalEntityBase.java"/>
<include name="common/businessentities/ExternalHostGroup.java"/>
<include name="common/businessentities/ExternalHost.java"/>
<include name="common/businessentities/ExternalDiscoveredHost.java"/>
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
index 8cb7c55..0d0eeec 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
@@ -3,9 +3,7 @@
import java.util.List;
import
org.ovirt.engine.core.common.action.VdsOperationActionParameters.AuthenticationMethod;
-import org.ovirt.engine.core.common.businessentities.ExternalComputeResource;
-import org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHost;
-import org.ovirt.engine.core.common.businessentities.ExternalHostGroup;
+import org.ovirt.engine.core.common.businessentities.ExternalEntityBase;
import org.ovirt.engine.core.common.businessentities.Provider;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDS;
@@ -158,17 +156,17 @@
@UiField(provided = true)
@Path(value = "externalDiscoveredHosts.selectedItem")
@WithElementId("externalDiscoveredHosts")
- ListModelTypeAheadListBoxEditor<Object> externalDiscoveredHostsEditor;
+ ListModelTypeAheadListBoxEditor<ExternalEntityBase>
externalDiscoveredHostsEditor;
@UiField(provided = true)
@Path(value = "externalHostGroups.selectedItem")
@WithElementId("externalHostGroups")
- ListModelTypeAheadListBoxEditor<Object> externalHostGroupsEditor;
+ ListModelTypeAheadListBoxEditor<ExternalEntityBase>
externalHostGroupsEditor;
@UiField(provided = true)
@Path(value = "externalComputeResource.selectedItem")
@WithElementId("externalComputeResource")
- ListModelTypeAheadListBoxEditor<Object> externalComputeResourceEditor;
+ ListModelTypeAheadListBoxEditor<ExternalEntityBase>
externalComputeResourceEditor;
@UiField
@Path(value = "host.entity")
@@ -561,61 +559,55 @@
pmSecondaryTypeEditor = new ListModelListBoxEditor<String>(new
StringRenderer<String>());
- externalDiscoveredHostsEditor = new
ListModelTypeAheadListBoxEditor<Object>(
- new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<Object>() {
+ externalDiscoveredHostsEditor = new
ListModelTypeAheadListBoxEditor<ExternalEntityBase>(
+ new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<ExternalEntityBase>()
{
@Override
- public String getReplacementStringNullSafe(Object data) {
- ExternalDiscoveredHost host = (ExternalDiscoveredHost)
data;
- return host.getName();
+ public String
getReplacementStringNullSafe(ExternalEntityBase data) {
+ return data.getName();
}
@Override
- public String getDisplayStringNullSafe(Object data) {
- ExternalDiscoveredHost host = (ExternalDiscoveredHost)
data;
+ public String getDisplayStringNullSafe(ExternalEntityBase
data) {
return typeAheadNameDescriptionTemplateNullSafe(
- host.getName(),
- host.getDescription()
+ data.getName(),
+ data.getDescription()
);
}
}
);
- externalHostGroupsEditor = new ListModelTypeAheadListBoxEditor<Object>(
- new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<Object>() {
+ externalHostGroupsEditor = new
ListModelTypeAheadListBoxEditor<ExternalEntityBase>(
+ new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<ExternalEntityBase>()
{
@Override
- public String getReplacementStringNullSafe(Object data) {
- ExternalHostGroup hg = (ExternalHostGroup) data;
- return hg.getName();
+ public String
getReplacementStringNullSafe(ExternalEntityBase data) {
+ return data.getName();
}
@Override
- public String getDisplayStringNullSafe(Object data) {
- ExternalHostGroup hg = (ExternalHostGroup) data;
+ public String getDisplayStringNullSafe(ExternalEntityBase
data) {
return typeAheadNameDescriptionTemplateNullSafe(
- hg.getName(),
- hg.getDescription()
+ data.getName(),
+ data.getDescription()
);
}
}
);
- externalComputeResourceEditor = new
ListModelTypeAheadListBoxEditor<Object>(
- new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<Object>() {
+ externalComputeResourceEditor = new
ListModelTypeAheadListBoxEditor<ExternalEntityBase>(
+ new
ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<ExternalEntityBase>()
{
@Override
- public String getReplacementStringNullSafe(Object data) {
- ExternalComputeResource cr = (ExternalComputeResource)
data;
- return cr.getName();
+ public String
getReplacementStringNullSafe(ExternalEntityBase data) {
+ return data.getName();
}
@Override
- public String getDisplayStringNullSafe(Object data) {
- ExternalComputeResource cr = (ExternalComputeResource)
data;
+ public String getDisplayStringNullSafe(ExternalEntityBase
data) {
return typeAheadNameDescriptionTemplateNullSafe(
- cr.getName(),
- cr.getDescription()
+ data.getName(),
+ data.getDescription()
);
}
}
--
To view, visit http://gerrit.ovirt.org/29372
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieedfa9efcd062c3a4a41250fee0a8b1a22844ff6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
