diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-10-03 23:19:04 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-10-03 23:19:04 +0200 |
| commit | a5a9d90ec6714ad6a9358c35ca7093e5868373f7 (patch) | |
| tree | 32bceabaac0abc7605fee5f873b84ba9b26d2a65 /src/main/java/com/c2kernel/gui/lifecycle | |
| parent | 31c13eed377fe1324ebed7fbaa56483a43e3d3d1 (diff) | |
Rolled back the renaming of existing exceptions.
Diffstat (limited to 'src/main/java/com/c2kernel/gui/lifecycle')
3 files changed, 8 insertions, 8 deletions
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 6f74968..f02e2f7 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.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
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 ObjectNotFound {
+ private static void resolveRealVersion(ActivitySlotDef childDef) throws ObjectNotFoundException {
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 ObjectNotFound("Could not create new version of "+defName+" from last");
+ throw new ObjectNotFoundException("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 76d027a..a13d610 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.InvalidData;
+import com.c2kernel.common.InvalidDataException;
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 (InvalidData ex) { }
+ } catch (InvalidDataException 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 1a8d4fc..f9a1a81 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.InvalidData;
+import com.c2kernel.common.InvalidDataException;
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 (InvalidData e) {
+ } catch (InvalidDataException 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 (InvalidData e) {
+ } catch (InvalidDataException e) {
status.setText("Could not find activity state");
Logger.error(e);
return;
|
