diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
index 3e4cc093480f8a274bab9bb106760474a4f66dad..6111097a86322be009e9c3a12d891d2f721f6ae0 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
@@ -110,7 +110,7 @@ public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComp
 
         myImageIcon = IconManager.imgic302;
     }
-    
+    @Override
     public void internalDrawing(Graphics g) {
     	if ((y + Y_MARGIN) > (getFather().getY() + getFather().getHeight()))
     		return;
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
index 458f7828ae7c5ff26f0b2657bd11167404d073c4..dffc06435be1d35efc423bf232edb4a065d0e531 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
@@ -63,7 +63,7 @@ public class AvatarMethodologyDiagramToolbar extends TToolBar {
         super(_mgui);
         
     }
-    
+    @Override
     protected void setActive(boolean b) {
 		mgui.actions[TGUIAction.ACT_ZOOM_MORE].setEnabled(b);
 		mgui.actions[TGUIAction.ACT_ZOOM_LESS].setEnabled(b);
@@ -89,7 +89,7 @@ public class AvatarMethodologyDiagramToolbar extends TToolBar {
         mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(!b);
         
     }
-    
+    @Override
     protected void setButtons() {
         JButton button;
         
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
index 1f4a2511d3bf112c9613eb625665ca8da354bd73..be55883f7e3714e010314e042b3dfb4b56818fd6 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
@@ -70,11 +70,11 @@ public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagr
         addTGConnectingPointsCommentTop();    
         
     }
-	
+	@Override
     public  int getType() {
         return TGComponentManager.AVATARMETHODOLOGY_REF_ANALYSIS;
     }
-    
+	@Override
     public boolean isAValidPanelType(TURTLEPanel panel) {
     	if (panel instanceof AvatarAnalysisPanel) {
     		return true;
@@ -82,11 +82,11 @@ public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagr
         return panel instanceof AttackTreePanel;
 
     }
-    
+	@Override
     public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
     	dn.setValidationsNumber(0);
     }
-    
+    @Override
     public boolean makeCall(String diagramName, int index) {
     	return true;
     }
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
index 726333ad14067d1c36707226d2c812f62e4434f0..9e4042771c3034db91132ab465bd835bcd24f618 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
@@ -69,20 +69,20 @@ public class AvatarMethodologyReferenceToAssumptions extends AvatarMethodologyDi
         addTGConnectingPointsCommentTop();    
         
     }
-	
+    @Override
     public  int getType() {
         return TGComponentManager.AVATARMETHODOLOGY_REF_ASSUMPTIONS;
     }
-    
+    @Override
     public boolean isAValidPanelType(TURTLEPanel panel) {
         return panel instanceof AvatarMADsPanel;
 
     }
-    
+    @Override
     public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
     	dn.setValidationsNumber(0);
     }
-    
+    @Override
     public boolean makeCall(String diagramName, int index) {
     	return true;
     }
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
index de63bfa669ce1b6aac54bda27d4dcad3f6afd1e8..547115e705d6e82e9fd6a64760640dc33d4edbe8 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
@@ -69,22 +69,22 @@ public class AvatarMethodologyReferenceToPrototype extends AvatarMethodologyDiag
         addTGConnectingPointsCommentTop();
 
     }
-
+    @Override
     public  int getType() {
         return TGComponentManager.AVATARMETHODOLOGY_REF_PROTOTYPE;
     }
-
+    @Override
     public boolean isAValidPanelType(TURTLEPanel panel) {
         return panel instanceof AvatarDesignPanel;
 
     }
-
+    @Override
     public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
         dn.setValidationsNumber(1);
 
         dn.setValidationsInfo(0, AvatarMethodologyDiagramName.PROTO);
     }
-
+    @Override
     public boolean makeCall(String diagramName, int index) {
         switch(index) {
         case 0:
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
index 0256cc187fa62ee253484f54512574203deb8917..15d6d70adbc12c00ffad14f827a2e6f5d7be7d61 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
@@ -71,20 +71,20 @@ public class AvatarMethodologyReferenceToRequirement extends AvatarMethodologyDi
         addTGConnectingPointsCommentTop();    
         
     }
-	
+    @Override
     public  int getType() {
         return TGComponentManager.AVATARMETHODOLOGY_REF_REQUIREMENT;
     }
-    
+    @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;
     }
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
index 5bd2dbeed1ed4456dc05f628ac409674aa10ccb7..dc53d11fc56161eefdc9beed100d8be8f6bf9014 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
@@ -117,14 +117,11 @@ public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternal
 
         name = "value ";
 
