From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/events/Event.java | 37 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/events/Event.java

(limited to 'source/com/c2kernel/events/Event.java')

diff --git a/source/com/c2kernel/events/Event.java b/source/com/c2kernel/events/Event.java
old mode 100755
new mode 100644
index e3ab8b3..18310ce
--- a/source/com/c2kernel/events/Event.java
+++ b/source/com/c2kernel/events/Event.java
@@ -54,13 +54,14 @@ public class Event implements C2KLocalObject
     /**
      * Set the Event Name, in parameter is a String
      */
-    public void setName(String name)
+    @Override
+	public void setName(String name)
     {
         mName = name;
         try {
             mID = Integer.parseInt(name);
         } catch (NumberFormatException ex) {
-            mID = -1; 
+            mID = -1;
         }
     }
 
@@ -87,7 +88,7 @@ public class Event implements C2KLocalObject
 	{
 		mStepType = type;
 	}
-	
+
     public void setCurrentState(int state)
     {
         mCurrentState = state;
@@ -100,7 +101,7 @@ public class Event implements C2KLocalObject
     {
         mAgentName = agentName;
     }
-    
+
     public void setAgentCentre(String agentCentre)
     {
         mAgentCentre = agentCentre;
@@ -146,7 +147,8 @@ public class Event implements C2KLocalObject
     /**
      * Return the Event Name
      */
-    public String getName()
+    @Override
+	public String getName()
     {
         return mName;
     }
@@ -174,7 +176,7 @@ public class Event implements C2KLocalObject
 	{
 		return mStepType;
 	}
-	
+
     public int getCurrentState()
     {
         return mCurrentState;
@@ -189,7 +191,7 @@ public class Event implements C2KLocalObject
             return mAgentCentre+"/"+mAgentName;
         return mAgentName;
     }
-    
+
     public String getAgentRole()
     {
     	return mAgentRole;
@@ -212,26 +214,26 @@ public class Event implements C2KLocalObject
     {
         return Event.timeToString(mTimeStamp);
     }
-    
+
     public static String timeToString(GTimeStamp timeStamp) {
         StringBuffer time = new StringBuffer().append(timeStamp.mYear).append("-");
-        
+
         if (timeStamp.mMonth<10) time.append("0");
         time.append(timeStamp.mMonth).append("-");
-        
+
         if (timeStamp.mDay<10) time.append("0");
         time.append(timeStamp.mDay).append(" ");
-        
+
         if (timeStamp.mHour<10) time.append("0");
         time.append(timeStamp.mHour).append(":");
-        
+
         if (timeStamp.mMinute<10) time.append("0");
         time.append(timeStamp.mMinute).append(":");
-        
+
         if (timeStamp.mSecond<10) time.append("0");
         time.append(timeStamp.mSecond);
-        
-        return time.toString();        
+
+        return time.toString();
     }
 
     public void setTimeString(String time) throws Exception
@@ -259,11 +261,11 @@ public class Event implements C2KLocalObject
     }
 
 
-    
+
    static public GTimeStamp getGMT()
     {
         java.util.Calendar now = Calendar.getInstance();
-		
+
         return new GTimeStamp( now.get(Calendar.YEAR),
                                now.get(Calendar.MONTH)+1,
                                now.get(Calendar.DAY_OF_MONTH),
@@ -275,6 +277,7 @@ public class Event implements C2KLocalObject
 	/**
 	 * @see com.c2kernel.entity.C2KLocalObject#getClusterType()
 	 */
+	@Override
 	public String getClusterType() {
 		return ClusterStorage.HISTORY;
 	}
-- 
cgit v1.2.3