From 31c13eed377fe1324ebed7fbaa56483a43e3d3d1 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:31:07 +0200
Subject: Adapt to new Exceptions

---
 .../com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java   | 6 +++---
 .../java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java  | 4 ++--
 .../java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/lifecycle')

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
index 4a43472..6f74968 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
@@ -6,7 +6,7 @@ import java.io.File;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.entity.agent.Job;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.graph.model.GraphableVertex;
@@ -158,7 +158,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 		}
 	}
 
-	private static void resolveRealVersion(ActivitySlotDef childDef) throws ObjectNotFoundException {
+	private static void resolveRealVersion(ActivitySlotDef childDef) throws ObjectNotFound {
 		String defName = childDef.getActName();
 		ItemProxy actDefItem = LocalObjectLoader.loadLocalObjectDef("/desc/ActivityDesc/", defName);
 		String actType = actDefItem.getProperty("Complexity");
@@ -183,7 +183,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 			MainFrame.userAgent.execute(createJob);
 		} catch (Exception e) {
 			Logger.error(e);
-			throw new ObjectNotFoundException("Could not create new version of "+defName+" from last", "");
+			throw new ObjectNotFound("Could not create new version of "+defName+" from last");
 		}
 		resolveRealVersion(childDef);
 	}
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java
index a13d610..76d027a 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java
@@ -6,7 +6,7 @@ import java.awt.Paint;
 import java.awt.Polygon;
 
 import com.c2kernel.common.GTimeStamp;
-import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.InvalidData;
 import com.c2kernel.graph.model.GraphPoint;
 import com.c2kernel.graph.model.Vertex;
 import com.c2kernel.gui.graph.view.VertexRenderer;
@@ -41,7 +41,7 @@ public class ActivityRenderer implements VertexRenderer
 			String stateName = "Invalid State"; 
 			try {
 				stateName = activity.getStateName();
-			} catch (InvalidDataException ex) { }
+			} catch (InvalidData ex) { }
 			
 			linesOfText[2] = 
 					Language.translate(stateName) + (showTime ? " " + getWaitTime(activity.getStateDate()) : "");
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
index f9a1a81..1a8d4fc 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
@@ -13,7 +13,7 @@ import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 
-import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.InvalidData;
 import com.c2kernel.entity.agent.Job;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.graph.model.Vertex;
@@ -111,7 +111,7 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen
         StateMachine sm;
 		try {
 			sm = mCurrentAct.getStateMachine();
-		} catch (InvalidDataException e) {
+		} catch (InvalidData e) {
 			status.setText("Invalid state machine.");
 			Logger.error(e);
 			return;
@@ -120,7 +120,7 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen
         int currentState;
 		try {
 			currentState = mCurrentAct.getState();
-		} catch (InvalidDataException e) {
+		} catch (InvalidData e) {
 			status.setText("Could not find activity state");
 			Logger.error(e);
 			return;
-- 
cgit v1.2.3