From f252f8689383012ce6cee75ec455dcba85626823 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 17 May 2013 16:49:12 +0200 Subject: Cleanup --- src/main/java/com/c2kernel/entity/agent/Job.java | 2 +- .../com/c2kernel/graph/model/GraphModelManager.java | 18 +++++++++--------- src/main/java/com/c2kernel/process/ClientShell.java | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/main/java/com/c2kernel/entity/agent/Job.java b/src/main/java/com/c2kernel/entity/agent/Job.java index 0388f83..859ec1a 100644 --- a/src/main/java/com/c2kernel/entity/agent/Job.java +++ b/src/main/java/com/c2kernel/entity/agent/Job.java @@ -137,7 +137,7 @@ public class Job implements C2KLocalObject { mError = errors; try { - mOutcome = Gateway.getMarshaller().marshall(errors); + mOutcome = Gateway.getMarshaller().marshall(mError); } catch (Exception e) { Logger.error("Error marshalling ErrorInfo in job"); Logger.error(e); diff --git a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java b/src/main/java/com/c2kernel/graph/model/GraphModelManager.java index f639d07..398cce5 100644 --- a/src/main/java/com/c2kernel/graph/model/GraphModelManager.java +++ b/src/main/java/com/c2kernel/graph/model/GraphModelManager.java @@ -14,15 +14,15 @@ import com.c2kernel.utils.Logger; public class GraphModelManager extends Observable { - private GraphModel mGraphModel; - private EdgeFactory mEdgeFactory; - private VertexFactory mVertexFactory; - private VertexOutlineCreator mVertexOutlineCreator; - private final EntireModelChangedEvent mEntireModelChangedEvent = new EntireModelChangedEvent(); - private final ForcedNotifyEvent mForcedNotifyEvent = new ForcedNotifyEvent(); - private final Stack mParentModels = new Stack(); - private final ArrayList mParentIds = new ArrayList(); - private boolean mEditable = true; + private GraphModel mGraphModel; + private EdgeFactory mEdgeFactory; + private VertexFactory mVertexFactory; + private VertexOutlineCreator mVertexOutlineCreator; + private final EntireModelChangedEvent mEntireModelChangedEvent = new EntireModelChangedEvent(); + private final ForcedNotifyEvent mForcedNotifyEvent = new ForcedNotifyEvent(); + private final Stack mParentModels = new Stack(); + private final ArrayList mParentIds = new ArrayList(); + private boolean mEditable = true; // Calling this constructor does not create a vertex outline creator // which is required by the method addVertexAndCreateId() diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/com/c2kernel/process/ClientShell.java index 5bb1246..d744525 100644 --- a/src/main/java/com/c2kernel/process/ClientShell.java +++ b/src/main/java/com/c2kernel/process/ClientShell.java @@ -36,6 +36,7 @@ public class ClientShell extends StandardClient { } public void run() { + @SuppressWarnings("resource") // closing the scanner closes system.in Scanner scan = new Scanner(System.in); System.out.print("> "); while (scan.hasNextLine()) { @@ -57,6 +58,7 @@ public class ClientShell extends StandardClient { public static void main(String[] args) throws Exception { Gateway.init(readC2KArgs(args)); + @SuppressWarnings("resource") // closing the scanner closes system.in Scanner scan = new Scanner(System.in); int loginAttempts = 0; ClientShell shell = null; -- cgit v1.2.3