From 845047d1fb81062599a914106949f5dd7ba67eee Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 30 Sep 2014 16:07:35 +0200
Subject: Remove misuse of Serializable

---
 src/main/java/com/c2kernel/gui/graph/controller/Selection.java       | 4 +---
 .../java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java     | 5 ++---
 .../java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java    | 3 +--
 .../java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java     | 5 ++---
 .../java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java    | 4 ++--
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/c2kernel/gui/graph/controller/Selection.java b/src/main/java/com/c2kernel/gui/graph/controller/Selection.java
index a05ff7f..3700e44 100644
--- a/src/main/java/com/c2kernel/gui/graph/controller/Selection.java
+++ b/src/main/java/com/c2kernel/gui/graph/controller/Selection.java
@@ -1,13 +1,11 @@
 package com.c2kernel.gui.graph.controller;
 
-import java.io.Serializable;
-
 import com.c2kernel.graph.model.DirectedEdge;
 import com.c2kernel.graph.model.Vertex;
 
 
 
-public class Selection implements Serializable
+public class Selection
 {
     // Either a single edge can be selected or
     // one or more vertices can be selected.
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java b/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java
index acce7ef..32830f7 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java
@@ -12,7 +12,6 @@ import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.Serializable;
 import java.util.HashMap;
 
 import javax.swing.BorderFactory;
@@ -51,9 +50,9 @@ public class ActivityChooser extends JFrame
 
     private JLabel label = null;
 
-    HashMap<String, Serializable> mhashmap = null;
+    HashMap<String, Object> mhashmap = null;
 
-    public ActivityChooser(String message, String title, Image img, WorkflowDialogue parent, HashMap<String, Serializable> hashmap)
+    public ActivityChooser(String message, String title, Image img, WorkflowDialogue parent, HashMap<String, Object> hashmap)
     {
         super(title);
         mMessage = message;
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java b/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java
index 4f99a61..61b70b5 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java
@@ -6,7 +6,6 @@
  */
 package com.c2kernel.gui.lifecycle.chooser;
 
-import java.io.Serializable;
 import java.util.HashMap;
 
 /**
@@ -17,5 +16,5 @@ import java.util.HashMap;
  */
 public interface WorkflowDialogue
 {
-	public void loadThisWorkflow(String name, HashMap<String, Serializable> hashMap);
+	public void loadThisWorkflow(String name, HashMap<String, Object> mhashmap);
 }
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java
index 17b2a38..f08f916 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java
@@ -1,5 +1,4 @@
 package com.c2kernel.gui.lifecycle.desc;
-import java.io.Serializable;
 import java.util.HashMap;
 
 import javax.swing.JOptionPane;
@@ -30,7 +29,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 			if (vertexTypeId.equals("Atomic") || vertexTypeId.equals("Composite"))
 			{
 				// ask for a name
-				HashMap<String, Serializable> mhm = new HashMap<String, Serializable>();
+				HashMap<String, Object> mhm = new HashMap<String, Object>();
 				mhm.put("P1", vertexTypeId);
 				mhm.put("P2", location);
 				//************************************************
@@ -48,7 +47,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 		}
 	}
 	@Override
-	public void loadThisWorkflow(String newName, HashMap<String, Serializable> hashMap)
+	public void loadThisWorkflow(String newName, HashMap<String, Object> hashMap)
 	{
 		String vertexTypeId = (String) hashMap.get("P1");
 		GraphPoint location = (GraphPoint) hashMap.get("P2");
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java
index e7f0034..91a0837 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java
@@ -28,7 +28,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 			vertexTypeId = (String) typeNameAndConstructionInfo.mInfo;
 			if (vertexTypeId.equals("Atomic") || vertexTypeId.equals("Composite"))
 			{
-				HashMap<String, Serializable> mhm = new HashMap<String, Serializable>();
+				HashMap<String, Object> mhm = new HashMap<String, Object>();
 				mhm.put("P1", vertexTypeId);
 				mhm.put("P2", location);
 				//************************************************
@@ -52,7 +52,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 			mRootAct = (CompositeActivity) newContext;
 	}
 	@Override
-	public void loadThisWorkflow(String newName, HashMap<String, Serializable> hashMap)
+	public void loadThisWorkflow(String newName, HashMap<String, Object> hashMap)
 	{
 		String vertexTypeId = (String) hashMap.get("P1");
 		GraphPoint location = (GraphPoint) hashMap.get("P2");
-- 
cgit v1.2.3