diff options
Diffstat (limited to 'src/com.gluster.storage.management.core')
5 files changed, 46 insertions, 8 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java index 2cfae3cb..a29c150b 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java @@ -1,12 +1,8 @@ package com.gluster.storage.management.core.model; -import javax.xml.bind.annotation.XmlRootElement; - import org.eclipse.osgi.internal.signedcontent.Base64; -@SuppressWarnings("restriction") -@XmlRootElement(name = "alert") -public class Alert { +public class Alert extends Entity { public enum ALERT_TYPES { CPU_USAGE_ALERT, MEMORY_USAGE_ALERT, DISK_USAGE_ALERT, OFFLINE_VOLUME_BRICKS_ALERT, OFFLINE_SERVERS_ALERT @@ -15,7 +11,7 @@ public class Alert { public static final String[] ALERT_TYPE_STR = { "High CPU Usage", "High Memory Usage", "Low Disk Space", "Offline Brick", "Offline Server" }; - protected String id; + // protected String id; protected ALERT_TYPES type; protected String reference; // [for server- "Server", for Disk- "Server:disk", for volume- "Volume:Server:disk"] protected String message; @@ -39,11 +35,11 @@ public class Alert { } public String getId() { - return id; + return getName(); } public void setId(String id) { - this.id = id; + setName(id); } public ALERT_TYPES getType() { @@ -69,4 +65,11 @@ public class Alert { public void setMessage(String message) { this.message = message; } + + public void copyFrom(Alert alert) { + this.setId(alert.getId()); + this.setReference(alert.getReference()); + this.setType(alert.getType()); + this.setMessage(alert.getMessage()); + } } 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 b62f69a8..58faef02 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 @@ -138,6 +138,10 @@ public class Cluster extends Entity { this.alerts.add(alert); } + public void removeAlert(Alert alert) { + this.alerts.remove(alert); + } + public double getTotalDiskSpace() { double totalDiskSpace = 0; for(GlusterServer server : getServers()) { 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 b6c9db34..2a4a9920 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 @@ -46,4 +46,10 @@ public interface ClusterListener { public void taskRemoved(TaskInfo taskInfo); public void taskUpdated(TaskInfo taskInfo); + + public void alertAdded(Alert alert); + + public void alertRemoved(Alert alert); + + public void alertUpdated(Alert alert); } 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 ce66a8f4..e72ff3e5 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 @@ -95,4 +95,19 @@ public class DefaultClusterListener implements ClusterListener { public void discoveredServerChanged(Server server, Event event) { modelChanged(); } + + @Override + public void alertAdded(Alert alert) { + modelChanged(); + } + + @Override + public void alertRemoved(Alert alert) { + modelChanged(); + } + + @Override + public void alertUpdated(Alert alert) { + modelChanged(); + } } diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java index 2fce81cb..cdf71dcc 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java @@ -18,6 +18,7 @@ *******************************************************************************/ package com.gluster.storage.management.core.utils; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; @@ -100,6 +101,15 @@ public class StringUtil { } return output; } + + public static String formatNumber(Double number, int dec) { + NumberFormat nf = NumberFormat.getInstance(); + nf.setMaximumFractionDigits(dec); + nf.setGroupingUsed(false); + // Setting this to true will give you xx,xxx,xxx type of formatting. + String formattedvalue = nf.format(number); + return formattedvalue; + } public static void main(String args[]) { |