Merge Origin develop

Author: UltimatePea

.gitignore

@@ -1 +1,2 @@
 *.class
+/bin/

src/actions/ConstructLineSegmentAction.java

@@ -1,5 +1,6 @@
 package actions;
 
+import java.awt.Component;
 import java.util.ArrayList;
 
 import paintcomponents.LineSegment;
@@ -20,12 +21,32 @@ public boolean canPerformAction() {
 		//only two points can be selected
 		if(items.size() != 2) return false;
 		//selected component must be of type point
+		
 		for (PaintComponent paintComponent : items) {
 			if(!(paintComponent instanceof SimplePoint)){
 				return false;
 			}
 		}
-		//TODO If line segment already exists, do not add again!!!
+		
+		//check if line segment already exist
+		// if exists, then it will not form a new line segment
+		ArrayList<PaintComponent> components = panel.getPaintComponents();
+		LineSegment line = null;
+		
+		//get all paintComponents
+		for(PaintComponent paintComponent : components) {
+			if( paintComponent instanceof LineSegment ) {
+				line = (LineSegment) paintComponent;
+				//check front point and to point similarities
+				if(items.get(0) == line.getFromPoint() && 
+					items.get(1) == line.getToPoint())
+					return false;
+				if(items.get(1) == line.getFromPoint() && 
+					items.get(0) == line.getToPoint())
+					return false;
+			}
+		}
+		
 		//TODO Do not allow adding two line segments connecting the same point
 		return true;
 

src/actions/menu/ActionsMenuBar.java

@@ -29,26 +29,26 @@ public ActionsMenuBar(PaintPanel panel){
 
 	private void addAction(PaintAction action) {
 		String[] strings = action.locationString().split("/");
-		JMenu insertionMenu = null;
+		Object insertionMenu = this;
 		//look for existing j menus
-		for (int i = 0; i < getMenuCount();i++) {
-			JMenu menu = getMenu(i);
-			if(menu.getText().equals(strings[0])){
-				insertionMenu = menu;
-				break;
+		for( int k = 0; k < strings.length-1; k++) {
+			for (int i = 0; i < menuCount( insertionMenu );i++) {
+				JMenuItem menu = obtainMenu(insertionMenu, i);
+				if(menu.getText().equals(strings[k])){
+					insertionMenu = menu;
+					break;
+				}
 			}
+			//create a new if not found
+			JMenu toInsert = new JMenu(strings[k]);
+			insertMenu( insertionMenu, toInsert );
+			insertionMenu = toInsert;
 		}
-		//create a new if not found
-		if(insertionMenu == null){
-			insertionMenu = new JMenu(strings[0]);
-			this.add(insertionMenu);
-		}
-		
 		//assume 2 level depth
 		//TODO Change here
 		PaintActionMenuItem item = new PaintActionMenuItem(action);
 		item.setEnabled(action.canPerformAction());
-		item.setText(strings[1]);
+		item.setText(strings[strings.length-1]);
 		item.addActionListener(new ActionListener() {
 
 			@Override
@@ -58,8 +58,33 @@ public void actionPerformed(ActionEvent e) {
 			}
 		});
 
-		insertionMenu.add(item);
-		
+		insertMenu( insertionMenu, item );		
+	}
+	private int menuCount( Object a ) {
+		if( a instanceof JMenu) {
+			return ((JMenu) a).getItemCount();
+		}
+		if( a instanceof JMenuBar) {
+			return ((JMenuBar) a).getMenuCount();
+		}
+		return -1;
+	}
+	private JMenuItem obtainMenu( Object a, int index  ) {
+		if( a instanceof JMenu) {
+			return ((JMenu) a).getItem(index);
+		}
+		if( a instanceof JMenuBar) {
+			return ((JMenuBar) a).getMenu(index);
+		}
+		return null;
+	}	
+	private void insertMenu( Object a, JMenuItem toInsert ) {
+		if( a instanceof JMenu) {
+			((JMenu) a).add(toInsert);
+		}
+		if( a instanceof JMenuBar) {
+			((JMenuBar) a).add(toInsert);
+		}
 	}
 
 	@Override

src/ui/PaintPanel.java

@@ -177,6 +177,10 @@ public void addPaintComponent(PaintComponent comp) {
 		components.add(comp);
 
 	}
+	
+	public ArrayList<PaintComponent> getPaintComponents() {
+		return components;
+	}
 
 	/**
 	 * Returns the topmost component under a given point