-
-
         initScaling(10, 10);
-
-
+        
         myImageIcon = IconManager.imgic302;
     }
-
+    @Override
     public void internalDrawing(Graphics g) {
         boolean onMe = false;
 
@@ -132,13 +129,13 @@ public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternal
             onMe = true;
         }
 
-	if (getFather() == null) {
-	    return;
-	}
-	
-	if ((y+Y_MARGIN) > (getFather().getY()+getFather().getHeight())) {
-	    return;
-	}
+		if (getFather() == null) {
+		    return;
+		}
+		
+		if ((y+Y_MARGIN) > (getFather().getY()+getFather().getHeight())) {
+		    return;
+		}
 	
 
         //TraceManager.addDev("Internal drawing ...");
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
index a0a07e012901a1a92aa67d41331e59f96ae043b5..7601ebb04690b6846bb55a2aa5d1ad190d6cc905 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
@@ -72,16 +72,16 @@ public class DiplodocusMethodologyDiagramReferenceToApplication extends Diplodoc
 
     }
 
-
+    @Override
     public  int getType() {
         return TGComponentManager.DIPLODODUSMETHODOLOGY_REF_APPLICATION;
     }
-
+    @Override
     public boolean isAValidPanelType(TURTLEPanel panel) {
         return (panel instanceof TMLDesignPanel) || (panel instanceof TMLComponentDesignPanel);
 
     }
-
+    @Override
     public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
         dn.setValidationsNumber(5);
         dn.setValidationsInfo(0, DiplodocusMethodologyDiagramName.SIM_ANIM_APP_DIPLO);
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
index 903b036d93867c08a3b02ad32945b61dd2c95c0e..bdbcc9dfbe76b0ef649b39ba54d08efce5c20ac0 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
@@ -74,16 +74,16 @@ public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMe
 
     }
 
-
+    @Override
     public  int getType() {
         return TGComponentManager.DIPLODODUSMETHODOLOGY_REF_MAPPING;
     }
-
+    @Override
     public boolean isAValidPanelType(TURTLEPanel panel) {
         return panel instanceof TMLArchiPanel;
 
     }
-
+    @Override
     public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
         dn.setValidationsNumber(4);
         dn.setValidationsInfo(0, DiplodocusMethodologyDiagramName.SIM_ANIM_MAPPING_DIPLO);
@@ -91,7 +91,7 @@ public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMe
         dn.setValidationsInfo(2, DiplodocusMethodologyDiagramName.FV_MAPPING_DIPLO);
         dn.setValidationsInfo(3, DiplodocusMethodologyDiagramName.TML_MAPPING_DIPLO);
     }
-
+    @Override
     public boolean makeCall(String diagramName, int index) {
         String tmp;
 
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
index dc56aab28942d789c354f79ef9033f8d3b830416..ec02141fd7ad70dccbfcc46e851f87a7728e32c4 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
@@ -69,20 +69,20 @@ public class DiplodocusMethodologyDiagramReferenceToRequirement extends Diplodoc
         addTGConnectingPointsCommentTop();    
         
     }
-	
+    @Override
     public  int getType() {
         return TGComponentManager.DIPLODODUSMETHODOLOGY_REF_REQUIREMENT;
     }
-    
+    @Override
     public boolean isAValidPanelType(TURTLEPanel panel) {
         return panel instanceof AvatarRequirementPanel;
 
     }
-    
+    @Override
     public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
     	dn.setValidationsNumber(0);
     }
-    
+    @Override
     public boolean makeCall(String diagramName, int index) {
     	return true;
     }
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
index df678ddc5b961fab1212f428acf2525aa0e685d9..7c58c5e10a59c85db4dc69694d922b4951105ec6 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
@@ -62,7 +62,7 @@ public class DiplodocusMethodologyDiagramToolbar extends TToolBar {
         super(_mgui);
 
     }
-
+    @Override
     protected void setActive(boolean b) {
         mgui.actions[TGUIAction.ACT_ZOOM_MORE].setEnabled(b);
         mgui.actions[TGUIAction.ACT_ZOOM_LESS].setEnabled(b);
@@ -88,7 +88,7 @@ public class DiplodocusMethodologyDiagramToolbar extends TToolBar {
         mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(!b);
 
     }
-
+    @Override
     protected void setButtons() {
         JButton button;