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 --- .../graph/controller/AutoScrollController.java | 6 +- .../graph/controller/DeletionController.java | 9 ++- .../controller/EdgeConstructionController.java | 33 ++++++---- .../controller/MultiSelectionDragController.java | 72 ++++++++++++++-------- .../graph/controller/StartVertexController.java | 6 +- .../controller/VertexConstructionController.java | 6 +- 6 files changed, 85 insertions(+), 47 deletions(-) mode change 100755 => 100644 source/com/c2kernel/graph/controller/AutoScrollController.java mode change 100755 => 100644 source/com/c2kernel/graph/controller/DeletionController.java mode change 100755 => 100644 source/com/c2kernel/graph/controller/EdgeConstructionController.java mode change 100755 => 100644 source/com/c2kernel/graph/controller/MultiSelectionDragController.java mode change 100755 => 100644 source/com/c2kernel/graph/controller/StartVertexController.java mode change 100755 => 100644 source/com/c2kernel/graph/controller/VertexConstructionController.java (limited to 'source/com/c2kernel/graph/controller') diff --git a/source/com/c2kernel/graph/controller/AutoScrollController.java b/source/com/c2kernel/graph/controller/AutoScrollController.java old mode 100755 new mode 100644 index d1e0d8d..aa04609 --- a/source/com/c2kernel/graph/controller/AutoScrollController.java +++ b/source/com/c2kernel/graph/controller/AutoScrollController.java @@ -20,7 +20,8 @@ public class AutoScrollController implements MouseMotionListener } - public void mouseDragged(MouseEvent me) + @Override + public void mouseDragged(MouseEvent me) { Point mousePoint = null; @@ -33,7 +34,8 @@ public class AutoScrollController implements MouseMotionListener } - public void mouseMoved(MouseEvent me) + @Override + public void mouseMoved(MouseEvent me) { } } diff --git a/source/com/c2kernel/graph/controller/DeletionController.java b/source/com/c2kernel/graph/controller/DeletionController.java old mode 100755 new mode 100644 index 38e8347..44ea990 --- a/source/com/c2kernel/graph/controller/DeletionController.java +++ b/source/com/c2kernel/graph/controller/DeletionController.java @@ -47,7 +47,8 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi // Invoked by the graph model - public void update(Observable o, Object arg) + @Override + public void update(Observable o, Object arg) { SelectionChangedEvent event = null; DirectedEdge selectedEdge = null; @@ -69,7 +70,8 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi // Invoked by the graph panel - public void keyPressed(KeyEvent e) + @Override + public void keyPressed(KeyEvent e) { if(e.getKeyCode() == KeyEvent.VK_DELETE && mGraphModelManager.isEditable()) { @@ -79,7 +81,8 @@ public class DeletionController extends KeyAdapter implements Observer, ActionLi // Invoked by the delete button - public void actionPerformed(ActionEvent ae) + @Override + public void actionPerformed(ActionEvent ae) { if(mGraphModelManager != null && mGraphModelManager.isEditable()) { diff --git a/source/com/c2kernel/graph/controller/EdgeConstructionController.java b/source/com/c2kernel/graph/controller/EdgeConstructionController.java old mode 100755 new mode 100644 index fdf52bf..00ea45b --- a/source/com/c2kernel/graph/controller/EdgeConstructionController.java +++ b/source/com/c2kernel/graph/controller/EdgeConstructionController.java @@ -3,7 +3,6 @@ package com.c2kernel.graph.controller; import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionListener; import com.c2kernel.graph.model.GraphModelManager; import com.c2kernel.graph.model.GraphPoint; @@ -12,7 +11,7 @@ import com.c2kernel.graph.view.EditorModeListener; import com.c2kernel.graph.view.EditorToolBar; -public class EdgeConstructionController extends MouseAdapter implements MouseMotionListener, EditorModeListener +public class EdgeConstructionController extends MouseAdapter implements EditorModeListener { private GraphModelManager mGraphModelManager = null; private EditorToolBar mEditorToolBar = null; @@ -49,7 +48,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot private Action mSetOriginVertex = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { if(mGraphModelManager != null) { @@ -61,7 +61,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot private Action mSetEndPoint = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { if(mGraphModelManager != null) { @@ -73,7 +74,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot private Action mClearEdge = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { if(mGraphModelManager != null) { @@ -86,7 +88,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot private Action mCreateEdge = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { if((mGraphModelManager != null) && (mEditorToolBar != null) && mGraphModelManager.isEditable()) { @@ -170,7 +173,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot } - public void editorModeChanged(String idOfNewMode) + @Override + public void editorModeChanged(String idOfNewMode) { if(idOfNewMode.equals("Edge")) { @@ -183,7 +187,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot } - public void mousePressed(MouseEvent me) + @Override + public void mousePressed(MouseEvent me) { Vertex vertex = null; Point mousePoint = null; @@ -203,7 +208,8 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot } - public void mouseReleased(MouseEvent me) + @Override + public void mouseReleased(MouseEvent me) { Vertex vertex = null; Point mousePoint = null; @@ -227,18 +233,21 @@ public class EdgeConstructionController extends MouseAdapter implements MouseMot } - public void mouseExited(MouseEvent me) + @Override + public void mouseExited(MouseEvent me) { } - public void mouseDragged(MouseEvent me) + @Override + public void mouseDragged(MouseEvent me) { processEvent(kDrag, me.getPoint()); } - public void mouseMoved(MouseEvent me) + @Override + public void mouseMoved(MouseEvent me) { } } diff --git a/source/com/c2kernel/graph/controller/MultiSelectionDragController.java b/source/com/c2kernel/graph/controller/MultiSelectionDragController.java old mode 100755 new mode 100644 index 8e9a2b3..eda5c1c --- a/source/com/c2kernel/graph/controller/MultiSelectionDragController.java +++ b/source/com/c2kernel/graph/controller/MultiSelectionDragController.java @@ -6,7 +6,6 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionListener; import com.c2kernel.graph.model.DirectedEdge; import com.c2kernel.graph.model.ElasticBand; @@ -20,7 +19,7 @@ import com.c2kernel.graph.view.EditorModeListener; public class MultiSelectionDragController extends MouseAdapter -implements EditorModeListener, MouseMotionListener, KeyListener +implements EditorModeListener, KeyListener { private class ResizeInf { @@ -90,7 +89,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mStoreResizeInf = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { Point mousePoint = (Point)data; GraphPoint centre = null; @@ -110,8 +110,9 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mResizeVertex = new Action() { - public void doIt(Object data) - { + @Override + public void doIt(Object data) + { Point mousePoint = (Point)data; int resizeX = 0; int resizeY = 0; @@ -186,7 +187,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mSelectEdge = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { Selection selection = new Selection((DirectedEdge)data, null, 0, 0, 0, 0); @@ -197,7 +199,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mSelectVertexAndStoreDisp = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { VertexAndDisp vertexAndDisp = (VertexAndDisp)data; GraphPoint centrePoint = vertexAndDisp.mVertex.getCentrePoint(); @@ -218,7 +221,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mStoreDisp = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { mDispForSelection = (DispForSelection)data; } @@ -227,7 +231,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mToggleVertex = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { Vertex vertex = (Vertex)data; @@ -245,7 +250,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mSelectAll = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { mGraphModelManager.getModel().selectAll(); } @@ -254,7 +260,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mCreateBand = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { Point fixedCorner = (Point)data; @@ -265,7 +272,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mMoveSelection = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { Point mousePoint = (Point)data; int topLeftX = mousePoint.x - mDispForSelection.mXDisp; @@ -279,7 +287,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mResizeBand = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { mGraphModelManager.getModel().resizeElasticBand((Point)data); } @@ -288,7 +297,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mSelectContents = new Action() { - public void doIt(Object data) + @Override + public void doIt(Object data) { mGraphModelManager.getModel().selectContentsOfElasticBand(); } @@ -296,7 +306,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener protected Action mZoomIn = new Action() { - public void doIt(Object data) // data is the clicked vertex + @Override + public void doIt(Object data) // data is the clicked vertex { // Need to get child graph model out of the vertex before we can zoom in if (data instanceof Vertex) { @@ -372,7 +383,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener } - public void editorModeChanged(String idOfNewMode) + @Override + public void editorModeChanged(String idOfNewMode) { if(idOfNewMode.equals("Select")) { @@ -385,7 +397,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener } - public void mousePressed(MouseEvent me) + @Override + public void mousePressed(MouseEvent me) { int modifiers = me.getModifiers(); @@ -402,7 +415,8 @@ implements EditorModeListener, MouseMotionListener, KeyListener } } - public void mouseClicked(MouseEvent me) + @Override + public void mouseClicked(MouseEvent me) { if (me.getClickCount() == 2) { // want double click Point clickedSpot = me.getPoint(); @@ -513,24 +527,28 @@ implements EditorModeListener, MouseMotionListener, KeyListener } - public void mouseReleased(MouseEvent me) + @Override + public void mouseReleased(MouseEvent me) { processEvent(kRelease, null); } - public void mouseMoved(MouseEvent me) + @Override + public void mouseMoved(MouseEvent me) { } - public void mouseDragged(MouseEvent e) + @Override + public void mouseDragged(MouseEvent e) { processEvent(kDrag, e.getPoint()); } - public void keyPressed(KeyEvent e) + @Override + public void keyPressed(KeyEvent e) { if((e.getKeyCode() == KeyEvent.VK_A) && e.isControlDown()) { @@ -539,13 +557,15 @@ implements EditorModeListener, MouseMotionListener, KeyListener } - public void keyReleased(KeyEvent e) + @Override + public void keyReleased(KeyEvent e) { } - public void keyTyped(KeyEvent e) + @Override + public void keyTyped(KeyEvent e) { - } - + } + } diff --git a/source/com/c2kernel/graph/controller/StartVertexController.java b/source/com/c2kernel/graph/controller/StartVertexController.java old mode 100755 new mode 100644 index 0dc959c..3984cb7 --- a/source/com/c2kernel/graph/controller/StartVertexController.java +++ b/source/com/c2kernel/graph/controller/StartVertexController.java @@ -44,7 +44,8 @@ public class StartVertexController implements Observer, ActionListener } - public void update(Observable o, Object arg) + @Override + public void update(Observable o, Object arg) { SelectionChangedEvent event = null; Vertex[] selectedVertices = null; @@ -67,7 +68,8 @@ public class StartVertexController implements Observer, ActionListener } - public void actionPerformed(ActionEvent ae) + @Override + public void actionPerformed(ActionEvent ae) { if(mGraphModelManager != null) { diff --git a/source/com/c2kernel/graph/controller/VertexConstructionController.java b/source/com/c2kernel/graph/controller/VertexConstructionController.java old mode 100755 new mode 100644 index d351b0a..1eb91f6 --- a/source/com/c2kernel/graph/controller/VertexConstructionController.java +++ b/source/com/c2kernel/graph/controller/VertexConstructionController.java @@ -28,13 +28,15 @@ public class VertexConstructionController extends MouseAdapter implements Editor } - public void editorModeChanged(String idOfNewMode) + @Override + public void editorModeChanged(String idOfNewMode) { mCreatingVertices = idOfNewMode.equals("Vertex"); } - public void mouseClicked(MouseEvent me) + @Override + public void mouseClicked(MouseEvent me) { if(mCreatingVertices && (mGraphModelManager != null) && (mEditorToolBar != null) && mGraphModelManager.isEditable()) { -- cgit v1.2.3