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/lifecycle/ActivityDef.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'source/com/c2kernel/lifecycle/ActivityDef.java')

diff --git a/source/com/c2kernel/lifecycle/ActivityDef.java b/source/com/c2kernel/lifecycle/ActivityDef.java
index 42385a4..235275f 100644
--- a/source/com/c2kernel/lifecycle/ActivityDef.java
+++ b/source/com/c2kernel/lifecycle/ActivityDef.java
@@ -33,6 +33,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 	/**
 	 * @see com.c2kernel.graph.model.Vertex#setID(int)
 	 */
+	@Override
 	public void setID(int id)
 	{
 		mId = id;
@@ -42,6 +43,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 	/**
 	 * @see com.c2kernel.graph.model.Vertex#getID()
 	 */
+	@Override
 	public int getID()
 	{
 		return mId;
@@ -49,6 +51,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 	/**
 	 * @see com.c2kernel.graph.model.Vertex#setName(java.lang.String)
 	 */
+	@Override
 	public void setName(String n)
 	{
 		mName = n;
@@ -56,11 +59,12 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 	/**
 	 * @see com.c2kernel.graph.model.Vertex#getName()
 	 */
+	@Override
 	public String getName()
 	{
 		return mName;
 	}
-	
+
 	public void setVersion(String v)
 	{
 		mVersion = v;
@@ -71,17 +75,18 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 	public String getVersion()
 	{
 		return mVersion;
-	}	
+	}
 	/**
 	 * @see com.c2kernel.lifecycle.WfVertexDef#getErrors()
 	 */
+	@Override
 	public String getErrors()
 	{
 		return super.getErrors();
 	}
 	/**
 	 * Method linkToSlot.
-	 * 
+	 *
 	 * @param actSl
 	 * @param name
 	 */
@@ -95,6 +100,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 	/**
 	 * @see com.c2kernel.lifecycle.WfVertexDef#verify()
 	 */
+	@Override
 	public boolean verify()
 	{
 		return true;
@@ -102,6 +108,7 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 	/**
 	 * @see com.c2kernel.entity.C2KLocalObject#getClusterType()
 	 */
+	@Override
 	public String getClusterType()
 	{
 		return null;
@@ -113,14 +120,15 @@ public class ActivityDef extends WfVertexDef implements C2KLocalObject
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see com.c2kernel.lifecycle.commonInterface.ActType#getDescName()
 	 */
 	public String getDescName()
 	{
 		return getName();
 	}
-	
+
+	@Override
 	public WfVertex instantiate() throws ObjectNotFoundException, InvalidDataException{
 		return instantiate(getName());
 	}
-- 
cgit v1.2.3