From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 00:42:34 +0200 Subject: More code cleanup: Refactored Entity Proxy Subscription to handle generics better Rewrote RemoteMap to use TreeMap instead of the internal array for order. It now sorts its keys by number if they parse, else as strings. Removed a no-longer-in-progress outcome form class --- .../instance/gui/model/WfEdgeFactory.java | 5 ++- .../lifecycle/instance/gui/model/WfGraphPanel.java | 3 +- .../instance/gui/model/WfVertexFactory.java | 9 +++-- .../instance/gui/model/WfVertexOutlineCreator.java | 3 +- .../instance/gui/view/ActivityRenderer.java | 9 +++-- .../instance/gui/view/FindActDefPanel.java | 13 +++--- .../instance/gui/view/SplitJoinRenderer.java | 9 +++-- .../instance/gui/view/TransitionPanel.java | 47 ++++++++++++---------- .../instance/gui/view/WfDirectedEdgeRenderer.java | 4 +- .../instance/gui/view/WfVertexRenderer.java | 3 +- 10 files changed, 61 insertions(+), 44 deletions(-) mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/view/FindActDefPanel.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/view/WfDirectedEdgeRenderer.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/view/WfVertexRenderer.java (limited to 'source/com/c2kernel/lifecycle/instance/gui') diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java old mode 100755 new mode 100644 index f79d312..e96ef37 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java @@ -9,7 +9,8 @@ import com.c2kernel.lifecycle.instance.WfVertex; public class WfEdgeFactory implements EdgeFactory { - public void create + @Override + public void create ( GraphModelManager graphModelManager, Vertex origin, @@ -22,7 +23,7 @@ public class WfEdgeFactory implements EdgeFactory } - private boolean validCreation( GraphModelManager graphModelManager, Vertex origin, Vertex terminus ) + private static boolean validCreation( GraphModelManager graphModelManager, Vertex origin, Vertex terminus ) { DirectedEdge[] connectingEdgesAToB = graphModelManager.getModel().getConnectingEdges( origin.getID() , terminus.getID() ); DirectedEdge[] connectingEdgesBToA = graphModelManager.getModel().getConnectingEdges( terminus.getID(), origin.getID() ); diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java old mode 100755 new mode 100644 index 752e1fa..16c8e16 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java @@ -18,6 +18,7 @@ public class WfGraphPanel extends GraphPanel super(d,v); } // Draws the highlight of the specified edge + @Override protected void drawEdgeHighlight(Graphics2D g2d, DirectedEdge edge) { GraphPoint originPoint = edge.getOriginPoint(); @@ -49,7 +50,7 @@ public class WfGraphPanel extends GraphPanel int minX = midPoint.x - 10; int minY = midPoint.y - 10; int maxX = midPoint.x + 10; - int maxY = midPoint.y + 10; + int maxY = midPoint.y + 10; g2d.drawLine(minX, minY, maxX, minY); g2d.drawLine(maxX, minY, maxX, maxY); g2d.drawLine(maxX, maxY, minX, maxY); diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java index d363dc6..0b6c9e4 100644 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java @@ -19,6 +19,7 @@ import com.c2kernel.utils.Resource; public class WfVertexFactory implements VertexFactory, WorkflowDialogue { protected CompositeActivity mRootAct = null; + @Override public void create(GraphModelManager graphModelManager, Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo) { String vertexTypeId = null; @@ -44,12 +45,14 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue mRootAct.newChild(vertexTypeId, location); } } + @Override public void setCreationContext(Object newContext) { if (newContext != null && newContext instanceof CompositeActivity) mRootAct = (CompositeActivity) newContext; } - public void loadThisWorkflow(String newName, HashMap hashMap) + @Override + public void loadThisWorkflow(String newName, HashMap hashMap) { String vertexTypeId = (String) hashMap.get("P1"); Point location = (Point) hashMap.get("P2"); @@ -69,7 +72,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue Resource.getImageResource("graph/newvertex_large.png"), null, null); - if (newName == null || newName.equals("")) + if (newName.equals("")) return; } Activity act = null; @@ -80,7 +83,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue } catch (Exception e) { - } + } if (act == null) mRootAct.newChild(unicName, vertexTypeId, location); else diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java old mode 100755 new mode 100644 index dd4b8af..e8cb303 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java @@ -14,7 +14,8 @@ public class WfVertexOutlineCreator implements VertexOutlineCreator,Serializable private final int mSplitJoinWidth = 60; private final int mSplitJoinHeight = 25; - public void setOutline(Vertex vertex) + @Override + public void setOutline(Vertex vertex) { GraphPoint centrePoint = vertex.getCentrePoint(); GraphPoint[] outlinePoints = new GraphPoint[ 4 ]; diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java b/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java old mode 100755 new mode 100644 index a67b4fd..046ed7c --- a/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/ActivityRenderer.java @@ -21,6 +21,7 @@ public class ActivityRenderer implements VertexRenderer private Paint mInactiveCompPaint = new Color(200, 200, 255); private Paint mErrorPaint = new Color(255, 50, 0); private Paint mTextPaint = Color.black; + @Override public void draw(Graphics2D g2d, Vertex vertex) { Activity activity = (Activity) vertex; @@ -28,7 +29,7 @@ public class ActivityRenderer implements VertexRenderer boolean hasError = !activity.verify(); boolean isComposite = activity.getIsComposite(); GraphPoint centrePoint = activity.getCentrePoint(); - String description = activity.getDescription(); + //String description = activity.getDescription(); String[] linesOfText = new String[3]; linesOfText[0] = "(" + activity.getType() + ")"; linesOfText[1] = activity.getName(); @@ -52,7 +53,7 @@ public class ActivityRenderer implements VertexRenderer else linesOfText[2] = Language.translate(States.getStateName(cs)); } - + FontMetrics metrics = g2d.getFontMetrics(); int lineWidth = 0; int lineHeight = metrics.getHeight(); @@ -86,7 +87,7 @@ public class ActivityRenderer implements VertexRenderer g2d.drawString(linesOfText[i], x, y); } } - private Polygon graphPointsToPolygon(GraphPoint[] points) + private static Polygon graphPointsToPolygon(GraphPoint[] points) { Polygon polygon = new Polygon(); int i = 0; @@ -96,7 +97,7 @@ public class ActivityRenderer implements VertexRenderer } return polygon; } - private String getWaitTime(GTimeStamp date) + private static String getWaitTime(GTimeStamp date) { GTimeStamp now = new GTimeStamp(); DateUtility.setToNow(now); diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/FindActDefPanel.java b/source/com/c2kernel/lifecycle/instance/gui/view/FindActDefPanel.java old mode 100755 new mode 100644 index 5cb00bf..4c1a148 --- a/source/com/c2kernel/lifecycle/instance/gui/view/FindActDefPanel.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/FindActDefPanel.java @@ -33,7 +33,8 @@ public class FindActDefPanel extends SelectedVertexPanel { add(findButton); findButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) + @Override + public void actionPerformed(ActionEvent e) { try { DomainPath actPath = (DomainPath)new DomainPath("/desc/ActivityDesc/").find(currentAct.getActivityDef()); @@ -47,21 +48,23 @@ public class FindActDefPanel extends SelectedVertexPanel { * */ - public void select(Vertex vert) { + @Override + public void select(Vertex vert) { if (vert instanceof ActivitySlotDef) { findButton.setEnabled(true); currentAct = (ActivitySlotDef)vert; } - else + else clear(); - + } /** * */ - public void clear() { + @Override + public void clear() { findButton.setEnabled(false); currentAct = null; } diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java b/source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java old mode 100755 new mode 100644 index 4c3f8bf..036f79a --- a/source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/SplitJoinRenderer.java @@ -39,7 +39,8 @@ public class SplitJoinRenderer implements VertexRenderer private int mXXXTextXOffset = 0; - public void draw( Graphics2D g2d, Vertex vertex) + @Override + public void draw( Graphics2D g2d, Vertex vertex) { GraphPoint centrePoint = vertex.getCentrePoint(); String text = null; @@ -79,9 +80,9 @@ public class SplitJoinRenderer implements VertexRenderer textXOffset = mJoinTextXOffset; } else if ( vertex instanceof Join) - { + { String type= (String)((Join)vertex).getProperties().get("Type"); - if (type!=null && type.equals("Route")) + if (type!=null && type.equals("Route")) { text = mRouteText; textXOffset = mRouteTextXOffset; @@ -116,7 +117,7 @@ public class SplitJoinRenderer implements VertexRenderer vertexHeight ); g2d.drawString( text, centrePoint.x - textXOffset, centrePoint.y + mTextYOffset ); - + if (!hasErrors) { g2d.setPaint( mErrorPaint ); String errors = Language.translate(((WfVertex)vertex).getErrors()); diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java index d33b717..32b234e 100644 --- a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java @@ -39,12 +39,12 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen protected GridBagLayout gridbag; protected GridBagConstraints c; protected Box transBox; - protected JComboBox executors; + protected JComboBox executors; protected JComboBox states = new JComboBox(States.states); protected JCheckBox active = new JCheckBox(); protected JLabel status = new JLabel(); protected ItemProxy mItem; - + public TransitionPanel() { super(); gridbag = new GridBagLayout(); @@ -53,37 +53,37 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen c.gridx=0; c.gridy=0; c.weightx=1; c.weighty=0; c.fill=GridBagConstraints.HORIZONTAL; - + JLabel title = new JLabel("Available Transitions"); title.setFont(EntityTabPane.titleFont); gridbag.setConstraints(title, c); add(title); - - c.gridy++; + + c.gridy++; gridbag.setConstraints(status, c); add(status); c.gridy++; - + transBox = Box.createHorizontalBox(); gridbag.setConstraints(transBox, c); add(transBox); - + c.weightx=0; c.gridx++; executors = MainFrame.getExecutionPlugins(); if (executors.getItemCount() > 1) { gridbag.setConstraints(executors, c); add(executors); } - - + + if (MainFrame.isAdmin) { c.gridx=0; c.gridy++; title = new JLabel("State Hacking"); title.setFont(EntityTabPane.titleFont); gridbag.setConstraints(title, c); add(title); - Box hackBox = Box.createHorizontalBox(); + Box hackBox = Box.createHorizontalBox(); hackBox.add(states); hackBox.add(Box.createHorizontalGlue()); hackBox.add(new JLabel("Active:")); @@ -94,14 +94,15 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen states.addActionListener(this); active.addActionListener(this); } - + clear(); - + } /** * */ - public void select(Vertex vert) { + @Override + public void select(Vertex vert) { clear(); if (!(vert instanceof Activity)) return; mCurrentAct = (Activity)vert; @@ -129,8 +130,9 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen } revalidate(); } - - public void actionPerformed(ActionEvent e) { + + @Override + public void actionPerformed(ActionEvent e) { if (e.getSource() == active && mCurrentAct != null) { mCurrentAct.active = active.isSelected(); return; @@ -142,14 +144,14 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen if (!e.getActionCommand().startsWith("Trans:")) return; int transition = Integer.parseInt(e.getActionCommand().substring(6)); Logger.msg("Requesting transition "+transition); - Job thisJob = new Job(mItem.getSystemKey(), - mCurrentAct.getPath(), + Job thisJob = new Job(mItem.getSystemKey(), + mCurrentAct.getPath(), transition, new StateMachine(mCurrentAct).simulate(transition), mCurrentAct.getCurrentState(), mCurrentAct.getName(), mCurrentAct.getProperties(), - mCurrentAct.getType(), + mCurrentAct.getType(), MainFrame.userAgent.getName()); try { Executor selectedExecutor = (Executor)executors.getSelectedItem(); @@ -160,10 +162,11 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen Logger.error(ex); JOptionPane.showMessageDialog(null, ex.getMessage(), className, JOptionPane.ERROR_MESSAGE); } - + } - public void clear() { + @Override + public void clear() { mCurrentAct = null; transBox.removeAll(); status.setText("No activity selected"); @@ -173,8 +176,8 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen active.setEnabled(false); revalidate(); } - - + + /** * @param item The mItem to set. */ diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/WfDirectedEdgeRenderer.java b/source/com/c2kernel/lifecycle/instance/gui/view/WfDirectedEdgeRenderer.java old mode 100755 new mode 100644 index 09dba77..f39d9a6 --- a/source/com/c2kernel/lifecycle/instance/gui/view/WfDirectedEdgeRenderer.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/WfDirectedEdgeRenderer.java @@ -4,6 +4,7 @@ import java.awt.Graphics2D; import java.awt.Shape; import java.awt.geom.AffineTransform; import java.awt.geom.GeneralPath; + import com.c2kernel.graph.model.DirectedEdge; import com.c2kernel.graph.model.GraphPoint; import com.c2kernel.graph.view.DirectedEdgeRenderer; @@ -17,6 +18,7 @@ public class WfDirectedEdgeRenderer implements DirectedEdgeRenderer mArrowTemplate.lineTo(0, 0); mArrowTemplate.lineTo(5, 5); } + @Override public void draw(Graphics2D g2d, DirectedEdge directedEdge) { GraphPoint originPoint = directedEdge.getOriginPoint(); @@ -87,7 +89,7 @@ public class WfDirectedEdgeRenderer implements DirectedEdgeRenderer if (text != null) g2d.drawString(text, midPoint.x + 10, midPoint.y); } - private double calcArrowAngle(int originX, int originY, int terminusX, int terminusY) + private static double calcArrowAngle(int originX, int originY, int terminusX, int terminusY) { double width = terminusX - originX; double height = terminusY - originY; diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/WfVertexRenderer.java b/source/com/c2kernel/lifecycle/instance/gui/view/WfVertexRenderer.java old mode 100755 new mode 100644 index 1e731e0..92a1021 --- a/source/com/c2kernel/lifecycle/instance/gui/view/WfVertexRenderer.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/WfVertexRenderer.java @@ -13,7 +13,8 @@ public class WfVertexRenderer implements VertexRenderer protected ActivityRenderer mActivityRenderer = new ActivityRenderer(); protected SplitJoinRenderer mSplitJoinRenderer = new SplitJoinRenderer(); - public void draw( Graphics2D g2d, Vertex vertex) + @Override + public void draw( Graphics2D g2d, Vertex vertex) { if ( vertex instanceof Activity ) { mActivityRenderer.draw( g2d, vertex); } else if ( ( vertex instanceof Split ) || ( vertex instanceof Join ) ) { mSplitJoinRenderer.draw( g2d, vertex ); } -- cgit v1.2.3