Merge pull request #146 from UCSDOalads/funcGroup

Fixed bug: Class Box is no longer updatable

Author: chenggong03

src/actions/InputDataForDataInputBoxAction.java

@@ -21,8 +21,12 @@ public InputDataForDataInputBoxAction(PaintPanel panel) {
 	public boolean canPerformAction() {
 		ArrayList<PaintComponent> comps = panel.getSelectTool().getSelectedComponents();
 		if(comps.size()!= 1) return false;
-		if (comps.get(0) instanceof DataInputTextfieldPaintComponent) {
-			return true;
+		Object comp = comps.get(0);
+		if (comp instanceof DataInputTextfieldPaintComponent) {
+			//Make sure this is not a class box
+			if( ((DataInputTextfieldPaintComponent) comp).canUpdate()){
+				return true;
+			}
 		}
 		return false;
 	}

src/actions/global/globalactions/AddLazyJavaClassGlobalAction.java

@@ -23,6 +23,8 @@ public void setClassToCreate(Class classToCreate) {
 	@Override
 	protected void execute(PaintPanel panel) {
 		ClassPaintComponent comp = new ClassPaintComponent(classToCreate, x, y);
+		//The class input box shouldn't be updatable.
+		comp.setCannotUpdate();
 		panel.addPaintComponent(comp);
 
 		if (panel.getSelectTool() != null) {

src/paintcomponents/data/DataInputTextfieldPaintComponent.java

@@ -16,6 +16,9 @@ public class DataInputTextfieldPaintComponent extends DataTextIOPaintComponent
 		implements DataFromPointDataProvider{
 
 
+	//Protect the class box from being updated
+	boolean canUpdate = true;
+	
 	public DataInputTextfieldPaintComponent(String displayingText, int x,
 			int y) {
 		super(displayingText, x, y);
@@ -52,8 +55,19 @@ public DataInputTextfieldPaintComponent(Element rootElement, PaintPanel panel) {
 		linkPoints(rootElement);
 	}
 
+	/*
+	 * Set this input box to be "in-updatable"
+	 * Now this should only be used by the class input box
+	 */
+	public void setCannotUpdate(){
+		this.canUpdate = false;
+	}
 
-	
+	/*
+	 * Getter for whether it's updatable.
+	 */
+	public boolean canUpdate(){
+		return this.canUpdate;
+	}
 
-	
 }