[ZOOM] Issue #31: Avatar Methodology factorisation of internalDraw

src/main/java/ui/TGScalableComponent.java

@@ -140,12 +140,12 @@ public abstract class TGScalableComponent extends TGComponent implements Scalabl
      * @param g
      * @param s
      */
-    protected void drawSingleString(Graphics g, String s)
+    protected void drawSingleString(Graphics g, String s, int xpos, int ypos)
     {
     	if (!isTextReadable(g))
     		return;
-    	int currentFontSize = g.getFont().getSize();
-    	drawLimitedString(g, s, x, y + currentFontSize, width, 1);
+    	//int currentFontSize = setCurrentFontSize ? g.getFont().getSize() : 0;
+    	g.drawString(s, xpos, ypos);
     }
     
     /**

src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java

@@ -170,7 +170,9 @@ public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComp
 					//if ((pointerIsOnMe && indexOnMe == i))
 					//	g.setFont(font.deriveFont(Font.BOLD));
 					setFontStyleWhenPointerIsOnMe(g, Font.BOLD, pointerIsOnMe, font, i);
-					g.drawString(SHORT_ACTION_NAMES[validations[i]], currentMaxWidthX - saveWidth, y);
+//					g.drawString(SHORT_ACTION_NAMES[validations[i]], currentMaxWidthX - saveWidth, y);
+					drawSingleString(g, SHORT_ACTION_NAMES[validations[i]], currentMaxWidthX - saveWidth, y);
+					
 					g.setFont(font.deriveFont(Font.ITALIC));
 					valMinX[i] = currentMaxWidthX-saveWidth;
 					valMaxX[i] = currentMaxWidthX;
@@ -212,11 +214,11 @@ public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComp
     	String textDiagramRef = value;
     	//int fontSize = g.getFont().getSize();
     	//boolean tooBig = !canTextGoInTheBox(g, fontSize, textDiagramRef, 0);
-    	if (!isTextReadable(g) /*||  canTextGoInTheBox(g, fontSize, textDiagramRef, 0)*/)
-    		return;
+//    	if (!isTextReadable(g) /*||  canTextGoInTheBox(g, fontSize, textDiagramRef, 0)*/)
+//    		return;
     	Font f = g.getFont();
-    	g.drawString(textDiagramRef, x, y);
-    	
+    	//g.drawString(textDiagramRef, x, y);
+    	drawSingleString(g, textDiagramRef, x, y);
     	//validation and String
     	manageValidations(g, f);
     }

src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java

@@ -61,10 +61,12 @@ public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPW
         addMouseMotionListener(tdmm);*/
     }
     
+    @Override
     public boolean actionOnDoubleClick(TGComponent tgc) {
         return true;
     }
     
+    @Override
     public boolean actionOnAdd(TGComponent tgc) {
         /*if (tgc instanceof TCDTClass) {
             TCDTClass tgcc = (TCDTClass)(tgc);
@@ -74,6 +76,7 @@ public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPW
         return false;
     }
     
+    @Override
     public boolean actionOnRemove(TGComponent tgc) {
         /*if (tgc instanceof TCDTClass) {
             TCDTClass tgcc = (TCDTClass)(tgc);
@@ -84,6 +87,7 @@ public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPW
         return false;
     }
     
+    @Override
     public boolean actionOnValueChanged(TGComponent tgc) {
         /*if (tgc instanceof TCDTClass) {
             return actionOnDoubleClick(tgc);
@@ -91,26 +95,32 @@ public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPW
         return false;
     }
     
+    @Override
     public String getXMLHead() {
         return "<AvatarMethodologyDiagramPanel name=\"" + name + "\"" + sizeParam() + zoomParam() + " >";
     }
     
+    @Override
     public String getXMLTail() {
         return "</AvatarMethodologyDiagramPanel>";
     }
     
+    @Override
     public String getXMLSelectedHead() {
         return "<AvatarMethodologyDiagramPanelCopy name=\"" + name + "\" xSel=\"" + xSel + "\" ySel=\"" + ySel + "\" widthSel=\"" + widthSel + "\" heightSel=\"" + heightSel + "\" >";
     }
     
+    @Override
     public String getXMLSelectedTail() {
         return "</AvatarMethodologyDiagramPanelCopy>";
     }
     
+    @Override
     public String getXMLCloneHead() {
         return "<AvatarMethodologyDiagramPanelCopy name=\"" + name + "\" xSel=\"" + 0 + "\" ySel=\"" + 0 + "\" widthSel=\"" + 0 + "\" heightSel=\"" + 0 + "\" >";
     }
     
+    @Override
     public String getXMLCloneTail() {
         return "</AvatarMethodologyDiagramPanelCopy>";
     }
@@ -120,6 +130,7 @@ public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPW
         
     }
 	
+    @Override
 	public void enhance() {
 		autoAdjust();
     }

src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java

@@ -69,20 +69,24 @@ public class AvatarMethodologyReferenceToProperties extends AvatarMethodologyDia
         addTGConnectingPointsCommentTop();    
         
     }
-	
+    
+    @Override
     public  int getType() {
         return TGComponentManager.AVATARMETHODOLOGY_REF_PROPERTIES;
     }
-    
+
+    @Override
     public boolean isAValidPanelType(TURTLEPanel panel) {
         return panel instanceof AvatarRequirementPanel;
 
     }
-    
+
+    @Override
     public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
     	dn.setValidationsNumber(0);
     }
-    
+
+    @Override
     public boolean makeCall(String diagramName, int index) {
     	return true;
     }