Merge pull request #41 from UCSDOalads/MYCBranch

add set annotation font size function

Author: UltimatePea

src/actions/AddAnnotationAction.java

@@ -5,44 +5,48 @@
 import javax.swing.JOptionPane;
 
 import actions.menu.ActionsMenuBarTitles;
+import actions.singleinstanceoperations.SingleInstanceOperation;
 import paintcomponents.PaintComponent;
 import paintcomponents.annotations.TextAnnotation;
 import paintcomponents.data.DataTextPaintComponent;
 import ui.PaintPanel;
 
-public class AddAnnotationAction extends PaintAction{
-
+/**
+ * add the annotation to a component
+ * 
+ * @author muchi
+ *
+ */
+public class AddAnnotationAction extends SingleInstanceOperation<PaintComponent>{
+
+	/**
+	 * ctor
+	 * @param panel the panel
+	 */
 	public AddAnnotationAction(PaintPanel panel) {
 		super(panel);
 	}
 
+	/**
+	 * @return the location of the button
+	 */
 	@Override
-	public boolean canPerformAction() {
-		//get selected components
-		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
-		
-		if(items.size() != 1){
-			return false;
-		}
-		if(!(items.get(0) instanceof DataTextPaintComponent)){
-			return false;
-		}
-		return true;
+	public String locationString() {
+		return ActionsMenuBarTitles.Data().Annotations().Add().toString();
 	}
 
 	@Override
-	public void performAction() {
-		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+	protected void performActionOnInstance(PaintComponent instance) {
+		// TODO Auto-generated method stub
 		String annotations = JOptionPane
 				.showInputDialog("Please specify the annotation of the component");
-		new TextAnnotation(items.get(0), annotations);
+		new TextAnnotation(instance, annotations);
 
-		panel.repaint();
 	}
 
 	@Override
-	public String locationString() {
-		return ActionsMenuBarTitles.Data().Annotations().Add().toString();
+	protected Class<PaintComponent> getGenericClassType() {
+		return PaintComponent.class;
 	}
 
 

src/actions/EditAnnotationSizeAction.java

@@ -0,0 +1,75 @@
+package actions;
+
+import java.util.ArrayList;
+
+import paintcomponents.PaintComponent;
+import paintcomponents.TextPaintComponent;
+import ui.PaintPanel;
+import ui.general.InputManager;
+import ui.general.InputManagerDelegate;
+import actions.menu.ActionsMenuBarTitles;
+import actions.singleinstanceoperations.SingleInstanceOperation;
+import paintcomponents.annotations.*;
+
+/**
+ * edit the size of the component
+ * 
+ * @author muchi
+ *
+ */
+public class EditAnnotationSizeAction extends SingleInstanceOperation<PaintComponent>{
+
+	/**
+	 * ctor
+	 * @param panel the panel of the component
+	 */
+	public EditAnnotationSizeAction(PaintPanel panel) {
+		super(panel);
+	}
+
+	/**
+	 * the action can only be performed when there is only one component selected and the component has a annotation
+	 * 
+	 * @return true if action can be performed, otherwise false
+	 */
+	@Override
+	public boolean canPerformAction(){
+		if(super.canPerformAction() == false){ return false;}
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		
+		// check if the annotation of the component is not null
+		if(items.get(0).getOptionalAnnotation() == null){
+			return false;
+		}
+		
+		return true;
+	}
+	
+	@Override
+	protected void performActionOnInstance(PaintComponent instance) {
+		InputManager.sharedInstance().askForFloat(panel, new InputManagerDelegate<Float>() {
+			
+			@Override
+			public void didFinishInput(Float input) {
+				instance.getOptionalAnnotation().setFontSize(input);
+				panel.repaint();
+			}
+		});
+		
+	}
+
+	@Override
+	protected Class<PaintComponent> getGenericClassType() {
+		// TODO Auto-generated method stub
+		return PaintComponent.class;
+	}
+
+	/**
+	 * @return the location of the button
+	 */
+	@Override
+	public String locationString() {
+		return ActionsMenuBarTitles.Edit().Annotation_Font_Size().toString();
+	}
+
+}

src/actions/RemoveAnnotationAction.java

@@ -3,38 +3,63 @@
 import java.util.ArrayList;
 
 import actions.menu.ActionsMenuBarTitles;
+import actions.singleinstanceoperations.SingleInstanceOperation;
 import paintcomponents.PaintComponent;
 import ui.PaintPanel;
 
-public class RemoveAnnotationAction extends PaintAction{
+/**
+ * remove the annotation of the component
+ * 
+ * @author muchi
+ *
+ */
+public class RemoveAnnotationAction extends SingleInstanceOperation<PaintComponent>{
 
+	/**
+	 * ctor
+	 * @param panel the panel of the component
+	 */
 	public RemoveAnnotationAction(PaintPanel panel) {
 		super(panel);
 	}
 
+	/**
+	 * the perform only can be performed when only one component is selected and the component has an annotation
+	 * 
+	 * @return true if the action can be performed, otherwise false
+	 */
 	@Override
 	public boolean canPerformAction() {
+		if(super.canPerformAction() == false){ return false;}
 		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
 
-		if(items.size() != 1){
-			return false;
-		}
+		// check if the component has an annotation
 		if(items.get(0).getOptionalAnnotation() == null){
 			return false;
 		}
 		return true;
 	}
 
+	/**
+	 * @return the location of the button
+	 */
 	@Override
-	public void performAction() {
-		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
-		items.get(0).setOptionalAnnotation(null);
-		panel.repaint();
+	public String locationString() {
+		return ActionsMenuBarTitles.Data().Annotations().Remove().toString();
 	}
 
 	@Override
-	public String locationString() {
-		return ActionsMenuBarTitles.Data().Annotations().Remove().toString();
+	protected void performActionOnInstance(PaintComponent instance) {
+		// TODO Auto-generated method stub
+		instance.setOptionalAnnotation(null);
+	}
+
+	@Override
+	protected Class<PaintComponent> getGenericClassType() {
+		// TODO Auto-generated method stub
+		return PaintComponent.class;
 	}
 
+
+
 }

src/actions/menu/ActionsMenuBar.java

@@ -22,6 +22,7 @@
 import actions.AddTextBoxAction;
 import actions.ConstructDataLineSegmentAction;
 import actions.ConstructLineSegmentAction;
+import actions.EditAnnotationSizeAction;
 import actions.EditRedoAction;
 import actions.EditUndoAction;
 import actions.FileOpen;
@@ -88,6 +89,8 @@ public ActionsMenuBar(PaintPanel panel){
 		// add data annotation
 		addAction(new AddAnnotationAction(panel));
 		addAction(new RemoveAnnotationAction(panel));
+		
+		addAction(new EditAnnotationSizeAction(panel));
 	}
 
 	private void addAction(PaintAction action) {

src/actions/menu/ActionsMenuBarTitles.java

@@ -153,4 +153,9 @@ public ActionsMenuBarTitles Add_Instance_Method() {
 		append("Add Instance Method");
 		return this;
 	}
+	
+	public ActionsMenuBarTitles Annotation_Font_Size() {
+		append("Annotation Font Size");
+		return this;
+	}
 }

src/paintcomponents/TextPaintComponent.java

@@ -96,7 +96,6 @@ public TextPaintComponent(Element rootElement, PaintPanel panel) {
 
 	@Override
 	protected void paintNotSelected(Graphics g) {
-		g.setFont(g.getFont().deriveFont(fontSize));
 		g.setColor(defaultTextColor);
 
 		//draw string starts from bottom left corner, shift to top left
@@ -113,6 +112,8 @@ private void updateBoundsAndDrawString(Graphics g) {
 	 * @param g Graphics Object
 	 */
 	public void updateBounds(Graphics g) {
+		g.setFont(g.getFont().deriveFont(fontSize));
+
 		//reset bounds to begin calculation
 		width = 0;
 		//derive row Height
@@ -155,7 +156,6 @@ private void drawString(Graphics g){
 
 	@Override
 	protected void paintSelected(Graphics g) {
-		g.setFont(g.getFont().deriveFont(fontSize));
 		g.setColor(selectedTextColor);
 
 		//draw string starts from bottom left corner, shift to top left

src/paintcomponents/annotations/PaintComponentAnnotation.java

@@ -35,12 +35,10 @@ public void setAttachedComponent(PaintComponent attachedComponent) {
 		this.attachedComponent = attachedComponent;
 	}
 
-	
-	
-
-
-
-
-	
-
+	/**
+	 * set the font size of the annotation
+	 * 
+	 * @param input the new size
+	 */
+	abstract public void setFontSize(float input);
 }

src/paintcomponents/annotations/TextAnnotation.java

@@ -5,21 +5,29 @@
 import paintcomponents.PaintComponent;
 import paintcomponents.TextPaintComponent;
 
+/**
+ * the text annotation of the component
+ * @author muchi
+ *
+ */
 public class TextAnnotation extends PaintComponentAnnotation {
 
 	private TextPaintComponent textPaintComponent;
 
-	
+	/**
+	 * create the annotation of a component with information
+	 * 
+	 * @param attachedComponent the component attached to the annotation
+	 * @param displayingText the information to be displayed
+	 */
 	public TextAnnotation(PaintComponent attachedComponent, String displayingText) {
 		super(attachedComponent);
 		this.textPaintComponent = new TextPaintComponent(displayingText, attachedComponent.getX(),
-				attachedComponent.getY());
-		
+				attachedComponent.getY());		
 	}
 
 	@Override
 	protected void paintNotSelected(Graphics g) {
-		// TODO Auto-generated method stub
 		textPaintComponent.updateBounds(g);
 		textPaintComponent.setY(getAttachedComponent().getY() - textPaintComponent.getRowHeight());
 		textPaintComponent.paint(g);
@@ -33,15 +41,32 @@ protected void paintSelected(Graphics g) {
 		textPaintComponent.paint(g);
 	}
 
+	/**
+	 * @return true if the given position is contained, otherwise false
+	 */
 	@Override
 	public boolean contains(int x2, int y2) {
 		// TODO Auto-generated method stub
 		return textPaintComponent.contains(x2, y2);
 	}
 
+	/**
+	 * move the text
+	 * 
+	 * @param x the movement on x-position
+	 * @param y the movement on y-position
+	 */
 	public void translate(int x, int y){
 		textPaintComponent.translate(x, y);
 	}
-	
-	
+
+	/**
+	 * set the font size of the given annotation
+	 * 
+	 * @param input the size
+	 */
+	@Override
+	public void setFontSize(float input) {
+		textPaintComponent.setFontSize(input);
+	}
 }