Merge pull request #11 from UCSDOalads/devBranchByUltimatePea

Introduce OOP in Menu Title Construction

Author: Ultimate Pea

src/actions/AddDataDisplayBoxAction.java

@@ -1,5 +1,6 @@
 package actions;
 
+import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.DataDisplayPaintComponent;
 import ui.PaintPanel;
 
@@ -23,7 +24,7 @@ public void performAction() {
 
 	@Override
 	public String locationString() {
-		return "Add/Data Display";
+		return ActionsMenuBarTitles.Data().Display_Box().Add().toString();
 	}
 
 }

src/actions/AddDataInputBoxAction.java

@@ -1,5 +1,6 @@
 package actions;
 
+import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.DataInputTextfieldPaintComponent;
 import ui.PaintPanel;
 
@@ -24,7 +25,7 @@ public void performAction() {
 
 	@Override
 	public String locationString() {
-		return "Add/Data Input Box...";
+		return ActionsMenuBarTitles.Data().Input_Box().Add().toString();
 	}
 
 }

src/actions/AddTextBoxAction.java

@@ -2,6 +2,7 @@
 
 import javax.swing.JOptionPane;
 
+import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.TextPaintComponent;
 import ui.PaintPanel;
 
@@ -25,7 +26,7 @@ public void performAction() {
 
 	@Override
 	public String locationString() {
-		return "Add/Text Box...";
+		return ActionsMenuBarTitles.Developer("Add/Text Box...").toString();
 	}
 
 }

src/actions/ConstructDataLineSegmentAction.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 
+import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.DataFromPoint;
 import paintcomponents.DataLineSegment;
 import paintcomponents.DataToPoint;
@@ -43,7 +44,7 @@ public void performAction() {
 	@Override
 	public String locationString() {
 		// TODO Auto-generated method stub
-		return "Data/Construct/Line Segment";
+		return ActionsMenuBarTitles.Data().Construct().Line_Segment().toString();
 	}
 
 }

src/actions/ConstructLineSegmentAction.java

@@ -3,6 +3,7 @@
 import java.awt.Component;
 import java.util.ArrayList;
 
+import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.LineSegment;
 import paintcomponents.PaintComponent;
 import paintcomponents.SimplePoint;
@@ -82,7 +83,7 @@ protected void  addLineSegment(LineSegment lineSegment) {
 
 	@Override
 	public String locationString() {
-		return "Construct/Line Segment";
+		return ActionsMenuBarTitles.Developer("Construct/Line Segment").toString();
 	}
 
 }

src/actions/InputDataForDataInputBoxAction.java

@@ -4,6 +4,7 @@
 
 import javax.swing.JOptionPane;
 
+import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.DataInputTextfieldPaintComponent;
 import paintcomponents.PaintComponent;
 import ui.PaintPanel;
@@ -34,7 +35,7 @@ public void performAction() {
 
 	@Override
 	public String locationString() {
-		return "Input/Input into Data Panel";
+		return ActionsMenuBarTitles.Data().Input_Box().Update().toString();
 	}
 
 }

src/actions/UpdateDataDisplayBoxAction.java

@@ -4,6 +4,7 @@
 
 import javax.swing.JOptionPane;
 
+import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.DataDisplayPaintComponent;
 import paintcomponents.DataFromPointNoDataProviderException;
 import paintcomponents.DataFromPointProviderCannotProvideDataException;
@@ -43,7 +44,7 @@ public void performAction() {
 
 	@Override
 	public String locationString() {
-		return "Data/Display Box/Update";
+		return ActionsMenuBarTitles.Data().Display_Box().Update().toString();
 	}
 
 }

src/actions/menu/ActionsMenuBarTitles.java

@@ -0,0 +1,65 @@
+package actions.menu;
+
+public class ActionsMenuBarTitles {
+	
+	public String pending;
+	
+	public ActionsMenuBarTitles(String string) {
+		pending = string;
+	}
+
+	@Override
+	public String toString() {
+		return pending;
+	}
+	
+	public static ActionsMenuBarTitles Data(){
+		return new ActionsMenuBarTitles("Data");
+	}
+	
+	/**
+	 * Returns the string construct for Developer Only Feature
+	 * @param remainingTitle the remaining menu titles, this should not begin with /
+	 * @return
+	 */
+	public static ActionsMenuBarTitles Developer(String remainingTitle){
+		return new ActionsMenuBarTitles("Developer" + "/" + remainingTitle);
+	}
+
+	private void append(String str){
+		this.pending += "/" + str;
+	}
+	
+	
+	public ActionsMenuBarTitles Input_Box(){
+		append("Input Box");
+		return this;
+	}
+	
+	public ActionsMenuBarTitles Display_Box(){
+		append("Display Box");
+		return this;
+	}
+	
+	public ActionsMenuBarTitles Add(){
+		append("Add");
+		return this;
+	}
+	
+	public ActionsMenuBarTitles Update(){
+		append("Update");
+		return this;
+	}
+	
+	public ActionsMenuBarTitles Construct(){
+		append("Construct");
+		return this;
+	}
+	
+	public ActionsMenuBarTitles Line_Segment(){
+		append("Line Segment");
+		return this;
+	}
+	
+
+}