add and remove annotations

Author: CVIllustrious

src/actions/AddAnnotationAction.java

@@ -6,7 +6,6 @@
 
 import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.PaintComponent;
-import paintcomponents.TextPaintComponent;
 import paintcomponents.annotations.TextAnnotation;
 import paintcomponents.data.DataTextPaintComponent;
 import ui.PaintPanel;
@@ -36,9 +35,8 @@ public void performAction() {
 		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
 		String annotations = JOptionPane
 				.showInputDialog("Please specify the annotation of the component");
-		TextAnnotation textAnnotation = new TextAnnotation(items.get(0), annotations);
-		items.get(0).setOptionalAnnotation(textAnnotation);
-		panel.addPaintComponent(textAnnotation);
+		new TextAnnotation(items.get(0), annotations);
+		
 		panel.repaint();
 	}
 

src/actions/RemoveAnnotationAction.java

@@ -0,0 +1,40 @@
+package actions;
+
+import java.util.ArrayList;
+
+import actions.menu.ActionsMenuBarTitles;
+import paintcomponents.PaintComponent;
+import ui.PaintPanel;
+
+public class RemoveAnnotationAction extends PaintAction{
+
+	public RemoveAnnotationAction(PaintPanel panel) {
+		super(panel);
+	}
+
+	@Override
+	public boolean canPerformAction() {
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		
+		if(items.size() != 1){
+			return false;
+		}
+		if(items.get(0).getOptionalAnnotation() == null){
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public void performAction() {
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		items.get(0).setOptionalAnnotation(null);
+		panel.repaint();
+	}
+
+	@Override
+	public String locationString() {
+		return ActionsMenuBarTitles.Data().Annotations().Remove().toString();
+	}
+
+}

src/actions/menu/ActionsMenuBar.java

@@ -28,6 +28,7 @@
 import actions.GeneratePolygonSourceJava;
 import actions.InputDataForDataInputBoxAction;
 import actions.PaintAction;
+import actions.RemoveAnnotationAction;
 import actions.RemovePaintComponent;
 import actions.UpdateDataDisplayBoxAction;
 import actions.singleinstanceoperations.SetPointSizeOperation;
@@ -82,6 +83,7 @@ public ActionsMenuBar(PaintPanel panel){
 
 		// add data annotation
 		addAction(new AddAnnotationAction(panel));
+		addAction(new RemoveAnnotationAction(panel));
 	}
 
 	private void addAction(PaintAction action) {

src/paintcomponents/PaintComponent.java

@@ -97,6 +97,10 @@ public void paint(Graphics g) {
 			paintNotSelected(g);
 		}
 
+		//paint annotation
+		if(optionalAnnotation != null){
+			optionalAnnotation.paint(g);
+		}
 	}
 
 	/**

src/paintcomponents/annotations/TextAnnotation.java

@@ -14,20 +14,21 @@ public TextAnnotation(PaintComponent attachedComponent, String displayingText) {
 		super(attachedComponent);
 		this.textPaintComponent = new TextPaintComponent(displayingText, attachedComponent.getX(),
 				attachedComponent.getY());
+		
 	}
 
 	@Override
 	protected void paintNotSelected(Graphics g) {
 		// TODO Auto-generated method stub
-		textPaintComponent.updateBoundsAndDrawString(g);
+		textPaintComponent.updateBounds(g);
 		textPaintComponent.setY(getAttachedComponent().getY() - textPaintComponent.getRowHeight());
 		textPaintComponent.paint(g);
 	}
 
 	@Override
 	protected void paintSelected(Graphics g) {
 		// TODO Auto-generated method stub
-		textPaintComponent.updateBoundsAndDrawString(g);
+		textPaintComponent.updateBounds(g);
 		textPaintComponent.setY(getAttachedComponent().getY() - textPaintComponent.getRowHeight());
 		textPaintComponent.paint(g);
 	}