From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java | 3 ++-
 source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java

(limited to 'source/com/c2kernel/lifecycle/instance/gui')

diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
old mode 100755
new mode 100644
index 020d694..d363dc6
--- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
+++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
@@ -1,5 +1,6 @@
 package com.c2kernel.lifecycle.instance.gui.model;
 import java.awt.Point;
+import java.io.Serializable;
 import java.util.HashMap;
 
 import javax.swing.JOptionPane;
@@ -26,7 +27,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 			vertexTypeId = (String) typeNameAndConstructionInfo.mInfo;
 			if (vertexTypeId.equals("Atomic") || vertexTypeId.equals("Composite"))
 			{
-				HashMap mhm = new HashMap();
+				HashMap<String, Serializable> mhm = new HashMap<String, Serializable>();
 				mhm.put("P1", vertexTypeId);
 				mhm.put("P2", location);
 				//************************************************
diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java
old mode 100755
new mode 100644
index fc0cd99..d33b717
--- a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java
+++ b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java
@@ -40,7 +40,7 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen
     protected GridBagConstraints c;
     protected Box transBox;
     protected JComboBox executors;
-    protected JComboBox states = new JComboBox(States.states);
+    protected JComboBox<String> states = new JComboBox<String>(States.states);
     protected JCheckBox active = new JCheckBox();
     protected JLabel status = new JLabel();
     protected ItemProxy mItem;
-- 
cgit v1.2.3