diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-04-21 15:24:30 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-04-25 14:24:48 +0530 |
| commit | 9d8fdadfeedbd132ab01dd0cdd79f21f52f90a4e (patch) | |
| tree | 387453bee4d3581158942f3cf3a20308117943ed /src/com.gluster.storage.management.core/src | |
| parent | 1bf13c069eff1230f768bb8611a3e643ff4334f5 (diff) | |
| parent | 2f7b2e1e712fe6ff51590b50c3b7215c5c0879f9 (diff) | |
Merge branch 'deletevolume'
Diffstat (limited to 'src/com.gluster.storage.management.core/src')
4 files changed, 13 insertions, 0 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java index 3fb22ff6..f44b24e5 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java @@ -35,9 +35,11 @@ public class RESTConstants { public static final String FORM_PARAM_VALUE_START = "start"; public static final String FORM_PARAM_VALUE_STOP = "stop"; public static final String FORM_PARAM_OPTION_KEY = "key"; + public static final String FORM_PARAM_VOLUME_NAME = "volumeName"; public static final String FORM_PARAM_OPTION_VALUE = "value"; public static final String PATH_PARAM_VOLUME_NAME = "volumeName"; + public static final String FORM_PARAM_DELETE_OPTION = "value"; public static final String QUERY_PARAM_DISK_NAME = "diskName"; public static final String QUERY_PARAM_LINE_COUNT = "lineCount"; 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 1af57266..8d1eb624 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 @@ -54,6 +54,10 @@ public class Cluster extends Entity { discoveredServers.remove(server); } + public void deleteVolume(Volume volume) { + volumes.remove(volume); + } + public void setServers(List<GlusterServer> servers) { this.servers = servers; children.add(new EntityGroup<GlusterServer>("Servers", GlusterServer.class, this, servers)); diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java index ce2752a4..f96116ed 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java @@ -40,4 +40,6 @@ public interface ClusterListener { public void volumeChanged(Volume volume, Event event); public void volumeCreated(Volume volume); + + public void volumeDeleted(Volume volume); } diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java index 1a39a014..e226d51b 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java @@ -69,6 +69,11 @@ public class DefaultClusterListener implements ClusterListener { clusterChanged(); } + @Override + public void volumeDeleted(Volume volume) { + clusterChanged(); + } + /** * This method is called by every other event method. Thus, if a view/listener is interested in performing the same * task on any change happening in the cluster data model, it can simply override this method and implement the |