Merge lp:~yrke/tapaal/cleanup-selectionmanager into lp:tapaal

[Kenneth Yrke Jørgensen]

Removed unused function, remove useless comments and code reformatting

Code fixes only, no changes in behavior

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/SelectionManager.java'
--- src/pipe/gui/SelectionManager.java	2018-04-11 23:20:44 +0000
+++ src/pipe/gui/SelectionManager.java	2018-09-24 12:02:46 +0000
@@ -28,9 +28,6 @@
 		java.awt.event.MouseListener, java.awt.event.MouseWheelListener,
 		java.awt.event.MouseMotionListener {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 9057152447545103393L;
 	private Point startPoint;
 	private Rectangle selectionRectangle = new Rectangle(-1, -1);
@@ -174,19 +171,13 @@
 		return selection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
-	 */
 	public void mousePressed(MouseEvent e) {
 		CreateGui.getCurrentTab().removeConstantHighlights();
 		if (e.getButton() == MouseEvent.BUTTON1 && !(e.isControlDown())) {
 			isSelecting = true;
 			drawingSurface.setLayer(this, Pipe.SELECTION_LAYER_OFFSET);
 			startPoint = e.getPoint();
-			selectionRectangle.setRect(startPoint.getX(), startPoint.getY(), 0,
-					0);
+			selectionRectangle.setRect(startPoint.getX(), startPoint.getY(), 0, 0);
 			// Select anything that intersects with the rectangle.
 			processSelection(e);
 			repaint();
@@ -195,12 +186,6 @@
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
-	 */
 	public void mouseReleased(MouseEvent e) {
 		if (isSelecting) {
 			// Select anything that intersects with the rectangle.
@@ -212,13 +197,6 @@
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent
-	 * )
-	 */
 	public void mouseDragged(MouseEvent e) {
 		if(CreateGui.getApp().getGUIMode().equals(GUIMode.animation)) return;
 		
@@ -255,12 +233,6 @@
 	public void mouseExited(MouseEvent e) {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent)
-	 */
 	public void mouseMoved(MouseEvent e) {
 	}
 
@@ -272,32 +244,4 @@
 		drawingSurface.repaint();
 	}
 
-	public int getSelectionCount() {
-		Component[] netObj = drawingSurface.getComponents();
-		int selectionCount = 0;
-		// Get all the objects in the current window
-		for (int i = 0; i < netObj.length; i++) {
-			// Handle Arcs and Arc Points
-			if ((netObj[i] instanceof Arc)
-					&& ((PetriNetObject) netObj[i]).isSelectable()) {
-				Arc thisArc = (Arc) netObj[i];
-				ArcPath thisArcPath = thisArc.getArcPath();
-				for (int j = 1; j < thisArcPath.getEndIndex(); j++) {
-					if (thisArcPath.isPointSelected(j)) {
-						selectionCount++;
-					}
-				}
-			}
-
-			// Handle PlaceTransition Objects
-			if ((netObj[i] instanceof PlaceTransitionObject)
-					&& ((PetriNetObject) netObj[i]).isSelectable()) {
-				if (((PlaceTransitionObject) netObj[i]).isSelected()) {
-					selectionCount++;
-				}
-			}
-		}
-		return selectionCount;
-	}
-
 }