diff --git a/src/main/java/ui/TMLDesignPanel.java b/src/main/java/ui/TMLDesignPanel.java
index 045b19bc1dd388f375f6f7a6482586536c749145..698388467dcb7bbd72112b5d3d1f837f2211fcc2 100644
--- a/src/main/java/ui/TMLDesignPanel.java
+++ b/src/main/java/ui/TMLDesignPanel.java
@@ -37,9 +37,6 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
-
-
-
 package ui;
 
 import myutil.GraphicLib;
@@ -56,6 +53,7 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Iterator;
 import java.util.Vector;
 
@@ -148,37 +146,39 @@ public class TMLDesignPanel extends TURTLEPanel {
         mgui.changeMade(tmltdp, TDiagramPanel.NEW_COMPONENT);
 
         //jsp.setVisible(true);
-
     }
 
+    @Override
     public String saveHeaderInXml(String extensionToName) {
-	if (extensionToName == null) {
-	    return "<Modeling type=\"TML Design\" nameTab=\"" + mgui.getTabName(this) + "\" >\n";
-	}
-	return "<Modeling type=\"TML Design\" nameTab=\"" + mgui.getTabName(this) + extensionToName + "\" >\n";
+		if (extensionToName == null) {
+		    return "<Modeling type=\"TML Design\" nameTab=\"" + mgui.getTabName(this) + "\" >\n";
+		}
+		return "<Modeling type=\"TML Design\" nameTab=\"" + mgui.getTabName(this) + extensionToName + "\" >\n";
     }
 
+    @Override
     public String saveTailInXml() {
         return "</Modeling>\n\n\n";
     }
 
+    @Override
     public String toString() {
         return mgui.getTitleAt(this) + " (TML Functional View)";
     }
 
-    public ArrayList<String> getAllTMLTaskNames(String _name) {
+    public List<String> getAllTMLTaskNames(String _name) {
         return tmltdp.getAllTMLTaskNames(_name);
     }
 
-    public ArrayList<String> getAllTMLCommunicationNames(String _name) {
+    public List<String> getAllTMLCommunicationNames(String _name) {
         return tmltdp.getAllTMLCommunicationNames(_name);
     }
 
-    public ArrayList<String> getAllTMLEventNames( String _name ) {
+    public List<String> getAllTMLEventNames( String _name ) {
         return tmltdp.getAllTMLEventNames( _name );
     }
 
-    public java.util.List<String> getAllNonMappedTMLTaskNames(String _name, TMLArchiDiagramPanel _tadp, boolean ref, String name) {
+    public List<String> getAllNonMappedTMLTaskNames(String _name, TMLArchiDiagramPanel _tadp, boolean ref, String name) {
         return tmltdp.getAllNonMappedTMLTaskNames(_name, _tadp, ref, name);
     }
 
diff --git a/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java b/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java
index 7bddc3d32128ffb4c4b5982acd5b53ac45f28013..e5aebcebb528c0be0ee24df4ffe748321aa3c410 100755
--- a/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java
+++ b/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java
@@ -84,26 +84,27 @@ public  class TGConnectorTMLAssociationNav extends TGConnector {
         myImageIcon = IconManager.imgic106;
     }
     
+    @Override
     public void internalDrawing(Graphics g) {
         TMLTaskDiagramPanel tmltdp = (TMLTaskDiagramPanel)tdp;
         if (!tmltdp.areAllVisible()) {
             if (!tmltdp.connectedToVisible(this))
                 return;
         }
-        super.internalDrawing(g);
+//        super.internalDrawing(g);
         super.internalDrawing(g);
     }
     
+    @Override
     protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
         GraphicLib.arrowWithLine(g, 1, 1, arrowLength, x1, y1, x2, y2, false);
     }
     
+    @Override
     public int getType() {
         return TGComponentManager.CONNECTOR_TML_ASSOCIATION_NAV;
     }
     
- 
-    
     public void setP1(TGConnectingPoint p) {
         p1 = p;
         if (nbConnectingPoint > 0) {
@@ -118,10 +119,7 @@ public  class TGConnectorTMLAssociationNav extends TGConnector {
         }
     }
    
-    
     public void pointHasBeenRemoved(TGCPointOfConnector tgc) {
-        
-        
         int i, index = 0;
         TGConnectingPointTwoFathers cp1, cp2;
         
@@ -202,6 +200,7 @@ public  class TGConnectorTMLAssociationNav extends TGConnector {
         return null;
     }
     
+    @Override
     public void addActionToPopupMenu(JPopupMenu componentMenu, ActionListener menuAL, int x, int y) {
         componentMenu.addSeparator();
         JMenuItem reverse = new JMenuItem("Reverse");
@@ -209,14 +208,14 @@ public  class TGConnectorTMLAssociationNav extends TGConnector {
         componentMenu.add(reverse);
     }
     
+    @Override
     public boolean eventOnPopup(ActionEvent e) {
         reverse();
         return true;
     }
     
+    @Override
     public int getDefaultConnector() {
-      return TGComponentManager.CONNECTOR_TML_COMPOSITION_OPERATOR;
+    	return TGComponentManager.CONNECTOR_TML_COMPOSITION_OPERATOR;
     }
-    
-
 }