diff options
Diffstat (limited to 'src')
4 files changed, 16 insertions, 11 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java index e6c08da7..ee3667d5 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java @@ -550,7 +550,7 @@ public class GlusterDataModelManager { for(Server server : cluster.getAutoDiscoveredServers()) { if(server.getName().toUpperCase().equals(serverName.toUpperCase())) { removeDiscoveredServer(server); - break; + return; } } } diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java index 289978ad..b62f69a8 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java @@ -72,15 +72,16 @@ public class Cluster extends Entity { children.add(new EntityGroup<Server>("Discovered Servers", Server.class, this, autoDiscoveredServers)); } - public EntityGroup<Server> getAutoDiscoveredServersEntityGroup() { + @SuppressWarnings({ "unchecked", "rawtypes" }) + public <T extends Entity> EntityGroup<T> getEntityGroup(Class<T> type) { for(Entity entity : getChildren()) { - if(entity instanceof EntityGroup && ((EntityGroup)entity).getEntityType() == Server.class) { - return (EntityGroup<Server>)entity; + if(entity instanceof EntityGroup && ((EntityGroup)entity).getEntityType() == type) { + return (EntityGroup<T>)entity; } } return null; } - + public List<Volume> getVolumes() { return volumes; } diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java index 0f3f1539..ebb095f1 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java @@ -187,14 +187,18 @@ public class Device extends Entity { Device device = (Device)obj; - String mountPoint = (getMountPoint() == null ? "" : getMountPoint()); - String fsType = (getFsType() == null ? "" : getFsType()); - String fsVersion = (getFsVersion() == null ? "" : getFsVersion()); + String oldMountPoint = (getMountPoint() == null ? "" : getMountPoint()); + String oldFsType = (getFsType() == null ? "" : getFsType()); + String oldFsVersion = (getFsVersion() == null ? "" : getFsVersion()); + String newMountPoint = (device.getMountPoint() == null ? "" : getMountPoint()); + String newFsType = (device.getFsType() == null ? "" : getFsType()); + String newFsVersion = (device.getFsVersion() == null ? "" : getFsVersion()); + if (getName().equals(device.getName()) && getServerName().equals(device.getServerName()) - && mountPoint.equals(device.getMountPoint()) && getStatus() == device.getStatus() + && oldMountPoint.equals(newMountPoint) && getStatus() == device.getStatus() && getSpace() == device.getSpace() && getSpaceInUse() == device.getSpaceInUse() - && fsType.equals(device.getFsType()) && fsVersion.equals(device.getFsVersion()) + && oldFsType.equals(newFsType) && oldFsVersion.equals(newFsVersion) && getType() == device.getType()) { return true; } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java index 32aeb0cb..49c55b8a 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java @@ -231,7 +231,7 @@ public class ClusterSummaryView extends ViewPart { public void linkActivated(HyperlinkEvent e) { // Open the "discovered servers" view by selecting the corresponding entity in the navigation view EntityGroup<Server> autoDiscoveredServersEntityGroup = GlusterDataModelManager.getInstance().getModel() - .getCluster().getAutoDiscoveredServersEntityGroup(); + .getCluster().getEntityGroup(Server.class); NavigationView navigationView = (NavigationView) guiHelper.getView(NavigationView.ID); navigationView.selectEntity(autoDiscoveredServersEntityGroup); |