diff --git a/src/main/java/ui/TGConnectingPoint.java b/src/main/java/ui/TGConnectingPoint.java
index 96631aa785ce095b9c5a79527600f141130f1b68..8359f38bcf346bf2305816cf5c1e5c0ea5617e5b 100644
--- a/src/main/java/ui/TGConnectingPoint.java
+++ b/src/main/java/ui/TGConnectingPoint.java
@@ -98,7 +98,7 @@ public class TGConnectingPoint extends AbstractCDElement /*implements CDElement*
y = _y;
in = _in;
out = _out;
-
+ /*
if (in) {
if (out) {
myColor = INOUT;
@@ -111,7 +111,17 @@ public class TGConnectingPoint extends AbstractCDElement /*implements CDElement*
} else {
myColor = NO;
}
- }
+ }*/
+
+ // Factorization of above commented text for more readability
+ if (in && out)
+ myColor = INOUT;
+ else if (in)
+ myColor = IN;
+ else if (out)
+ myColor = OUT;
+ else
+ myColor = NO;
id = TGComponent.getGeneralId();
TGComponent.setGeneralId(id + 1);
@@ -183,7 +193,7 @@ public class TGConnectingPoint extends AbstractCDElement /*implements CDElement*
int my = getY();
return GraphicLib.isInRectangle(_x, _y, mx - width /2, my - height /2, width, height);
}
-
+
public void setCdX(int _x) {
x = _x;
}
@@ -191,19 +201,20 @@ public class TGConnectingPoint extends AbstractCDElement /*implements CDElement*
public void setCdY(int _y) {
y = _y;
}
-
+
+ @Override
public void setCd(int x, int y) {
this.x = x;
this.y = y;
}
-
+ @Override
public int getX() {
if (container != null) {
return scaledX() + container.getX();
}
return scaledX();
}
-
+ @Override
public int getY() {
if (container != null) {
return scaledY() + container.getY();
@@ -214,11 +225,12 @@ public class TGConnectingPoint extends AbstractCDElement /*implements CDElement*
public int getId() {
return id;
}
-
+ @Override
public int getWidth() {
return width;
}
-
+
+ @Override
public int getHeight() {
return height;
}
@@ -277,7 +289,8 @@ public class TGConnectingPoint extends AbstractCDElement /*implements CDElement*
cpg.setFree(b);
}
}
-
+
+ @Override
public String getName() {
return container.getName();
}
diff --git a/src/main/java/ui/TGConnectorWithCommentConnectionPoints.java b/src/main/java/ui/TGConnectorWithCommentConnectionPoints.java
index 0f3b3cd017dccf5760a13f8ac0ecf0d58112ced4..071a07de82d43b35d6f3b12e088c013e1cfc1c97 100644
--- a/src/main/java/ui/TGConnectorWithCommentConnectionPoints.java
+++ b/src/main/java/ui/TGConnectorWithCommentConnectionPoints.java
@@ -51,7 +51,7 @@ import java.util.Vector;
/**
* Class TGConnectorWithCommentConnectingPoints
- * Generic
+ * Generic (abstract class)
* Creation: 25/05/2011
* @version 1.0 25/05/2011
* @author Ludovic APVRILLE
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
index 98039f56c36ce83397b44578e30f6227775d33c0..dd17c09d0b6e8ad80b253987883532fda4a1d7b2 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
@@ -55,7 +55,12 @@ public class AvatarMethodologyConnectingPoint extends TGConnectingPointWidthHei
super(_container, _x, _y, _in, _out, _w, _h);
orientation = _orientation;
}
-
+ /**
+ * From ui.TGConnectingPoint.isCompatibleWith
+ * isCompatibleWith checks if the element to be connected are compatible ?
+ * @param type
+ * @return boolean indicating if the type is compatible
+ * */
@Override
public boolean isCompatibleWith(int type) {
return type == TGComponentManager.AVATARMETHODOLOGY_CONNECTOR;
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java
index 6a2093629b5baa45eb04c65f20d19afff5e703bc..60371e55c429a8ba3d76f047e0dc065124c13992 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java
@@ -69,14 +69,28 @@ public class AvatarMethodologyConnector extends TGConnectorWithCommentConnectio
removable = false;
}
-
+ /**
+ * drawLastSegment: calling arrowWithLine
+ * Is Linking 2 diagram references ? (x1,y1) and (x2, y2)
+ * @param g grahics
+ * @param x1 int
+ * @param y1 int
+ * @param x2 int
+ * @param y2 int
+ * */
+ @Override
protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
//g.drawLine(x1, y1, x2, y2);
GraphicLib.arrowWithLine(g, 1, 1, 0, x1, y1, x2, y2, false);
}
-
+ /**
+ * extraIsOnOnlyMe
+ * @param x1 int
+ * @param y1 int
+ **/
+ @Override
public TGComponent extraIsOnOnlyMe(int x1, int y1) {
if (GraphicLib.isInRectangle(x1, y1, (p1.getX() + p2.getX() - w) / 2, (p1.getY() + p2.getY())/2 - h, w, h)) {
return this;
@@ -84,6 +98,11 @@ public class AvatarMethodologyConnector extends TGConnectorWithCommentConnectio
return null;
}
+ /**
+ * get the type of the current avatar methodology connector ?
+ * @return int denoting of the type avatar methodology connector
+ */
+ @Override
public int getType() {
return TGComponentManager.AVATARMETHODOLOGY_CONNECTOR;
}
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
index 48540c9d3a2e2ef003213cb1749b684cc05293bb..fe985e12f3553055700afff0ed4a00651c493b23 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
@@ -136,8 +136,8 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
actionOnAdd();
}
- /*From abstract class ui.TGComponent: declaration of abstract method*/
- /*
+ /**
+ * From abstract class ui.TGComponent: declaration of abstract method
* InternalDrawing
* @param g
* */
@@ -191,7 +191,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
}
}
- /*
+ /**
* editOndoubleClick: permits edition of the element on double click
* by simply calling adddiagramReference
* @param frame
@@ -258,7 +258,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
return editAttributes();*/
}
- /*
+ /**
* Rescale: rescale the element with the help of a scaleFactor
* From abstract class TGScalableComponent
* @param scaleFactor
@@ -275,7 +275,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
super.rescale(scaleFactor);
}
- /*
+ /**
* isOnOnlyMe, Coming from Abstract Method From TGCWithInternalComponent (Abstract Class)
* @param x1
* @param y1
@@ -288,7 +288,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
return null;
}
- /*
+ /**
* addActionToPopupMenu
* @param componentMenu
* @param menuAL
@@ -305,7 +305,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
componentMenu.add(diagramReference);
}
- /*
+ /**
* eventOnPopup
* @param e
* @return boolean true
@@ -322,7 +322,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
return true;
}
- /*
+ /**
* addDiagramReference: permits to pop a new window???
* @param frame
* */
@@ -401,7 +401,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
public abstract void makeValidationInfos(AvatarMethodologyDiagramName dn);
- /*
+ /**
* hasAvatarMethodologyDiagramName
* @param s
* @return boolean denoting if the string s is in the tgcomponent list
@@ -413,7 +413,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
return false;
}
- /*
+ /**
* fillIgnoredSelectedFromInternalComponents
* @param ignored
* @param selected
@@ -465,7 +465,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
public abstract boolean isAValidPanelType(TURTLEPanel panel);
- /*
+ /**
* Permits to know if tgc is an instance of AvatarMethodologyDiagramName
* @param tgc
* @return boolean
@@ -474,7 +474,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
return tgc instanceof AvatarMethodologyDiagramName;
}
- /*
+ /**
* addSwallowedTGComponent
* @param tgc
* @param x
@@ -488,7 +488,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
return true;
}
- /*
+ /**
* removeSwallowedTGComponent
* @param tgc
* */
@@ -498,7 +498,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
public abstract boolean makeCall(String diagramName, int index);
- /*
+ /**
* openDiagram
* @param tabName
* @return boolean
@@ -511,7 +511,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
return true;
}
- /*
+ /**
* giveInformation
* @param info
*