Revert Action Menubar Changes, Add Intermediate Layer DataTextPaintComponent, Modify DataInputTextfieldPaintComponent to use the intermediate layer

Author: UltimatePea

src/actions/menu/ActionsMenuBar.java

@@ -29,26 +29,26 @@ public ActionsMenuBar(PaintPanel panel){
 
 	private void addAction(PaintAction action) {
 		String[] strings = action.locationString().split("/");
-		Object insertionMenu = this;
+		JMenu insertionMenu = null;
 		//look for existing j menus
-		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;
-				}
+		for (int i = 0; i < getMenuCount();i++) {
+			JMenu menu = getMenu(i);
+			if(menu.getText().equals(strings[0])){
+				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[strings.length-1]);
+		item.setText(strings[1]);
 		item.addActionListener(new ActionListener() {
 
 			@Override
@@ -58,33 +58,8 @@ public void actionPerformed(ActionEvent e) {
 			}
 		});
 
-		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);
-		}
+		insertionMenu.add(item);
+		
 	}
 
 	@Override

src/paintcomponents/DataInputTextfieldPaintComponent.java

@@ -7,52 +7,30 @@
 
 import settings.Defaults;
 
-public class DataInputTextfieldPaintComponent extends TextPaintComponent {
+public class DataInputTextfieldPaintComponent extends DataTextPaintComponent {
+
 
 	private static final int HORIZONTAL_OFFSET = 10;
 	private DataFromPoint<String> fromPoint;
-	private RectanglePaintComponent rect;
-	private Color defaultColor;
-	private Color selectedColor;
 
-
 	public DataInputTextfieldPaintComponent(String displayingText, int x,
 			int y) {
 		super(displayingText, x, y);
-		fromPoint = new DataFromPoint<>(x - 50, y);
-		defaultColor = Defaults.sharedDefaults().defaultColorForDataInputTextfield();
-		selectedColor = Defaults.sharedDefaults().defaultColorForSelectedDataInputTextfield();
+		this.fromPoint = new DataFromPoint<>(x, y);
 	}
 
-	
-
 	@Override
-	protected void paintNotSelected(Graphics g) {
-		g.setColor(defaultColor);
-		((Graphics2D)g).setStroke(new BasicStroke(1));
-		super.paintNotSelected(g);
+	protected void paintSelected(Graphics g) {
+		super.paintSelected(g);
 		updateFromPointPosition();
-		updateAndPaintBoudingRectangle(g);
-		fromPoint.paintNotSelected(g);
-		
+		fromPoint.paint(g);
 	}
 
-
 	@Override
-	protected void paintSelected(Graphics g) {
-		g.setColor(selectedColor);
-		((Graphics2D)g).setStroke(new BasicStroke(1));
-		super.paintSelected(g);;
+	protected void paintNotSelected(Graphics g) {
+		super.paintNotSelected(g);
 		updateFromPointPosition();
-		updateAndPaintBoudingRectangle(g);
-		fromPoint.paintSelected(g);
-	}
-	
-	private void updateAndPaintBoudingRectangle(Graphics g){
-		rect = new RectanglePaintComponent(getX(), getY(), (int)this.bounds.getWidth(), (int)this.bounds.getHeight());
-		//select rectangle according to current select status
-		if(isSelected())rect.select(); else rect.deselect();
-		rect.paint(g);
+		fromPoint.paint(g);
 	}
 
 	/**

src/paintcomponents/DataTextPaintComponent.java

@@ -0,0 +1,58 @@
+package paintcomponents;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+import settings.Defaults;
+
+/**
+ * A text component with a bounding box,
+ * this.bounds is updated in paint method
+ * @author chenzb
+ *
+ */
+public class DataTextPaintComponent extends TextPaintComponent {
+
+
+private RectanglePaintComponent rect;
+	private Color defaultColor;
+	private Color selectedColor;
+	
+public DataTextPaintComponent(String displayingText, int x, int y) {
+		super(displayingText, x, y);
+		defaultColor = Defaults.sharedDefaults().defaultColorForDataInputTextfield();
+		selectedColor = Defaults.sharedDefaults().defaultColorForSelectedDataInputTextfield();
+	}
+
+	
+	
+	
+
+	@Override
+	protected void paintNotSelected(Graphics g) {
+		g.setColor(defaultColor);
+		((Graphics2D)g).setStroke(new BasicStroke(1));
+		super.paintNotSelected(g);
+		updateAndPaintBoudingRectangle(g);
+		
+	}
+	
+
+	@Override
+	protected void paintSelected(Graphics g) {
+		g.setColor(selectedColor);
+		((Graphics2D)g).setStroke(new BasicStroke(1));
+		super.paintSelected(g);;
+		updateAndPaintBoudingRectangle(g);
+	}
+	
+	private void updateAndPaintBoudingRectangle(Graphics g){
+		rect = new RectanglePaintComponent(getX(), getY(), (int)this.bounds.getWidth(), (int)this.bounds.getHeight());
+		//select rectangle according to current select status
+		if(isSelected())rect.select(); else rect.deselect();
+		rect.paint(g);
+	}
+
+}