[Engine-patches] Change in ovirt-engine[master]: core: Rename NetworkView property name

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: core: Rename  NetworkView property name
......................................................................

core: Rename  NetworkView property name

Renamed storagePoolName to dataCenterName.

Change-Id: I1230e63beae6c8d3da045a818a0111d643588424
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
3 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/10591/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java
index b7e28f0..447c5e7 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java
@@ -6,15 +6,15 @@
 
     private static final long serialVersionUID = 7541192304006710467L;
 
-    private String storagePoolName;
+    private String dataCenterName;
     private Version compatibilityVersion;
 
-    public String getStoragePoolName() {
-        return storagePoolName;
+    public String getDataCenterName() {
+        return dataCenterName;
     }
 
     public void setStoragePoolName(String storagePoolName) {
-        this.storagePoolName = storagePoolName;
+        this.dataCenterName = storagePoolName;
     }
 
     public Version getCompatibilityVersion() {
@@ -30,7 +30,7 @@
         final int prime = 31;
         int result = super.hashCode();
         result = prime * result + ((getCompatibilityVersion() == null) ? 0 : 
getCompatibilityVersion().hashCode());
-        result = prime * result + ((getStoragePoolName() == null) ? 0 : 
getStoragePoolName().hashCode());
+        result = prime * result + ((getDataCenterName() == null) ? 0 : 
getDataCenterName().hashCode());
         return result;
     }
 
@@ -53,11 +53,11 @@
         } else if 
(!getCompatibilityVersion().equals(other.getCompatibilityVersion())) {
             return false;
         }
-        if (getStoragePoolName() == null) {
-            if (other.getStoragePoolName() != null) {
+        if (getDataCenterName() == null) {
+            if (other.getDataCenterName() != null) {
                 return false;
             }
-        } else if (!getStoragePoolName().equals(other.getStoragePoolName())) {
+        } else if (!getDataCenterName().equals(other.getDataCenterName())) {
             return false;
         }
         return true;
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
index ba05418..b354023 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
@@ -35,12 +35,12 @@
                         || netView.getDescription().trim().equals("")) { 
//$NON-NLS-1$
                     list.add(ConstantsManager.getInstance()
                             .getMessages()
-                            .networkDc(netView.getname(), 
netView.getStoragePoolName()));
+                            .networkDc(netView.getname(), 
netView.getDataCenterName()));
                 } else {
                     list.add(ConstantsManager.getInstance()
                             .getMessages()
                             .networkDcDescription(netView.getname(),
-                                    netView.getStoragePoolName(),
+                                    netView.getDataCenterName(),
                                     netView.getDescription()));
                 }
 
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 dc6deab..9b922f6 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
@@ -69,7 +69,7 @@
         TextColumnWithTooltip<NetworkView> dcColumn = new 
TextColumnWithTooltip<NetworkView>() {
             @Override
             public String getValue(NetworkView object) {
-                return object.getStoragePoolName();
+                return object.getDataCenterName();
             }
         };
 


--
To view, visit http://gerrit.ovirt.org/10591
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1230e63beae6c8d3da045a818a0111d643588424
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches