diff --git a/src/GraphMinimize.java b/src/GraphMinimize.java
index 8b3ee5a2fb8deb5f5c7651697efff8d98a7855cf..8c61c4b701c5c8c82fd1f502128dfb6e8767c2af 100755
--- a/src/GraphMinimize.java
+++ b/src/GraphMinimize.java
@@ -46,9 +46,11 @@
    * @see
    */
 
+import myutil.FileUtils;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+
 import java.io.File;
-import myutil.*;
-import ui.graph.*; 
 
 public class GraphMinimize {
 
diff --git a/src/GraphShow.java b/src/GraphShow.java
index d7756cebb0fa0ddd61865b9f4a45547ddb4fd804..00f0ac371a6553eed9d4bd27ef4739c3b949fd2e 100755
--- a/src/GraphShow.java
+++ b/src/GraphShow.java
@@ -46,11 +46,11 @@
    * @see
    */
 
-import java.io.File;
-
 import myutil.FileUtils;
 import myutil.TraceManager;
-import ui.graph.AUTGraph; 
+import ui.graph.AUTGraph;
+
+import java.io.File;
 
 public class GraphShow  {
 
diff --git a/src/Main.java b/src/Main.java
index 6670539987a13b15fd0d426d3f15d9d009f9f4e2..19abff561bed08e5730c6108072a5d76da4dda46 100755
--- a/src/Main.java
+++ b/src/Main.java
@@ -44,17 +44,19 @@
    * @see
    */
 
+import myutil.BoolExpressionEvaluator;
+import myutil.TraceManager;
+import ui.*;
+import ui.window.JStartingWindow;
+
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.Locale;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.net.URL;
-//import java.io.*;
-import javax.swing.ImageIcon;
-import javax.swing.*;
+import java.util.Locale;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.io.*;
 
 public class Main implements ActionListener {
     public boolean finish = false;
diff --git a/src/RTLLauncher.java b/src/RTLLauncher.java
index e880c2a0aaca9751f6b99a3b8677aef0aa966388..5f38c872c045d3887234e1ee9320347cc341045a 100755
--- a/src/RTLLauncher.java
+++ b/src/RTLLauncher.java
@@ -45,10 +45,8 @@
    */
 
 
-
-import launcher.*;
-
-import myutil.*;
+import launcher.RshServer;
+import myutil.TraceManager;
 
 public class RTLLauncher implements Runnable {
 
diff --git a/src/RemoteSimulationControl.java b/src/RemoteSimulationControl.java
index 8a9adc328806739718900af20f8e6bdf5e67d954..61ad988541da884be5ffa417961fdf7a7af55599 100755
--- a/src/RemoteSimulationControl.java
+++ b/src/RemoteSimulationControl.java
@@ -44,14 +44,14 @@ knowledge of the CeCILL license and that you accept its terms.
 * @see
 */
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
 import remotesimulation.CommandParser;
 import remotesimulation.RemoteConnection;
 import remotesimulation.RemoteConnectionException;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
 public class RemoteSimulationControl extends Thread  {
 	
     public static int port = 3490; 
diff --git a/src/TIFTranslator.java b/src/TIFTranslator.java
index 6074f2a2d79c53f7b4cc3929e2167202a4f13b2b..58ab255ad05e6965082b1d68bf05ece2fb74b59b 100755
--- a/src/TIFTranslator.java
+++ b/src/TIFTranslator.java
@@ -44,12 +44,15 @@ knowledge of the CeCILL license and that you accept its terms.
  * @see
  */
 
-import java.io.*;
- 
-import translator.*;
-import translator.touppaal.*;
-import myutil.*;
-import uppaaldesc.*;
+import myutil.FileUtils;
+import translator.TIFExchange;
+import translator.TURTLEModeling;
+import translator.TURTLETranslator;
+import translator.touppaal.TURTLE2UPPAAL;
+import uppaaldesc.UPPAALSpec;
+
+import java.io.File;
+import java.io.FileOutputStream;
 
 public class TIFTranslator  {
 	// 0 -> RT-LOTOS
diff --git a/src/TMLTranslator.java b/src/TMLTranslator.java
index e1a90b6b9815f45fd9440fbd19297c1af8c72f30..47a203dc5ee2416d40ea50573861a7ce4754b6fa 100755
--- a/src/TMLTranslator.java
+++ b/src/TMLTranslator.java
@@ -45,25 +45,20 @@
    * @see
    */
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-
 import myutil.FileUtils;
-import tmltranslator.TMLError;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLMappingTextSpecification;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLSyntaxChecking;
-import tmltranslator.TMLTextSpecification;
-import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
+import tmltranslator.*;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
+import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
 import tmltranslator.toturtle.Mapping2TIF;
 import tmltranslator.toturtle.TML2TURTLE;
 import tmltranslator.touppaal.TML2UPPAAL;
 import translator.TURTLEModeling;
 import translator.TURTLETranslator;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.List;
+
 public class TMLTranslator  {
     // 0 -> LOTOS
     // 1 -> UPPAAL
diff --git a/src/Test.java b/src/Test.java
index b96ec86dd86907e455be4ec6c5179bb3cd526596..2549c54175426bc981a6e010b74f814f2eae0779 100755
--- a/src/Test.java
+++ b/src/Test.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 
-
-import myutil.*;
-import ui.graph.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
 
 
 public class Test  {
diff --git a/src/android/src/copyfromJAVAsource/AvatarSignal.java b/src/android/src/copyfromJAVAsource/AvatarSignal.java
index 242966471dc92f23a3e0dff96ae044b816899a0d..2e82534f61ebb776483fb4962dde64ab23cf8fbc 100644
--- a/src/android/src/copyfromJAVAsource/AvatarSignal.java
+++ b/src/android/src/copyfromJAVAsource/AvatarSignal.java
@@ -49,8 +49,6 @@ package copyfromJAVAsource;
 
 //import translator.*;
 //import translator.tojava.*;
-import java.util.*;
-
 //import myutil.*;
 
 public class AvatarSignal extends AvatarMethod {
diff --git a/src/android/src/copyfromJAVAsource/Conversion.java b/src/android/src/copyfromJAVAsource/Conversion.java
index 381c9654e210b57986a0b17a1bd754fe9126609d..9fdb96104e2337d12081b994db396cf57c014fcd 100644
--- a/src/android/src/copyfromJAVAsource/Conversion.java
+++ b/src/android/src/copyfromJAVAsource/Conversion.java
@@ -45,7 +45,8 @@
 
 package copyfromJAVAsource;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class Conversion {
diff --git a/src/android/src/copyfromJAVAsource/TAttribute.java b/src/android/src/copyfromJAVAsource/TAttribute.java
index 619e8ceea71be3ae1f3778be71dc7d224acd9a80..b7f591bdd9b8e3c6889c168324b96c9255f51d52 100644
--- a/src/android/src/copyfromJAVAsource/TAttribute.java
+++ b/src/android/src/copyfromJAVAsource/TAttribute.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package copyfromJAVAsource;
 
-import java.util.*;
-
-
 import android.util.Log;
 
+import java.util.Vector;
+
 
 //import myutil.*;
 //import translator.*;
diff --git a/src/android/src/copyfromJAVAsource/TraceManager.java b/src/android/src/copyfromJAVAsource/TraceManager.java
index 4b5b4d8c258f06506892af2c214461c0623d5304..d45428e7ed11e24621a70a0ac5faabc4280fb385 100644
--- a/src/android/src/copyfromJAVAsource/TraceManager.java
+++ b/src/android/src/copyfromJAVAsource/TraceManager.java
@@ -45,9 +45,6 @@
 
 package copyfromJAVAsource;
 
-import java.io.*;
-
-
 public class TraceManager {
 	public final static int TO_CONSOLE = 0;
 	public final static int TO_FILE = 1;
diff --git a/src/android/src/project/alwaystry/AlwaystryActivity.java b/src/android/src/project/alwaystry/AlwaystryActivity.java
index 5cc97811379da7ffac3b5a5defa631b2274c3dcb..73aa8c069b0f459e8491e8ff2f1ccc9505b58462 100644
--- a/src/android/src/project/alwaystry/AlwaystryActivity.java
+++ b/src/android/src/project/alwaystry/AlwaystryActivity.java
@@ -1,29 +1,18 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.app.TabActivity;
 import android.content.Intent;
-import android.gesture.Gesture;
-import android.gesture.GestureLibraries;
-import android.gesture.GestureLibrary;
-import android.gesture.GestureOverlayView;
+import android.gesture.*;
 import android.gesture.GestureOverlayView.OnGesturePerformedListener;
-import android.gesture.Prediction;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.GestureDetector;
-import android.view.GestureDetector.OnGestureListener;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnTouchListener;
-import android.widget.RelativeLayout;
-import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TabHost;
 import android.widget.Toast;
 
+import java.util.ArrayList;
+
 public class AlwaystryActivity extends TabActivity implements OnGesturePerformedListener{//implements OnTouchListener{//implements OnLongClickListener,OnTouchListener{
 	
 	int clickaction = 0;
diff --git a/src/android/src/project/alwaystry/AnotherTagActivity.java b/src/android/src/project/alwaystry/AnotherTagActivity.java
index 46049e0c5ec5218c88b44733bef869a459c23384..66b208f1e40146cc44ea2f4d8b8ff7be97461da4 100644
--- a/src/android/src/project/alwaystry/AnotherTagActivity.java
+++ b/src/android/src/project/alwaystry/AnotherTagActivity.java
@@ -1,19 +1,7 @@
 package project.alwaystry;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnLongClickListener;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
 
 public class AnotherTagActivity extends Activity {
     /** Called when the activity is first created. */
diff --git a/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java b/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
index 5f0b43a13f27a32cc00ca4140859fc764f2e7ebe..ccf62c00a83a22e60918b471f066b84b23ba3a05 100644
--- a/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
@@ -1,31 +1,24 @@
 package project.alwaystry;
 
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarMethod;
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
-import myutilandroid.GraphicLibAndroid;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
+import android.graphics.*;
 import android.os.Bundle;
 import android.text.TextPaint;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
+import copyfromJAVAsource.AvatarMethod;
+import copyfromJAVAsource.AvatarSignal;
+import copyfromJAVAsource.TAttribute;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.Vector;
 
 public class AvatarBDBlockAndroid extends TGComponentAndroid{
 
diff --git a/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java b/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
index 65faff57ed9c9ed13f9cbda01240414e75a7dc80..faba6e688413c492be52526b43bd5510838f97ff 100644
--- a/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
@@ -1,14 +1,10 @@
 package project.alwaystry;
 
-import java.util.LinkedList;
-
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Point;
+import android.graphics.*;
 import android.view.View;
 
+import java.util.LinkedList;
+
 public class AvatarBDCompositionConnectorAndroid extends TGConnectorAndroid{
 
 	private Paint paint;
diff --git a/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java b/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
index 4aab33af6337868b8d91599c81f8c7670a011013..5668d54c741676b35050ef649b918f1eec74d272 100644
--- a/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
@@ -1,21 +1,11 @@
 package project.alwaystry;
 
-import java.util.Vector;
-
-import copyfromJAVAsource.TAttribute;
-
-import myutilandroid.GraphicLibAndroid;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
+import android.graphics.*;
 import android.os.Bundle;
 import android.text.TextPaint;
 import android.util.Log;
@@ -24,6 +14,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
+import copyfromJAVAsource.TAttribute;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.Vector;
 
 
 public class AvatarBDDataTypeAndroid extends TGComponentAndroid{
diff --git a/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java b/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
index 3526e5d1f15bc266c522ed35db026627121ec21f..a29a384489ce9696b405d730f4ab4d75fbb7965d 100644
--- a/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
@@ -1,11 +1,5 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Vector;
-
-import myutilandroid.GraphicLibAndroid;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -16,6 +10,12 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import copyfromJAVAsource.AvatarSignal;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarBDPanelAndroid extends View {
 	
diff --git a/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java b/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
index 8493426b9e601f530a4deeda7bda9e37f3b26627..ff04d2282b0db3042413023d8598d6edc9cdd443 100644
--- a/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
@@ -1,22 +1,18 @@
 package project.alwaystry;
 
-import java.util.LinkedList;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarSignal;
-
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Point;
 import android.os.Bundle;
 import android.text.TextPaint;
-import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import copyfromJAVAsource.AvatarSignal;
+
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarBDPortConnectorAndroid extends TGConnectorAndroid{
 
diff --git a/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java b/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
index 8b492dd959357083f60dda31e3e4d87f55a30ea5..5d92f9c46a5e39f9494ccdc323a64cfbafc74b98 100644
--- a/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
@@ -3,9 +3,7 @@ package project.alwaystry;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 public class AvatarbdToolbarAndroid extends LinearLayout {
diff --git a/src/android/src/project/alwaystry/EditAttributesActivity.java b/src/android/src/project/alwaystry/EditAttributesActivity.java
index ba2cb075e32cec5bd4ce74922a1cff73e22aea44..724c1364dff9ad111622e3c70bfa17783650e1b3 100644
--- a/src/android/src/project/alwaystry/EditAttributesActivity.java
+++ b/src/android/src/project/alwaystry/EditAttributesActivity.java
@@ -1,28 +1,19 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarMethod;
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
 import android.app.TabActivity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ListView;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.TabHost;
-import android.widget.Toast;
+import android.widget.*;
+import copyfromJAVAsource.AvatarMethod;
+import copyfromJAVAsource.AvatarSignal;
+import copyfromJAVAsource.TAttribute;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
 
 public class EditAttributesActivity extends TabActivity {
 	
diff --git a/src/android/src/project/alwaystry/PanelWithTitledBorder.java b/src/android/src/project/alwaystry/PanelWithTitledBorder.java
index 69f69f135c9aa860de5a15fcd10b55ba87324f48..4897f7b6ccf18b747202cb21d0b36694d2a48b32 100644
--- a/src/android/src/project/alwaystry/PanelWithTitledBorder.java
+++ b/src/android/src/project/alwaystry/PanelWithTitledBorder.java
@@ -6,8 +6,6 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.text.TextPaint;
 import android.util.AttributeSet;
-import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 public class PanelWithTitledBorder extends RelativeLayout{
diff --git a/src/android/src/project/alwaystry/SignalAssociationActivity.java b/src/android/src/project/alwaystry/SignalAssociationActivity.java
index cba95640c77b71184167baad368289a36025547f..f6c9f5b22fa618938133c5a338c6107bb4ebbc86 100644
--- a/src/android/src/project/alwaystry/SignalAssociationActivity.java
+++ b/src/android/src/project/alwaystry/SignalAssociationActivity.java
@@ -1,29 +1,18 @@
 package project.alwaystry;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.RadioGroup;
+import android.widget.*;
 import android.widget.RadioGroup.OnCheckedChangeListener;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
+import copyfromJAVAsource.AvatarSignal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
 
 public class SignalAssociationActivity extends Activity{
 	
diff --git a/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java b/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
index b87b3b64c7f2b7822d929cb43f881dd7033ed49f..f86552a50c90f3dd24bc86c22d35f065f7f28c7f 100644
--- a/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
+++ b/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
@@ -1,11 +1,11 @@
 package project.alwaystry;
 
-import myutilandroid.GraphicLibAndroid;
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
+import myutilandroid.GraphicLibAndroid;
 
 public class TDiagramTouchManagerAndroid implements OnTouchListener{
 
diff --git a/src/android/src/project/alwaystry/TGConnectingPointAndroid.java b/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
index 3b33749794ece3df501b7f3ce8570158e741212e..8dccfc0983d3df052947800d19c5f4652f100fc4 100644
--- a/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
+++ b/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
@@ -1,10 +1,10 @@
 package project.alwaystry;
 
-import myutilandroid.GraphicLibAndroid;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.Log;
+import myutilandroid.GraphicLibAndroid;
 
 
 
diff --git a/src/android/src/project/alwaystry/TGConnectorAndroid.java b/src/android/src/project/alwaystry/TGConnectorAndroid.java
index c17ef288a11db5f2f40d08790676dbf9c11dc39a..fc7feb05222af0eda26682debd45e33487a1a7b5 100644
--- a/src/android/src/project/alwaystry/TGConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/TGConnectorAndroid.java
@@ -1,8 +1,8 @@
 package project.alwaystry;
 
-import myutilandroid.GraphicLibAndroid;
 import android.graphics.Canvas;
 import android.view.View;
+import myutilandroid.GraphicLibAndroid;
 
 public abstract class TGConnectorAndroid extends TGComponentAndroid{
 	
diff --git a/src/android/src/project/alwaystry/TwoDScrollView.java b/src/android/src/project/alwaystry/TwoDScrollView.java
index f47d81ed0ee385098982f05e80dd6a9dbc29cdeb..a8e9edd6bd6e4862cf592b9dde4600453054b9c2 100644
--- a/src/android/src/project/alwaystry/TwoDScrollView.java
+++ b/src/android/src/project/alwaystry/TwoDScrollView.java
@@ -1,24 +1,13 @@
 package project.alwaystry;
- 
-import java.util.List;
- 
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.view.FocusFinder;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewParent;
+import android.view.*;
 import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Scroller;
-import android.widget.TextView;
+import android.widget.*;
+
+import java.util.List;
  
 /**
  * Layout container for a view hierarchy that can be scrolled by the user,
diff --git a/src/attacktrees/ANDNode.java b/src/attacktrees/ANDNode.java
index b6aa05551ff26c8a0b62a519b4f7248a43fa5a47..26bd2a9bac546424f8e46531d37c46dbc7c4ee44 100755
--- a/src/attacktrees/ANDNode.java
+++ b/src/attacktrees/ANDNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class ANDNode extends BooleanNode { 
+public class ANDNode extends BooleanNode {
     
     public ANDNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/Attack.java b/src/attacktrees/Attack.java
index 73bc2d2591a9822f8589d4a11e9a590fe8c624d3..ebd8fda098ff55a282a916660cf6543836d748a4 100755
--- a/src/attacktrees/Attack.java
+++ b/src/attacktrees/Attack.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class Attack { 
diff --git a/src/attacktrees/AttackNode.java b/src/attacktrees/AttackNode.java
index f66a93ea5918482693cc36cb34c7a244a0334bdc..436e386cebf44fe4690082c160fcbf7c25f66e61 100755
--- a/src/attacktrees/AttackNode.java
+++ b/src/attacktrees/AttackNode.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
 
 
 public abstract class AttackNode { 
diff --git a/src/attacktrees/AttackTree.java b/src/attacktrees/AttackTree.java
index 6e8fcf0f56ac74f2821805bd9e8639a0be9bf9fe..09647dac9e1730963a4be67189dc403b9d617a85 100755
--- a/src/attacktrees/AttackTree.java
+++ b/src/attacktrees/AttackTree.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class AttackTree {
diff --git a/src/attacktrees/BeforeNode.java b/src/attacktrees/BeforeNode.java
index afc3ec40414c3a06e76b162c07868d0944d35bf9..34218bab543b4092fa86e251495eb25e948346f0 100755
--- a/src/attacktrees/BeforeNode.java
+++ b/src/attacktrees/BeforeNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class BeforeNode extends TimeNode { 
+public class BeforeNode extends TimeNode {
 
     public BeforeNode(String _name, Object _referenceObject, int _time) {
 	super(_name, _referenceObject, _time);
diff --git a/src/attacktrees/BooleanNode.java b/src/attacktrees/BooleanNode.java
index f68908b787d18537d174e60be538bbb4ee7f5b14..5bbe833d505715ddb3e0d55bbb58e7d2e8583161 100755
--- a/src/attacktrees/BooleanNode.java
+++ b/src/attacktrees/BooleanNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public abstract class BooleanNode extends AttackNode{ 
+public abstract class BooleanNode extends AttackNode{
     
     public BooleanNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/ORNode.java b/src/attacktrees/ORNode.java
index 31b673e298eb16fe82cd73c598e5b46d0d29477f..5d9194f2737f69cab7595a2cc674a22546506c0d 100755
--- a/src/attacktrees/ORNode.java
+++ b/src/attacktrees/ORNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class ORNode extends BooleanNode { 
+public class ORNode extends BooleanNode {
     
     public ORNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/SequenceNode.java b/src/attacktrees/SequenceNode.java
index eb52b701c9dce413276d8aeaeb2abe4a99c58f8c..0695feff85fba73daab4fc59bae70f4c27b287d7 100755
--- a/src/attacktrees/SequenceNode.java
+++ b/src/attacktrees/SequenceNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class SequenceNode extends AttackNode { 
+public class SequenceNode extends AttackNode {
     
     public SequenceNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/attacktrees/TimeNode.java b/src/attacktrees/TimeNode.java
index 4095ab4920d731369ef948acca81c14fbec528c5..de513b7d8fe7f8fdeff0fef7b5405f28efb7b6a1 100755
--- a/src/attacktrees/TimeNode.java
+++ b/src/attacktrees/TimeNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public abstract class TimeNode extends AttackNode{ 
+public abstract class TimeNode extends AttackNode{
     protected int time;
 
     public TimeNode(String _name, Object _objectReference, int _time) {
diff --git a/src/attacktrees/XORNode.java b/src/attacktrees/XORNode.java
index 9d5ea37529c2c93556b64c4b5914598d986c6f8b..c720d046ae4c4c466c8f760ca7464ad23cc053ef 100755
--- a/src/attacktrees/XORNode.java
+++ b/src/attacktrees/XORNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package attacktrees;
 
-import java.util.*;
-
-
-public class XORNode extends BooleanNode { 
+public class XORNode extends BooleanNode {
     
     public XORNode(String _name, Object _referenceObject) {
 	super(_name, _referenceObject);
diff --git a/src/automata/Automata.java b/src/automata/Automata.java
index ed20c7bb35ec7d1324e1d05383a071b600108418..b9308529a65071fc1cbf917cfb903ca544289c82 100755
--- a/src/automata/Automata.java
+++ b/src/automata/Automata.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package automata;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class Automata {
diff --git a/src/automata/State.java b/src/automata/State.java
index 360adb52c0fbdadc10489affafbcf1160034ed20..6a636257c0b03311b9a83cbc2b72343862ad2451 100755
--- a/src/automata/State.java
+++ b/src/automata/State.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package automata;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class State {
diff --git a/src/avatartranslator/AvatarAction.java b/src/avatartranslator/AvatarAction.java
index 9d86f16b499a3794a9f65a84cf9f1330dfc0fa98..f4ae258965dd0bfdaa2ec4157c3c443f6ca8cae8 100644
--- a/src/avatartranslator/AvatarAction.java
+++ b/src/avatartranslator/AvatarAction.java
@@ -47,8 +47,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.TraceManager;
-
 public interface AvatarAction {
     public boolean isAMethodCall ();
     public boolean isAVariableSetting ();
diff --git a/src/avatartranslator/AvatarActionOnSignal.java b/src/avatartranslator/AvatarActionOnSignal.java
index 825c85d4c579f291e61158b398e07329e76693f6..822036c2ac67ddb2ee38742ecb57bc00edbefd90 100644
--- a/src/avatartranslator/AvatarActionOnSignal.java
+++ b/src/avatartranslator/AvatarActionOnSignal.java
@@ -45,9 +45,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarActionOnSignal extends AvatarStateMachineElement {
diff --git a/src/avatartranslator/AvatarArithmeticOp.java b/src/avatartranslator/AvatarArithmeticOp.java
index 1f8232bee03579a3aca35541a6229fc203c9b7c0..b9874677e463e09fb9cf26510abaaf1257f18231 100644
--- a/src/avatartranslator/AvatarArithmeticOp.java
+++ b/src/avatartranslator/AvatarArithmeticOp.java
@@ -47,8 +47,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.TraceManager;
-
 public class AvatarArithmeticOp extends AvatarTerm {
     AvatarTerm term1;
     AvatarTerm term2;
diff --git a/src/avatartranslator/AvatarAttribute.java b/src/avatartranslator/AvatarAttribute.java
index e3648c00d6632c29a4a4f65e98bbb9e4731462be..c6bfc32b37e495dd8624e325a20d4f9fed4d340e 100644
--- a/src/avatartranslator/AvatarAttribute.java
+++ b/src/avatartranslator/AvatarAttribute.java
@@ -47,11 +47,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
-import translator.*;
-import translator.tojava.*;
+import java.util.HashMap;
 
 public class AvatarAttribute extends AvatarLeftHand {
 
diff --git a/src/avatartranslator/AvatarAttributeState.java b/src/avatartranslator/AvatarAttributeState.java
index 77d10bb47f7818f30b4a16dd3e9e4f7137bc5c2b..45f50b33e9b6449573f7b8b5e3fbb48fb666f609 100644
--- a/src/avatartranslator/AvatarAttributeState.java
+++ b/src/avatartranslator/AvatarAttributeState.java
@@ -45,11 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-import ui.avatarbd.*;
-import myutil.*;
-import ui.*;
-
 public class AvatarAttributeState extends AvatarElement {
     private AvatarAttribute attribute;
     private AvatarState state;
diff --git a/src/avatartranslator/AvatarBinaryGuard.java b/src/avatartranslator/AvatarBinaryGuard.java
index a6a4b5a00a2fa2bae8f03247bd40aca18ecc109e..b7ad39a08073766623339a5577bd0f19fa5fe3cc 100644
--- a/src/avatartranslator/AvatarBinaryGuard.java
+++ b/src/avatartranslator/AvatarBinaryGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 public class AvatarBinaryGuard extends AvatarComposedGuard {
     AvatarComposedGuard guardA;
     AvatarComposedGuard guardB;
diff --git a/src/avatartranslator/AvatarBlock.java b/src/avatartranslator/AvatarBlock.java
index 136a53db8b61349f76cb3ed33e365236abced30a..1c9e11d86c35cee93355f74e770b70ece9bfe73a 100644
--- a/src/avatartranslator/AvatarBlock.java
+++ b/src/avatartranslator/AvatarBlock.java
@@ -45,9 +45,8 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
 
 
 public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwner {
diff --git a/src/avatartranslator/AvatarBlockTemplate.java b/src/avatartranslator/AvatarBlockTemplate.java
index 24d7428405e19e81ff855e53f6db9ab971a08e06..9623f385e4c0a9ee1577be496ac9f530348f2100 100644
--- a/src/avatartranslator/AvatarBlockTemplate.java
+++ b/src/avatartranslator/AvatarBlockTemplate.java
@@ -47,9 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import myutil.TraceManager;
 
 public class AvatarBlockTemplate  {
 
diff --git a/src/avatartranslator/AvatarBroadcast.java b/src/avatartranslator/AvatarBroadcast.java
index 86191e49d7b854508419ba880424ead26903d302..7e6740396c60339df8d3a61fd6e744f4384214d5 100644
--- a/src/avatartranslator/AvatarBroadcast.java
+++ b/src/avatartranslator/AvatarBroadcast.java
@@ -47,9 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 public class AvatarBroadcast extends AvatarElement {
     
diff --git a/src/avatartranslator/AvatarComposedGuard.java b/src/avatartranslator/AvatarComposedGuard.java
index 7ecb5bc56d14c24034f60c1205f5271910812085..590b1507b2cc68b457a10b727277385b2fe5b464 100644
--- a/src/avatartranslator/AvatarComposedGuard.java
+++ b/src/avatartranslator/AvatarComposedGuard.java
@@ -46,8 +46,6 @@
 
 package avatartranslator;
 
-import myutil.Conversion;
-
 public abstract class AvatarComposedGuard extends AvatarGuard {
     public AvatarComposedGuard getOpposite () {
         return new AvatarUnaryGuard ("not", "(", ")", this);
diff --git a/src/avatartranslator/AvatarConstant.java b/src/avatartranslator/AvatarConstant.java
index 0122ce4412ba5097e48f480423ea91c37434b2e1..2e8b16abd20c78faab917541668f0bb8b30bda42 100644
--- a/src/avatartranslator/AvatarConstant.java
+++ b/src/avatartranslator/AvatarConstant.java
@@ -48,10 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.TraceManager;
-import translator.RTLOTOSKeyword;
-import translator.tojava.JKeyword;
-
 public class AvatarConstant extends AvatarTerm {
 
     public static final AvatarConstant TRUE = new AvatarConstant ("true", null);
diff --git a/src/avatartranslator/AvatarConstantGuard.java b/src/avatartranslator/AvatarConstantGuard.java
index e6c6eb076f983e65d87ae954e0614b4ff23fc014..be13be20433b3817d906559cbc9b52a27edfdc18 100644
--- a/src/avatartranslator/AvatarConstantGuard.java
+++ b/src/avatartranslator/AvatarConstantGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarConstantGuard is an {@link AvatarSimpleGuard} that is of the form:
  * {@link AvatarConstant}
diff --git a/src/avatartranslator/AvatarElement.java b/src/avatartranslator/AvatarElement.java
index c1825b0cd0224aba91ed7a5098ee4efe735aca4f..eee5519362e97df18ca6a825e8cc383193b0200e 100644
--- a/src/avatartranslator/AvatarElement.java
+++ b/src/avatartranslator/AvatarElement.java
@@ -45,9 +45,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.Vector;
 
 public class AvatarElement {
 
diff --git a/src/avatartranslator/AvatarExpireTimer.java b/src/avatartranslator/AvatarExpireTimer.java
index 4db8a83abcbf8fc9b52431942c5020f6e35937b6..8a1f9175976cc0058eae281b27d80535a170ed05 100644
--- a/src/avatartranslator/AvatarExpireTimer.java
+++ b/src/avatartranslator/AvatarExpireTimer.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarExpireTimer extends AvatarTimerOperator {
 	
     public AvatarExpireTimer(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarGuard.java b/src/avatartranslator/AvatarGuard.java
index 34da46a4d1799ec03f3abac31c834cb22c79a327..ab830d187f8a8253f2de2ef7949c9c8bcc9e6e1c 100644
--- a/src/avatartranslator/AvatarGuard.java
+++ b/src/avatartranslator/AvatarGuard.java
@@ -46,10 +46,10 @@
 
 package avatartranslator;
 
-import java.util.HashMap;
-
-import myutil.TraceManager;
 import myutil.Conversion;
+import myutil.TraceManager;
+
+import java.util.HashMap;
 
 public abstract class AvatarGuard {
 
diff --git a/src/avatartranslator/AvatarGuardElse.java b/src/avatartranslator/AvatarGuardElse.java
index d25a5637b28351ed8fcba72d582480a46c7254b7..988efcb0c25806536c367eea35abdfdcfcb458cc 100644
--- a/src/avatartranslator/AvatarGuardElse.java
+++ b/src/avatartranslator/AvatarGuardElse.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarGuardElse is an {@link AvatarGuard} that is of the form:
  * else
diff --git a/src/avatartranslator/AvatarGuardEmpty.java b/src/avatartranslator/AvatarGuardEmpty.java
index 8d69c45c79677b6968062f504dfb78a31c32bac3..b00425eaa80025b9c6190ef97f74dc244e9f5bd8 100644
--- a/src/avatartranslator/AvatarGuardEmpty.java
+++ b/src/avatartranslator/AvatarGuardEmpty.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarGuardEmpty is an empty {@link AvatarGuard}
  */
diff --git a/src/avatartranslator/AvatarLibraryFunction.java b/src/avatartranslator/AvatarLibraryFunction.java
index 8b5c8e72a18c98492d86b656b6aef88f2802e06c..599252bddf33162f08adad2bfab081e595be30be 100644
--- a/src/avatartranslator/AvatarLibraryFunction.java
+++ b/src/avatartranslator/AvatarLibraryFunction.java
@@ -38,11 +38,9 @@
 
 package avatartranslator;
 
-import java.util.LinkedList;
 import java.util.HashMap;
 import java.util.Iterator;
-
-import myutil.TraceManager;
+import java.util.LinkedList;
 
 /**
  * AvatarLibraryFunction is used to represent a library function that can be further used in state machine diagrams.
diff --git a/src/avatartranslator/AvatarLibraryFunctionCall.java b/src/avatartranslator/AvatarLibraryFunctionCall.java
index e6299dad822b1cb6ab5707edc778e7b887e915a5..0c76a102c7d29c7a836260bf4a68df37f6ac11fb 100644
--- a/src/avatartranslator/AvatarLibraryFunctionCall.java
+++ b/src/avatartranslator/AvatarLibraryFunctionCall.java
@@ -38,8 +38,8 @@
 
 package avatartranslator;
 
-import java.util.LinkedList;
 import java.util.HashMap;
+import java.util.LinkedList;
 
 /**
  * AvatarLibraryFunctionCall represent a call to a library function. It is part of an {@link AvatarStateMachine}.
diff --git a/src/avatartranslator/AvatarMethod.java b/src/avatartranslator/AvatarMethod.java
index 8f10c0e7603b629acd583090ea2adcd27db1c462..23992142f071b437010d1e269659593c8de33d41 100644
--- a/src/avatartranslator/AvatarMethod.java
+++ b/src/avatartranslator/AvatarMethod.java
@@ -47,9 +47,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 public class AvatarMethod extends AvatarElement {
 
diff --git a/src/avatartranslator/AvatarPragma.java b/src/avatartranslator/AvatarPragma.java
index 161dae6f43c7087c0e34c315b457324b47903ce5..81258520b711992d47515f2d66ca46544ff61186 100644
--- a/src/avatartranslator/AvatarPragma.java
+++ b/src/avatartranslator/AvatarPragma.java
@@ -45,11 +45,12 @@
 
 package avatartranslator;
 
-import java.util.*;
-import myutil.*;
-import ui.*;
+import myutil.TraceManager;
+import ui.TAttribute;
 import ui.avatarbd.AvatarBDPragma;
 
+import java.util.*;
+
 public abstract class AvatarPragma extends AvatarElement {
     public static final String[] PRAGMAS =               {"Confidentiality", "Secret", "SecrecyAssumption", "InitialSystemKnowledge", "InitialSessionKnowledge", "Authenticity", "PrivatePublicKeys", "Public", "PublicConstant", "PrivateConstant"};
     public static final String[] PRAGMAS_TRANSLATION =    {"Secret",          "Secret", "SecrecyAssumption", "InitialSystemKnowledge", "InitialSessionKnowledge", "Authenticity", "PrivatePublicKeys", "Public", "PublicConstant", "PrivateConstant"};
diff --git a/src/avatartranslator/AvatarPragmaAuthenticity.java b/src/avatartranslator/AvatarPragmaAuthenticity.java
index 6c504055366f3df10432e1158b4e0f76f30f781d..1748f48b546e464aa3086f79114a3a223b171e78 100644
--- a/src/avatartranslator/AvatarPragmaAuthenticity.java
+++ b/src/avatartranslator/AvatarPragmaAuthenticity.java
@@ -45,7 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
+import java.util.List;
 
 public class AvatarPragmaAuthenticity extends AvatarPragma {
 
diff --git a/src/avatartranslator/AvatarPragmaConstant.java b/src/avatartranslator/AvatarPragmaConstant.java
index b2c746f0153241e189e971ca8774a9b7ffdeae6f..7a0a8734144a7fe3bd4ceebf543c65ee58a7990f 100644
--- a/src/avatartranslator/AvatarPragmaConstant.java
+++ b/src/avatartranslator/AvatarPragmaConstant.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaConstant extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaInitialKnowledge.java b/src/avatartranslator/AvatarPragmaInitialKnowledge.java
index 6622210b2b9d883fb915cb4333a81a81f90bae7e..f7b8d599b9b1b0b31d11c58f9cb9ac17a72f8ce5 100644
--- a/src/avatartranslator/AvatarPragmaInitialKnowledge.java
+++ b/src/avatartranslator/AvatarPragmaInitialKnowledge.java
@@ -45,7 +45,8 @@
 
 package avatartranslator;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
 
 public class AvatarPragmaInitialKnowledge extends AvatarPragma {
 
diff --git a/src/avatartranslator/AvatarPragmaPrivatePublicKey.java b/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
index 74f833e6caf03aa30af9882aeab07c15c150cce5..15574bcd1445032b8d88cd462dc3d1c59c42f7cb 100644
--- a/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
+++ b/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaPrivatePublicKey extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaPublic.java b/src/avatartranslator/AvatarPragmaPublic.java
index 9c8c6a1485148c1498fc394cf5ec0a0061b44079..0244f1d479696690e99f64007b512ec6c00d7de3 100644
--- a/src/avatartranslator/AvatarPragmaPublic.java
+++ b/src/avatartranslator/AvatarPragmaPublic.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaPublic extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaSecrecyAssumption.java b/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
index 2efe6bfb7ca1146fb731f5667538aa810508ee32..0282f517e64b6a4938debb675c56a121f04791f6 100644
--- a/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
+++ b/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
@@ -45,9 +45,7 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class AvatarPragmaSecrecyAssumption extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaSecret.java b/src/avatartranslator/AvatarPragmaSecret.java
index 597fc706b163bb773b3a33708e9208b827cb5573..d51cdb0e42d5e4a31fe461556a8dc85b540c0cda 100644
--- a/src/avatartranslator/AvatarPragmaSecret.java
+++ b/src/avatartranslator/AvatarPragmaSecret.java
@@ -45,11 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class AvatarPragmaSecret extends AvatarPragma {
 
     private AvatarAttribute argument;
diff --git a/src/avatartranslator/AvatarRandom.java b/src/avatartranslator/AvatarRandom.java
index 04972ce13a55ba1ba15740b148eee230fa16d356..a0579efe66fa0c32fb1e296e3aca50e02e1b4ffa 100644
--- a/src/avatartranslator/AvatarRandom.java
+++ b/src/avatartranslator/AvatarRandom.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarRandom extends AvatarStateMachineElement {
     protected String variable;
     protected String minValue;
diff --git a/src/avatartranslator/AvatarRelation.java b/src/avatartranslator/AvatarRelation.java
index df618e9859414c308110f299d6dac542f8d79bd0..b6e2228d3328a747e13bec6b6e06b51715471915 100644
--- a/src/avatartranslator/AvatarRelation.java
+++ b/src/avatartranslator/AvatarRelation.java
@@ -47,7 +47,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class AvatarRelation extends AvatarElement {
 
diff --git a/src/avatartranslator/AvatarResetTimer.java b/src/avatartranslator/AvatarResetTimer.java
index d0cee4086be22b720503c89ffbd80d9209e151fa..ff72aba239f32830e73132eda21e9a4375efcbbc 100644
--- a/src/avatartranslator/AvatarResetTimer.java
+++ b/src/avatartranslator/AvatarResetTimer.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarResetTimer extends AvatarTimerOperator {
 	
     public AvatarResetTimer(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarSetTimer.java b/src/avatartranslator/AvatarSetTimer.java
index ac600350d0cea813e563eddde3fee282c4c1b4e0..a76bebbc0b17a7887b71f88b19f3a57ba13ab8ea 100644
--- a/src/avatartranslator/AvatarSetTimer.java
+++ b/src/avatartranslator/AvatarSetTimer.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarSetTimer extends AvatarTimerOperator {
 	protected String setValue;
 	
diff --git a/src/avatartranslator/AvatarSignal.java b/src/avatartranslator/AvatarSignal.java
index 1fa12f2c09cca625e1e5941e4a66a7a538a2b8e4..8effe45f0c0da4c5cee51691afc1c919a8e34ba2 100644
--- a/src/avatartranslator/AvatarSignal.java
+++ b/src/avatartranslator/AvatarSignal.java
@@ -47,10 +47,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
-
 public class AvatarSignal extends AvatarMethod {
 
     // Signa type
diff --git a/src/avatartranslator/AvatarSimpleGuard.java b/src/avatartranslator/AvatarSimpleGuard.java
index 982974c836379d63e2cfdef9aad3086d0ceedc3f..4b3a8d105f835073fd98eff164d38e63a84ac921 100644
--- a/src/avatartranslator/AvatarSimpleGuard.java
+++ b/src/avatartranslator/AvatarSimpleGuard.java
@@ -46,8 +46,6 @@
 
 package avatartranslator;
 
-import myutil.Conversion;
-
 /**
  * An AvatarSimpleGuard is an {@link AvatarGuard} that is of the form:
  * {@link AvatarTerm} binaryOp {@link AvatarTerm} or simply {@link AvatarTerm}, or else
diff --git a/src/avatartranslator/AvatarSimpleGuardDuo.java b/src/avatartranslator/AvatarSimpleGuardDuo.java
index 3b855b6f14ef0832d9832b8270f445e38a2aa5d5..13b2ab8dac20a0dc5841158b0922b35f5007de25 100644
--- a/src/avatartranslator/AvatarSimpleGuardDuo.java
+++ b/src/avatartranslator/AvatarSimpleGuardDuo.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 /**
  * An AvatarSimpleGuardDuo is an {@link AvatarSimpleGuard} that is of the form:
  * {@link AvatarTerm} binaryOp {@link AvatarTerm}
diff --git a/src/avatartranslator/AvatarSimpleGuardMono.java b/src/avatartranslator/AvatarSimpleGuardMono.java
index dc9afdb9bb33f6c16e71864e0464f4e948ce1d4d..63644a4cd94d6394f263779e9e16834355f5d4c7 100644
--- a/src/avatartranslator/AvatarSimpleGuardMono.java
+++ b/src/avatartranslator/AvatarSimpleGuardMono.java
@@ -47,9 +47,6 @@
 package avatartranslator;
 
 import java.util.HashMap;
-import myutil.TraceManager;
-
-import myutil.Conversion;
 
 /**
  * An AvatarSimpleGuardMono is an {@link AvatarSimpleGuard} that is of the form:
diff --git a/src/avatartranslator/AvatarSpecification.java b/src/avatartranslator/AvatarSpecification.java
index 059c167392f1067b397959917453902a01d36344..ecad080b68385402efdd30ae1ca0754f5c69b280 100644
--- a/src/avatartranslator/AvatarSpecification.java
+++ b/src/avatartranslator/AvatarSpecification.java
@@ -47,9 +47,13 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class AvatarSpecification extends AvatarElement {
     public static String[] ops = {">", "<", "+", "-", "*", "/", "[", "]", "(", ")", ":", "=", "==", ",", "!", "?", "{", "}", "|", "&"};
diff --git a/src/avatartranslator/AvatarStartState.java b/src/avatartranslator/AvatarStartState.java
index 0031449b67b031b464f674317d0551cd7ada1f8b..3089aa2e4614a3491f6968f2f2983d9c825d7c0d 100644
--- a/src/avatartranslator/AvatarStartState.java
+++ b/src/avatartranslator/AvatarStartState.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarStartState extends AvatarStateElement {
 
 
diff --git a/src/avatartranslator/AvatarState.java b/src/avatartranslator/AvatarState.java
index 877f844ecd06a9c34208b6b8a11713bf67816bbe..8f6918ddc4917ce55ce93a2322c5fafbd2404441 100644
--- a/src/avatartranslator/AvatarState.java
+++ b/src/avatartranslator/AvatarState.java
@@ -45,11 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class AvatarState extends AvatarStateElement {
     private String entryCode;
     private boolean hidden; // i.e, not present in the original state machine
diff --git a/src/avatartranslator/AvatarStateElement.java b/src/avatartranslator/AvatarStateElement.java
index 77a6441de73f75af0b0af4f890654a4691da4307..85104957037c7ffc830473756e163afa203dc3c7 100644
--- a/src/avatartranslator/AvatarStateElement.java
+++ b/src/avatartranslator/AvatarStateElement.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public abstract class AvatarStateElement extends AvatarStateMachineElement {
 
 
diff --git a/src/avatartranslator/AvatarStateMachine.java b/src/avatartranslator/AvatarStateMachine.java
index a959845bad6b2f90cc765d1fb79c9951ec742f1a..95bcbaf7408b5401d51ed097f348942d1ef00c1b 100644
--- a/src/avatartranslator/AvatarStateMachine.java
+++ b/src/avatartranslator/AvatarStateMachine.java
@@ -47,9 +47,9 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.*;
 
 public class AvatarStateMachine extends AvatarElement {
     // to be used by code generator for fast access to states
diff --git a/src/avatartranslator/AvatarStateMachineElement.java b/src/avatartranslator/AvatarStateMachineElement.java
index ac3f7c72ad0f5ec6d37047674ea4c83831132bd3..ca357809b3e41f324acd8ae1453dbb5143dbee5b 100644
--- a/src/avatartranslator/AvatarStateMachineElement.java
+++ b/src/avatartranslator/AvatarStateMachineElement.java
@@ -45,11 +45,11 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-import myutil.*;
 import ui.TGComponent;
 
+import java.util.HashMap;
+import java.util.LinkedList;
+
 
 public abstract class AvatarStateMachineElement extends AvatarElement {
 
diff --git a/src/avatartranslator/AvatarStopState.java b/src/avatartranslator/AvatarStopState.java
index 5e17cb3af233376186057f4afaba23eba72a2e74..ea2461440241320d89e7b78c03f0c77a05d3c682 100644
--- a/src/avatartranslator/AvatarStopState.java
+++ b/src/avatartranslator/AvatarStopState.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public class AvatarStopState extends AvatarStateElement {
 
     public AvatarStopState(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarSyntaxChecker.java b/src/avatartranslator/AvatarSyntaxChecker.java
index 93b1c28db386d17b51a2a18963074cc49469cded..2a01f05afa7f6770c6f91dfce3dc498aa2591e30 100644
--- a/src/avatartranslator/AvatarSyntaxChecker.java
+++ b/src/avatartranslator/AvatarSyntaxChecker.java
@@ -45,11 +45,17 @@
 
 package avatartranslator;
 
-import java.io.*;
-import java.util.*;
-
-import compiler.tmlparser.*;
-import myutil.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.io.StringReader;
+import java.util.ArrayList;
 
 
 public class AvatarSyntaxChecker  {
diff --git a/src/avatartranslator/AvatarTerm.java b/src/avatartranslator/AvatarTerm.java
index 7d51ca75b821ff4777683720df8b8287a01c0d38..77ff991a84c40828a02c8c13b4e13914a12625ee 100644
--- a/src/avatartranslator/AvatarTerm.java
+++ b/src/avatartranslator/AvatarTerm.java
@@ -46,12 +46,12 @@
 
 package avatartranslator;
 
-import java.util.HashMap;
-
 import myutil.TraceManager;
 import translator.RTLOTOSKeyword;
 import translator.tojava.JKeyword;
 
+import java.util.HashMap;
+
 public abstract class AvatarTerm extends AvatarElement {
 
     public abstract boolean isLeftHand ();
diff --git a/src/avatartranslator/AvatarTermFunction.java b/src/avatartranslator/AvatarTermFunction.java
index 68579ba46a63ec703a88e4763510aa7ac5fb4067..f9517f4a6d6690aa1468a5feffc6832df936288a 100644
--- a/src/avatartranslator/AvatarTermFunction.java
+++ b/src/avatartranslator/AvatarTermFunction.java
@@ -46,9 +46,6 @@
 package avatartranslator;
 
 import java.util.HashMap;
-import java.util.LinkedList;
-
-import myutil.TraceManager;
 
 public class AvatarTermFunction extends AvatarTerm implements AvatarAction {
     AvatarTuple args;
diff --git a/src/avatartranslator/AvatarTimerOperator.java b/src/avatartranslator/AvatarTimerOperator.java
index d625ebbc523a97731a8af9c72c6b3828ef4fdf31..1c01efdfc885990b513c85540c0456333b28a7b7 100644
--- a/src/avatartranslator/AvatarTimerOperator.java
+++ b/src/avatartranslator/AvatarTimerOperator.java
@@ -45,9 +45,6 @@
 
 package avatartranslator;
 
-import java.util.*;
-
-
 public abstract class AvatarTimerOperator extends AvatarStateMachineElement {
 	protected AvatarAttribute timer;
 	
diff --git a/src/avatartranslator/AvatarTransition.java b/src/avatartranslator/AvatarTransition.java
index 4fd97f331c49b7996ef6a003bf22c8731280d8c5..070fa9b89b59791bf803321386ea42e7cbde3cae 100644
--- a/src/avatartranslator/AvatarTransition.java
+++ b/src/avatartranslator/AvatarTransition.java
@@ -45,9 +45,10 @@
 
 package avatartranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 
 public class AvatarTransition extends AvatarStateMachineElement {
diff --git a/src/avatartranslator/AvatarTuple.java b/src/avatartranslator/AvatarTuple.java
index 75c3cc1e47155534f6ead5b9e7a9ecbf486ae4c6..4cd8299a38e3351772a6140971ff244b745da69b 100644
--- a/src/avatartranslator/AvatarTuple.java
+++ b/src/avatartranslator/AvatarTuple.java
@@ -46,10 +46,8 @@
 
 package avatartranslator;
 
-import java.util.LinkedList;
 import java.util.HashMap;
-
-import myutil.TraceManager;
+import java.util.LinkedList;
 
 public class AvatarTuple extends AvatarLeftHand {
     LinkedList<AvatarTerm> components;
diff --git a/src/avatartranslator/AvatarUnaryGuard.java b/src/avatartranslator/AvatarUnaryGuard.java
index 1b84757f71283801bd05b98048e5a4dcde3b8c0b..c18916a68194022aa2c5a54129da127031571c93 100644
--- a/src/avatartranslator/AvatarUnaryGuard.java
+++ b/src/avatartranslator/AvatarUnaryGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
 
 import java.util.HashMap;
 
-import myutil.Conversion;
-
 public class AvatarUnaryGuard extends AvatarComposedGuard {
     AvatarComposedGuard guard;
 
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
index 17a2d5e0a7efc6ed6cf35ee0db2e5bb8e9aae887..2287c5b3b99802d2db3861c1ab271535feb31b68 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
@@ -47,10 +47,10 @@
 
 package avatartranslator.directsimulation;
 
-import java.util.*;
+import avatartranslator.AvatarRelation;
+import avatartranslator.AvatarSignal;
 
-import avatartranslator.*;
-import myutil.*;
+import java.util.Vector;
 
 public class AvatarSimulationAsynchronousTransaction  {
 
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
index 81aa2b618bcfa8a2fc856b2a6192ef9737d53668..3deb75691993e1066429d1b433b9f93dbd58e0f7 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -47,10 +47,13 @@
 
 package avatartranslator.directsimulation;
 
-import java.util.*;
-
 import avatartranslator.*;
-import myutil.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.util.Vector;
 
 public class AvatarSimulationBlock  {
     public final static int NOT_STARTED = 0;
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
index 538cfb13ba707c7e2315658bb0ba211ce98d3054..4fff419ecf88b2a477d6f1ccf38fed654e1243d3 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
@@ -47,11 +47,11 @@
 
 package avatartranslator.directsimulation;
 
-import java.awt.*;
-import java.util.*;
+import avatartranslator.AvatarStateMachineElement;
+import myutil.TraceManager;
 
-import avatartranslator.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public class AvatarSimulationPendingTransaction  {
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
index ea3e64b836703edcbc749fb07104fd26ba80b9e7..4a44a2f7772d528f2b534fef4375975403ea7340 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
@@ -47,10 +47,12 @@
 
 package avatartranslator.directsimulation;
 
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
 
-import avatartranslator.*;
-import myutil.*;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarSimulationTransaction  {
 
diff --git a/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java b/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
index 918fe274e5092cf92b97053048bdcaf5688c12ba..43dd9d788e24cd597f2b66354947495b0b265320 100644
--- a/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
+++ b/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
@@ -47,11 +47,12 @@
 
 package avatartranslator.directsimulation;
 
-import java.awt.*;
-import java.util.*;
-
 import avatartranslator.*;
-import myutil.*;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.awt.*;
+import java.util.Vector;
 
 
 public class AvatarSpecificationSimulation  {
diff --git a/src/avatartranslator/modelchecker/AvatarModelChecker.java b/src/avatartranslator/modelchecker/AvatarModelChecker.java
index 01cea656aec12c186859d881e9d5310da8fd81cc..2ba2fbc3e044344d0f151db70cab0429f680a8a5 100644
--- a/src/avatartranslator/modelchecker/AvatarModelChecker.java
+++ b/src/avatartranslator/modelchecker/AvatarModelChecker.java
@@ -47,10 +47,13 @@
 
 package avatartranslator.modelchecker;
 
-import java.util.*;
-
 import avatartranslator.*;
-import myutil.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.util.*;
 
 public class AvatarModelChecker implements Runnable, myutil.Graph {
     private final static int DEFAULT_NB_OF_THREADS = 12;
diff --git a/src/avatartranslator/modelchecker/SpecificationBlock.java b/src/avatartranslator/modelchecker/SpecificationBlock.java
index 2736b0855b0f4f851cf372b2c4c1523e722c5b09..6e66a81730449f3769b07cd6b866bf49c40ee8a9 100644
--- a/src/avatartranslator/modelchecker/SpecificationBlock.java
+++ b/src/avatartranslator/modelchecker/SpecificationBlock.java
@@ -47,10 +47,11 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.AvatarBlock;
 
-import myutil.*;
+import java.util.Arrays;
+import java.util.LinkedList;
 
 public class SpecificationBlock  {
     
diff --git a/src/avatartranslator/modelchecker/SpecificationLink.java b/src/avatartranslator/modelchecker/SpecificationLink.java
index 1a64e27dbd152ceb46f912349a3f318711622d66..914df13fa03ddf6878ca041538577b5ae7260be3 100644
--- a/src/avatartranslator/modelchecker/SpecificationLink.java
+++ b/src/avatartranslator/modelchecker/SpecificationLink.java
@@ -47,10 +47,6 @@
 
 package avatartranslator.modelchecker;
 
-import java.util.*;
-
-import myutil.*;
-
 public class SpecificationLink  {
 
     public SpecificationState originState;
diff --git a/src/avatartranslator/modelchecker/SpecificationLiveness.java b/src/avatartranslator/modelchecker/SpecificationLiveness.java
index b5e7a83d8d980d43a91557f25abb1bd495a40f64..258e67538a3baf2c77c53ac2de928ae6fc4a4ae2 100644
--- a/src/avatartranslator/modelchecker/SpecificationLiveness.java
+++ b/src/avatartranslator/modelchecker/SpecificationLiveness.java
@@ -47,10 +47,8 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
 
 public class SpecificationLiveness  {
     public Object ref1, ref2; // ref1 must be provided, ref2 might be null
diff --git a/src/avatartranslator/modelchecker/SpecificationReachability.java b/src/avatartranslator/modelchecker/SpecificationReachability.java
index 0a480406f57eca37bf1ca5fda83274cba3455a82..123a1aa8e88110a0da191035438d96b483c965fc 100644
--- a/src/avatartranslator/modelchecker/SpecificationReachability.java
+++ b/src/avatartranslator/modelchecker/SpecificationReachability.java
@@ -47,10 +47,8 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
 
 public class SpecificationReachability  {
     public Object ref1, ref2; // ref1 must be provided, ref2 might be null
diff --git a/src/avatartranslator/modelchecker/SpecificationReachabilityType.java b/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
index d4e5dcf01a71c04bb2179b995828ff65747d3a9c..41fdd734b5b7278ba228449b9ab28712dbf38a08 100644
--- a/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
+++ b/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
@@ -47,11 +47,6 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
-
 public enum SpecificationReachabilityType  {
     NOTCOMPUTED, REACHABLE, NONREACHABLE
 }
diff --git a/src/avatartranslator/modelchecker/SpecificationState.java b/src/avatartranslator/modelchecker/SpecificationState.java
index 027f021e41f66bc2ea0242d9649876066ff8e85c..39d4e77ef14db3a642d0228b0a58854cb9bdd227 100644
--- a/src/avatartranslator/modelchecker/SpecificationState.java
+++ b/src/avatartranslator/modelchecker/SpecificationState.java
@@ -48,11 +48,12 @@
 package avatartranslator.modelchecker;
 
 
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
 
-import java.util.*;
-
-import avatartranslator.*;
-import myutil.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
 
 public class SpecificationState implements Comparable<SpecificationState>  {
 
diff --git a/src/avatartranslator/modelchecker/SpecificationTransition.java b/src/avatartranslator/modelchecker/SpecificationTransition.java
index 16b2558f05e944534777f52570bd882f09cf56a9..dc949c1154c2eb0ee2c352659570239142709c91 100644
--- a/src/avatartranslator/modelchecker/SpecificationTransition.java
+++ b/src/avatartranslator/modelchecker/SpecificationTransition.java
@@ -47,10 +47,8 @@
 
 package avatartranslator.modelchecker;
 
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarTransition;
 
 public class SpecificationTransition  {
     public int clockMin, clockMax;
diff --git a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
index cf15a721f8f1e94996c292bf9240ceb1264968ae..31c119ac745464e4c450d97d06666a554e49b0bc 100755
--- a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
+++ b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
@@ -45,13 +45,15 @@
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-
-import java.io.*;
-
-import myutil.*;
 import avatartranslator.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AVATAR2CPOSIX {
 
diff --git a/src/avatartranslator/toexecutable/MainFile.java b/src/avatartranslator/toexecutable/MainFile.java
index 655f059e56f36ba0ec12f32d9202bbe951015613..6ab354acc3613f9c8375042218df2f87dea0c751 100755
--- a/src/avatartranslator/toexecutable/MainFile.java
+++ b/src/avatartranslator/toexecutable/MainFile.java
@@ -45,15 +45,8 @@
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import java.lang.reflect.*;
-import java.lang.reflect.Method;
-
-import myutil.*;
-import avatartranslator.*;
+import myutil.PluginManager;
+import myutil.TraceManager;
 
 public class MainFile {
 
diff --git a/src/avatartranslator/toexecutable/TaskFile.java b/src/avatartranslator/toexecutable/TaskFile.java
index bff388ea1d7ed32c3cf2d9c3d5de4e6c76a35e89..a3b8cb56eb0ffd5b54847c2ad5f7163ef438f1b7 100755
--- a/src/avatartranslator/toexecutable/TaskFile.java
+++ b/src/avatartranslator/toexecutable/TaskFile.java
@@ -45,12 +45,6 @@
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
 public class TaskFile {
     /////////////////////RG
     //1) enlever pthread.h
diff --git a/src/avatartranslator/toexecutable/TaskFileSoclib.java b/src/avatartranslator/toexecutable/TaskFileSoclib.java
index 82939ca92462d51b1282ad20045b54ced4f66450..a0e1adbd6d9189280ae3ba998c40f90e7e21dfb6 100755
--- a/src/avatartranslator/toexecutable/TaskFileSoclib.java
+++ b/src/avatartranslator/toexecutable/TaskFileSoclib.java
@@ -45,12 +45,6 @@
 
 package avatartranslator.toexecutable;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
 public class TaskFileSoclib {
 	/////////////////////RG
 	//1) enlever pthread.h
diff --git a/src/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
index 8f48c8111981d97275fc827dd04f852ee66c357b..4b7a86d315c7b73c6e070d40080281b0752573a2 100755
--- a/src/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -45,21 +45,26 @@
 
 package avatartranslator.toproverif;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.io.*;
-import javax.swing.*;
-
-import ui.ConfigurationTTool;
-import ui.CheckingError;
+import avatartranslator.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import proverifspec.*;
 import ui.AvatarDesignPanel;
-import ui.window.JDialogProverifVerification;
+import ui.CheckingError;
+import ui.ConfigurationTTool;
 import ui.TGComponent;
-import proverifspec.*;
-import myutil.*;
-import avatartranslator.*;
+import ui.window.JDialogProverifVerification;
+
+import javax.swing.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 
 public class AVATAR2ProVerif implements AvatarTranslator {
 
diff --git a/src/avatartranslator/totpn/AVATAR2TPN.java b/src/avatartranslator/totpn/AVATAR2TPN.java
index f73e774b283bb5ed5cedb2451cda1435ef3d9981..e3e616c0eea3ecada578e76e9054911e96cc2985 100755
--- a/src/avatartranslator/totpn/AVATAR2TPN.java
+++ b/src/avatartranslator/totpn/AVATAR2TPN.java
@@ -45,11 +45,16 @@
 
 package avatartranslator.totpn;
 
-import java.util.*;
-
-import tpndescription.*;
-import myutil.*;
 import avatartranslator.*;
+import myutil.TraceManager;
+import tpndescription.Place;
+import tpndescription.TPN;
+import tpndescription.Transition;
+
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class AVATAR2TPN {
 
diff --git a/src/avatartranslator/toturtle/AVATAR2TURTLE.java b/src/avatartranslator/toturtle/AVATAR2TURTLE.java
index 2209c39c926970848f343ae9a9490ea376017041..a10107e8a2f15e52987e3d2cb682589ea40fe2fc 100644
--- a/src/avatartranslator/toturtle/AVATAR2TURTLE.java
+++ b/src/avatartranslator/toturtle/AVATAR2TURTLE.java
@@ -45,12 +45,13 @@
 
 package avatartranslator.toturtle;
 
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
+import translator.ActivityDiagram;
+import translator.TClass;
+import translator.TURTLEModeling;
 
-import avatartranslator.*;
-import myutil.*;
-import translator.*;
-import ui.*;
+import java.util.Vector;
 
 
 public class AVATAR2TURTLE {
diff --git a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
index 160038df26991d98eb3bdaa52de59117e2cf703f..5124289781ad1e4f83e26c6b8e0b83d400dea1c3 100755
--- a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
+++ b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
@@ -45,13 +45,21 @@
 
 package avatartranslator.touppaal;
 
-import java.awt.*;
-import java.util.*;
-
-import uppaaldesc.*;
-import myutil.*;
 import avatartranslator.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import ui.CheckingError;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+import uppaaldesc.UPPAALTransition;
+
+import java.awt.*;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class AVATAR2UPPAAL {
 
diff --git a/src/compiler/tmlgrammar/SimpleNode.java b/src/compiler/tmlgrammar/SimpleNode.java
index 85718824457a17b18dfe1e031f2a3089c207921f..cc0880ca920ba83b50093d510bac2df4ab084933 100755
--- a/src/compiler/tmlgrammar/SimpleNode.java
+++ b/src/compiler/tmlgrammar/SimpleNode.java
@@ -1,38 +1,38 @@
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.*/
-
-
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL  license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.*/
+
+
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
 ludovic.apvrille AT enst.fr
@@ -81,7 +81,7 @@ knowledge of the CeCILL license and that you accept its terms.
  /* Has been partially generated by: JJTree */
 /* Generated By:JJTree: Do not edit this line. SimpleNode.java */
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class SimpleNode implements Node {
 	protected Node parent;
diff --git a/src/compiler/tmlparser/SimpleNode.java b/src/compiler/tmlparser/SimpleNode.java
index 6ab8c987b533762d83f1a34cb5446999ef896540..d50888a4f500f9a88b877afb2c11dd3fee53f565 100755
--- a/src/compiler/tmlparser/SimpleNode.java
+++ b/src/compiler/tmlparser/SimpleNode.java
@@ -1,74 +1,74 @@
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.*/
-
-package compiler.tmlparser;
-
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL  license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.*/
-
-
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL  license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.*/
+
+package compiler.tmlparser;
+
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL  license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL license and that you accept its terms.*/
+
+
 /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
 ludovic.apvrille AT enst.fr
@@ -117,7 +117,7 @@ knowledge of the CeCILL license and that you accept its terms.
  /* Has been partially generated by: JJTree */
 /* Generated By:JJTree: Do not edit this line. SimpleNode.java */
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class SimpleNode implements Node {
 	protected Node parent;
diff --git a/src/ddtranslator/DDStructLink.java b/src/ddtranslator/DDStructLink.java
index 6d00a089d84be8c9fe12c2016007dce4920dab2c..c9ac71032c78b68a18f490c7c3ee24d69d78ed10 100755
--- a/src/ddtranslator/DDStructLink.java
+++ b/src/ddtranslator/DDStructLink.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ddtranslator;
 
-import translator.*;
+import translator.Gate;
 
 public class DDStructLink  {
     public Gate lgate;
diff --git a/src/ddtranslator/DDStructSynchro.java b/src/ddtranslator/DDStructSynchro.java
index 46b6a9e875f6c00844e489ea64c7702a56ccadc0..57807f4519dd6229e496266738170af54c580f54 100755
--- a/src/ddtranslator/DDStructSynchro.java
+++ b/src/ddtranslator/DDStructSynchro.java
@@ -45,9 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ddtranslator;
 
-import java.util.*;
+import translator.Param;
+import translator.TClass;
 
-import translator.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class DDStructSynchro  {
     private List<String> list;
diff --git a/src/ddtranslator/DDTranslator.java b/src/ddtranslator/DDTranslator.java
index 70889f87c130025b5c3f4d9b2d2f9e036d9aec18..3011f6742155d4771644c0c5a31a28d554a511c1 100755
--- a/src/ddtranslator/DDTranslator.java
+++ b/src/ddtranslator/DDTranslator.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 package ddtranslator;
 
 
-import java.util.*;
-
-
 import translator.*;
 import ui.*;
-import ui.cd.*;
-import ui.dd.*;
+import ui.cd.TCDTClass;
+import ui.dd.TDDNode;
+import ui.dd.TGConnectorLinkNode;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class DDTranslator {
     
diff --git a/src/ddtranslator/TClassLinkNode.java b/src/ddtranslator/TClassLinkNode.java
index 449e31a4fdb74fa341d524fd8e1423e1ee3bf023..2a1ba221e0a6c79c8335e54e0e804ea908ddf724 100755
--- a/src/ddtranslator/TClassLinkNode.java
+++ b/src/ddtranslator/TClassLinkNode.java
@@ -44,10 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package ddtranslator;
- 
 
 
-import myutil.*;
+import myutil.Conversion;
 import translator.*;
 
 public class TClassLinkNode extends TClass {
diff --git a/src/ddtranslatorSoclib/AvatarBridge.java b/src/ddtranslatorSoclib/AvatarBridge.java
index ee7accf3824f0f02db7a8e38dd11acf2b522b5a5..76233bcbbc2ee6a3b37071255b0dc2f1116c4b21 100755
--- a/src/ddtranslatorSoclib/AvatarBridge.java
+++ b/src/ddtranslatorSoclib/AvatarBridge.java
@@ -43,7 +43,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarBridge extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarBus.java b/src/ddtranslatorSoclib/AvatarBus.java
index a24289e199eae98f41a10875a18a25c249252d17..2bf73566a4934fcbdec839fb147c19590e0531cc 100755
--- a/src/ddtranslatorSoclib/AvatarBus.java
+++ b/src/ddtranslatorSoclib/AvatarBus.java
@@ -42,7 +42,6 @@
     * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarBus extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarCPU.java b/src/ddtranslatorSoclib/AvatarCPU.java
index 35e7f98e6fa13e39882b49e7ab23cdf5373f76fb..0f6b2c8a16fbf29a9a0f74343bd8df895edcbd4e 100755
--- a/src/ddtranslatorSoclib/AvatarCPU.java
+++ b/src/ddtranslatorSoclib/AvatarCPU.java
@@ -4,7 +4,8 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
 
 public class AvatarCPU extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarConnectingPoint.java b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
index d6f17ba7004425a5a75b733746a734dc9c12aa16..bae722998dc6cce4e68fef21e29e898072ca8d01 100755
--- a/src/ddtranslatorSoclib/AvatarConnectingPoint.java
+++ b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
@@ -44,7 +44,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarConnectingPoint{
     
diff --git a/src/ddtranslatorSoclib/AvatarConnector.java b/src/ddtranslatorSoclib/AvatarConnector.java
index b8dc7664223f9f0199900e1d7b298af651a26519..dcddb1138a2c15c4e62be9f1907197e0f38d2bce 100755
--- a/src/ddtranslatorSoclib/AvatarConnector.java
+++ b/src/ddtranslatorSoclib/AvatarConnector.java
@@ -45,7 +45,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarConnector{
     
diff --git a/src/ddtranslatorSoclib/AvatarCoproMWMR.java b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
index d8c9b2cec5d58d9652c6655b6e09e448f79b9bea..940bc5b8b5bc23da0eb8488393729ac1e50cae8b 100755
--- a/src/ddtranslatorSoclib/AvatarCoproMWMR.java
+++ b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
@@ -44,7 +44,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarCoproMWMR extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarCrossbar.java b/src/ddtranslatorSoclib/AvatarCrossbar.java
index 21b710d5034eb2a4c5a28ad98532fa366c092444..a08e5e26719162f7d3fc0fb6acab36654471459b 100755
--- a/src/ddtranslatorSoclib/AvatarCrossbar.java
+++ b/src/ddtranslatorSoclib/AvatarCrossbar.java
@@ -44,7 +44,6 @@
    * @author  Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarCrossbar extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarICU.java b/src/ddtranslatorSoclib/AvatarICU.java
index 8b30b2102d1af841a75abddf240f6ba962ca755a..4f6698bbc3330c241ad994aba3cbf3bc08053204 100755
--- a/src/ddtranslatorSoclib/AvatarICU.java
+++ b/src/ddtranslatorSoclib/AvatarICU.java
@@ -46,7 +46,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarICU extends AvatarComponent{
  
diff --git a/src/ddtranslatorSoclib/AvatarRAM.java b/src/ddtranslatorSoclib/AvatarRAM.java
index b8bb4092fa90966c784584a1a4285ca9d16d2a84..92b118f6b711b2c68a4cff7a6481c06d7fbe641a 100755
--- a/src/ddtranslatorSoclib/AvatarRAM.java
+++ b/src/ddtranslatorSoclib/AvatarRAM.java
@@ -46,7 +46,8 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
 
 public class AvatarRAM extends AvatarComponent{
     
diff --git a/src/ddtranslatorSoclib/AvatarTTY.java b/src/ddtranslatorSoclib/AvatarTTY.java
index b6b0403e23958a6f2f28755fdaae2493df9f2e2c..433d4b0be65b4659d675dad0cea349236f352515 100755
--- a/src/ddtranslatorSoclib/AvatarTTY.java
+++ b/src/ddtranslatorSoclib/AvatarTTY.java
@@ -46,10 +46,8 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
-import ddtranslatorSoclib.*;
 
-public class AvatarTTY extends AvatarComponent {	
+public class AvatarTTY extends AvatarComponent {
 
     private int index = 0;
     private String ttyName;
diff --git a/src/ddtranslatorSoclib/AvatarTask.java b/src/ddtranslatorSoclib/AvatarTask.java
index f8f8b2901e3cc39cd4cc6bae594a50ab562cf2cb..bd14c95369ddd8ba6ac20dc39a77c03b7dfa6de0 100755
--- a/src/ddtranslatorSoclib/AvatarTask.java
+++ b/src/ddtranslatorSoclib/AvatarTask.java
@@ -47,7 +47,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarTask extends AvatarMappedObject{
 
diff --git a/src/ddtranslatorSoclib/AvatarTimer.java b/src/ddtranslatorSoclib/AvatarTimer.java
index 60b0b613f2e94724bd6ce785c42f4b31d0e4b24a..86c0dee77584f5ef9183763b9c0319edf807a3bd 100755
--- a/src/ddtranslatorSoclib/AvatarTimer.java
+++ b/src/ddtranslatorSoclib/AvatarTimer.java
@@ -46,7 +46,6 @@
 
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarTimer extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarVgmn.java b/src/ddtranslatorSoclib/AvatarVgmn.java
index a46d70240f95871620fd9e918259a593f42387f9..9d908f0dd41df590464951638f565276287e164d 100755
--- a/src/ddtranslatorSoclib/AvatarVgmn.java
+++ b/src/ddtranslatorSoclib/AvatarVgmn.java
@@ -45,7 +45,6 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
 
 public class AvatarVgmn extends AvatarComponent{
 
diff --git a/src/ddtranslatorSoclib/AvatarddSpecification.java b/src/ddtranslatorSoclib/AvatarddSpecification.java
index 25532d2c8919760914d86cf6d8303208520e7e41..7bd2f8c8a8628979ce674f15299eadb6859b05c4 100755
--- a/src/ddtranslatorSoclib/AvatarddSpecification.java
+++ b/src/ddtranslatorSoclib/AvatarddSpecification.java
@@ -45,7 +45,9 @@
    * @author  Julien Henon, Daniela Genius */
 
 package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.List;
 
 public class AvatarddSpecification{
 	
diff --git a/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java b/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
index 2d07738953305f6fb6772b1168a39f7a6a7a5528..867417f5fd5f16318a5b500b03f99f8a388f4165 100755
--- a/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
+++ b/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
@@ -3,12 +3,6 @@
 
 package ddtranslatorSoclib.toSoclib;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
 public class MainFileSoclib {
 	
     private final static String H_DEF = "#ifndef MAIN_H\n#define MAIN_H\n";
diff --git a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index 7abb9e906cf08fb1b65352a0f52fd67488c66ba3..0c926c36148a9cac63e198ead10be8145540c2e3 100755
--- a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -47,37 +47,20 @@
 
 package ddtranslatorSoclib.toSoclib;
 
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-import avatartranslator.AvatarAction;
-import avatartranslator.AvatarActionAssignment;
-import avatartranslator.AvatarActionOnSignal;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarMethod;
-import avatartranslator.AvatarRandom;
-import avatartranslator.AvatarRelation;
-import avatartranslator.AvatarSignal;
-import avatartranslator.AvatarSpecification;
-import avatartranslator.AvatarStartState;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarStateMachine;
-import avatartranslator.AvatarStateMachineElement;
-import avatartranslator.AvatarStopState;
-import avatartranslator.AvatarTransition;
-import avatartranslator.AvatarType;
+import avatartranslator.*;
+import ddtranslatorSoclib.AvatarRAM;
 import ddtranslatorSoclib.AvatarTask;
 import ddtranslatorSoclib.AvatarddSpecification;
+import ddtranslatorSoclib.toTopCell.TopCellGenerator;
 import myutil.Conversion;
 import myutil.FileException;
 import myutil.FileUtils;
 import myutil.TraceManager;
-import ddtranslatorSoclib.toTopCell.TopCellGenerator;
-import ddtranslatorSoclib.AvatarRAM;
-import ddtranslatorSoclib.AvatarChannel;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class TasksAndMainGenerator {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Code.java b/src/ddtranslatorSoclib/toTopCell/Code.java
index 915da23d07bc03bce5905425bae2806ae69ff840..76193b9d917625e71ee26ddcf3dcfc62810985f3 100755
--- a/src/ddtranslatorSoclib/toTopCell/Code.java
+++ b/src/ddtranslatorSoclib/toTopCell/Code.java
@@ -44,15 +44,14 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
-import java.io.*;
-import myutil.FileException;
-import myutil.FileUtils;
-import ui.*;
-import ui.avatardd.*;
-import ui.window.*;
-import tmltranslator.*;
+
+import ddtranslatorSoclib.AvatarCPU;
+import ui.ConfigurationTTool;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 //import ui.TGComponentManager;
 //import ui.TDiagramPanel;
 //import ui.TURTLEPanel;
diff --git a/src/ddtranslatorSoclib/toTopCell/Declaration.java b/src/ddtranslatorSoclib/toTopCell/Declaration.java
index f3325370cdd3e9496d852d4a8bc8004cb34ed182..f5e4a9db1bf644fa89482aec3cbace3c3c505d46 100755
--- a/src/ddtranslatorSoclib/toTopCell/Declaration.java
+++ b/src/ddtranslatorSoclib/toTopCell/Declaration.java
@@ -43,7 +43,7 @@
 	    v2.1 Daniela GENIUS, summer 2016*/
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
+
 import ddtranslatorSoclib.*;
 
 public class Declaration {
diff --git a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
index 0d9a71fe703a3c40164eebf4f1f735495ca7e060..5e7d179a8fab0cebcdeb1c8d112fd2ce711581b9 100755
--- a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
@@ -71,10 +71,10 @@
  */
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
-import avatartranslator.AvatarRelation;
+
 import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.AvatarCPU;
+import ddtranslatorSoclib.AvatarRAM;
 
 public class Deployinfo {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Header.java b/src/ddtranslatorSoclib/toTopCell/Header.java
index 4e1474949ce3f479b5e510ed1dc05093fbf39d1b..1c19c42a820e90b67cbf58616292d3e58123acd6 100755
--- a/src/ddtranslatorSoclib/toTopCell/Header.java
+++ b/src/ddtranslatorSoclib/toTopCell/Header.java
@@ -45,8 +45,6 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
 
 public class Header {
 	
diff --git a/src/ddtranslatorSoclib/toTopCell/Loader.java b/src/ddtranslatorSoclib/toTopCell/Loader.java
index d33bf23d058c8f324407382ec31cc7a289ae980e..ac50354fd021eb4051195c2949d362a768058662 100755
--- a/src/ddtranslatorSoclib/toTopCell/Loader.java
+++ b/src/ddtranslatorSoclib/toTopCell/Loader.java
@@ -42,8 +42,8 @@
 
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
+
+import ddtranslatorSoclib.AvatarChannel;
 
 public class Loader {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/MappingTable.java b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
index d0b5516f7911c4e1e000c84aeb5161ea743a175f..5b68e8d200ac82629e819f0103737ab8cf6f225d 100755
--- a/src/ddtranslatorSoclib/toTopCell/MappingTable.java
+++ b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
@@ -46,8 +46,9 @@
 
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
+
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
 
 public class MappingTable {
 	
diff --git a/src/ddtranslatorSoclib/toTopCell/NetList.java b/src/ddtranslatorSoclib/toTopCell/NetList.java
index c6db44071d3e979e826c6b1753e9bbe4c442a284..146b0e733106c789e2136b0302230a6292025287 100755
--- a/src/ddtranslatorSoclib/toTopCell/NetList.java
+++ b/src/ddtranslatorSoclib/toTopCell/NetList.java
@@ -43,8 +43,11 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
+
+import ddtranslatorSoclib.AvatarCPU;
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
 
 public class NetList {
     public static final String NAME_CLK = "signal_clk";
diff --git a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
index 25a25e4857b879205cfee3061429809877816526..40abf1d34942d8c3e5a0eabb94a6c52d1349eb5d 100755
--- a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
@@ -45,8 +45,6 @@
 /* authors: v1.0 Daniela GENIUS august 2016 */
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
 
 public class Platforminfo {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Signal.java b/src/ddtranslatorSoclib/toTopCell/Signal.java
index 0ef15361c19d59f2c6b60cb1db51f2249b4ebf18..0c915a8edc0b800afddc2816455203bc085d2eca 100755
--- a/src/ddtranslatorSoclib/toTopCell/Signal.java
+++ b/src/ddtranslatorSoclib/toTopCell/Signal.java
@@ -45,8 +45,10 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
+
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
 
 public class Signal {
 
diff --git a/src/ddtranslatorSoclib/toTopCell/Simulation.java b/src/ddtranslatorSoclib/toTopCell/Simulation.java
index c7248f87a97f65f56a25ce1a8906e39232ce98ed..036677a24dcfdc5a9842850121919b6832a512c5 100755
--- a/src/ddtranslatorSoclib/toTopCell/Simulation.java
+++ b/src/ddtranslatorSoclib/toTopCell/Simulation.java
@@ -43,8 +43,6 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
 
 public class Simulation {
 	
diff --git a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
index a91224e760929d5c4bcff8980d84221318cd52f1..dc1cc1df17dfd84289666d5adaec05f8fab0b8c7 100755
--- a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
+++ b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
@@ -46,11 +46,11 @@
             v2.0 Daniela GENIUS, Julien HENON 2015 */
 
 package ddtranslatorSoclib.toTopCell;
+
 import ddtranslatorSoclib.*;
-import java.io.*;
-import java.io.Writer.*;
-import java.util.*;
 
+import java.io.*;
+import java.util.ArrayList;
 import java.util.List;
 
 public class TopCellGenerator
diff --git a/src/dseengine/BusContentionResult.java b/src/dseengine/BusContentionResult.java
index 9c3076b8b32992a786ef7457f229693524bb342e..3e896a4ff1e80819a843beec5685318e1f7cbd56 100755
--- a/src/dseengine/BusContentionResult.java
+++ b/src/dseengine/BusContentionResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusContentionResult  {
diff --git a/src/dseengine/BusContentionWholeResult.java b/src/dseengine/BusContentionWholeResult.java
index f547a5faddb84f8b902a2caab205f3dc173bd416..48b969e5a7e7494e42dfdd2d5f102724863899b4 100755
--- a/src/dseengine/BusContentionWholeResult.java
+++ b/src/dseengine/BusContentionWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusContentionWholeResult  {
diff --git a/src/dseengine/BusResult.java b/src/dseengine/BusResult.java
index eaaf8f49cd0d7e2a763a0223ca9034aa734ccc0a..6bc358386a30f4e1fc59974cd9e435beecf032fa 100755
--- a/src/dseengine/BusResult.java
+++ b/src/dseengine/BusResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusResult  {
diff --git a/src/dseengine/BusWholeResult.java b/src/dseengine/BusWholeResult.java
index ddd52e4427815c30969d0d05e54a2bb1f1f5492b..a90aa99e4bc6f6dfdeace12ed6cdb9a7ae2b053d 100755
--- a/src/dseengine/BusWholeResult.java
+++ b/src/dseengine/BusWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class BusWholeResult  {
diff --git a/src/dseengine/CPUResult.java b/src/dseengine/CPUResult.java
index 494d5712ec87ea2e426a7abc5f5eac0d0e5d220e..9fd55416ed9b2d670b4a0735cd34caa95d2fe915 100755
--- a/src/dseengine/CPUResult.java
+++ b/src/dseengine/CPUResult.java
@@ -46,11 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
+import java.util.Vector;
 
 
 //import uppaaldesc.*;
diff --git a/src/dseengine/CPUWholeResult.java b/src/dseengine/CPUWholeResult.java
index 877e6094106b7d95be18cd77041ce12865e7b2b5..82ae276b8d3d7f301f5066e4bd52bd9989d21673 100755
--- a/src/dseengine/CPUWholeResult.java
+++ b/src/dseengine/CPUWholeResult.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.TraceManager;
 
-
-import myutil.*;
+import java.util.Hashtable;
+import java.util.Vector;
 
 
 //import uppaaldesc.*;
diff --git a/src/dseengine/CPUWithTasks.java b/src/dseengine/CPUWithTasks.java
index d21d046c9726f1f296351f8bb54879fb42a8f8d3..2a300f6d623bb22d7d4826ae03eed01554e7b772 100755
--- a/src/dseengine/CPUWithTasks.java
+++ b/src/dseengine/CPUWithTasks.java
@@ -46,12 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import tmltranslator.TMLTask;
 
-
-import myutil.*;
-import tmltranslator.*;
+import java.util.Vector;
 
 
 public class CPUWithTasks  {
diff --git a/src/dseengine/DSEConfiguration.java b/src/dseengine/DSEConfiguration.java
index 3453722ac6185de3a60a9383e0a2c9c6109279a5..5bf60ceed13c46f11a759834c57566c41471a1d6 100755
--- a/src/dseengine/DSEConfiguration.java
+++ b/src/dseengine/DSEConfiguration.java
@@ -46,21 +46,29 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.awt.Point;
-import java.io.*;
+import myutil.Conversion;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import tmltranslator.*;
+import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
+import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
+import ui.GTMLModeling;
+import ui.MainGUI;
+import ui.TMLArchiPanel;
+import ui.TMLComponentDesignPanel;
+import ui.tmldd.*;
+
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
 import java.util.*;
+import java.util.List;
 
-import tmltranslator.*;
 //import tmltranslator.touppaal.*;
 //import tmltranslator.tomappingsystemc.*;
-import tmltranslator.tomappingsystemc2.*;
 //import tmltranslator.toturtle.*;
 
-import myutil.*;
-
-import ui.*;
-import ui.tmldd.*;
-
 //import uppaaldesc.*;
 
 public class DSEConfiguration implements Runnable  {
diff --git a/src/dseengine/DSEMappingSimulationResults.java b/src/dseengine/DSEMappingSimulationResults.java
index c10ea8fc97ea135b612351dd0a909d4643874389..1ac2dae16813692bea3dacd39dc4b84c45577e6d 100755
--- a/src/dseengine/DSEMappingSimulationResults.java
+++ b/src/dseengine/DSEMappingSimulationResults.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.Conversion;
+import tmltranslator.TMLMapping;
 
-import tmltranslator.*;
-
-import myutil.*;
-
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import java.util.Vector;
 
 //import uppaaldesc.*;
 
diff --git a/src/dseengine/DSEScriptReader.java b/src/dseengine/DSEScriptReader.java
index 41e607bf01df3b45bf7c711012a02dc36325552f..089c65aba482659f2983cb67905925827a824677 100755
--- a/src/dseengine/DSEScriptReader.java
+++ b/src/dseengine/DSEScriptReader.java
@@ -46,21 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
 
 //import tmltranslator.*;
 //import tmltranslator.touppaal.*;
-//import tmltranslator.tomappingsystemc.*; 
-import tmltranslator.tomappingsystemc2.*;
+//import tmltranslator.tomappingsystemc.*;
 //import tmltranslator.toturtle.*;
 
-import translator.*;
-
-import dseengine.*;
-
-import myutil.*;
-
 
 //import uppaaldesc.*;
 
diff --git a/src/dseengine/DSESimulationResult.java b/src/dseengine/DSESimulationResult.java
index 6af9944a6e617147a6ac8a4af837730de9632bb2..056bda24bafa5085365d6e360a1d3f4d5e379755 100755
--- a/src/dseengine/DSESimulationResult.java
+++ b/src/dseengine/DSESimulationResult.java
@@ -46,16 +46,22 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
-
-import myutil.*;
-
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
 
 //import uppaaldesc.*;
 
diff --git a/src/dseengine/SimulationDurationWholeResult.java b/src/dseengine/SimulationDurationWholeResult.java
index 6205a28fdfe19f7ed1639dcd72afba5f5f23732a..9b33078d0c8e6f6d766b5019d568816b61a34208 100755
--- a/src/dseengine/SimulationDurationWholeResult.java
+++ b/src/dseengine/SimulationDurationWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class SimulationDurationWholeResult  {
diff --git a/src/dseengine/TaskResult.java b/src/dseengine/TaskResult.java
index 830dcd6129545b0f27769997c044fd9af2bc73ba..322d5d805898ce6ea6f2653748b9d1879050a5d6 100755
--- a/src/dseengine/TaskResult.java
+++ b/src/dseengine/TaskResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class TaskResult  {
diff --git a/src/dseengine/TaskWholeResult.java b/src/dseengine/TaskWholeResult.java
index d9808e60aa032212f30b2d06cca8c9f0ead0f1f1..191a6f9a6a8568d444d6b5355b3eb84a18953c67 100755
--- a/src/dseengine/TaskWholeResult.java
+++ b/src/dseengine/TaskWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package dseengine;
 
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
 //import uppaaldesc.*;
 
 public class TaskWholeResult  {
diff --git a/src/launcher/ExecutionThread.java b/src/launcher/ExecutionThread.java
index a54b9cac40a09f2a84d0f5e2f44e0aff0945d7b9..0539ded983944d7eaedb12701256cdbc06a79039 100755
--- a/src/launcher/ExecutionThread.java
+++ b/src/launcher/ExecutionThread.java
@@ -46,10 +46,11 @@
 
 package launcher;
 
-import myutil.*;
+import myutil.TraceManager;
 
 import java.io.*;
-import java.net.*;
+import java.net.ServerSocket;
+import java.net.Socket;
 
 
 class ExecutionThread extends Thread {
diff --git a/src/launcher/RshClient.java b/src/launcher/RshClient.java
index 5204c7077a0a5c0e936fc0caadc164828f994096..940342710b258a3721945c128d7981ccf36e7b2e 100755
--- a/src/launcher/RshClient.java
+++ b/src/launcher/RshClient.java
@@ -46,10 +46,12 @@
 
 package launcher;
 
-import java.io.*;
-import java.net.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
 
 public class RshClient {
 
diff --git a/src/launcher/RshServer.java b/src/launcher/RshServer.java
index 318cf882c742c1189b02ed389d47b1827e1ee3ab..8ae21dd2fad3bc3b83d4f00a6917f3705ed5885f 100755
--- a/src/launcher/RshServer.java
+++ b/src/launcher/RshServer.java
@@ -47,20 +47,15 @@
 package launcher;
 
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
+import myutil.AESEncryptor;
+import myutil.TraceManager;
+
+import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Iterator;
 import java.util.Vector;
 
-import myutil.AESEncryptor;
-import myutil.TraceManager;
-
 public class RshServer {
     public static int PORT_NUMBER = 8375;
 
diff --git a/src/launcher/SocketComHelper.java b/src/launcher/SocketComHelper.java
index 548bf6c1057908536f1c4d40b99a0dffca2978ec..fd62083e08be13e19af71c2fd41fbca0f4e77178 100644
--- a/src/launcher/SocketComHelper.java
+++ b/src/launcher/SocketComHelper.java
@@ -1,15 +1,11 @@
 package launcher;
 
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
 import myutil.AESEncryptor;
 import myutil.TraceManager;
 
+import java.io.PrintStream;
+import java.util.*;
+
 public class SocketComHelper {
 
 	private static final Comparator<Enum<?>> codeComparator = new Comparator<Enum<?>>() {
diff --git a/src/myutil/AESEncryptor.java b/src/myutil/AESEncryptor.java
index ead2c2073041d8c62b7c29b1bd673754baaba4fa..a058835e92c7d91a960dcc63bbbe232fa26a93b0 100644
--- a/src/myutil/AESEncryptor.java
+++ b/src/myutil/AESEncryptor.java
@@ -48,12 +48,12 @@
 
      package myutil;
 
+import org.apache.commons.codec.binary.Base64;
+
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.commons.codec.binary.Base64;
-
 public class AESEncryptor {
     public static String encrypt(String key1, String key2, String value) {
         try {
diff --git a/src/myutil/BoolExpressionEvaluator.java b/src/myutil/BoolExpressionEvaluator.java
index 2ee9572f098b76b21e8545e5be955eb128b25184..0cffb67bfaaf5cd199abc51f8fd087cb29543aa6 100755
--- a/src/myutil/BoolExpressionEvaluator.java
+++ b/src/myutil/BoolExpressionEvaluator.java
@@ -45,7 +45,7 @@
 
 package myutil;
 
-import java.util.*;
+import java.util.StringTokenizer;
 
 public class BoolExpressionEvaluator {
 
diff --git a/src/myutil/CallbackLoaderInterface.java b/src/myutil/CallbackLoaderInterface.java
index 344c3c05e096f073f07c363c4be959a738eed1cc..429013b133064570b2acdfb4ba884a80390a12b4 100755
--- a/src/myutil/CallbackLoaderInterface.java
+++ b/src/myutil/CallbackLoaderInterface.java
@@ -45,12 +45,6 @@
 
 package myutil;
 
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-
-
 public interface CallbackLoaderInterface {
 
     public void loadDone();
diff --git a/src/myutil/CheckConnection.java b/src/myutil/CheckConnection.java
index 0ef70c9fdcf0533eae457a49ea5b6e8ea1fb4031..b0d1aff83adafae33969ae03188039324ad065ec 100644
--- a/src/myutil/CheckConnection.java
+++ b/src/myutil/CheckConnection.java
@@ -47,9 +47,11 @@
  */
 
 package myutil;
+
 import java.io.IOException;
-import java.net.*;
-import java.lang.Runtime;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 
 
 public final class CheckConnection {
diff --git a/src/myutil/Conversion.java b/src/myutil/Conversion.java
index 52c48e6a42815926d623e2b138125bc507cf0b11..3f40d57dd986a245abd8a26942f5f07df5cb18f5 100755
--- a/src/myutil/Conversion.java
+++ b/src/myutil/Conversion.java
@@ -45,8 +45,10 @@
 
 package myutil;
 
-import java.util.*;
-import java.util.regex.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class Conversion {
diff --git a/src/myutil/ErrorThread.java b/src/myutil/ErrorThread.java
index 35c1d2e1c2a8d5bb0ae05088ca1881ebb87110f8..c5c233dda24caf44789ec13b50a6f5d71630b66c 100755
--- a/src/myutil/ErrorThread.java
+++ b/src/myutil/ErrorThread.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
+import java.io.BufferedReader;
 
 
 public class ErrorThread extends Thread {
diff --git a/src/myutil/FileUtils.java b/src/myutil/FileUtils.java
index fbe24343a3bbf34b46abcc0e0dcc2558d8ea534b..974f75f7dd5e690afc2eeb56374919a9bf86af1c 100755
--- a/src/myutil/FileUtils.java
+++ b/src/myutil/FileUtils.java
@@ -45,8 +45,10 @@
 
 package myutil;
 
-import java.io.*;
-import java.nio.file.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
 
 
 public class FileUtils {
diff --git a/src/myutil/GoogleSearch.java b/src/myutil/GoogleSearch.java
index acb74fc0f89e405c07a0ad36d0b6aa63a203604a..c9ca5a6628d5259790c2f8c2f7f447fc469cc4df 100644
--- a/src/myutil/GoogleSearch.java
+++ b/src/myutil/GoogleSearch.java
@@ -46,19 +46,17 @@
 package myutil;
 
 
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-
-import org.jsoup.nodes.Document;
-import myutil.TraceManager;
-
 public class GoogleSearch {
 
     public static final String charset = "UTF-8";
diff --git a/src/myutil/GraphAlgorithms.java b/src/myutil/GraphAlgorithms.java
index 16aa00c67c28e9565f957add7eee867051fe64ca..e1674c23ab1a3908882e81d9021bd0349422f3e0 100755
--- a/src/myutil/GraphAlgorithms.java
+++ b/src/myutil/GraphAlgorithms.java
@@ -46,7 +46,7 @@
 
 package myutil;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class GraphAlgorithms {
diff --git a/src/myutil/GraphicLib.java b/src/myutil/GraphicLib.java
index b4fe6c02dda8f317a3c4f7ceb6e207a095c5ec3f..193b47422099eb15a0e3c7ca39a8bfe224394732 100755
--- a/src/myutil/GraphicLib.java
+++ b/src/myutil/GraphicLib.java
@@ -45,10 +45,10 @@
 
 package myutil;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
 import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.Vector;
 
 
 public final class GraphicLib {
diff --git a/src/myutil/HTMLCodeGeneratorForTables.java b/src/myutil/HTMLCodeGeneratorForTables.java
index 288f19afa4dd2743cc990058b2baa0aaef0e4e12..62c59f9a98ca3f69e805825c607187b24772565b 100755
--- a/src/myutil/HTMLCodeGeneratorForTables.java
+++ b/src/myutil/HTMLCodeGeneratorForTables.java
@@ -46,12 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
-//import java.awt.*;
-import javax.swing.table.*;
-import java.text.*;
+import ui.DefaultText;
+
+import javax.swing.table.AbstractTableModel;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
 
-import ui.*;
+//import java.awt.*;
 
 public class HTMLCodeGeneratorForTables  {
 	
diff --git a/src/myutil/ImageManager.java b/src/myutil/ImageManager.java
index d5dab72f0094062b7b9be09aea49c93503b0cfcf..2b43afe2d15e3d1a82ae2f9017e7b9c01d52f0ef 100755
--- a/src/myutil/ImageManager.java
+++ b/src/myutil/ImageManager.java
@@ -45,11 +45,8 @@
 
 package myutil;
 
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
 import java.awt.*;
-import javax.imageio.*;
+import java.awt.image.BufferedImage;
 
 
 public final class ImageManager {
diff --git a/src/myutil/IntExpressionEvaluator.java b/src/myutil/IntExpressionEvaluator.java
index 3be20af812763b7fac1de84a67fbbc25a421b599..ea4f4dfb799b355fe871eb08933b5dfaa7c91f56 100755
--- a/src/myutil/IntExpressionEvaluator.java
+++ b/src/myutil/IntExpressionEvaluator.java
@@ -45,7 +45,7 @@
 
 package myutil;
 
-import java.util.*;
+import java.util.StringTokenizer;
 
 public class IntExpressionEvaluator {
     public static final int NUMBER_TOKEN = -1;
diff --git a/src/myutil/IntLine.java b/src/myutil/IntLine.java
index b0a3116c6766b03134738f9226c407137cccd1e8..46e86b290c8975cd8eb02a142ad67546d4a06a88 100755
--- a/src/myutil/IntLine.java
+++ b/src/myutil/IntLine.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
+import java.util.BitSet;
 
 public class IntLine  {
    public int [] line;
diff --git a/src/myutil/IntMatrix.java b/src/myutil/IntMatrix.java
index 52e902ccd3c8ca06d5d7b11674efff339a4f097c..243d0ad628d676625cb077297c42bb784231c5f1 100755
--- a/src/myutil/IntMatrix.java
+++ b/src/myutil/IntMatrix.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
+import java.util.BitSet;
+import java.util.LinkedList;
 
 public class IntMatrix implements Runnable {
    public int [][] matrice;
diff --git a/src/myutil/LoaderFacilityInterface.java b/src/myutil/LoaderFacilityInterface.java
index b2e596a3b0b58770c5af720642337e14706bc67c..9ddf2577c15b55c21b155e3cb8fe1f85501688d7 100755
--- a/src/myutil/LoaderFacilityInterface.java
+++ b/src/myutil/LoaderFacilityInterface.java
@@ -45,12 +45,6 @@
 
 package myutil;
 
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-
-
 public interface LoaderFacilityInterface {
 
     public void load(int index);
diff --git a/src/myutil/MyMath.java b/src/myutil/MyMath.java
index 87d573ed11f39bd5046173f3a9c53a23a59fe953..a0d86b52ba47271e3a64021b1803fbd9dcd6d976 100755
--- a/src/myutil/MyMath.java
+++ b/src/myutil/MyMath.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
-
 public class MyMath {
   
    
diff --git a/src/myutil/PeriodicBehavior.java b/src/myutil/PeriodicBehavior.java
index 14bf7fa1f8027f66cf60c14fc491a48711e24303..d91e75b7d82c5101e4fde5b98afd7a201aefecd6 100755
--- a/src/myutil/PeriodicBehavior.java
+++ b/src/myutil/PeriodicBehavior.java
@@ -47,9 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
-
-
 public interface PeriodicBehavior {
     
 	public void periodicAction();
diff --git a/src/myutil/PeriodicBehaviorThread.java b/src/myutil/PeriodicBehaviorThread.java
index 3f3350a31cb3bd7b11860c32d7d559ab41f33e10..9194386cfbb4f93c521cae89a35c6bfe0589a8cd 100755
--- a/src/myutil/PeriodicBehaviorThread.java
+++ b/src/myutil/PeriodicBehaviorThread.java
@@ -47,9 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
-
-
 public class PeriodicBehaviorThread extends Thread {
     
 	private PeriodicBehavior pb;
diff --git a/src/myutil/Plugin.java b/src/myutil/Plugin.java
index 749b306bb9928f4da658aa5dc9232ca292bfcdf8..f286b059ff4b2790b265cfff23427bd10545afa0 100755
--- a/src/myutil/Plugin.java
+++ b/src/myutil/Plugin.java
@@ -45,10 +45,11 @@
 
 package myutil;
 
-import java.util.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashMap;
 
 public class Plugin {
     private String name;
diff --git a/src/myutil/PluginManager.java b/src/myutil/PluginManager.java
index fd49be05e4433a57eafde621e4fe649b8210154d..632d77c8b7faa44f820d473b502aba8b1e48ece4 100755
--- a/src/myutil/PluginManager.java
+++ b/src/myutil/PluginManager.java
@@ -45,8 +45,8 @@
 
 package myutil;
 
-import java.util.*;
-import java.lang.reflect.*;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
 
 public class PluginManager  {
     public ArrayList<Plugin> plugins;
diff --git a/src/myutil/ProcessThread.java b/src/myutil/ProcessThread.java
index 92a2fda6bc396d636f7b2b990750f41d6b5ea9a1..3fa324e21cfbaa1e71e9b95cb0bee405851f4583 100755
--- a/src/myutil/ProcessThread.java
+++ b/src/myutil/ProcessThread.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package myutil;
 
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 
 
 public class ProcessThread extends Thread {
diff --git a/src/myutil/SVGGraphics.java b/src/myutil/SVGGraphics.java
index 994253c24575a00a3385e53d08dfc03a707e50a8..cf773169a8f02e08519ece953e6dff822f4606d0 100755
--- a/src/myutil/SVGGraphics.java
+++ b/src/myutil/SVGGraphics.java
@@ -47,16 +47,16 @@
 package myutil;
 
 import java.awt.*;
-import java.awt.image.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.awt.image.*;
-import java.awt.image.renderable.*;
-
-import java.text.*;
-import java.util.*;
-
-import javax.swing.*;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ImageObserver;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.RenderableImage;
+import java.text.AttributedCharacterIterator;
+import java.util.Map;
 
 
 
diff --git a/src/myutil/TableSorter.java b/src/myutil/TableSorter.java
index 91c84a55abee55c6703e1e96a02588276c58bb89..421555286ee4c218e8294e5e47e83759fd0135b9 100755
--- a/src/myutil/TableSorter.java
+++ b/src/myutil/TableSorter.java
@@ -2,15 +2,16 @@
 
 package myutil;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.util.List;
-
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.*;
+import java.util.List;
 
 /**
  * TableSorter is a decorator for TableModels; adding sorting
diff --git a/src/myutil/TreeCell.java b/src/myutil/TreeCell.java
index 71b0ca4df9bfff49cef044536a38569f80899aba..588cedc1a7ff2018f18cc33a595db2825a3dbb9e 100755
--- a/src/myutil/TreeCell.java
+++ b/src/myutil/TreeCell.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package myutil;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class TreeCell {
    private Object element;
diff --git a/src/myutil/URLManager.java b/src/myutil/URLManager.java
index 390169544418908d73120621b6019173527e2ba2..89a29adde2fbb6a5e80db01acd82613864bbbcbf 100755
--- a/src/myutil/URLManager.java
+++ b/src/myutil/URLManager.java
@@ -45,13 +45,16 @@
 
 package myutil;
 
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-
 import org.apache.commons.io.FileUtils;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
 public final class URLManager implements Runnable {
 
     private String url;
diff --git a/src/myutil/externalSearch/Client.java b/src/myutil/externalSearch/Client.java
index ff7835aa61153759d5b35c3d41890ed277437452..2d8bdb230beabb79adcc95fa4ad15e489c007f9e 100644
--- a/src/myutil/externalSearch/Client.java
+++ b/src/myutil/externalSearch/Client.java
@@ -45,21 +45,18 @@
    */
 package myutil.externalSearch;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.net.*;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
 import myutil.TraceManager;
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.jsoup.parser.Parser;
 import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 
-import myutil.*;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.Socket;
+import java.util.ArrayList;
 
 public class Client {
     public  Object parserAnswerMessage(Message answerMsg) {
diff --git a/src/myutil/externalSearch/Message.java b/src/myutil/externalSearch/Message.java
index 4fd15167ab7d7a6934d6c4c82f90739827267385..96d0bfcd68dcfd14a1db7ddfa6eee6a0b6cf2246 100644
--- a/src/myutil/externalSearch/Message.java
+++ b/src/myutil/externalSearch/Message.java
@@ -45,15 +45,10 @@
  */
 package myutil.externalSearch;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
-import java.io.Serializable;
-import javax.imageio.ImageIO;
 
 
 
diff --git a/src/nc/NCPath.java b/src/nc/NCPath.java
index a6daa363a3143745a6b128008ae5d9917495a016..376fe49933522f7df28061d029f1620eadd19a16 100755
--- a/src/nc/NCPath.java
+++ b/src/nc/NCPath.java
@@ -45,7 +45,7 @@
 
 package nc;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class NCPath extends NCElement {
 	public NCTraffic traffic;
diff --git a/src/nc/NCStructure.java b/src/nc/NCStructure.java
index edcf5f31a121b89f9ee5d26304e80eef0ec30240..84e061be256410e98f96124d05a4be759878c9ab 100755
--- a/src/nc/NCStructure.java
+++ b/src/nc/NCStructure.java
@@ -45,7 +45,7 @@
 
 package nc;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class NCStructure extends NCElement {
 	public ArrayList<NCEquipment> equipments;
diff --git a/src/proverifspec/ProVerifComment.java b/src/proverifspec/ProVerifComment.java
index be79bc1c9c902a523e978298d997e0df5a09ef24..b68cdea8bd28689fe26640118947a38fda63d903 100644
--- a/src/proverifspec/ProVerifComment.java
+++ b/src/proverifspec/ProVerifComment.java
@@ -45,7 +45,7 @@
 
 package proverifspec;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public class ProVerifComment implements ProVerifDeclaration {
     protected LinkedList<String> lines;
diff --git a/src/proverifspec/ProVerifFunction.java b/src/proverifspec/ProVerifFunction.java
index 33c0967de3d34c591ef949d79bc03adb2c4c65e9..ef6bbe4b770cb98e7b9c79db726fef9550dcc465 100755
--- a/src/proverifspec/ProVerifFunction.java
+++ b/src/proverifspec/ProVerifFunction.java
@@ -45,11 +45,6 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class ProVerifFunction {
 	public String functionName;
 	public int functionArity;
diff --git a/src/proverifspec/ProVerifOutputAnalyzer.java b/src/proverifspec/ProVerifOutputAnalyzer.java
index cfe3301e1da8086d14139840103d7d1e679fa31d..70c0eb9dcd8c639c80c74c40ed21f274ec1f8327 100644
--- a/src/proverifspec/ProVerifOutputAnalyzer.java
+++ b/src/proverifspec/ProVerifOutputAnalyzer.java
@@ -45,25 +45,17 @@
 
 package proverifspec;
 
+import avatartranslator.*;
+import avatartranslator.toproverif.AVATAR2ProVerif;
+
 import java.io.BufferedReader;
-import java.io.StringReader;
 import java.io.IOException;
+import java.io.StringReader;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.regex.Pattern;
 import java.util.regex.Matcher;
-
-import myutil.TraceManager;
-
-import avatartranslator.toproverif.AVATAR2ProVerif;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarPragma;
-import avatartranslator.AvatarPragmaAuthenticity;
-import avatartranslator.AvatarPragmaReachability;
-import avatartranslator.AvatarPragmaSecret;
+import java.util.regex.Pattern;
 
 
 public class ProVerifOutputAnalyzer {
diff --git a/src/proverifspec/ProVerifProcess.java b/src/proverifspec/ProVerifProcess.java
index 70e7613e68ffc578742603be3b8a1db2f2435e18..d8fec78a00e32b776e2ea6af679e613f3579d679 100755
--- a/src/proverifspec/ProVerifProcess.java
+++ b/src/proverifspec/ProVerifProcess.java
@@ -45,11 +45,6 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class ProVerifProcess extends ProVerifProcInstr {
     protected String name;
     protected ProVerifVar[] args;
diff --git a/src/proverifspec/ProVerifProperty.java b/src/proverifspec/ProVerifProperty.java
index b8bc78caf0a7fa1606039d3178a1d0029a841d58..441e4c8b2fb93bd8091f07a702bb04fcfcb89454 100644
--- a/src/proverifspec/ProVerifProperty.java
+++ b/src/proverifspec/ProVerifProperty.java
@@ -45,8 +45,6 @@
 
 package proverifspec;
 
-import java.util.*;
-
 public class ProVerifProperty implements ProVerifDeclaration {
     protected String prop;
 
diff --git a/src/proverifspec/ProVerifQuery.java b/src/proverifspec/ProVerifQuery.java
index 63872723edf3769bb7a8dfbd0173c6e4e2deef79..fbee22ea1c7df72125c1a1ea1b39516d98d9ac0e 100755
--- a/src/proverifspec/ProVerifQuery.java
+++ b/src/proverifspec/ProVerifQuery.java
@@ -45,11 +45,6 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
-
-
 public class ProVerifQuery {
 	public String query;
 
diff --git a/src/proverifspec/ProVerifResultTrace.java b/src/proverifspec/ProVerifResultTrace.java
index 2070f08e040d4c4f34bef2f14667c529129319da..52114fd8670c6385b3ee7b9501273730060d923c 100644
--- a/src/proverifspec/ProVerifResultTrace.java
+++ b/src/proverifspec/ProVerifResultTrace.java
@@ -45,21 +45,18 @@
 
 package proverifspec;
 
-import java.util.LinkedList;
-import java.util.HashMap;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-
+import avatartranslator.toproverif.AVATAR2ProVerif;
 import myutil.TraceManager;
-
 import ui.AvatarDesignPanel;
 import ui.TAttribute;
 import ui.avatarbd.AvatarBDBlock;
 
-import avatartranslator.toproverif.AVATAR2ProVerif;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class ProVerifResultTrace {
     private static Pattern tracePattern;
diff --git a/src/proverifspec/ProVerifResultTraceStep.java b/src/proverifspec/ProVerifResultTraceStep.java
index fd14e6663c5bc009e3262a7c2a9a43aef1867d6d..7c7d264b177e183eb6a43e2aa8b2524ff031d234 100644
--- a/src/proverifspec/ProVerifResultTraceStep.java
+++ b/src/proverifspec/ProVerifResultTraceStep.java
@@ -45,11 +45,11 @@
 
 package proverifspec;
 
+import ui.AvatarDesignPanel;
+
 import java.io.BufferedWriter;
 import java.io.IOException;
 
-import ui.AvatarDesignPanel;
-
 public interface ProVerifResultTraceStep {
     public String describeAsString(AvatarDesignPanel adp);
     public void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException;
diff --git a/src/proverifspec/ProVerifSpec.java b/src/proverifspec/ProVerifSpec.java
index 39939661bd18665be645b55846801f40286bbb11..fa0bf56badfc96f76c6f81aa4610c86076599a97 100755
--- a/src/proverifspec/ProVerifSpec.java
+++ b/src/proverifspec/ProVerifSpec.java
@@ -45,9 +45,7 @@
 
 package proverifspec;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
 
 
 public class ProVerifSpec implements ProVerifDeclaration {
diff --git a/src/proverifspec/ProVerifSyntaxer.java b/src/proverifspec/ProVerifSyntaxer.java
index 3046b8978d33f9fed8d1aca6ce901dbeffc4a73a..f0224b2dc5de683c5425006eb01c0c754abb2ae3 100644
--- a/src/proverifspec/ProVerifSyntaxer.java
+++ b/src/proverifspec/ProVerifSyntaxer.java
@@ -45,8 +45,6 @@
 
 package proverifspec;
 
-import myutil.*;
-
 public abstract class ProVerifSyntaxer {
 
     public static final String DEC = "\t";
diff --git a/src/remotesimulation/CommandParser.java b/src/remotesimulation/CommandParser.java
index b7168efb187236fad11bd3a4625fb6034ef90ce6..fd72c7d98241fbe35edc82da53b04d9e064e9b0c 100755
--- a/src/remotesimulation/CommandParser.java
+++ b/src/remotesimulation/CommandParser.java
@@ -46,10 +46,7 @@
 
 package remotesimulation;
 
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class CommandParser {
diff --git a/src/remotesimulation/SimulationCommand.java b/src/remotesimulation/SimulationCommand.java
index 4ad532d577bd63e58e756cd3b5c0f513b0f73035..53de6a1820755ae84700abad388c1dc7a2f1839d 100755
--- a/src/remotesimulation/SimulationCommand.java
+++ b/src/remotesimulation/SimulationCommand.java
@@ -46,11 +46,6 @@
 
 package remotesimulation;
 
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-
-
 public class SimulationCommand {
     public String userCommand;
     public String alias;
diff --git a/src/remotesimulation/SimulationCommandSaveState.java b/src/remotesimulation/SimulationCommandSaveState.java
index 319bd3909ef09a6e7430f721ca8d87af3d28fcee..c7fffc3ff4ae9b5c2e39fd5bc5264f9dacfacae0 100755
--- a/src/remotesimulation/SimulationCommandSaveState.java
+++ b/src/remotesimulation/SimulationCommandSaveState.java
@@ -46,11 +46,6 @@
 
 package remotesimulation;
 
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-
-
 public class SimulationCommandSaveState extends SimulationCommand {
 
     
diff --git a/src/req/ebrdd/EBRDD.java b/src/req/ebrdd/EBRDD.java
index ae5c55614e367332b2067ac7ec190f4776b05714..1c4787544660727b66439ec914afc532ddf3ee5f 100644
--- a/src/req/ebrdd/EBRDD.java
+++ b/src/req/ebrdd/EBRDD.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.ArrayList;
 
 public class EBRDD extends ArrayList<EBRDDComponent> {
     private String name;
diff --git a/src/req/ebrdd/EBRDDAttribute.java b/src/req/ebrdd/EBRDDAttribute.java
index 91d7cea2d32b539a767c67935a54377a44dad2d6..a97d78e4f12b4c539f231667762fdf2250c52482 100755
--- a/src/req/ebrdd/EBRDDAttribute.java
+++ b/src/req/ebrdd/EBRDDAttribute.java
@@ -47,7 +47,8 @@
 
 package req.ebrdd;
 
-import tmltranslator.*;
+import tmltranslator.DIPLOElement;
+import tmltranslator.TMLType;
 
 
 public class EBRDDAttribute extends DIPLOElement {
diff --git a/src/req/ebrdd/EBRDDChoice.java b/src/req/ebrdd/EBRDDChoice.java
index 22d0912ec51ca1339fbb7b1d89a4bd79976899b6..d6d9a91404066f1fee9173dc72f0c4bb8c4a677d 100755
--- a/src/req/ebrdd/EBRDDChoice.java
+++ b/src/req/ebrdd/EBRDDChoice.java
@@ -45,9 +45,9 @@
 
 package req.ebrdd;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.ArrayList;
 
 public class EBRDDChoice extends EBRDDComponent {
     private ArrayList<String> guards;
diff --git a/src/req/ebrdd/EBRDDComponent.java b/src/req/ebrdd/EBRDDComponent.java
index 99f487464bb32b3b99dec3217b2b8401a8ca0ae6..f90a21437b99f65850b5c138a68deb789c6b44e5 100644
--- a/src/req/ebrdd/EBRDDComponent.java
+++ b/src/req/ebrdd/EBRDDComponent.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public abstract class EBRDDComponent extends EBRDDGeneralComponent implements Cloneable {
 	protected int nbNext = 1; // -1 means more than 1
diff --git a/src/req/ebrdd/EBRDDERC.java b/src/req/ebrdd/EBRDDERC.java
index c746af2772f903d423c05753b51b5e5fb0fb398c..745c8858343a972649e17b65d71b0aff50b0524a 100644
--- a/src/req/ebrdd/EBRDDERC.java
+++ b/src/req/ebrdd/EBRDDERC.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class EBRDDERC extends EBRDDComponent {
diff --git a/src/req/ebrdd/EBRDDGeneralComponent.java b/src/req/ebrdd/EBRDDGeneralComponent.java
index 771806f57048969c09b18df5d9819ea32ea6e76f..f6296e753af1f4e7b9cfc1e5eaa5c04f91ea7393 100644
--- a/src/req/ebrdd/EBRDDGeneralComponent.java
+++ b/src/req/ebrdd/EBRDDGeneralComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
-import tmltranslator.*;
+import tmltranslator.DIPLOElement;
 
 public abstract class EBRDDGeneralComponent extends DIPLOElement  {
 	protected Object referenceObject;
diff --git a/src/req/ebrdd/EBRDDSequence.java b/src/req/ebrdd/EBRDDSequence.java
index ea81c08a5d7dc7b6b0ac29144bdbe40bb990aba6..a134c044e3d6aa749a4e0eaaad3a1bfcc4db2052 100644
--- a/src/req/ebrdd/EBRDDSequence.java
+++ b/src/req/ebrdd/EBRDDSequence.java
@@ -45,7 +45,8 @@
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class EBRDDSequence extends EBRDDComponent{
diff --git a/src/req/ebrdd/ERB.java b/src/req/ebrdd/ERB.java
index 8b667702ed3864217d392144974633d1e8eedcec..3d6cc4f0ddfa5a334233c3e1049b3752128f816e 100644
--- a/src/req/ebrdd/ERB.java
+++ b/src/req/ebrdd/ERB.java
@@ -46,8 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
 public class ERB extends ERCElement  {
 	
 	protected String evt, condition, action; 
diff --git a/src/req/ebrdd/ERCElement.java b/src/req/ebrdd/ERCElement.java
index 5334b68e99fec620dde989d835046b9c22421301..5ee82a8a918a23bf08fb57c20fec8f9020304bff 100644
--- a/src/req/ebrdd/ERCElement.java
+++ b/src/req/ebrdd/ERCElement.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
-
 public abstract class ERCElement extends EBRDDGeneralComponent implements Cloneable {
     protected boolean negated;
 	
diff --git a/src/req/ebrdd/ESO.java b/src/req/ebrdd/ESO.java
index 4ef1fd7700b406d7a4ee534b167c2f543a260e60..7659ca24aea7680a64feb0778d4de0c26de88dc6 100644
--- a/src/req/ebrdd/ESO.java
+++ b/src/req/ebrdd/ESO.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package req.ebrdd;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public class ESO extends ERCElement {
 	public final static String [] ESOSTR = {"Conjunction", "Disjunction", "Sequence", "Strict sequence", "Simultaneous", "At least/At most"};
diff --git a/src/sddescription/HMSC.java b/src/sddescription/HMSC.java
index 309dfb85551ee5e84e3fe2e14a16ec1274a551e7..f59a6027142838f9ae544ff711819f8ff1c5f265 100755
--- a/src/sddescription/HMSC.java
+++ b/src/sddescription/HMSC.java
@@ -45,7 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sddescription;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class HMSC {
     private String name;
diff --git a/src/sddescription/HMSCNode.java b/src/sddescription/HMSCNode.java
index 83bdeaabeffe2fc2b913ead9eb8ac7d0e040c4b0..032f7c507f95f6b4c083b5e4a5614bed3fb80f16 100755
--- a/src/sddescription/HMSCNode.java
+++ b/src/sddescription/HMSCNode.java
@@ -45,7 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sddescription;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class HMSCNode extends HMSCElement {
     
diff --git a/src/sddescription/MSC.java b/src/sddescription/MSC.java
index 14c5b3526a038c618603ecd6e1485680971e1f35..c18b4c7b38aaedf9166bf39b74e2bb649bfc1e4d 100755
--- a/src/sddescription/MSC.java
+++ b/src/sddescription/MSC.java
@@ -45,7 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sddescription;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class MSC extends HMSCElement {
     private HMSCNode nextNode;
diff --git a/src/sddescription/SDExchange.java b/src/sddescription/SDExchange.java
index dbae83d6261ce1427ad2dd2d4f2ff06a792111a5..b95dac27152d0575afb08f3ef96d493f7231968b 100755
--- a/src/sddescription/SDExchange.java
+++ b/src/sddescription/SDExchange.java
@@ -45,13 +45,19 @@
 
 package sddescription;
 
-import java.io.*;
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.Conversion;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
-import myutil.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ListIterator;
 
 public class SDExchange {
 	private MSC msc;
diff --git a/src/sdtranslator/ActionEvt.java b/src/sdtranslator/ActionEvt.java
index 36023ffaa6339c0bf0caa232d4df277db7f0a991..3a0bbbe0800f3cf23f9213b5b864bbca64e27744 100755
--- a/src/sdtranslator/ActionEvt.java
+++ b/src/sdtranslator/ActionEvt.java
@@ -45,11 +45,11 @@
 
 package sdtranslator;
 
-import sddescription.*;
+import myutil.Conversion;
+import sddescription.Evt;
 import translator.*;
-import myutil.*;
 
-import java.util.*;
+import java.util.Vector;
 
 public class ActionEvt {
     
diff --git a/src/sdtranslator/ActionInstance.java b/src/sdtranslator/ActionInstance.java
index a8ef9860ae80ce578c66ad7fc3def1f2280d6b36..1e1e49103159351bca8e55095479be9952c5a987 100755
--- a/src/sdtranslator/ActionInstance.java
+++ b/src/sdtranslator/ActionInstance.java
@@ -45,8 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sdtranslator;
 
-import sddescription.*;
-import translator.*;
+import sddescription.Instance;
+import sddescription.MSC;
+import translator.ADComponent;
+import translator.TClass;
 
 
 
diff --git a/src/sdtranslator/EvtToLink.java b/src/sdtranslator/EvtToLink.java
index f5e8f9a2e65739a125eac82aff1db16baa5a075e..c73d55d66a3af048da1bc211205e4d2f1919a173 100755
--- a/src/sdtranslator/EvtToLink.java
+++ b/src/sdtranslator/EvtToLink.java
@@ -45,8 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sdtranslator;
 
-import sddescription.*;
-import translator.*;
+import sddescription.Evt;
+import translator.Gate;
+import translator.Param;
+import translator.TClass;
 
 public class EvtToLink {
     public static final int SYNC = 0;
diff --git a/src/sdtranslator/SDTranslator.java b/src/sdtranslator/SDTranslator.java
index 8cac6296390c82cea15718dcd73e195194623fe2..d4961a09b0910df14a421498f5ea576c73c852ca 100755
--- a/src/sdtranslator/SDTranslator.java
+++ b/src/sdtranslator/SDTranslator.java
@@ -48,7 +48,9 @@ package sdtranslator;
 import sddescription.*;
 import translator.*;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class SDTranslator {
diff --git a/src/sdtranslator/TimeConstraintLink.java b/src/sdtranslator/TimeConstraintLink.java
index e91486f3137afcad795923a421f0d5e6823dca30..39b64d935a8d6bb619f697b191c62d93779d48eb 100755
--- a/src/sdtranslator/TimeConstraintLink.java
+++ b/src/sdtranslator/TimeConstraintLink.java
@@ -45,8 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package sdtranslator;
 
-import sddescription.*;
-import translator.*;
+import sddescription.MSC;
+import sddescription.TimeConstraint;
+import translator.AbsoluteTimeConstraintTClass;
+import translator.Gate;
+import translator.RelativeTimeConstraintTClass;
+import translator.TimeConstraintTClass;
 
 public class TimeConstraintLink {
     
diff --git a/src/tepe/TEPE.java b/src/tepe/TEPE.java
index 1e0625cf5c42b7d857e27bb9f61c31b2d6862e4b..37b66ad9ead2980fbffeb26396c7f2299410d4f4 100644
--- a/src/tepe/TEPE.java
+++ b/src/tepe/TEPE.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public class TEPE extends Vector<TEPEComponent> {
     private String name;
diff --git a/src/tepe/TEPEAliasComponent.java b/src/tepe/TEPEAliasComponent.java
index 63a73d3511a78ff5644f7301930280cac91fea34..c223285f4e987f8e975e9f8a2311ee4f184f7a3c 100644
--- a/src/tepe/TEPEAliasComponent.java
+++ b/src/tepe/TEPEAliasComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEAliasComponent extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPEAttributeComponent.java b/src/tepe/TEPEAttributeComponent.java
index 74b0c4dbd6a3d7bab27c2920d511e39bd02ad2ed..8d78e3cabc0ab37b40c2d1023a8f0ced541d73c4 100644
--- a/src/tepe/TEPEAttributeComponent.java
+++ b/src/tepe/TEPEAttributeComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEAttributeComponent  extends TEPEComponent  {
 	protected String blockName;
diff --git a/src/tepe/TEPEComponent.java b/src/tepe/TEPEComponent.java
index 73de9b585e8e9ef47854c5dcea980c04d9da2889..3471ccfaa1b9ef6bf85a43d062c89bdc65043473 100644
--- a/src/tepe/TEPEComponent.java
+++ b/src/tepe/TEPEComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public abstract class TEPEComponent  {
 	private static int ID = 0;
diff --git a/src/tepe/TEPEEquationComponent.java b/src/tepe/TEPEEquationComponent.java
index 6d3be09dde9c5785eba88fd7606e55518ab4f94b..b1245f6891ba63b636da522d9544b04f46d301ed 100644
--- a/src/tepe/TEPEEquationComponent.java
+++ b/src/tepe/TEPEEquationComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEEquationComponent  extends TEPEComponent   {
 	
diff --git a/src/tepe/TEPELogicalConstraintComponent.java b/src/tepe/TEPELogicalConstraintComponent.java
index 5d9f9541797f3e7011393e72ca6418e025dccd64..70201c69120f25cf19bcea3989cc9e82bb03fec1 100644
--- a/src/tepe/TEPELogicalConstraintComponent.java
+++ b/src/tepe/TEPELogicalConstraintComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPELogicalConstraintComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPEPropertyComponent.java b/src/tepe/TEPEPropertyComponent.java
index dc06b3904ce08c17360631965ecaf8d1a04ad81f..35cce0bf2d8dce2b6e0bc0a338a4de07eb9335bd 100644
--- a/src/tepe/TEPEPropertyComponent.java
+++ b/src/tepe/TEPEPropertyComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEPropertyComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPEPropertyOperatorComponent.java b/src/tepe/TEPEPropertyOperatorComponent.java
index 3998ccf151e751ee6a44eece28f3445a65a7288d..54efa05d9a0b00e941b3327a17f59b081904d7d3 100644
--- a/src/tepe/TEPEPropertyOperatorComponent.java
+++ b/src/tepe/TEPEPropertyOperatorComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPEPropertyOperatorComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPESettingComponent.java b/src/tepe/TEPESettingComponent.java
index 676277b20366d3a13529e71b517ced4589274676..f0d571629ee7f7f43679a8ddf90f295cfca48ac9 100644
--- a/src/tepe/TEPESettingComponent.java
+++ b/src/tepe/TEPESettingComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPESettingComponent  extends TEPEComponent  {
 	
diff --git a/src/tepe/TEPESignalComponent.java b/src/tepe/TEPESignalComponent.java
index 251e88869815bbafb0898f3e1a7aab76ad393992..4dfe9147f59552a062210ea24252363c76b3d774 100644
--- a/src/tepe/TEPESignalComponent.java
+++ b/src/tepe/TEPESignalComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPESignalComponent  extends TEPEComponent  {
 	protected String blockName;
diff --git a/src/tepe/TEPETimeConstraintComponent.java b/src/tepe/TEPETimeConstraintComponent.java
index 470be3245c644883adda5890ea7437cf663b8735..48e1c0e353a81fab48ce3fd506d602509f56cc5a 100644
--- a/src/tepe/TEPETimeConstraintComponent.java
+++ b/src/tepe/TEPETimeConstraintComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tepe;
 
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
 
 public  class TEPETimeConstraintComponent  extends TEPEComponent  {
 	
diff --git a/src/tmatrix/RequirementModeling.java b/src/tmatrix/RequirementModeling.java
index 2cb02d15a94809b262d95838fc7044e99847d2c4..814a1e9dfafcd7699abeaa8aace2f45b7fa0d5ab 100755
--- a/src/tmatrix/RequirementModeling.java
+++ b/src/tmatrix/RequirementModeling.java
@@ -47,14 +47,19 @@
 
 package tmatrix;
 
-import java.util.*;
-
-
+import sddescription.HMSC;
+import sdtranslator.SDTranslationException;
+import sdtranslator.SDTranslator;
 import translator.*;
 import ui.*;
-import ui.req.*;
-import sddescription.*;
-import sdtranslator.*;
+import ui.req.Requirement;
+import ui.req.RequirementDiagramPanel;
+import ui.req.RequirementObserver;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class RequirementModeling {
     protected static final String NOT_FORMAL = "Requirement is not a formal requirement";
diff --git a/src/tmatrix/Requirements.java b/src/tmatrix/Requirements.java
index 0259c5d30ed8ea5fc3d4a58abcd312922c62c0b9..c48a79ee06831b27cd2d58c7f4e0ee8a2886dc97 100755
--- a/src/tmatrix/Requirements.java
+++ b/src/tmatrix/Requirements.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmatrix;
 
-import translator.*;
-import ui.req.*;
-import ui.graph.*;
+import translator.TURTLEModeling;
+import ui.graph.AUTGraph;
+import ui.req.Requirement;
+import ui.req.RequirementObserver;
 
 public class Requirements {
     public Requirement req;
diff --git a/src/tmltranslator/DIPLOElement.java b/src/tmltranslator/DIPLOElement.java
index 06fe55e0bd6865809541778337ccfe150c6802d0..46ea4fc6e583dbdea0d9843042a28235d7cc2196 100755
--- a/src/tmltranslator/DIPLOElement.java
+++ b/src/tmltranslator/DIPLOElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import myutil.*;
+import myutil.TraceManager;
 
 public class DIPLOElement {
 	
diff --git a/src/tmltranslator/HwBridge.java b/src/tmltranslator/HwBridge.java
index 1a5a068290505116ec8dbb902db45df95e335567..ef8367a9fc52907026f16da0b1cd40bc292af109 100755
--- a/src/tmltranslator/HwBridge.java
+++ b/src/tmltranslator/HwBridge.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class HwBridge extends HwCommunicationNode  {
diff --git a/src/tmltranslator/HwCPU.java b/src/tmltranslator/HwCPU.java
index 35e63f80b39c2e26c26e369b6b52eee4948eb3c9..62bd7f6d6e8f7f47b9d92fdb1b2b55121d11d2df 100755
--- a/src/tmltranslator/HwCPU.java
+++ b/src/tmltranslator/HwCPU.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import tmltranslator.modelcompiler.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import tmltranslator.modelcompiler.CpuMEC;
 
 
 public class HwCPU extends HwExecutionNode  {
diff --git a/src/tmltranslator/HwNode.java b/src/tmltranslator/HwNode.java
index 4f0be4994e5110c0c983c8ce8ae7fac138b7f24b..d8b39813abed559bf9f5e2b3d2ecbe8e80534b3d 100755
--- a/src/tmltranslator/HwNode.java
+++ b/src/tmltranslator/HwNode.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import tmltranslator.modelcompiler.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
 
 
 public abstract class HwNode extends DIPLOElement  {
diff --git a/src/tmltranslator/SecurityPattern.java b/src/tmltranslator/SecurityPattern.java
index 557d3f5fa0958bac4ce66725ce35c32e1b2d4e57..ca20a6c43dfbceb54600deeba048abcf41106aa6 100644
--- a/src/tmltranslator/SecurityPattern.java
+++ b/src/tmltranslator/SecurityPattern.java
@@ -1,5 +1,6 @@
 package tmltranslator;
-import avatartranslator.*;
+
+import avatartranslator.AvatarState;
 
 public class SecurityPattern {
 
diff --git a/src/tmltranslator/TMLActivity.java b/src/tmltranslator/TMLActivity.java
index bfd3952a74f36a04cd5e0183a0aa464d6e9d5b6f..d7bb885d971fdf8e30ea0453a9c712ee81b0d4f5 100755
--- a/src/tmltranslator/TMLActivity.java
+++ b/src/tmltranslator/TMLActivity.java
@@ -45,9 +45,10 @@
 
 package tmltranslator;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.Vector;
 
 
 public class TMLActivity extends TMLElement {
diff --git a/src/tmltranslator/TMLActivityElement.java b/src/tmltranslator/TMLActivityElement.java
index f3fb5be3cc6b60b69dea42a9545b31eeb0406bfb..4e9ea23bfa23bd5c8909d397d35075e85e51d5a6 100755
--- a/src/tmltranslator/TMLActivityElement.java
+++ b/src/tmltranslator/TMLActivityElement.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLActivityElement extends TMLElement{
diff --git a/src/tmltranslator/TMLActivityElementChannel.java b/src/tmltranslator/TMLActivityElementChannel.java
index e8e466d5f9e878a28c6bf92c252c4ba2f22495e0..7f15af4949ffdfb7a3eb0282e41992cb9d412ce9 100755
--- a/src/tmltranslator/TMLActivityElementChannel.java
+++ b/src/tmltranslator/TMLActivityElementChannel.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.ArrayList;
 
 
 public class TMLActivityElementChannel extends TMLActivityElement {
diff --git a/src/tmltranslator/TMLActivityElementEvent.java b/src/tmltranslator/TMLActivityElementEvent.java
index b79b454af4622c2f94a22149b93fca7c4b1b1aaa..02025e71e0af2fc48caab315d432230213ce3527 100755
--- a/src/tmltranslator/TMLActivityElementEvent.java
+++ b/src/tmltranslator/TMLActivityElementEvent.java
@@ -45,7 +45,8 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.List;
+import java.util.Vector;
 
 
 public abstract class TMLActivityElementEvent extends TMLActivityElement {
diff --git a/src/tmltranslator/TMLArchiTextSpecification.java b/src/tmltranslator/TMLArchiTextSpecification.java
index 79aeffd9b0dca3def8cfd5b0c72fc42915a810ad..9207907484cfcdf77e387e68f44854f721d549ce 100755
--- a/src/tmltranslator/TMLArchiTextSpecification.java
+++ b/src/tmltranslator/TMLArchiTextSpecification.java
@@ -47,9 +47,14 @@
 
 package tmltranslator;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLArchiTextSpecification {
     public final static String CR = "\n";
diff --git a/src/tmltranslator/TMLArchitecture.java b/src/tmltranslator/TMLArchitecture.java
index fc058325bba1567ea363cad3072a8098c945f8a1..cbb1d9427c108c6f52dff36ce732bfd35a960d98 100755
--- a/src/tmltranslator/TMLArchitecture.java
+++ b/src/tmltranslator/TMLArchitecture.java
@@ -45,9 +45,10 @@
 
 package tmltranslator;
 
-import java.util.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLArchitecture {
     private List<HwNode> hwnodes;
diff --git a/src/tmltranslator/TMLCP.java b/src/tmltranslator/TMLCP.java
index 81735f2db53ebe55d0dacbaa386bc02d70ee3fc9..0a4f468f879344423c79ad709ec5173baff40d69 100755
--- a/src/tmltranslator/TMLCP.java
+++ b/src/tmltranslator/TMLCP.java
@@ -46,9 +46,12 @@
 
 package tmltranslator;
 
-import java.util.*;
 import tmltranslator.tmlcp.*;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
 public class TMLCP extends TMLElement {
 
     private TMLCPActivityDiagram mainCP;
diff --git a/src/tmltranslator/TMLCPError.java b/src/tmltranslator/TMLCPError.java
index a7b8960dd00eb4fadfa812c59da4341c16070f6b..5332c40c7ff65298fd8b0803d0c38ac0f320e6b2 100755
--- a/src/tmltranslator/TMLCPError.java
+++ b/src/tmltranslator/TMLCPError.java
@@ -47,7 +47,7 @@
 
 package tmltranslator;
 
-import tmltranslator.tmlcp.*;
+import tmltranslator.tmlcp.TMLCPElement;
 
 public class TMLCPError {
     
diff --git a/src/tmltranslator/TMLCPLib.java b/src/tmltranslator/TMLCPLib.java
index 30e0f0db5169fd5f8ab1f2d08c992771bb03eb66..98a40299d7f2e4c492bd127cbe86d00f4d7db276 100755
--- a/src/tmltranslator/TMLCPLib.java
+++ b/src/tmltranslator/TMLCPLib.java
@@ -46,7 +46,9 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
 
 public class TMLCPLib extends TMLElement {
 
diff --git a/src/tmltranslator/TMLCPLibArtifact.java b/src/tmltranslator/TMLCPLibArtifact.java
index e97961147c0a27dc2e5ad0d1b39d51498e0a823e..9e3dc6bf476ded371aaafedc9d23f7cc6a6b8866 100755
--- a/src/tmltranslator/TMLCPLibArtifact.java
+++ b/src/tmltranslator/TMLCPLibArtifact.java
@@ -46,7 +46,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.List;
 
 public class TMLCPLibArtifact extends TMLElement {
 
diff --git a/src/tmltranslator/TMLCPSyntaxChecking.java b/src/tmltranslator/TMLCPSyntaxChecking.java
index c07c83dc83dfd52a2cb59f160bf25b1faf10997b..8223a527083bf5d6173a1f62459df284bebbf150 100755
--- a/src/tmltranslator/TMLCPSyntaxChecking.java
+++ b/src/tmltranslator/TMLCPSyntaxChecking.java
@@ -48,11 +48,15 @@
 
 package tmltranslator;
 
-import java.io.*;
-import java.util.*;
-import compiler.tmlparser.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
 import tmltranslator.tmlcp.*;
 
+import java.io.StringReader;
+import java.util.*;
+
 
 public class TMLCPSyntaxChecking {
 
diff --git a/src/tmltranslator/TMLCPTextSpecification.java b/src/tmltranslator/TMLCPTextSpecification.java
index 0e69dc2f1873348e7ce6fbbfca688e943c4ceb31..f81eec7979d0ee8a42bcc5fd7cfdb7883f390e82 100755
--- a/src/tmltranslator/TMLCPTextSpecification.java
+++ b/src/tmltranslator/TMLCPTextSpecification.java
@@ -48,10 +48,13 @@
 
 package tmltranslator;
 
-import java.util.*;
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tmltranslator.tmlcp.*;
 
+import java.util.*;
+
 public class TMLCPTextSpecification {
     public final static String CR = "\n";
     public final static String SP = " ";
diff --git a/src/tmltranslator/TMLChannel.java b/src/tmltranslator/TMLChannel.java
index 08c5561927e04b6e222dbc4c329553d016743759..885e9a27ec2fc030a403a717019f16eacae050e7 100755
--- a/src/tmltranslator/TMLChannel.java
+++ b/src/tmltranslator/TMLChannel.java
@@ -45,11 +45,12 @@
 
 package tmltranslator;
 
-import myutil.*;
-
-import java.util.*;
+import myutil.TraceManager;
 import ui.tmlcompd.TMLCPrimitivePort;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TMLChannel extends TMLCommunicationElement {
 
     public static final int BRBW = 0;
diff --git a/src/tmltranslator/TMLChoice.java b/src/tmltranslator/TMLChoice.java
index ce2f4e58b3cfb60cd9715615d9bd1194fada5482..17b004bb1919e2e1a60aebd2f89c9bf459ebf921 100755
--- a/src/tmltranslator/TMLChoice.java
+++ b/src/tmltranslator/TMLChoice.java
@@ -45,9 +45,9 @@
 
 package tmltranslator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.ArrayList;
 
 public class TMLChoice extends TMLActivityElement{
     private ArrayList<String> guards;
diff --git a/src/tmltranslator/TMLCommunicationElement.java b/src/tmltranslator/TMLCommunicationElement.java
index 79155b7557b6f24ad8b028a9aa219d765657f093..0d3656ff21e60197b67452323fa85b70c3c5c7c5 100755
--- a/src/tmltranslator/TMLCommunicationElement.java
+++ b/src/tmltranslator/TMLCommunicationElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator;
 
-import myutil.*;
+import myutil.TraceManager;
 
 public abstract class TMLCommunicationElement extends TMLElement {
    //private boolean infected;
diff --git a/src/tmltranslator/TMLEvent.java b/src/tmltranslator/TMLEvent.java
index df2d2d805381b27d7be759fb5622da51eade173f..b70648bdde5a8a2d4db6d3271a190deaa3ef9946 100755
--- a/src/tmltranslator/TMLEvent.java
+++ b/src/tmltranslator/TMLEvent.java
@@ -45,9 +45,12 @@
 
 package tmltranslator;
 
-import java.util.*;
 import ui.tmlcompd.TMLCPrimitivePort;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
 public class TMLEvent extends TMLCommunicationElement {
     // Options
     protected Vector<TMLType> params; // List of various types of parameters
diff --git a/src/tmltranslator/TMLMapping.java b/src/tmltranslator/TMLMapping.java
index 84d34aee0774ea207e553200c975fc14ab20c45a..b554cc71acc587db23c9e6e88d20aec730e5c00a 100755
--- a/src/tmltranslator/TMLMapping.java
+++ b/src/tmltranslator/TMLMapping.java
@@ -46,10 +46,13 @@
 
 package tmltranslator;
 
+import myutil.TraceManager;
+import tmltranslator.toproverif.TML2ProVerif;
+import ui.CorrespondanceTGElement;
+import ui.TMLArchiPanel;
+import ui.TMLComponentDesignPanel;
+
 import java.util.*;
-import myutil.*;
-import tmltranslator.toproverif.*;
-import ui.*;
 
 public class TMLMapping {
 
diff --git a/src/tmltranslator/TMLMappingTextSpecification.java b/src/tmltranslator/TMLMappingTextSpecification.java
index 34467f6a47e567499fa788f71205a421e0c02f5f..ed288cd17472b2b8ce7bede6669c197c32d34d1e 100755
--- a/src/tmltranslator/TMLMappingTextSpecification.java
+++ b/src/tmltranslator/TMLMappingTextSpecification.java
@@ -47,9 +47,15 @@
 
 package tmltranslator;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLMappingTextSpecification {
     public final static String CR = "\n";
diff --git a/src/tmltranslator/TMLModeling.java b/src/tmltranslator/TMLModeling.java
index fb1c6b281c11ca754e2c74c38e7550dee7f38103..68a5e362b256a528c06445bd8512a14bac459972 100755
--- a/src/tmltranslator/TMLModeling.java
+++ b/src/tmltranslator/TMLModeling.java
@@ -45,13 +45,20 @@
 
 package tmltranslator;
 
-import java.util.*;
-import myutil.*;
-import ui.TGComponent;
-import ui.tmlcompd.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaSecret;
+import myutil.Conversion;
+import myutil.TraceManager;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
 import ui.TAttribute;
-import avatartranslator.*;
-import proverifspec.*;
+import ui.TGComponent;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
+
+import java.util.*;
 
 
 public class TMLModeling {
diff --git a/src/tmltranslator/TMLRandomSequence.java b/src/tmltranslator/TMLRandomSequence.java
index 20bcde97a20068bf5f63972fb4c9545dd2bbe7c2..92df51f23f5ba915a9da1bf77a3afcc6d8d85cf7 100755
--- a/src/tmltranslator/TMLRandomSequence.java
+++ b/src/tmltranslator/TMLRandomSequence.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLRandomSequence extends TMLActivityElement{
diff --git a/src/tmltranslator/TMLRequest.java b/src/tmltranslator/TMLRequest.java
index 65ef718670f618f21e6051f02292c57a82f1e088..1447f14e35b45f09fdf591c45fa090a160f7d0e1 100755
--- a/src/tmltranslator/TMLRequest.java
+++ b/src/tmltranslator/TMLRequest.java
@@ -45,9 +45,12 @@
 
 package tmltranslator;
 
-import java.util.*;
 import ui.tmlcompd.TMLCPrimitivePort;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
 public class TMLRequest extends TMLCommunicationElement {
     
 	protected Vector<TMLType> params; // List of various types of parameters
diff --git a/src/tmltranslator/TMLSendRequest.java b/src/tmltranslator/TMLSendRequest.java
index 53351e9e2221be8e603caa9574a064b47d422482..4bb6ff5ee2adf2854ed0a04bd20871c78984b51d 100755
--- a/src/tmltranslator/TMLSendRequest.java
+++ b/src/tmltranslator/TMLSendRequest.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLSendRequest extends TMLActivityElement  {
diff --git a/src/tmltranslator/TMLSequence.java b/src/tmltranslator/TMLSequence.java
index 4f914c4eec7045dea0d410f10d7cb0e28ff94e4a..bac3749177a124f3a928a33a60a0279200dcf823 100755
--- a/src/tmltranslator/TMLSequence.java
+++ b/src/tmltranslator/TMLSequence.java
@@ -45,7 +45,7 @@
 
 package tmltranslator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class TMLSequence extends TMLActivityElement{
diff --git a/src/tmltranslator/TMLSyntaxChecking.java b/src/tmltranslator/TMLSyntaxChecking.java
index 6a77696baac5c8c9651bb1d6527f2f720fbca543..141659b62f3454a6b436cdb26c1a583ccfe30758 100755
--- a/src/tmltranslator/TMLSyntaxChecking.java
+++ b/src/tmltranslator/TMLSyntaxChecking.java
@@ -47,10 +47,15 @@
 
 package tmltranslator;
 
-import java.io.*;
-import java.util.*;
-import compiler.tmlparser.*;
-import myutil.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.Conversion;
+import myutil.TraceManager;
+
+import java.io.StringReader;
+import java.util.ArrayList;
 
 
 public class TMLSyntaxChecking {
diff --git a/src/tmltranslator/TMLTextSpecification.java b/src/tmltranslator/TMLTextSpecification.java
index 75d86f782de560703e6dd915ff04b9cf703febd0..e6092855a5d72e1b54cd4b3ed2c240cf970d7c7d 100755
--- a/src/tmltranslator/TMLTextSpecification.java
+++ b/src/tmltranslator/TMLTextSpecification.java
@@ -47,9 +47,15 @@
 
 package tmltranslator;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Date;
 
 public class TMLTextSpecification {
     public final static String CR = "\n";
diff --git a/src/tmltranslator/modelcompiler/AdaifBuffer.java b/src/tmltranslator/modelcompiler/AdaifBuffer.java
index b442ec520b7a192df409e6cb2ee93f7db272d3c7..0bbb61f33ebb38bad4947547a073c5f209ea225a 100644
--- a/src/tmltranslator/modelcompiler/AdaifBuffer.java
+++ b/src/tmltranslator/modelcompiler/AdaifBuffer.java
@@ -46,21 +46,13 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.ArrayList;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
 import org.w3c.dom.Element;
-
 import tmltranslator.TMLTask;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
 public class AdaifBuffer extends Buffer	{
 
 	public static final int NUM_SAMPLES_INDEX = 1;
diff --git a/src/tmltranslator/modelcompiler/Buffer.java b/src/tmltranslator/modelcompiler/Buffer.java
index 158e18172c8d4bdc2cbb817d6a2f89a0531d37f5..7084edb3a5e438318cbb518fa631ceada5479f6c 100755
--- a/src/tmltranslator/modelcompiler/Buffer.java
+++ b/src/tmltranslator/modelcompiler/Buffer.java
@@ -46,12 +46,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.List;
-
 import tmltranslator.TMLCPLibArtifact;
 import tmltranslator.TMLPort;
 import tmltranslator.TMLTask;
 
+import java.util.List;
+
 public class Buffer	{
 
 	public static final String[] memoryTypesList = { "FEP memory", "MAPPER memory", "ADAIF memory", "INTERLEAVER memory", "MAIN MEMORY memory" };
diff --git a/src/tmltranslator/modelcompiler/BufferMEC.java b/src/tmltranslator/modelcompiler/BufferMEC.java
index 72ecff9fdc57bd49c70c3b93ebdab3de6786a15f..f1e7c12b90e67c3ed3b3af84e57ab5e2fc279eea 100644
--- a/src/tmltranslator/modelcompiler/BufferMEC.java
+++ b/src/tmltranslator/modelcompiler/BufferMEC.java
@@ -45,14 +45,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.util.ArrayList;
-
-import javax.swing.JPanel;
-
 import org.w3c.dom.Element;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
 public interface BufferMEC	{
 
 	public ArrayList<String> getBufferParameters();
diff --git a/src/tmltranslator/modelcompiler/DMAContext.java b/src/tmltranslator/modelcompiler/DMAContext.java
index a215f8c7e050a5837f25457cbd0b05fe02e35ea3..cc7912370af4398d93967c1f8f982d91dfd9c8a8 100644
--- a/src/tmltranslator/modelcompiler/DMAContext.java
+++ b/src/tmltranslator/modelcompiler/DMAContext.java
@@ -44,15 +44,9 @@
    * @see
    */
 
-package tmltranslator.modelcompiler;;
+package tmltranslator.modelcompiler;
 
-import java.util.*;
-import java.nio.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import myutil.*;
-
-import tmltranslator.*;
+;
 
 public class DMAContext	{
 
diff --git a/src/tmltranslator/modelcompiler/DataTransfer.java b/src/tmltranslator/modelcompiler/DataTransfer.java
index 42ba3a77ad297e33b0bef5a592d5c3e9cf45dc7e..31b3fd914266c85af0909c19bcdabc1b37f4432a 100755
--- a/src/tmltranslator/modelcompiler/DataTransfer.java
+++ b/src/tmltranslator/modelcompiler/DataTransfer.java
@@ -46,12 +46,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import tmltranslator.TMLCP;
 import tmltranslator.TMLCPLib;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DataTransfer	{
 
 	public static final int DMA = 0;
diff --git a/src/tmltranslator/modelcompiler/FepBuffer.java b/src/tmltranslator/modelcompiler/FepBuffer.java
index cc990d56b447249cadc78137fbe2498ce1128bfa..b072518106e585bdb434743fafbedec8f77e2ed3 100755
--- a/src/tmltranslator/modelcompiler/FepBuffer.java
+++ b/src/tmltranslator/modelcompiler/FepBuffer.java
@@ -46,24 +46,15 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Vector;
 
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
 public class FepBuffer extends Buffer	{
 
 	public static final String[] dataTypeList = { "int8", "int16", "cpx16", "cpx32" };
diff --git a/src/tmltranslator/modelcompiler/FepMEC.java b/src/tmltranslator/modelcompiler/FepMEC.java
index 2ccb360de80e139480a3fae13c0abbfc9aad315b..aaa75f103087821014131fd2e0253275890b2470 100644
--- a/src/tmltranslator/modelcompiler/FepMEC.java
+++ b/src/tmltranslator/modelcompiler/FepMEC.java
@@ -46,7 +46,8 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Vector;
 
 public class FepMEC extends ArchUnitMEC	{
 
diff --git a/src/tmltranslator/modelcompiler/InterleaverBuffer.java b/src/tmltranslator/modelcompiler/InterleaverBuffer.java
index 95f3f393ecfde6f2321f207e98f683c43a1aeffe..0237297aa0ba3470fa5005470080264a5238bc19 100644
--- a/src/tmltranslator/modelcompiler/InterleaverBuffer.java
+++ b/src/tmltranslator/modelcompiler/InterleaverBuffer.java
@@ -46,24 +46,15 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Vector;
 
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
 public class InterleaverBuffer extends Buffer	{
 
 	public static final String[] symmetricalValues = { "OFF", "ON" };
diff --git a/src/tmltranslator/modelcompiler/MMBuffer.java b/src/tmltranslator/modelcompiler/MMBuffer.java
index 9a28b60535e0665b25980194d357a517cb668782..76f14e0dd979f60c959ab0c39d47d44b1f78c2f5 100644
--- a/src/tmltranslator/modelcompiler/MMBuffer.java
+++ b/src/tmltranslator/modelcompiler/MMBuffer.java
@@ -46,21 +46,13 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.ArrayList;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
 import org.w3c.dom.Element;
-
 import tmltranslator.TMLTask;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
 public class MMBuffer extends Buffer	{
 
 	public static final int NUM_SAMPLES_INDEX = 1;
diff --git a/src/tmltranslator/modelcompiler/MapperBuffer.java b/src/tmltranslator/modelcompiler/MapperBuffer.java
index 5a4f48c09a4ee23f78d628d54c341f2a230675b3..39ef4a1f06e534a8b6810a7d66eefd2081c834d7 100644
--- a/src/tmltranslator/modelcompiler/MapperBuffer.java
+++ b/src/tmltranslator/modelcompiler/MapperBuffer.java
@@ -46,24 +46,15 @@
 
 package tmltranslator.modelcompiler;
 
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Vector;
 
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
 public class MapperBuffer extends Buffer	{
 
 	public static final String[] symmetricalValues = { "OFF", "ON" };
diff --git a/src/tmltranslator/modelcompiler/Operation.java b/src/tmltranslator/modelcompiler/Operation.java
index 89eaa7e912fb7f56876bb89b22f38ab6df05568f..9190dc482d6088e742a43e90c55b75e430be1edc 100755
--- a/src/tmltranslator/modelcompiler/Operation.java
+++ b/src/tmltranslator/modelcompiler/Operation.java
@@ -46,12 +46,12 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import tmltranslator.HwNode;
 import tmltranslator.TMLTask;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Operation	{
 
 	public static final int NONSDR = 0;
diff --git a/src/tmltranslator/modelcompiler/OperationMEC.java b/src/tmltranslator/modelcompiler/OperationMEC.java
index ea88e0cec578a8afcacfc06ee19bcbf2434c0bda..bc4e333fecedda37d8c7a076e974a83ba7eb6718 100755
--- a/src/tmltranslator/modelcompiler/OperationMEC.java
+++ b/src/tmltranslator/modelcompiler/OperationMEC.java
@@ -46,7 +46,9 @@
 
 package tmltranslator.modelcompiler;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public abstract class OperationMEC	{
 
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompiler.java b/src/tmltranslator/modelcompiler/TMLModelCompiler.java
index 6e6d4e8f1a3e5a84695acc2c3509b7bab1c03f4a..6853532edc69bfd487f704ac928ab48dcf5a76bb 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompiler.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompiler.java
@@ -48,6 +48,15 @@
 
 package tmltranslator.modelcompiler;
 
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import tmltranslator.*;
+import ui.ConfigurationTTool;
+import ui.GTMLModeling;
+import ui.TMLCommunicationPatternPanel;
+
+import javax.swing.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -56,24 +65,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
-import javax.swing.JFrame;
-
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.TraceManager;
-import tmltranslator.HwNode;
-import tmltranslator.TMLArchitecture;
-import tmltranslator.TMLCP;
-import tmltranslator.TMLCPLib;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLPort;
-import tmltranslator.TMLTask;
-import ui.ConfigurationTTool;
-import ui.GTMLModeling;
-import ui.TMLCommunicationPatternPanel;
-
 public class TMLModelCompiler	{
 
 	public String title;
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompilerError.java b/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
index 1d1670d93f47ed2f86f8f6ec767e00e2d0bcdd1b..4e114bf622f892277e99e0a0dc86d5e7d0cb1c83 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
@@ -49,7 +49,8 @@
 
 package tmltranslator.modelcompiler;
 
-import tmltranslator.*;
+import tmltranslator.TMLActivityElement;
+import tmltranslator.TMLTask;
 
 public class TMLModelCompilerError {
     
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java b/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
index 1c530ed614e7965ba0cc308d981023a3a97c1d60..5e36ccce748acf1d0dbe3ab35b5c8b0a4fd35c98 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
@@ -49,9 +49,13 @@
 
 package tmltranslator.modelcompiler;
 
+import myutil.TraceManager;
 import tmltranslator.*;
-import java.util.*;
-import myutil.*;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class TMLModelCompilerParser {
     
diff --git a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
index b1f52d76774ca88daf54f964cfe860677d731f2f..0c5b2069a2322ff00328573f23a84890001f3ad4 100755
--- a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
+++ b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
@@ -46,8 +46,10 @@
 
 package tmltranslator.tmlcp;
 
+import tmltranslator.TMLCP;
+import tmltranslator.TMLElement;
+
 import java.util.*;
-import tmltranslator.*;
 
 public class TMLCPActivityDiagram  extends TMLElement {
 
diff --git a/src/tmltranslator/tmlcp/TMLCPChoice.java b/src/tmltranslator/tmlcp/TMLCPChoice.java
index 9f09bf8cc6487541c59907bac5d96d93b4b797d7..52e87dd30e0acdaba1ffdd1c31a455e1c2016a38 100755
--- a/src/tmltranslator/tmlcp/TMLCPChoice.java
+++ b/src/tmltranslator/tmlcp/TMLCPChoice.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tmlcp;
 
-import java.util.*;
+import java.util.ArrayList;
 
 //The method is not very suited for the language, I should come back later...
 public class TMLCPChoice extends TMLCPElement  {
diff --git a/src/tmltranslator/tmlcp/TMLCPElement.java b/src/tmltranslator/tmlcp/TMLCPElement.java
index 8229ed122ec6ea6feeb61682e16a55f9074c5331..b69d831c9e74ebea83011c1c8123ec30851fbd7e 100755
--- a/src/tmltranslator/tmlcp/TMLCPElement.java
+++ b/src/tmltranslator/tmlcp/TMLCPElement.java
@@ -46,8 +46,10 @@
 
 package tmltranslator.tmlcp;
 
-import tmltranslator.*;
-import java.util.*;
+import tmltranslator.TMLElement;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class TMLCPElement extends TMLElement  {
     protected List<TMLCPElement> nexts;
diff --git a/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java b/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
index e04dd292068c4e832698560a3fe47198da77c04c..1c5dc350d28c3d1d00111c3522f1e783bf4ca339 100755
--- a/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
+++ b/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
@@ -47,9 +47,11 @@
 
 package tmltranslator.tmlcp;
 
-import java.util.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
 
-import tmltranslator.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TMLCPSequenceDiagram  extends TMLElement {
 
diff --git a/src/tmltranslator/tmlcp/TMLSDElement.java b/src/tmltranslator/tmlcp/TMLSDElement.java
index fc37a9370a7e513d5087f204bd7e67a6cb6435ab..d1778caaf94e0f39f5bcd5b61f240ac619794cb9 100755
--- a/src/tmltranslator/tmlcp/TMLSDElement.java
+++ b/src/tmltranslator/tmlcp/TMLSDElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tmlcp;
 
-import tmltranslator.*;
+import tmltranslator.TMLElement;
 
 public abstract class TMLSDElement extends TMLElement  {
 	
diff --git a/src/tmltranslator/tmlcp/TMLSDInstance.java b/src/tmltranslator/tmlcp/TMLSDInstance.java
index e7b7720155beb6ee9ee27d3b98fc477bd95d254b..13f2b98274d51d7c3651559de6791a284238ed80 100755
--- a/src/tmltranslator/tmlcp/TMLSDInstance.java
+++ b/src/tmltranslator/tmlcp/TMLSDInstance.java
@@ -47,11 +47,14 @@
 
 package tmltranslator.tmlcp;
 
-import tmltranslator.*;
-import ui.tmldd.*;
-import java.util.*;
-
-import ui.tmlsd.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
+import tmltranslator.TMLType;
+import ui.tmldd.TMLArchiNode;
+import ui.tmlsd.TGConnectorMessageTMLSD;
+
+import java.util.ArrayList;
+import java.util.Collections;
 
 public class TMLSDInstance extends TMLElement  {
 
diff --git a/src/tmltranslator/tmlcp/TMLSDMessage.java b/src/tmltranslator/tmlcp/TMLSDMessage.java
index c68750857ed92997e3f8c53764be8f8fc67395a8..66e7cb656880c5b05e7ac0a2dfe76d4836c2b707 100755
--- a/src/tmltranslator/tmlcp/TMLSDMessage.java
+++ b/src/tmltranslator/tmlcp/TMLSDMessage.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tmlcp;
 
-import java.util.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
 
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public class TMLSDMessage extends TMLElement  {
 
diff --git a/src/tmltranslator/toautomata/TML2AUT.java b/src/tmltranslator/toautomata/TML2AUT.java
index 90e09d4cc55849076b743afe1a559618f693dc1f..81cdbfc3c92150056e5642a808d08e873b9098ce 100755
--- a/src/tmltranslator/toautomata/TML2AUT.java
+++ b/src/tmltranslator/toautomata/TML2AUT.java
@@ -45,11 +45,17 @@
 
 package tmltranslator.toautomata;
 
-import java.util.*;
-
+import automata.Automata;
+import automata.State;
+import automata.Transition;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import automata.*;
-import myutil.*;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
 
 
 public class TML2AUT {
diff --git a/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java b/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
index d3f8067a455b842c7a62a87529420ddcfe1097d7..4e52fa7bcb37733d8954f6f54cf77e8328bbc7b8 100755
--- a/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
+++ b/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
@@ -45,12 +45,17 @@
 
 package tmltranslator.toautomata;
 
-import java.util.*;
+import automata.Automata;
+import myutil.FileException;
+import myutil.FileUtils;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
+import translator.TURTLEModeling;
+import translator.TURTLETranslator;
 
-import translator.*;
-import tmltranslator.*;
-import automata.*;
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class TML2AUTviaLOTOS {
diff --git a/src/tmltranslator/toavatar/TML2Avatar.java b/src/tmltranslator/toavatar/TML2Avatar.java
index 5b36d525d8f82b3fcab4735fac8373180899ca6b..0befba876b5cb4753401a557de62dcd185237503 100644
--- a/src/tmltranslator/toavatar/TML2Avatar.java
+++ b/src/tmltranslator/toavatar/TML2Avatar.java
@@ -44,22 +44,18 @@
  */
 
 package tmltranslator.toavatar;
-import tmltranslator.*;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.ArrayList;
 
-import ui.tmlcompd.*;
-import ui.tmlad.*;
-import ui.TGComponent;
-import myutil.*;
 import avatartranslator.*;
-
+import myutil.TraceManager;
 import proverifspec.ProVerifQueryResult;
+import tmltranslator.*;
+import ui.TGComponent;
+import ui.tmlad.*;
+import ui.tmlcompd.TMLCPrimitivePort;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class TML2Avatar {
 	private TMLMapping tmlmap;
diff --git a/src/tmltranslator/toavatar/TML2AvatarDP.java b/src/tmltranslator/toavatar/TML2AvatarDP.java
index 019e8c829e84c968dae3849de9a31afb884b10aa..2fe9ebaca5746ed5308f9baaf341d5a301d8066f 100644
--- a/src/tmltranslator/toavatar/TML2AvatarDP.java
+++ b/src/tmltranslator/toavatar/TML2AvatarDP.java
@@ -44,17 +44,21 @@
 
 package tmltranslator.toavatar;
 
-import java.util.*;
-import java.awt.*;
-import tmltranslator.*;
-import ui.*;
-import myutil.*;
-import ui.avatarbd.*;
+import avatartranslator.*;
+import tmltranslator.TMLMapping;
+import ui.AvatarDesignPanel;
+import ui.TAttribute;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDPanel;
+import ui.avatarbd.AvatarBDPortConnector;
+import ui.avatarbd.AvatarBDPragma;
 import ui.avatarsmd.*;
 
-import avatartranslator.*;
+import java.util.*;
+
 //import translator.*;
-import ui.window.*;
 
 
 public class TML2AvatarDP {
diff --git a/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java b/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
index 180f448f73744de07cfe9c7ca14f90d5038e2daa..6778daa373b6f2d42c814e1d03af6c2be9869eb6 100755
--- a/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
+++ b/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
@@ -45,10 +45,13 @@
 
 package tmltranslator.tomappingsystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.List;
 
 
 public class MappedSystemCTask {
diff --git a/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java b/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
index f7a173d7e3074776a526c22181eae438cb3d31e5..e7e332e7f05bd8baa3e5c7a575d98a17506233f4 100755
--- a/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
+++ b/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tomappingsystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 
 public class TML2MappingSystemC {
diff --git a/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
index b8c2841509477a4c67bd3452f8b6db5ebed206d6..cbe052128bc8c26858a4aea51d28e8da670e154b 100644
--- a/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
+++ b/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
@@ -45,12 +45,15 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import req.ebrdd.EBRDD;
+import tepe.TEPE;
 import tmltranslator.*;
-import myutil.*;
-import req.ebrdd.*;
-import tepe.*;
+
+import java.util.*;
 
 
 public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator {
diff --git a/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java b/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
index 546b79b62521987fb6e3a1631df4395a6db4f2b1..c98870e6c51fb6c3238407035883d1488c87d71f 100644
--- a/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
+++ b/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
@@ -1,12 +1,12 @@
 package tmltranslator.tomappingsystemc2;
 
-import java.util.List;
-
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
 import tmltranslator.TMLMapping;
 import tmltranslator.TMLModeling;
 
+import java.util.List;
+
 public class DiploSimulatorFactory {
 	
 	public static final DiploSimulatorFactory INSTANCE = new DiploSimulatorFactory();
diff --git a/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java b/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
index d5c3dc9411c930e35a59a2d8ef5a19f45124823d..30bd4d85dd2934e08ec7022bcce037dee997b93e 100644
--- a/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
+++ b/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
@@ -1,10 +1,12 @@
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
+import myutil.TraceManager;
 import tmltranslator.*;
-import javax.script.*;
 
-import myutil.*;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import java.util.LinkedList;
 
 public class LiveVariableNode{
 	private LinkedList<LiveVariableNode> _succList = new LinkedList<LiveVariableNode>(), _predList = new LinkedList<LiveVariableNode>();
diff --git a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
index 33a6f909c6a87703decd80e671e7735a0885cef9..f3a5aa774ef06afa35589f42dbebc1debfdbd818 100644
--- a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
+++ b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
@@ -45,9 +45,16 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 
 public class MappedSystemCTask {
diff --git a/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java b/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
index d87df65b56f13241615c4433fad96dde41ed7506..2df16b5f872c258b0f1c6213647f9e22c886dad3 100644
--- a/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
+++ b/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
@@ -1,21 +1,10 @@
 package tmltranslator.tomappingsystemc2;
 
+import tmltranslator.*;
+
 import java.util.Arrays;
 import java.util.Collection;
 
-import tmltranslator.CPPCodeGenerationHelper;
-import tmltranslator.HwA;
-import tmltranslator.HwBridge;
-import tmltranslator.HwBus;
-import tmltranslator.HwCPU;
-import tmltranslator.HwCommunicationNode;
-import tmltranslator.HwExecutionNode;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLEvent;
-import tmltranslator.TMLTask;
-
 public class NamesGenerationHelper {
 	
 	private static final String[] RESERVED_WORDS = {
diff --git a/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java b/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
index 77ecbd05cc15f7b2717377b1757786784ac673d9..da6045b1e9d072d1e4afc084ec5aeea13cfba6b1 100644
--- a/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
+++ b/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
@@ -1,10 +1,14 @@
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
+import myutil.TraceManager;
 import tmltranslator.*;
-import java.util.regex.*;
 
-import myutil.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 //import java.util.HashSet;
 
 public class StaticAnalysis{
diff --git a/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java b/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
index 98b20593e514e28f0c8926b40ebce5741b91f4bb..6ca05877e67aaedb5784c8379f859b5db68cc379 100644
--- a/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
+++ b/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
@@ -45,11 +45,14 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-
-import tmltranslator.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import req.ebrdd.*;
+import tmltranslator.*;
+
+import java.util.LinkedList;
 
 
 public class SystemCEBRDD {
diff --git a/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java b/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
index 5f02acc621433fe44220d4778fb457a39e54c150..864796326c461ae8f79226b16a5bf46d670d94ca 100644
--- a/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
+++ b/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
@@ -45,10 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tepe.*;
-import java.util.regex.*;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class SystemCTEPE {
diff --git a/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java b/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
index 7b752c7a7cf7436147a771bdb56cc374960eaf56..95b45ad1759651029f5c3b9c6ade747cc8dc2472 100644
--- a/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
+++ b/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
@@ -45,12 +45,15 @@
 
 package tmltranslator.tomappingsystemc2;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import req.ebrdd.EBRDD;
+import tepe.TEPE;
 import tmltranslator.*;
-import myutil.*;
-import req.ebrdd.*;
-import tepe.*;
+
+import java.util.*;
 
 
 public class TML2MappingSystemC implements IDiploSimulatorCodeGenerator {
diff --git a/src/tmltranslator/toproverif/TML2ProVerif.java b/src/tmltranslator/toproverif/TML2ProVerif.java
index fc84fc8375434cbe5edb02e102fefae36b3fb48d..b174022ea56ff8e7d5a3bbe0c83d83885b100513 100644
--- a/src/tmltranslator/toproverif/TML2ProVerif.java
+++ b/src/tmltranslator/toproverif/TML2ProVerif.java
@@ -45,21 +45,18 @@
 
 package tmltranslator.toproverif;
 
-import java.util.LinkedList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.io.*;
-import javax.swing.*;
-
-
-import ui.ConfigurationTTool;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import proverifspec.*;
-import myutil.*;
 import tmltranslator.*;
+import ui.ConfigurationTTool;
+
+import javax.swing.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.*;
 
 public class TML2ProVerif {
 
diff --git a/src/tmltranslator/tosystemc/SystemCTask.java b/src/tmltranslator/tosystemc/SystemCTask.java
index 69ec35b66d21f5f8f1476aa32ca62a0d1e350ed8..eae7ed1ed8ba626c63fbdca7f9e39e3687ed7956 100755
--- a/src/tmltranslator/tosystemc/SystemCTask.java
+++ b/src/tmltranslator/tosystemc/SystemCTask.java
@@ -45,10 +45,10 @@
 
 package tmltranslator.tosystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.ListIterator;
 
 
 public class SystemCTask {
diff --git a/src/tmltranslator/tosystemc/TML2SystemC.java b/src/tmltranslator/tosystemc/TML2SystemC.java
index 44fd92b0d876242c942c1ab08460841610ae027f..016f9dd632d719deaf1033d3e81bb73dc6f1f772 100755
--- a/src/tmltranslator/tosystemc/TML2SystemC.java
+++ b/src/tmltranslator/tosystemc/TML2SystemC.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tmltranslator.tosystemc;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class TML2SystemC {
diff --git a/src/tmltranslator/toturtle/Mapping2TIF.java b/src/tmltranslator/toturtle/Mapping2TIF.java
index 61ef55b011eacab08a55559112c4f5d7d242e781..4ed40a30e1d7c9e9cae4148ba21df82ec571a6d4 100755
--- a/src/tmltranslator/toturtle/Mapping2TIF.java
+++ b/src/tmltranslator/toturtle/Mapping2TIF.java
@@ -44,12 +44,16 @@
 
 package tmltranslator.toturtle;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
 import translator.*;
-import ui.*;
+import ui.CheckingError;
+import ui.TGComponent;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class Mapping2TIF {
diff --git a/src/tmltranslator/toturtle/TML2TURTLE.java b/src/tmltranslator/toturtle/TML2TURTLE.java
index 0f880b19654213c09111b8552fe7188beacae7d4..83a5b14ee2aa0e354f97cb662e1dc28c86b36427 100755
--- a/src/tmltranslator/toturtle/TML2TURTLE.java
+++ b/src/tmltranslator/toturtle/TML2TURTLE.java
@@ -45,12 +45,14 @@
 
 package tmltranslator.toturtle;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
 import translator.*;
-import ui.*;
+import ui.CheckingError;
+
+import java.util.Iterator;
+import java.util.Vector;
 
 
 public class TML2TURTLE {
diff --git a/src/tmltranslator/touppaal/RelationTMLUPPAAL.java b/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
index e4300b14c8e44a639dcf71bfc8418e193c2fbdaa..ff518f2a0cdba84a170a6cff3103624233cd4320 100755
--- a/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
+++ b/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
@@ -45,12 +45,12 @@
 
 package tmltranslator.touppaal;
 
-import java.awt.*;
-import java.util.*;
+import tmltranslator.TMLActivityElement;
+import tmltranslator.TMLTask;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALTemplate;
 
-import uppaaldesc.*;
-import myutil.*;
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public class RelationTMLUPPAAL {
     
diff --git a/src/tmltranslator/touppaal/TML2UPPAAL.java b/src/tmltranslator/touppaal/TML2UPPAAL.java
index e30ec5aac36f71c445cb018f80937269cc2d1fbd..4c786fda7e53eedff0fe63b262e9985dbe143c25 100755
--- a/src/tmltranslator/touppaal/TML2UPPAAL.java
+++ b/src/tmltranslator/touppaal/TML2UPPAAL.java
@@ -45,12 +45,16 @@
 
 package tmltranslator.touppaal;
 
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
 import tmltranslator.*;
-import myutil.*;
 import uppaaldesc.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 
 public class TML2UPPAAL {
 
diff --git a/src/tmltranslator/touppaal/TMLActivityElementLocation.java b/src/tmltranslator/touppaal/TMLActivityElementLocation.java
index 44e730e58f340daaed1bd69e1f3b24513369cb03..5f9b9ffcf3f4a3c004df3c5aaaf1162b2842047a 100755
--- a/src/tmltranslator/touppaal/TMLActivityElementLocation.java
+++ b/src/tmltranslator/touppaal/TMLActivityElementLocation.java
@@ -45,8 +45,8 @@
 
 package tmltranslator.touppaal;
 
-import tmltranslator.*;
-import uppaaldesc.*;
+import tmltranslator.TMLActivityElement;
+import uppaaldesc.UPPAALLocation;
 
 public class TMLActivityElementLocation {
 	public TMLActivityElement elt;
diff --git a/src/tmltranslator/touppaal/TMLTaskTemplate.java b/src/tmltranslator/touppaal/TMLTaskTemplate.java
index 0499c739df30c90d64b5b9fdd8ecc4b9cf0795df..1f1c319ca07203e9c20222afc64b126bd3414ddb 100755
--- a/src/tmltranslator/touppaal/TMLTaskTemplate.java
+++ b/src/tmltranslator/touppaal/TMLTaskTemplate.java
@@ -45,8 +45,8 @@
 
 package tmltranslator.touppaal;
 
-import tmltranslator.*;
-import uppaaldesc.*;
+import tmltranslator.TMLTask;
+import uppaaldesc.UPPAALTemplate;
 
 public class TMLTaskTemplate {
 	public TMLTask task;
diff --git a/src/tpndescription/TPN.java b/src/tpndescription/TPN.java
index 5409fdef4b37d836e85b8fa9e20cac11a27005e8..c6113215be6a8d0fc55341bb61566ceef0a233bb 100755
--- a/src/tpndescription/TPN.java
+++ b/src/tpndescription/TPN.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package tpndescription;
 
-import java.util.*;
+import myutil.IntMatrix;
 
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TPN {
     public static int INDEX  = 0;
diff --git a/src/tpndescription/Transition.java b/src/tpndescription/Transition.java
index fabf215c68914d77a969918b97d385cb07bb960f..08f1a631bf2b14845b2ada62c27d8c79b65644c7 100755
--- a/src/tpndescription/Transition.java
+++ b/src/tpndescription/Transition.java
@@ -45,7 +45,8 @@
 
 package tpndescription;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class Transition {
     public static int INDEX  = 0;
diff --git a/src/translator/ADChoice.java b/src/translator/ADChoice.java
index cc52414dda83e3e79754afef5b93fdefef951564..d346c38a6505909b0a79ab3f5b0121fc9dfc1267 100755
--- a/src/translator/ADChoice.java
+++ b/src/translator/ADChoice.java
@@ -45,9 +45,9 @@
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.Vector;
 
 public class ADChoice extends ADComponent implements NonBlockingADComponent {
     protected Vector guard; // String
diff --git a/src/translator/ADComponent.java b/src/translator/ADComponent.java
index bdbb0d9168dcfa9ab53e05e9725f8133d6f8c405..74d00f99aaadfe20cb2575118b68c93d3c81df1f 100755
--- a/src/translator/ADComponent.java
+++ b/src/translator/ADComponent.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public abstract class ADComponent implements Cloneable {
     protected boolean selected = false;
diff --git a/src/translator/ADParallel.java b/src/translator/ADParallel.java
index f7a9706a9dfa4797638b901e6a8fc2bbeeb9e6ae..76c4545b1c70429cb7189885706290236d4443f4 100755
--- a/src/translator/ADParallel.java
+++ b/src/translator/ADParallel.java
@@ -45,9 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.Vector;
 
 public class ADParallel extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
     protected String valueGate;
diff --git a/src/translator/ADPreempt.java b/src/translator/ADPreempt.java
index c2faaa63603c311f0df72fefce55e573a489e31a..ecc2b869b3cc3eafcd315871a0fb06d9f38b2026 100755
--- a/src/translator/ADPreempt.java
+++ b/src/translator/ADPreempt.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class ADPreempt extends ADComponent implements NonBlockingADComponent {
diff --git a/src/translator/ADSequence.java b/src/translator/ADSequence.java
index 09911482c5c564086fd556c20431ca3cafad2131..0c6f82b4a17c05d9d5f13370d5b4739a2438b6eb 100755
--- a/src/translator/ADSequence.java
+++ b/src/translator/ADSequence.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 
 public class ADSequence extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
diff --git a/src/translator/ActivityDiagram.java b/src/translator/ActivityDiagram.java
index 457a8f07c636aba366a4bc2332651fd61b1cc1a5..88711e80a460ff085d54f77caffa410a427d5114 100755
--- a/src/translator/ActivityDiagram.java
+++ b/src/translator/ActivityDiagram.java
@@ -45,9 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class ActivityDiagram extends Vector<ADComponent>{
     
diff --git a/src/translator/FIFOFiniteAndGetSizeTClass.java b/src/translator/FIFOFiniteAndGetSizeTClass.java
index b0370e5632ae8e63e7d0619d5dfa7d24b4d5218b..0d72068edb6afcf88491483a2b20052363260b8d 100755
--- a/src/translator/FIFOFiniteAndGetSizeTClass.java
+++ b/src/translator/FIFOFiniteAndGetSizeTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOFiniteAndGetSizeTClass  {
     public int getNbPara();
diff --git a/src/translator/FIFOInfiniteAndGetSizeTClass.java b/src/translator/FIFOInfiniteAndGetSizeTClass.java
index f031c4e42803194f707dc90021848a4087f45d9f..49dccb895bcf401589a8055f52085331a16cea86 100755
--- a/src/translator/FIFOInfiniteAndGetSizeTClass.java
+++ b/src/translator/FIFOInfiniteAndGetSizeTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOInfiniteAndGetSizeTClass  {
     public int getNbPara();
diff --git a/src/translator/FIFOSizeTClass.java b/src/translator/FIFOSizeTClass.java
index 1303b78201d8821feb523730431c4a79805ec409..99626b205a3d17a2efbba816bc8adc64eb9f968b 100755
--- a/src/translator/FIFOSizeTClass.java
+++ b/src/translator/FIFOSizeTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOSizeTClass  {
     public int getNbPara();
diff --git a/src/translator/FIFOTClass.java b/src/translator/FIFOTClass.java
index cfb84ad514ba86db59e75529a50cd948a9ab0a9d..922e06d1e0b982e04b72551dfb2d629953f4c523 100755
--- a/src/translator/FIFOTClass.java
+++ b/src/translator/FIFOTClass.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface FIFOTClass  {
     public int getNbPara();
diff --git a/src/translator/GroupOfGates.java b/src/translator/GroupOfGates.java
index c58770a47b9d1046cd826b25e2a2ffa9f879c4ca..1247b9b4747cd91b5504c5d9fdab078f06ce0559 100755
--- a/src/translator/GroupOfGates.java
+++ b/src/translator/GroupOfGates.java
@@ -46,8 +46,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package translator;
 
 
-
-import myutil.*;
+import myutil.GenericTree;
+import myutil.SortedVector;
 
 public class GroupOfGates extends SortedVector implements Comparable<GroupOfGates>, GenericTree {
     /**
diff --git a/src/translator/HLProcess.java b/src/translator/HLProcess.java
index 4d78a92292dd3d3f8456be7cdc1b5ad8f91f075f..a12e78b8c1addb6c4a90c6f1327f4c63a74be669 100755
--- a/src/translator/HLProcess.java
+++ b/src/translator/HLProcess.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public class HLProcess extends Process {
     private TClass tc;
diff --git a/src/translator/Param.java b/src/translator/Param.java
index ef8e66544b4c34957bb73f2a864edacfed087d4a..130592201c0898f34da189a0b1d6b7878e67d14f 100755
--- a/src/translator/Param.java
+++ b/src/translator/Param.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import translator.tojava.*;
+import translator.tojava.JKeyword;
 
 public class Param {
     private String name;
diff --git a/src/translator/Process.java b/src/translator/Process.java
index cb840d846f5576450064dca5d3c0fe3d035b8cd1..45f85c3da6a79ff64a2805bab5c15daf2d09d774 100755
--- a/src/translator/Process.java
+++ b/src/translator/Process.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public class Process {
     protected String name;
diff --git a/src/translator/Relation.java b/src/translator/Relation.java
index 9bc91ef039f0c6b411afd7f4b71b2434683e01f8..fdd67663e494d68a63057766978fdbd81b68d727 100755
--- a/src/translator/Relation.java
+++ b/src/translator/Relation.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.Vector;
 
 public class Relation {
     // composition operator
diff --git a/src/translator/TClass.java b/src/translator/TClass.java
index 26b4027a1e5de55769d707d760f4f42c60a094e1..e3a577f675f59ea1fbcdbf878091476e53fcaad1 100755
--- a/src/translator/TClass.java
+++ b/src/translator/TClass.java
@@ -45,8 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
-import myutil.*;
+import myutil.Conversion;
+
+import java.util.Vector;
 
 public class TClass {
     private String name;
diff --git a/src/translator/TClassBasicFIFO.java b/src/translator/TClassBasicFIFO.java
index 7202630c38904343a9331b02000c6bd046df182d..f93005e5252067d643ec956ae217d2623bbf7cc9 100755
--- a/src/translator/TClassBasicFIFO.java
+++ b/src/translator/TClassBasicFIFO.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
-
 public class TClassBasicFIFO extends TClassBuffer {
     
     public TClassBasicFIFO(String name) {
diff --git a/src/translator/TClassBuffer.java b/src/translator/TClassBuffer.java
index 7acd20c5268c0c844f8c3716c579024f385b04fb..8ea9c5df3f5c36e4fba2549ad25386e01b3bc709 100755
--- a/src/translator/TClassBuffer.java
+++ b/src/translator/TClassBuffer.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public abstract class TClassBuffer extends TClass {
 	
diff --git a/src/translator/TClassBufferIn.java b/src/translator/TClassBufferIn.java
index c3f60ba737e3e38079d35e84a166d4a1e6854cc7..03c26eb06c01cd562bcce5a923ccaf9034aaf360 100755
--- a/src/translator/TClassBufferIn.java
+++ b/src/translator/TClassBufferIn.java
@@ -44,8 +44,6 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
 
 public class TClassBufferIn extends TClassBuffer {
     
diff --git a/src/translator/TClassBufferOut.java b/src/translator/TClassBufferOut.java
index af406020288e1875aaf721b105bfdee7c109739f..dcfdb027c8516e65341082c7cb875a5105ba42ef 100755
--- a/src/translator/TClassBufferOut.java
+++ b/src/translator/TClassBufferOut.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
-
 public class TClassBufferOut extends TClassBuffer {
     
     public TClassBufferOut(String name) {
diff --git a/src/translator/TClassEventCommon.java b/src/translator/TClassEventCommon.java
index 7edb542f1f846ed0981f203d3e3e818e6ea66c23..2748c98e277e3806dc2eae7c54dbdf39b7f19137 100755
--- a/src/translator/TClassEventCommon.java
+++ b/src/translator/TClassEventCommon.java
@@ -45,7 +45,7 @@
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public interface TClassEventCommon  {
     public int getNbPara();
diff --git a/src/translator/TClassEventFinite.java b/src/translator/TClassEventFinite.java
index a336a74cad1f3c5853c569f3fb3706e44ac82db7..a262ed6c72f7811b5c7816873c2dca82d033cd56 100755
--- a/src/translator/TClassEventFinite.java
+++ b/src/translator/TClassEventFinite.java
@@ -44,8 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassEventFinite extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
      private int nbPara;
diff --git a/src/translator/TClassEventFiniteBlocking.java b/src/translator/TClassEventFiniteBlocking.java
index 735b0bc55ac486e48d37622a3ad2ea3c4c6baa25..f77220f916b8dac5c11bc9821a3abd2fc78d61b9 100755
--- a/src/translator/TClassEventFiniteBlocking.java
+++ b/src/translator/TClassEventFiniteBlocking.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassEventFiniteBlocking extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
 	private int nbPara;
diff --git a/src/translator/TClassEventInfinite.java b/src/translator/TClassEventInfinite.java
index 9f903d411079fffa73c88df16d14c29f160e436d..f5857a2a8b0c1fa3b1ba0202c5ab65178bdfe444 100755
--- a/src/translator/TClassEventInfinite.java
+++ b/src/translator/TClassEventInfinite.java
@@ -44,10 +44,11 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
 
-import myutil.*;
+import myutil.TraceManager;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassEventInfinite extends TClass implements FIFOInfiniteAndGetSizeTClass, TClassEventCommon {
   private int nbPara;
diff --git a/src/translator/TClassInfiniteFIFO.java b/src/translator/TClassInfiniteFIFO.java
index 3f8da9419943f0d49d26f84c1f014ecb3abdd9b4..07ff2ccc4523a52d39357c97c9a3355c50e9f70a 100755
--- a/src/translator/TClassInfiniteFIFO.java
+++ b/src/translator/TClassInfiniteFIFO.java
@@ -44,8 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassInfiniteFIFO extends TClassBuffer implements FIFOInfiniteAndGetSizeTClass, TClassEventCommon {
 
diff --git a/src/translator/TClassRequest.java b/src/translator/TClassRequest.java
index 9e2bbe9240cd97c6be9f309c075aa7ff610ddce0..3f10a47844d15e52ee6ce13e25e191c72284e809 100755
--- a/src/translator/TClassRequest.java
+++ b/src/translator/TClassRequest.java
@@ -44,8 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
  */
 
 package translator;
- 
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class TClassRequest extends TClass implements FIFOTClass{
     
diff --git a/src/translator/TIFExchange.java b/src/translator/TIFExchange.java
index 14d39e96db223b006e5af6f48294132ddb36beac..2a31973363885454e9b305f9bca9213f449a4612 100755
--- a/src/translator/TIFExchange.java
+++ b/src/translator/TIFExchange.java
@@ -45,13 +45,19 @@
 
 package translator;
 
-import java.io.*;
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.Conversion;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
-import myutil.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 
 public class TIFExchange {
 	private TURTLEModeling tm;
diff --git a/src/translator/TURTLEModelChecker.java b/src/translator/TURTLEModelChecker.java
index dcc679f4c7bafa08932490157b368bd8db367ebb..62896b9e2cf1bc944c5d77fd7de41517f2e8e618 100755
--- a/src/translator/TURTLEModelChecker.java
+++ b/src/translator/TURTLEModelChecker.java
@@ -45,12 +45,18 @@
 
 package translator;
 
-import ui.*;
-import compiler.tmlparser.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.TraceManager;
+import ui.CheckingError;
+import ui.CorrespondanceTGElement;
+import ui.TGComponent;
 
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.LinkedList;
 
 
 public class TURTLEModelChecker {
diff --git a/src/translator/TURTLEModeling.java b/src/translator/TURTLEModeling.java
index f9918d0e7681fab4e028f3d82f74f9410eba94ef..c57d838811e75277bf87044f57c901e915815d24 100755
--- a/src/translator/TURTLEModeling.java
+++ b/src/translator/TURTLEModeling.java
@@ -45,11 +45,13 @@
 
 package translator;
 
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
 import ui.CheckingError;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
+
 public class TURTLEModeling {
 	private String[] ops = {">", "<", "+", "-", "*", "/", "[", "]", "(", ")", ":", "=", "==", ",", "!", "?", "{", "}"};
     
diff --git a/src/translator/TURTLETranslator.java b/src/translator/TURTLETranslator.java
index baee7048f903c56831a89d13c0b0394ec41f017c..fb82fb1f73c10647bd825fbad2ff76fcbdbe8210 100755
--- a/src/translator/TURTLETranslator.java
+++ b/src/translator/TURTLETranslator.java
@@ -45,10 +45,12 @@
 
 package translator;
 
-import java.util.*;
+import myutil.Conversion;
+import ui.CheckingError;
 
-import ui.*;
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class TURTLETranslator {
 
diff --git a/src/translator/tojava/ComponentId.java b/src/translator/tojava/ComponentId.java
index ab8a60776230b92b7222c18b8a1e9576486b16d1..eeaa0f95cd84a3c4798688e03bcf58da31f0c73e 100755
--- a/src/translator/tojava/ComponentId.java
+++ b/src/translator/tojava/ComponentId.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import translator.*;
+import translator.ADComponent;
 
 public class ComponentId  {
     public ADComponent adc;
diff --git a/src/translator/tojava/JAttribute.java b/src/translator/tojava/JAttribute.java
index 2d6c6eb8887d206538e17b605b0e5e68b28224e5..395a368062fd65bcc55931da0c1a524d60843170 100755
--- a/src/translator/tojava/JAttribute.java
+++ b/src/translator/tojava/JAttribute.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import translator.*;
+import translator.Param;
 
 public class JAttribute {
     private String access;
diff --git a/src/translator/tojava/JOperation.java b/src/translator/tojava/JOperation.java
index 8be0f601f49f0b2586077e29a843d85da565cca5..58e558cb56fb04c4c4c2f45acd202af3b667e6c9 100755
--- a/src/translator/tojava/JOperation.java
+++ b/src/translator/tojava/JOperation.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import myutil.*;
-import translator.*;
+import myutil.Conversion;
+import translator.ADComponent;
 
 public class JOperation  {
     public String name;
diff --git a/src/translator/tojava/JavaClass.java b/src/translator/tojava/JavaClass.java
index 6ef7eae38144a69dec6b4f0e4f5ff0ec0282f4a3..7137567126e65b7c068aedfa55d1daf166d945e7 100755
--- a/src/translator/tojava/JavaClass.java
+++ b/src/translator/tojava/JavaClass.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
 
-import myutil.*;
+import java.util.Vector;
 
 public class JavaClass {
     
diff --git a/src/translator/tojava/MainClass.java b/src/translator/tojava/MainClass.java
index f3afa2e041654324901a626753e6927ec53a2726..bb13a085f578596a56d595d12e7f1527e0a2a1af 100755
--- a/src/translator/tojava/MainClass.java
+++ b/src/translator/tojava/MainClass.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tojava;
 
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
 
 public class MainClass {
     
diff --git a/src/translator/tojava/TURTLE2Java.java b/src/translator/tojava/TURTLE2Java.java
index 1d504480cb1f3bdb75d742cedff29622247d8857..fb0cac9da76d8588e3a366a110e77b18ea99ff1a 100755
--- a/src/translator/tojava/TURTLE2Java.java
+++ b/src/translator/tojava/TURTLE2Java.java
@@ -45,12 +45,15 @@
 
 package translator.tojava;
 
-import java.util.*;
-
-import ddtranslator.*;
-import myutil.*;
+import ddtranslator.TClassLinkNode;
+import myutil.Conversion;
+import myutil.FileException;
 import translator.*;
 
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
+
 public class TURTLE2Java {
     
     //private static int gateId;
diff --git a/src/translator/tosimujava/JSimuGate.java b/src/translator/tosimujava/JSimuGate.java
index 01af5fb4b4f60c33dcaf2500752a761454ea30c8..79cecd1412f8f15ffb66cd3952b64eb1b8698ad2 100755
--- a/src/translator/tosimujava/JSimuGate.java
+++ b/src/translator/tosimujava/JSimuGate.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tosimujava;
 
-import translator.tojava.*;
+import translator.tojava.JKeyword;
 
 public class JSimuGate implements Comparable {
     private String name;
diff --git a/src/translator/tosimujava/MainClassSimu.java b/src/translator/tosimujava/MainClassSimu.java
index 26ea9c6b586586a73eaa231578f025ee378fb166..b059f9c4b9ccbfb1d5984f74d0d69caf966fdc4c 100755
--- a/src/translator/tosimujava/MainClassSimu.java
+++ b/src/translator/tosimujava/MainClassSimu.java
@@ -46,8 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package translator.tosimujava;
 
 
-import translator.tojava.*;
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import translator.tojava.JKeyword;
+import translator.tojava.TURTLE2Java;
 
 public class MainClassSimu {
     
diff --git a/src/translator/tosimujava/TJavaProcess.java b/src/translator/tosimujava/TJavaProcess.java
index 810dc60a9e85a4dd2768f2d02722f931f337d248..3778f42797e3a4e42f4cd394bed7614250f61445 100755
--- a/src/translator/tosimujava/TJavaProcess.java
+++ b/src/translator/tosimujava/TJavaProcess.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package translator.tosimujava;
 
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import translator.tojava.JAttribute;
+import translator.tojava.JKeyword;
+import translator.tojava.JOperation;
+import translator.tojava.TURTLE2Java;
 
-import translator.tojava.*;
-import myutil.*;
+import java.util.Vector;
 
 public class TJavaProcess {
     
diff --git a/src/translator/tosimujava/TURTLE2SimuJava.java b/src/translator/tosimujava/TURTLE2SimuJava.java
index 5837728c56056b0cae2ad4357642bec0883074f3..477d8f5373d38c98c5eaeeb1f306dbb0861751de 100755
--- a/src/translator/tosimujava/TURTLE2SimuJava.java
+++ b/src/translator/tosimujava/TURTLE2SimuJava.java
@@ -45,12 +45,19 @@
 
 package translator.tosimujava;
 
-import java.util.*;
+import myutil.Conversion;
+import myutil.FileException;
+import translator.*;
+import translator.tojava.ComponentId;
+import translator.tojava.JAttribute;
+import translator.tojava.JKeyword;
+import translator.tojava.JOperation;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 //import ddtranslator.*;
-import myutil.*;
-import translator.*;
-import translator.tojava.*;
 
 public class TURTLE2SimuJava {
     
diff --git a/src/translator/totpn/TURTLE2TPN.java b/src/translator/totpn/TURTLE2TPN.java
index 3335126a4da2dd736174245fe081f1ddf11b0391..8c5c7f18abcfd3589dd1276b9234af34d3268151 100755
--- a/src/translator/totpn/TURTLE2TPN.java
+++ b/src/translator/totpn/TURTLE2TPN.java
@@ -45,13 +45,15 @@
 
 package translator.totpn;
 
-import java.util.*;
-
-import tpndescription.*;
-import myutil.*;
+import myutil.FileException;
+import tpndescription.Place;
+import tpndescription.TPN;
+import tpndescription.Transition;
 import translator.*;
 import ui.CheckingError;
 
+import java.util.LinkedList;
+
 public class TURTLE2TPN {
     
     private TPN tpn;
diff --git a/src/translator/touppaal/ADComponentLocation.java b/src/translator/touppaal/ADComponentLocation.java
index 17475a0b7913f74b49237d71ad8d8bf164032225..47e98ac2812403a0396ba4c835c8a66f87fa6073 100755
--- a/src/translator/touppaal/ADComponentLocation.java
+++ b/src/translator/touppaal/ADComponentLocation.java
@@ -45,8 +45,8 @@
 
 package translator.touppaal;
 
-import translator.*;
-import uppaaldesc.*;
+import translator.ADComponent;
+import uppaaldesc.UPPAALLocation;
 
 public class ADComponentLocation {
 	public ADComponent adc;
diff --git a/src/translator/touppaal/RelationTIFUPPAAL.java b/src/translator/touppaal/RelationTIFUPPAAL.java
index de7bcac207a4327019b5c611afb9d274e5cb8865..0b217e04f13af9ffa94eb09f337c294ab525f640 100755
--- a/src/translator/touppaal/RelationTIFUPPAAL.java
+++ b/src/translator/touppaal/RelationTIFUPPAAL.java
@@ -45,12 +45,12 @@
 
 package translator.touppaal;
 
-import java.awt.*;
-import java.util.*;
+import translator.ADComponent;
+import translator.TClass;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALTemplate;
 
-import uppaaldesc.*;
-import myutil.*;
-import translator.*;
+import java.util.ArrayList;
 
 public class RelationTIFUPPAAL {
     
diff --git a/src/translator/touppaal/TClassTemplate.java b/src/translator/touppaal/TClassTemplate.java
index 6b7ec0f3be4781e898bc53f219f804e205cc6107..9338a6dd51ed50747a933fa221587df7cbc2b536 100755
--- a/src/translator/touppaal/TClassTemplate.java
+++ b/src/translator/touppaal/TClassTemplate.java
@@ -45,8 +45,8 @@
 
 package translator.touppaal;
 
-import translator.*;
-import uppaaldesc.*;
+import translator.TClass;
+import uppaaldesc.UPPAALTemplate;
 
 public class TClassTemplate {
 	public TClass tclass;
diff --git a/src/translator/touppaal/TURTLE2UPPAAL.java b/src/translator/touppaal/TURTLE2UPPAAL.java
index 0d79b0d668a1428a852c18a3dc12341b1fae8daa..d535fd28d3197e34c5a822a98aa44100f919b60a 100755
--- a/src/translator/touppaal/TURTLE2UPPAAL.java
+++ b/src/translator/touppaal/TURTLE2UPPAAL.java
@@ -45,12 +45,20 @@
 
 package translator.touppaal;
 
-import java.awt.*;
-import java.util.*;
-
-import uppaaldesc.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
 import translator.*;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+import uppaaldesc.UPPAALTransition;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class TURTLE2UPPAAL {
 	
diff --git a/src/ui/ADDPanel.java b/src/ui/ADDPanel.java
index 0466d02d24df4143c7cedaf1b57b98e11d4b208f..47159b172e733aea9abc508cf963afa271db2eaa 100755
--- a/src/ui/ADDPanel.java
+++ b/src/ui/ADDPanel.java
@@ -46,13 +46,14 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatardd.ADDDiagramToolBar;
 
-import ui.avatardd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class ADDPanel extends TURTLEPanel {
     public ADDDiagramPanel tmladd;
diff --git a/src/ui/ActionPerformer.java b/src/ui/ActionPerformer.java
index f24cf00472befea686896f86b2f2925106927958..46f67b09258c346202ed7992aadc93a120380756 100755
--- a/src/ui/ActionPerformer.java
+++ b/src/ui/ActionPerformer.java
@@ -48,8 +48,8 @@
 
 package ui;
 
-import java.awt.event.*;
 import javax.swing.*;
+import java.awt.event.ActionEvent;
 
 public class ActionPerformer {
 
diff --git a/src/ui/ActivityDiagramPanelInterface.java b/src/ui/ActivityDiagramPanelInterface.java
index 28c5c635fd468a37103285e098fee4a15d48a057..a87bfbf71b6abf7249fe41fc8c77281a892936f9 100755
--- a/src/ui/ActivityDiagramPanelInterface.java
+++ b/src/ui/ActivityDiagramPanelInterface.java
@@ -47,7 +47,7 @@
 
 package ui;
 
-import java.util.*;
+import java.util.List;
 
 
 public interface ActivityDiagramPanelInterface {
diff --git a/src/ui/AnalysisPanel.java b/src/ui/AnalysisPanel.java
index d0de6e385ae1928578d91b9da12558ffd2b6f9e6..d9a4d30289c956f34784bfc4ebc3938a0eaf3203 100755
--- a/src/ui/AnalysisPanel.java
+++ b/src/ui/AnalysisPanel.java
@@ -46,16 +46,20 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
-import ui.iod.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarcd.AvatarCDPanel;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.iod.InteractionOverviewDiagramToolBar;
 import ui.ucd.*;
-import ui.avatarcd.*;
-import ui.avatarad.*;
-import myutil.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class AnalysisPanel extends TURTLEPanel {
     public InteractionOverviewDiagramPanel iodp;
diff --git a/src/ui/AnalysisPanelTranslator.java b/src/ui/AnalysisPanelTranslator.java
index fd9d3b2887a0b18313820bd78615dd8fe1463d86..d28e533bcc8882bc962b0d834d278088ba858be3 100755
--- a/src/ui/AnalysisPanelTranslator.java
+++ b/src/ui/AnalysisPanelTranslator.java
@@ -47,19 +47,21 @@ package ui;
 //import java.io.*;
 //import java.awt.*;
 //import javax.swing.*;
-import java.util.*;
 
+import sddescription.*;
+import ui.iod.*;
+import ui.sd.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 //import myutil.*;
-import ui.iod.*;
-import ui.sd.*;
 //import ui.ucd.*;
 //import ui.tree.*;
 //import ui.window.*;
-
 //import ddtranslator.*;
-import sddescription.*;
 //import sdtranslator.*;
 
 public class AnalysisPanelTranslator {
diff --git a/src/ui/AttackTreePanel.java b/src/ui/AttackTreePanel.java
index f44e1cb7010cf9990c67ac72c27280e1f35ed32e..356be7a9bd0c59d71d403425341186578cc7108b 100755
--- a/src/ui/AttackTreePanel.java
+++ b/src/ui/AttackTreePanel.java
@@ -46,14 +46,15 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.atd.*;
+import ui.atd.AttackTreeDiagramPanel;
+import ui.atd.AttackTreeDiagramToolbar;
 
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
 
 public class AttackTreePanel extends TURTLEPanel {
     public AttackTreeDiagramPanel atdp;
diff --git a/src/ui/AttackTreePanelTranslator.java b/src/ui/AttackTreePanelTranslator.java
index efe049c3a1c55dd3172639c83542c5f8303b81eb..c6b3895895770421bcc136a42bcd7bec5fadb975 100644
--- a/src/ui/AttackTreePanelTranslator.java
+++ b/src/ui/AttackTreePanelTranslator.java
@@ -44,15 +44,13 @@
 
 package ui;
 
-import java.util.*;
-
-import myutil.*;
+import attacktrees.*;
+import avatartranslator.*;
 import ui.atd.*;
 
-import attacktrees.*;
+import java.util.LinkedList;
+
 //import translator.*;
-import ui.window.*;
-import avatartranslator.*;
 
 
 public class AttackTreePanelTranslator {
diff --git a/src/ui/AvatarAnalysisPanel.java b/src/ui/AvatarAnalysisPanel.java
index 8d22cdc79de8622062aaf626f79d58d904b5fbe1..f4cbec8906f12ee7c8e094141ff69a497ed4d292 100755
--- a/src/ui/AvatarAnalysisPanel.java
+++ b/src/ui/AvatarAnalysisPanel.java
@@ -46,15 +46,20 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarad.AvatarADToolBar;
+import ui.avatarcd.AvatarCDPanel;
+import ui.avatarcd.AvatarCDToolBar;
 import ui.ucd.*;
-import ui.avatarcd.*;
-import ui.avatarad.*;
-import myutil.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class AvatarAnalysisPanel extends TURTLEPanel {
 
diff --git a/src/ui/AvatarDeploymentPanelTranslator.java b/src/ui/AvatarDeploymentPanelTranslator.java
index b7fd935d0df43556f6761e4bbd8d5d0d523291c5..9c75b0c66f8ba29bc22b59073fb9f85d8c80ced4 100644
--- a/src/ui/AvatarDeploymentPanelTranslator.java
+++ b/src/ui/AvatarDeploymentPanelTranslator.java
@@ -46,44 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import ddtranslatorSoclib.AvatarBridge;
-import ddtranslatorSoclib.AvatarBus;
-import ddtranslatorSoclib.AvatarCPU;
-import ddtranslatorSoclib.AvatarChannel;
-import ddtranslatorSoclib.AvatarComponent;
-import ddtranslatorSoclib.AvatarConnectingPoint;
-import ddtranslatorSoclib.AvatarConnector;
-import ddtranslatorSoclib.AvatarCoproMWMR;
-import ddtranslatorSoclib.AvatarCrossbar;
-import ddtranslatorSoclib.AvatarICU;
-import ddtranslatorSoclib.AvatarMappedObject;
-import ddtranslatorSoclib.AvatarRAM;
-import ddtranslatorSoclib.AvatarTTY;
-import ddtranslatorSoclib.AvatarTask;
-import ddtranslatorSoclib.AvatarTimer;
-import ddtranslatorSoclib.AvatarVgmn;
-import ddtranslatorSoclib.AvatarddSpecification;
-import ui.avatardd.ADDBlockArtifact;
-import ui.avatardd.ADDBridgeNode;
-import ui.avatardd.ADDBusNode;
-import ui.avatardd.ADDCPUNode;
-import ui.avatardd.ADDChannelArtifact;
-import ui.avatardd.ADDConnector;
-import ui.avatardd.ADDCoproMWMRNode;
-import ui.avatardd.ADDCrossbarNode;
-import ui.avatardd.ADDDiagramPanel;
-import ui.avatardd.ADDICUNode;
-import ui.avatardd.ADDMemoryNode;
-import ui.avatardd.ADDRAMNode;
-import ui.avatardd.ADDTTYNode;
-import ui.avatardd.ADDTimerNode;
-import ui.avatardd.ADDVgmnNode;
+import ddtranslatorSoclib.*;
+import ui.avatardd.*;
+
+import java.util.*;
 
 public class AvatarDeploymentPanelTranslator {
 
diff --git a/src/ui/AvatarDesignPanel.java b/src/ui/AvatarDesignPanel.java
index f0739f3f64143cf127fcd6b214a0b1e83ddfdf5d..65b0f0c039e6bcb26362d1056f661e72cbf39941 100644
--- a/src/ui/AvatarDesignPanel.java
+++ b/src/ui/AvatarDesignPanel.java
@@ -46,23 +46,25 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.avatarbd.*;
-import ui.avatardd.*;
-import ui.avatarsmd.*;
-
 import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarPragmaSecret;
-import avatartranslator.AvatarPragmaReachability;
 import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaReachability;
+import avatartranslator.AvatarPragmaSecret;
+import myutil.GraphicLib;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
+import ui.avatarbd.*;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.avatarsmd.AvatarSMDState;
+import ui.avatarsmd.AvatarSMDToolBar;
 
-
-import proverifspec.*;
-
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.*;
 
 public class AvatarDesignPanel extends TURTLEPanel {
     public AvatarBDPanel abdp;
diff --git a/src/ui/AvatarDesignPanelTranslator.java b/src/ui/AvatarDesignPanelTranslator.java
index 867d588cd6d80a5d26a07a7a08024d4e85567ea6..4b328ea34486c1215c45e1f11145e99bb094888b 100644
--- a/src/ui/AvatarDesignPanelTranslator.java
+++ b/src/ui/AvatarDesignPanelTranslator.java
@@ -44,13 +44,13 @@
 
 package ui;
 
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 import ui.avatarbd.*;
 import ui.avatarsmd.*;
 
-import avatartranslator.*;
+import java.util.*;
 
 public class AvatarDesignPanelTranslator {
 
diff --git a/src/ui/AvatarMADsPanel.java b/src/ui/AvatarMADsPanel.java
index dac0fdee79a4f282de99beb8c3962d27eb8add0d..ef0079b78f5fc75f545b24316fdb2e7c2cfa00cb 100644
--- a/src/ui/AvatarMADsPanel.java
+++ b/src/ui/AvatarMADsPanel.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.avatarmad.*;
+import ui.avatarmad.AvatarMADPanel;
+import ui.avatarmad.AvatarMADToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class AvatarMADsPanel extends TURTLEPanel {
     
diff --git a/src/ui/AvatarMethod.java b/src/ui/AvatarMethod.java
index 6ed469873fcc2300d8155710c15f9367caf6d804..12a19dff07852e84b74d43c5c4af9198db36ad25 100644
--- a/src/ui/AvatarMethod.java
+++ b/src/ui/AvatarMethod.java
@@ -47,11 +47,12 @@
 
 package ui;
 
-import translator.*;
-import translator.tojava.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
+import translator.RTLOTOSKeyword;
+import translator.tojava.JKeyword;
 
-import myutil.*;
+import java.util.Vector;
 
 public class AvatarMethod {
 
diff --git a/src/ui/AvatarMethodologyPanel.java b/src/ui/AvatarMethodologyPanel.java
index cc7937346fe0c22d45b22458d72c381c9ff99dd7..176c9b707458e8386f911414b77039f4ed086bb5 100755
--- a/src/ui/AvatarMethodologyPanel.java
+++ b/src/ui/AvatarMethodologyPanel.java
@@ -46,15 +46,15 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.avatarmethodology.*;
+import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
+import ui.avatarmethodology.AvatarMethodologyDiagramToolbar;
 
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class AvatarMethodologyPanel extends TURTLEPanel {
     
diff --git a/src/ui/AvatarRequirementPanel.java b/src/ui/AvatarRequirementPanel.java
index 578fb910a05b4468376acc60e2d0ba9b5e0f0839..bd7369210b6be61a37549445c004d36d330b8f2a 100755
--- a/src/ui/AvatarRequirementPanel.java
+++ b/src/ui/AvatarRequirementPanel.java
@@ -46,15 +46,17 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
+import ui.avatarpd.AvatarPDPanel;
+import ui.avatarpd.AvatarPDToolBar;
+import ui.avatarrd.AvatarRDPanel;
+import ui.avatarrd.AvatarRDToolBar;
 
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class AvatarRequirementPanel extends TURTLEPanel {
     public AvatarRDPanel ardp;
diff --git a/src/ui/AvatarRequirementPanelTranslator.java b/src/ui/AvatarRequirementPanelTranslator.java
index 4065111e0eeaa59318ec5696641421d801f90699..2e8dd7df34f158fb7a270f11c5515ebe85cc33c4 100644
--- a/src/ui/AvatarRequirementPanelTranslator.java
+++ b/src/ui/AvatarRequirementPanelTranslator.java
@@ -44,13 +44,12 @@
 
 package ui;
 
-import java.util.*;
-
-
-
-import myutil.*;
-import ui.avatarpd.*;
+import myutil.TraceManager;
 import tepe.*;
+import ui.avatarpd.*;
+
+import java.util.ListIterator;
+import java.util.Vector;
 
 
 public class AvatarRequirementPanelTranslator {
diff --git a/src/ui/AvatarSignal.java b/src/ui/AvatarSignal.java
index cf6f19edebaf4af6a831345bae253decf27c229f..2b12b882f147fe3f7e487710b84e81d03ea9519f 100644
--- a/src/ui/AvatarSignal.java
+++ b/src/ui/AvatarSignal.java
@@ -47,11 +47,8 @@
 
 package ui;
 
-import translator.*;
-import translator.tojava.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.TraceManager;
 
 public class AvatarSignal extends AvatarMethod {
 
diff --git a/src/ui/CheckingError.java b/src/ui/CheckingError.java
index ffb962788dd185009571bcc979ff2ae277836517..63f037f2a240d457b022a2bf3099534f8133dc7d 100755
--- a/src/ui/CheckingError.java
+++ b/src/ui/CheckingError.java
@@ -45,10 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import avatartranslator.*;
-
-import translator.*;
-import tmltranslator.*;
+import avatartranslator.AvatarBlock;
+import tmltranslator.TMLTask;
+import translator.Relation;
+import translator.TClass;
 
 
 
diff --git a/src/ui/ClassDiagramPanelInterface.java b/src/ui/ClassDiagramPanelInterface.java
index c121ae4ac9df9d9c419ecb4ee39c4d587641ab51..4d3f9a937ed504f1251022901c287561309dea57 100755
--- a/src/ui/ClassDiagramPanelInterface.java
+++ b/src/ui/ClassDiagramPanelInterface.java
@@ -47,7 +47,7 @@
 
 package ui;
 
-import java.util.*;
+import java.util.List;
 
 public interface ClassDiagramPanelInterface {
   public List<TGComponent> getComponentList();
diff --git a/src/ui/ColorManager.java b/src/ui/ColorManager.java
index fe00c535fe38cdc8c877e7fa2a25e01214858236..c8aef4469d2bff67e26d51ef4925086edba985a0 100755
--- a/src/ui/ColorManager.java
+++ b/src/ui/ColorManager.java
@@ -44,8 +44,9 @@
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-import myutil.*;
 
 /**
  * Class
diff --git a/src/ui/ConfigurationTTool.java b/src/ui/ConfigurationTTool.java
index 6928d0b0a895bdae74812fc8d38039ddecb05341..720a02eb665422b12c0dbb414144046547e36532 100755
--- a/src/ui/ConfigurationTTool.java
+++ b/src/ui/ConfigurationTTool.java
@@ -46,13 +46,20 @@
 package ui;
 
 //import java.awt.*;
-import java.io.*;
 
-import org.w3c.dom.*;
-//import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 
-import myutil.*;
+//import org.xml.sax.*;
 
 /**
  * Class
diff --git a/src/ui/CorrespondanceTGElement.java b/src/ui/CorrespondanceTGElement.java
index 5444bde99ddf3872ac85db9f213541f039d97a37..b3797fe0d948064eabdacd9d457d181e71d86403 100755
--- a/src/ui/CorrespondanceTGElement.java
+++ b/src/ui/CorrespondanceTGElement.java
@@ -47,16 +47,25 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarLibraryFunction;
+import req.ebrdd.EBRDDComponent;
+import req.ebrdd.EBRDDGeneralComponent;
+import sddescription.Evt;
+import sddescription.HMSCElement;
+import sddescription.HMSCNode;
+import sddescription.MSC;
+import tepe.TEPEComponent;
+import tmltranslator.DIPLOElement;
+import tmltranslator.HwNode;
+import tmltranslator.TMLActivityElement;
+import translator.ADComponent;
+import translator.TClass;
+import ui.cd.TCDTClass;
 
-import avatartranslator.*;
-import req.ebrdd.*;
-import translator.*;
-import tmltranslator.*;
-import sddescription.*;
-import ui.cd.*;
-import tepe.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public class CorrespondanceTGElement {
     private Vector<TGComponent> tg; //tgelement
diff --git a/src/ui/DeploymentPanel.java b/src/ui/DeploymentPanel.java
index 5ce15c23f5c977e1b88f97e937473e9cee2c8486..82b6940c320cf41a50e50b23f0a932b6f01573ad 100755
--- a/src/ui/DeploymentPanel.java
+++ b/src/ui/DeploymentPanel.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.dd.*;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.dd.TDeploymentDiagramToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class DeploymentPanel extends TURTLEPanel {
     public TDeploymentDiagramPanel tddp; 
diff --git a/src/ui/DesignPanel.java b/src/ui/DesignPanel.java
index faaf1f341d8d2611e15b33e46e8d2f873cbae4a1..85c73b903a05ede345bef17260f2b1903ad9e54a 100755
--- a/src/ui/DesignPanel.java
+++ b/src/ui/DesignPanel.java
@@ -46,13 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.cd.*;
-import ui.ad.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.ad.TActivityDiagramToolBar;
+import ui.cd.TCDTClass;
+import ui.cd.TClassDiagramPanel;
+import ui.cd.TClassDiagramToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class DesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterface {
 
diff --git a/src/ui/DesignPanelTranslator.java b/src/ui/DesignPanelTranslator.java
index 593a3f4deb48ee03f92c4244e90580cfc5aae6ca..49180bc12a6e672353d27dbd0e168c5fee7d9c75 100755
--- a/src/ui/DesignPanelTranslator.java
+++ b/src/ui/DesignPanelTranslator.java
@@ -44,16 +44,17 @@
 
 package ui;
 
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
+import translator.*;
 import ui.ad.*;
 import ui.cd.*;
-
-import translator.*;
-
 import ui.osad.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
 public class DesignPanelTranslator {
     protected TURTLEDesignPanelInterface dp;
     protected LinkedList<CheckingError> checkingErrors, warnings;
diff --git a/src/ui/DiplodocusMethodologyPanel.java b/src/ui/DiplodocusMethodologyPanel.java
index 94a3e16f132c906061d48e039159dea570d90dd7..87582ebcdbf5538f72ba2221517f83bfb6539e04 100755
--- a/src/ui/DiplodocusMethodologyPanel.java
+++ b/src/ui/DiplodocusMethodologyPanel.java
@@ -46,15 +46,15 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.diplodocusmethodology.*;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramToolbar;
 
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class DiplodocusMethodologyPanel extends TURTLEPanel {
     public DiplodocusMethodologyDiagramPanel dmd;
diff --git a/src/ui/DocumentationGenerator.java b/src/ui/DocumentationGenerator.java
index 39e79c95d15bb59f635ce6ef354a6b101a92ea06..0c7cfdf5fb43788b402a5b51d1b56a1b91c1d65e 100644
--- a/src/ui/DocumentationGenerator.java
+++ b/src/ui/DocumentationGenerator.java
@@ -47,20 +47,25 @@
 
 package ui;
 
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.SteppedAlgorithm;
+import ui.ad.TActivityDiagramPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmldd.TMLArchiDiagramPanel;
+
+import javax.imageio.ImageIO;
 import javax.swing.*;
-import java.util.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-import java.text.*;
-
-import myutil.*;
-import ui.ad.*;
-import ui.dd.*;
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmldd.*;
-import ui.avatarsmd.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Vector;
 
 public class DocumentationGenerator implements SteppedAlgorithm, StoppableGUIElement {
 
diff --git a/src/ui/EBRDDTranslator.java b/src/ui/EBRDDTranslator.java
index 646fbaa6263a6ced9cd2730295c1a2a18bc5bcca..8515aa33719bcf2aa0ec8e85dfab9bcecc791a7c 100755
--- a/src/ui/EBRDDTranslator.java
+++ b/src/ui/EBRDDTranslator.java
@@ -44,11 +44,17 @@
 
 package ui;
 
-import java.util.*;
-
-import ui.ebrdd.*;
 import req.ebrdd.*;
-import tmltranslator.*;
+import tmltranslator.TMLType;
+import ui.ebrdd.EBRDDAttributeBox;
+import ui.ebrdd.EBRDDPanel;
+import ui.ebrdd.EBRDDStartState;
+import ui.ebrdd.TGConnectorEBRDDERC;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 
 public class EBRDDTranslator {
diff --git a/src/ui/FormatManager.java b/src/ui/FormatManager.java
index bd30dfe8d9a391e1926ccd7f19f961b7739b78e3..d97e54e3c1565d77dfba0aa7c678f9db9b8826c8 100755
--- a/src/ui/FormatManager.java
+++ b/src/ui/FormatManager.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import java.io.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.StringReader;
 
 public class FormatManager {
     
diff --git a/src/ui/GNCModeling.java b/src/ui/GNCModeling.java
index f3228ef059b4dbd744452da5ec1dc96dad70050c..7e2b3a56aa6fc1804e63066817fb5b98ba0838d6 100755
--- a/src/ui/GNCModeling.java
+++ b/src/ui/GNCModeling.java
@@ -47,12 +47,13 @@
 
 package ui;
 
-import java.util.*;
-
-
-import ui.ncdd.*;
+import myutil.TreeCell;
 import nc.*;
-import myutil.*;
+import ui.ncdd.*;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class GNCModeling  {
 	private NCStructure ncs;
diff --git a/src/ui/GProactiveDesign.java b/src/ui/GProactiveDesign.java
index cf7c20136807254e5c89893af85134e2af965a80..86d13be78b759921ddc02a66651584118f86c474 100755
--- a/src/ui/GProactiveDesign.java
+++ b/src/ui/GProactiveDesign.java
@@ -47,25 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.*;
-
-import fr.inria.oasis.vercors.cttool.model.Attribute;
-import fr.inria.oasis.vercors.cttool.model.Component;
-import fr.inria.oasis.vercors.cttool.model.ComponentImpl;
-import fr.inria.oasis.vercors.cttool.model.InPort;
-import fr.inria.oasis.vercors.cttool.model.Interface;
-import fr.inria.oasis.vercors.cttool.model.InterfaceImpl;
-import fr.inria.oasis.vercors.cttool.model.Message;
-import fr.inria.oasis.vercors.cttool.model.MessageImpl;
-import fr.inria.oasis.vercors.cttool.model.OutPort;
-import fr.inria.oasis.vercors.cttool.model.Port;
-
+import fr.inria.oasis.vercors.cttool.model.*;
 import translator.*;
-
 import ui.procsd.*;
 import ui.prosmd.*;
 import ui.prosmd.util.CorrespondanceSMDManager;
 
+import java.util.*;
+
 public class GProactiveDesign  {
     private TURTLEModeling tm;
     private ProactiveDesignPanel pdp;
diff --git a/src/ui/GTMLModeling.java b/src/ui/GTMLModeling.java
index bc24157742ab85e6fbee8d82b58352ae8ca52f6c..d8ee8262342192a4a4c01a78b0f87ec12230ca6a 100755
--- a/src/ui/GTMLModeling.java
+++ b/src/ui/GTMLModeling.java
@@ -48,18 +48,31 @@
 
 package ui;
 
-import java.util.*;
-
+import avatartranslator.AvatarSpecification;
+import myutil.Conversion;
+import myutil.TraceManager;
+import tmltranslator.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import tmltranslator.tmlcp.TMLCPElement;
+import tmltranslator.tmlcp.TMLSDAction;
+import tmltranslator.tmlcp.TMLSDEvent;
+import tmltranslator.tmlcp.TMLSDMessage;
 import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmlcompd.*;
+import ui.tmlcd.TMLChannelOperator;
+import ui.tmlcd.TMLEventOperator;
+import ui.tmlcd.TMLRequestOperator;
+import ui.tmlcd.TMLTaskOperator;
+import ui.tmlcompd.TMLCPath;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
+import ui.tmlcompd.TMLCRecordComponent;
 import ui.tmldd.*;
-import ui.tmlsd.*;
-import tmltranslator.*;
-import tmltranslator.tmlcp.*;
-import myutil.*;
-import tmltranslator.modelcompiler.*;
-import avatartranslator.*;
+import ui.tmlsd.TGConnectorMessageTMLSD;
+import ui.tmlsd.TMLSDControllerInstance;
+import ui.tmlsd.TMLSDStorageInstance;
+import ui.tmlsd.TMLSDTransferInstance;
+
+import java.util.*;
 
 
 public class GTMLModeling  {
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index 0f653d770a03aa672ca3f7b8a51fd9eb6b72c494..87311199f6d523724c4ba8bfe1f600ee98589ef9 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -45,67 +45,26 @@
 
 package ui;
 
-import java.awt.Point;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.swing.JOptionPane;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import avatartranslator.AvatarActionOnSignal;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarPragma;
-import avatartranslator.AvatarPragmaSecret;
-import avatartranslator.AvatarPragmaAuthenticity;
-import avatartranslator.AvatarRelation;
-import avatartranslator.AvatarSpecification;
-import avatartranslator.AvatarStartState;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarStateMachine;
-import avatartranslator.AvatarStateMachineElement;
-import avatartranslator.AvatarStopState;
-import avatartranslator.AvatarTransition;
-import avatartranslator.AvatarType;
+import avatartranslator.*;
 import avatartranslator.toproverif.AVATAR2ProVerif;
 import avatartranslator.totpn.AVATAR2TPN;
 import avatartranslator.toturtle.AVATAR2TURTLE;
 import avatartranslator.touppaal.AVATAR2UPPAAL;
-import proverifspec.ProVerifQueryResult;
-import proverifspec.ProVerifQueryAuthResult;
 import ddtranslator.DDSyntaxException;
 import ddtranslator.DDTranslator;
 import launcher.LauncherException;
 import launcher.RemoteExecutionThread;
 import launcher.RshClient;
-import myutil.Conversion;
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.TraceManager;
+import myutil.*;
 import nc.NCStructure;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
 import proverifspec.ProVerifSpec;
 import req.ebrdd.EBRDD;
 import sddescription.HMSC;
@@ -114,33 +73,7 @@ import sddescription.SDExchange;
 import sdtranslator.SDTranslationException;
 import sdtranslator.SDTranslator;
 import tmatrix.RequirementModeling;
-import tmltranslator.HwBridge;
-import tmltranslator.HwBus;
-import tmltranslator.HwExecutionNode;
-import tmltranslator.HwLink;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.SecurityPattern;
-import tmltranslator.TMLActivityElement;
-import tmltranslator.TMLCP;
-import tmltranslator.TMLCPTextSpecification;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLError;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLMappingTextSpecification;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLPort;
-import tmltranslator.HwCPU;
-import tmltranslator.TMLStopState;
-import tmltranslator.TMLChoice;
-import tmltranslator.TMLExecI;
-import tmltranslator.TMLReadChannel;
-import tmltranslator.TMLWriteChannel;
-import tmltranslator.TMLTask;
-import tmltranslator.TMLActivity;
-import tmltranslator.TMLStartState;
-import tmltranslator.TMLForLoop;
-import tmltranslator.TMLTextSpecification;
+import tmltranslator.*;
 import tmltranslator.modelcompiler.TMLModelCompiler;
 import tmltranslator.toautomata.TML2AUT;
 import tmltranslator.toautomata.TML2AUTviaLOTOS;
@@ -151,43 +84,21 @@ import tmltranslator.toturtle.TML2TURTLE;
 import tmltranslator.touppaal.RelationTMLUPPAAL;
 import tmltranslator.touppaal.TML2UPPAAL;
 import tpndescription.TPN;
-import translator.ADComponent;
-import translator.Gate;
-import translator.GroupOfGates;
-import translator.MasterGateManager;
-import translator.TClass;
-import translator.TIFExchange;
-import translator.TURTLEModelChecker;
-import translator.TURTLEModeling;
-import translator.TURTLETranslator;
+import translator.*;
 import translator.totpn.TURTLE2TPN;
 import translator.touppaal.RelationTIFUPPAAL;
 import translator.touppaal.TURTLE2UPPAAL;
 import ui.ad.TActivityDiagramPanel;
 import ui.atd.AttackTreeDiagramPanel;
 import ui.avatarad.AvatarADPanel;
-import ui.avatarbd.AvatarBDBlock;
-import ui.avatarbd.AvatarBDLibraryFunction;
-import ui.avatarbd.AvatarBDPanel;
-import ui.avatarbd.AvatarBDPortConnector;
-import ui.avatarbd.AvatarBDPragma;
-import ui.avatarbd.AvatarBDStateMachineOwner;
+import ui.avatarbd.*;
 import ui.avatarcd.AvatarCDPanel;
-import ui.avatarbd.AvatarBDDataType;
-// AVATAR
-// AVATAR
 import ui.avatardd.ADDDiagramPanel;
 import ui.avatarmad.AvatarMADPanel;
 import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
 import ui.avatarpd.AvatarPDPanel;
 import ui.avatarrd.AvatarRDPanel;
-import ui.avatarsmd.AvatarSMDConnector;
-import ui.avatarsmd.AvatarSMDPanel;
-import ui.avatarsmd.AvatarSMDReceiveSignal;
-import ui.avatarsmd.AvatarSMDSendSignal;
-import ui.avatarsmd.AvatarSMDStartState;
-import ui.avatarsmd.AvatarSMDState;
-import ui.avatarsmd.AvatarSMDStopState;
+import ui.avatarsmd.*;
 import ui.cd.TCDTClass;
 import ui.cd.TCDTObject;
 import ui.cd.TClassDiagramPanel;
@@ -196,6 +107,7 @@ import ui.dd.TDDNode;
 import ui.dd.TDeploymentDiagramPanel;
 import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
+import ui.graph.RG;
 import ui.iod.InteractionOverviewDiagramPanel;
 import ui.ncdd.NCDiagramPanel;
 import ui.osad.TURTLEOSActivityDiagramPanel;
@@ -207,49 +119,32 @@ import ui.prosmd.ProactiveSMDPanel;
 import ui.req.Requirement;
 import ui.req.RequirementDiagramPanel;
 import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
-import ui.tmlad.TGConnectorTMLAD;
-import ui.tmlad.TMLADDecrypt;
-import ui.tmlad.TMLADEncrypt;
-import ui.tmlad.TMLADSendRequest;
-import ui.tmlad.TMLADReadRequestArg;
-import ui.tmlad.TMLADReadChannel;
-import ui.tmlad.TMLADExecI;
-import ui.tmlad.TMLADChoice;
-import ui.tmlad.TMLADStartState;
-import ui.tmlad.TMLADActionState;
-import ui.tmlad.TMLADForEverLoop;
-import ui.tmlad.TMLADWriteChannel;
-import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.*;
 import ui.tmlcd.TMLTaskDiagramPanel;
 import ui.tmlcd.TMLTaskOperator;
-import ui.tmlcompd.TMLCChannelOutPort;
-import ui.tmlcompd.TMLCCompositeComponent;
-import ui.tmlcompd.TMLCPortConnector;
-import ui.tmlcompd.TMLCPrimitiveComponent;
-import ui.tmlcompd.TMLCPrimitivePort;
-import ui.tmlad.TMLADStopState;
-import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcompd.*;
 import ui.tmlcp.TMLCPPanel;
-import ui.tmldd.TMLArchiCPNode;
-import ui.tmldd.TMLArchiCPUNode;
-import ui.tmldd.TMLArchiDiagramPanel;
-import ui.tmldd.TMLArchiKey;
-import ui.tmldd.TMLArchiArtifact;
-import ui.tmldd.TMLArchiBUSNode;
-import ui.tmldd.TMLArchiHWANode;
-import ui.tmldd.TMLArchiMemoryNode;
-import ui.tmldd.TMLArchiConnectorNode;
+import ui.tmldd.*;
 import ui.tmlsd.TMLSDPanel;
+import ui.tree.GraphTree;
 import ui.tree.InvariantDataTree;
 import ui.tree.SearchTree;
 import ui.tree.SyntaxAnalysisTree;
 import ui.ucd.UseCaseDiagramPanel;
 import ui.window.JFrameSimulationTrace;
 import uppaaldesc.UPPAALSpec;
+
+import javax.swing.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.io.*;
 import java.util.*;
-import ui.tree.*;
+import java.util.List;
 
-import ui.graph.*;
+// AVATAR
+// AVATAR
 
 //Communication Pattern javaCC parser
 //import compiler.tmlCPparser.*;
diff --git a/src/ui/GTURTLEOSModeling.java b/src/ui/GTURTLEOSModeling.java
index 066f60b20689f618c7f944a4553b306d25344c42..a09dd6b9aeff2191b9c2549cf2ca9080b1ab11ea 100755
--- a/src/ui/GTURTLEOSModeling.java
+++ b/src/ui/GTURTLEOSModeling.java
@@ -47,10 +47,12 @@
 
 package ui;
 
-import java.util.*;
+import translator.TClass;
+import translator.TURTLEModeling;
+import ui.oscd.TOSClass;
 
-import ui.oscd.*;
-import translator.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 public class GTURTLEOSModeling  {
     private TURTLEOSDesignPanel tosdp;
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index f67937e4c8151995fd708e3d76b15037ad8b456a..5cc4bfa936a5884b81852f156e76096ab04b5f60 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -45,9 +45,9 @@
 
 package ui;
 
-import java.net.*;
+import javax.swing.*;
 import java.awt.*;
-import javax.swing.ImageIcon;
+import java.net.URL;
 
 /**
  * Class
diff --git a/src/ui/Invariant.java b/src/ui/Invariant.java
index 98836c65036661fba63d1e35968500405410aa14..b48681f67f532b89241ee727c5e2a0cce74015c6 100755
--- a/src/ui/Invariant.java
+++ b/src/ui/Invariant.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import myutil.*;
+import myutil.GenericTree;
+import myutil.TraceManager;
 
-import java.util.*;
+import java.util.LinkedList;
 
 
 public class Invariant implements GenericTree {
diff --git a/src/ui/InvariantSynchro.java b/src/ui/InvariantSynchro.java
index 5a4ad263b972d9c8640776a423b407e9ca25b855..95afda0ddf883791682a60f3eda3de18c3a162ba 100755
--- a/src/ui/InvariantSynchro.java
+++ b/src/ui/InvariantSynchro.java
@@ -46,9 +46,7 @@
 
 package ui;
 
-import myutil.*;
-
-import java.util.*;
+import myutil.GenericTree;
 
 
 public class InvariantSynchro implements GenericTree {
diff --git a/src/ui/JTextAreaWriter.java b/src/ui/JTextAreaWriter.java
index 9a4fc95d898366c2b04f078ffe1987db0bb72507..6daada3dab3b3661202b7e576ff2118d30da05ff 100644
--- a/src/ui/JTextAreaWriter.java
+++ b/src/ui/JTextAreaWriter.java
@@ -1,10 +1,9 @@
 package ui;
 
+import javax.swing.*;
 import java.io.IOException;
 import java.io.Writer;
 
-import javax.swing.JTextArea;
-
 public class JTextAreaWriter extends Writer {
 
 	private final JTextArea textArea;
diff --git a/src/ui/JToolBarMainTurtle.java b/src/ui/JToolBarMainTurtle.java
index 6446dceb0efef4a8745a4e9878f4809b984e345d..ee4e1ad4955a6ff38fc43e9c76febd30a78906d6 100755
--- a/src/ui/JToolBarMainTurtle.java
+++ b/src/ui/JToolBarMainTurtle.java
@@ -45,12 +45,13 @@
 
 package ui;
 
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
 
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * Class        *
diff --git a/src/ui/MSCDrawer.java b/src/ui/MSCDrawer.java
index d125b784221c44227f4a92e1f79bee4bf10a0409..5672f541f6fd918c86da0515738da744971353bc 100755
--- a/src/ui/MSCDrawer.java
+++ b/src/ui/MSCDrawer.java
@@ -46,11 +46,15 @@
 
 package ui;
 
-import java.util.*;
-
 import sddescription.*;
-import ui.sd.*;
-import ui.iod.*;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.sd.SDInstance;
+import ui.sd.SequenceDiagramPanel;
+import ui.sd.TGConnectorMessageSD;
+
+import java.util.ArrayList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class MSCDrawer {
     public final static int DEC = 50;
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 54f4dad929935e2c383059d6f2bc10bb1a6c97e5..1635a67a73452388ddb4f2c4548ae02412f33c46 100644
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -48,60 +48,6 @@
 
 package ui;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Robot;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.imageio.ImageIO;
-import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingUtilities;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-
-import ui.networkmodelloader.*;
 import avatartranslator.AvatarSpecification;
 import ddtranslatorSoclib.AvatarddSpecification;
 import ddtranslatorSoclib.toSoclib.TasksAndMainGenerator;
@@ -113,7 +59,6 @@ import translator.MasterGateManager;
 import ui.ad.TActivityDiagramPanel;
 import ui.atd.AttackTreeDiagramPanel;
 import ui.avatarad.AvatarADPanel;
-// AVATAR
 import ui.avatarbd.AvatarBDLibraryFunction;
 import ui.avatarbd.AvatarBDPortConnector;
 import ui.avatarbd.AvatarBDStateMachineOwner;
@@ -126,23 +71,13 @@ import ui.avatarrd.AvatarRDPanel;
 import ui.avatarsmd.AvatarSMDPanel;
 import ui.cd.TClassDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
-import ui.file.AUTFileFilter;
-import ui.file.DTAFileFilter;
-import ui.file.MSCFilter;
-import ui.file.RGFileFilter;
-import ui.file.RTLFileFilter;
-import ui.file.TDotFilter;
-import ui.file.TFileFilter;
-import ui.file.TImgFilter;
-import ui.file.TLSAFileFilter;
-import ui.file.TLibFilter;
-import ui.file.TSVGFilter;
-import ui.file.TTIFFilter;
+import ui.file.*;
 import ui.graph.AUTGraph;
 import ui.graph.RG;
 import ui.interactivesimulation.JFrameInteractiveSimulation;
 import ui.interactivesimulation.SimulationTransaction;
 import ui.iod.InteractionOverviewDiagramPanel;
+import ui.networkmodelloader.JDialogLoadingNetworkModel;
 import ui.osad.TURTLEOSActivityDiagramPanel;
 import ui.prosmd.ProactiveSMDPanel;
 import ui.req.Requirement;
@@ -160,6 +95,22 @@ import ui.tree.JDiagramTree;
 import ui.ucd.UseCaseDiagramPanel;
 import ui.window.*;
 
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.*;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+// AVATAR
+
 public  class MainGUI implements ActionListener, WindowListener, KeyListener, PeriodicBehavior {
 
     public static boolean systemcOn;
diff --git a/src/ui/ModeManager.java b/src/ui/ModeManager.java
index 26f007941d770e4b2cfed7a8bbb84155f819a6c7..0e90c2b30f6329ec883cc5ea88fee4c4146280b9 100755
--- a/src/ui/ModeManager.java
+++ b/src/ui/ModeManager.java
@@ -48,9 +48,7 @@
 
 package ui;
 
-import java.awt.event.*;
-import javax.swing.*;
-import myutil.*;
+import myutil.TraceManager;
 
 public class ModeManager {
 
diff --git a/src/ui/NCPanel.java b/src/ui/NCPanel.java
index ab7ce8e5facce2fd9dd35ada3dc42341c41bdcb6..f87a7f78ea66fb2c4683a7f84980ee0a4e5f8c98 100755
--- a/src/ui/NCPanel.java
+++ b/src/ui/NCPanel.java
@@ -46,13 +46,14 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
+import ui.ncdd.NCDiagramPanel;
+import ui.ncdd.NCDiagramToolBar;
 
-import ui.ncdd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class NCPanel extends TURTLEPanel {
     public NCDiagramPanel ncdp;
diff --git a/src/ui/ProactiveDesignPanel.java b/src/ui/ProactiveDesignPanel.java
index 60c3fc0c93e4492732270e79be673a56f9dfeeb0..2789140a351d98e09735486d7aa3a38dbd33d2ac 100755
--- a/src/ui/ProactiveDesignPanel.java
+++ b/src/ui/ProactiveDesignPanel.java
@@ -46,13 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.procsd.*;
-import ui.prosmd.*;
+import ui.procsd.ProActiveCompSpecificationCSDPanel;
+import ui.procsd.ProactiveCSDPanel;
+import ui.procsd.ProactiveCSDToolBar;
+import ui.prosmd.ProactiveSMDPanel;
+import ui.prosmd.ProactiveSMDToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class ProactiveDesignPanel extends TURTLEPanel {
    
diff --git a/src/ui/RequirementPanel.java b/src/ui/RequirementPanel.java
index 0b9e2004d7e30b76b75c1e55ab466b6f8fd2be09..a025312caef38a7433be866bba54f188b09a0925 100755
--- a/src/ui/RequirementPanel.java
+++ b/src/ui/RequirementPanel.java
@@ -46,15 +46,17 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.req.*;
-import ui.ebrdd.*;
+import ui.ebrdd.EBRDDPanel;
+import ui.ebrdd.EBRDDToolBar;
+import ui.req.RequirementDiagramPanel;
+import ui.req.RequirementDiagramToolBar;
 
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class RequirementPanel extends TURTLEPanel {
     public RequirementDiagramPanel rdp;
diff --git a/src/ui/SysmlsecMethodologyPanel.java b/src/ui/SysmlsecMethodologyPanel.java
index b4450592c0fa5164a4d3b90e5e5fcf0a96a4888d..0f1e1710b5e4ea64aa1959b9b3938071e59e8c93 100755
--- a/src/ui/SysmlsecMethodologyPanel.java
+++ b/src/ui/SysmlsecMethodologyPanel.java
@@ -46,15 +46,15 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.sysmlsecmethodology.*;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramToolbar;
 
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class SysmlsecMethodologyPanel extends TURTLEPanel {
     public SysmlsecMethodologyDiagramPanel dmd;
diff --git a/src/ui/TAction.java b/src/ui/TAction.java
index 04abee894b5ef8b4b9878b0ce780cd247dde64c3..bcf3d00b8280c849b094b138bf88b16d5b3e55ee 100755
--- a/src/ui/TAction.java
+++ b/src/ui/TAction.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import javax.swing.ImageIcon;
+import javax.swing.*;
 
 public class TAction  {
 	
diff --git a/src/ui/TAttribute.java b/src/ui/TAttribute.java
index 35112d8f458b8411a3e12e80e0b254d992d5f2cb..e3c1efb833d2ef21ed97baee822aa253b55f86e3 100755
--- a/src/ui/TAttribute.java
+++ b/src/ui/TAttribute.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.*;
+import tmltranslator.TMLTextSpecification;
+import translator.RTLOTOSKeyword;
+import translator.tojava.JKeyword;
 
-import translator.*;
-import translator.tojava.*;
-import tmltranslator.*;
+import java.util.List;
 
 public class TAttribute {
     
diff --git a/src/ui/TClassAndGateDS.java b/src/ui/TClassAndGateDS.java
index 68965adc5612d00fe8640c88381e3fa680cb6ca6..d1b4e4d54589ad84423cf0e43c485d5a25783ccc 100755
--- a/src/ui/TClassAndGateDS.java
+++ b/src/ui/TClassAndGateDS.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import translator.*;
+import translator.Gate;
+import translator.TClass;
 
 public class TClassAndGateDS implements Comparable {
     
diff --git a/src/ui/TClassSynchroInterface.java b/src/ui/TClassSynchroInterface.java
index 93950a64df8d6659e9794cec446a1939a2df7cb5..88d4cc93304f65f0df6179c5a4c9c361274aef33 100755
--- a/src/ui/TClassSynchroInterface.java
+++ b/src/ui/TClassSynchroInterface.java
@@ -47,9 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.List;
+import ui.cd.TCDSynchroGateList;
 
-import ui.cd.*;
+import java.util.List;
 
 public interface TClassSynchroInterface extends TClassInterface  {
     public List<TAttribute> gatesNotSynchronizedOn(TCDSynchroGateList tcdsgl);
diff --git a/src/ui/TDiagramMouseManager.java b/src/ui/TDiagramMouseManager.java
index 3d7147d45a5c2c9498455a2ef20aaf68bef09cdd..7e084cf9ae31a6f7df4e6b7aae889e6a6875ab39 100755
--- a/src/ui/TDiagramMouseManager.java
+++ b/src/ui/TDiagramMouseManager.java
@@ -46,13 +46,14 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.window.JDialogSearchBox;
 
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.util.ArrayList;
 
-import ui.window.JDialogSearchBox;
-
 public class TDiagramMouseManager implements MouseListener, MouseMotionListener  {
 
     private TDiagramPanel tdp;
diff --git a/src/ui/TDiagramPanel.java b/src/ui/TDiagramPanel.java
index 3e053525a391664a7d8ab3e4919d5edb79083f5d..7ec1eaa399b3da4d3aa6e51dbb04d9de92ab84ab 100755
--- a/src/ui/TDiagramPanel.java
+++ b/src/ui/TDiagramPanel.java
@@ -46,35 +46,12 @@
 
 package ui;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.RepaintManager;
-
 import myutil.GenericTree;
 import myutil.GraphicLib;
 import myutil.SVGGraphics;
 import myutil.TraceManager;
 import ui.atd.ATDBlock;
 import ui.avatarad.AvatarADActivity;
-// AVATAR
 import ui.avatarbd.AvatarBDBlock;
 import ui.avatarbd.AvatarBDDataType;
 import ui.avatarbd.AvatarBDLibraryFunction;
@@ -82,12 +59,7 @@ import ui.avatarcd.AvatarCDBlock;
 import ui.avatarmad.AvatarMADAssumption;
 import ui.avatarrd.AvatarRDRequirement;
 import ui.avatarsmd.AvatarSMDState;
-import ui.cd.TCDCompositionOperatorWithSynchro;
-import ui.cd.TCDSynchroGateList;
-import ui.cd.TCDTClass;
-import ui.cd.TCDTData;
-import ui.cd.TCDTObject;
-import ui.cd.TGConnectorAssociation;
+import ui.cd.*;
 import ui.ncdd.NCEqNode;
 import ui.ncdd.NCRouteArtifact;
 import ui.ncdd.NCSwitchNode;
@@ -102,6 +74,16 @@ import ui.window.JDialogCode;
 import ui.window.JDialogNote;
 import ui.window.JDialogSearchBox;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.util.*;
+import java.util.List;
+
+// AVATAR
+
 public abstract class TDiagramPanel extends JPanel implements GenericTree {
 
     protected TDiagramMouseManager tdmm;
diff --git a/src/ui/TGCAttributeBox.java b/src/ui/TGCAttributeBox.java
index ab77f797b3d638901ae2d4b42e27720b62516fcf..ef59cad0c762e2bdf8269c97aa978fd4eed567d5 100755
--- a/src/ui/TGCAttributeBox.java
+++ b/src/ui/TGCAttributeBox.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.cd.TCDTClass;
+import ui.cd.TGConnectingPointTClasses;
+import ui.window.JDialogAttribute;
 
-import myutil.*;
-
-import ui.cd.*;
-import ui.window.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public abstract class TGCAttributeBox extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/TGCNote.java b/src/ui/TGCNote.java
index 19ec7da45f330a16745b14affc449f582bc1716d..b798016ea7b09792a4a79c86df80c957b342d7c5 100755
--- a/src/ui/TGCNote.java
+++ b/src/ui/TGCNote.java
@@ -46,19 +46,16 @@
 
 package ui;
 
-import java.awt.Color;
-import java.awt.Graphics;
-
-import javax.swing.JFrame;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-import myutil.Conversion;
-import myutil.GraphicLib;
 import ui.window.JDialogNote;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TGCNote extends TGCScalableWithoutInternalComponent {
 
     protected String[] values;
diff --git a/src/ui/TGCOneLineText.java b/src/ui/TGCOneLineText.java
index a00530b28a7d408930aa1f42999c08b5cbc8a0c6..e48984438160674698eab7f6db99ef476c6851ec 100755
--- a/src/ui/TGCOneLineText.java
+++ b/src/ui/TGCOneLineText.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
 import javax.swing.*;
+import java.awt.*;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TGCOneLineText extends TGCWithoutInternalComponent{
     protected boolean emptyText;
diff --git a/src/ui/TGCPanelInfo.java b/src/ui/TGCPanelInfo.java
index 4e66a07ce976f37ae10b011fdf416d1a85037a7c..84581e763706ad1e551b070bb8ef258661acf857 100755
--- a/src/ui/TGCPanelInfo.java
+++ b/src/ui/TGCPanelInfo.java
@@ -46,14 +46,13 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import java.awt.*;
 
 public class TGCPanelInfo extends TGCScalableWithoutInternalComponent {
 
diff --git a/src/ui/TGCPointOfConnector.java b/src/ui/TGCPointOfConnector.java
index 626f80ba7c4a56235891cb06b19004028f1ca6e3..ee8c8b6d182528edcfe42669eea36e1949c69e31 100755
--- a/src/ui/TGCPointOfConnector.java
+++ b/src/ui/TGCPointOfConnector.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
+
 //import java.awt.geom.*;
 //import javax.swing.*;
 
-import myutil.*;
-
 public class TGCPointOfConnector extends TGCScalableWithoutInternalComponent {
     private int width = 8;
     private int height = 8;
diff --git a/src/ui/TGCScalableOneLineText.java b/src/ui/TGCScalableOneLineText.java
index 4ef46305bfb1c7502ca7db37c68ff084bf8b5703..1a45aaf854a9b89b50cd156884c587ac2cc87378 100755
--- a/src/ui/TGCScalableOneLineText.java
+++ b/src/ui/TGCScalableOneLineText.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
 import javax.swing.*;
+import java.awt.*;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TGCScalableOneLineText extends TGCScalableWithoutInternalComponent {
     protected boolean emptyText;
diff --git a/src/ui/TGCScalableWithInternalComponent.java b/src/ui/TGCScalableWithInternalComponent.java
index a78fc9c306ed5861781c610cb2d7446137297f2a..062f69f597d77e71647786a41a3df765ddc5c17a 100755
--- a/src/ui/TGCScalableWithInternalComponent.java
+++ b/src/ui/TGCScalableWithInternalComponent.java
@@ -46,8 +46,6 @@
 
 package ui;
 
-import myutil.*;
-
 //import java.awt.*;
 
 public abstract class TGCScalableWithInternalComponent extends TGCWithInternalComponent implements ScalableTGComponent {
diff --git a/src/ui/TGCScalableWithoutInternalComponent.java b/src/ui/TGCScalableWithoutInternalComponent.java
index a475d52080d1e054fe04500d0baabad4b14d25e5..e087c7e7425bdc5d4d4dc23a5eed45edf75387de 100755
--- a/src/ui/TGCScalableWithoutInternalComponent.java
+++ b/src/ui/TGCScalableWithoutInternalComponent.java
@@ -47,8 +47,6 @@
 
 package ui;
 
-import myutil.TraceManager;
-
 //import java.awt.*;
 
 public abstract class TGCScalableWithoutInternalComponent extends TGCWithoutInternalComponent implements ScalableTGComponent {
diff --git a/src/ui/TGCScalableWithoutInternalComponentOneLineText.java b/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
index a2861ee2caa460b67f1095a0993323f6fad4ad1b..619318ece3a449540bb4570406f1a02159e4d15c 100755
--- a/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
+++ b/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
@@ -47,10 +47,13 @@
 
 package ui;
 
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
-import javax.swing.*;
 
 //import java.awt.*;
 
diff --git a/src/ui/TGCTimeDelay.java b/src/ui/TGCTimeDelay.java
index 540115070b76732a14004a40fd4c00d4c2bea3c5..e6b99e99f812d3d5422e9400169ed8f87075662b 100644
--- a/src/ui/TGCTimeDelay.java
+++ b/src/ui/TGCTimeDelay.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.window.JDialogTimeIntervalUnit;
+
 import javax.swing.*;
-import org.w3c.dom.*;
+import java.awt.*;
 
-import myutil.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class TGCTimeDelay extends TGCWithoutInternalComponent{
     protected int minWidth = 10;
diff --git a/src/ui/TGCTimeInterval.java b/src/ui/TGCTimeInterval.java
index 4a500a4e5b65f792e0fdd31518cc12e813d4463b..b4e13ab1a83a13a36d629aecd7a5d457a912009b 100755
--- a/src/ui/TGCTimeInterval.java
+++ b/src/ui/TGCTimeInterval.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.window.JDialogTimeInterval;
+
 import javax.swing.*;
-import org.w3c.dom.*;
+import java.awt.*;
 
-import myutil.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class TGCTimeInterval extends TGCScalableWithoutInternalComponent{
     protected int minWidth = 10;
diff --git a/src/ui/TGCWithOneLineText.java b/src/ui/TGCWithOneLineText.java
index e5920608bad277653c0bc48014af9205d1e39563..916b497cf313839f95e88a61280a8057e4a06e8d 100755
--- a/src/ui/TGCWithOneLineText.java
+++ b/src/ui/TGCWithOneLineText.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
-import javax.swing.*;
 
 
 /**
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index aa8d0cd97a5e3ce7cb40bd10322154e6cb534dc4..2e31149449934bbe23814eefd6cafb4f6d52db07 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -47,23 +47,29 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.procsd.ProCSDPort;
+import myutil.Conversion;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import org.w3c.dom.NodeList;
+import ui.interactivesimulation.SimulationTransaction;
 import ui.procsd.ProCSDComponent;
+import ui.procsd.ProCSDPort;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmldd.TMLArchiArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiFirewallNode;
 
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmlcompd.*;
-import ui.tmldd.*;
-import ui.interactivesimulation.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public abstract class TGComponent implements CDElement, GenericTree {
 
diff --git a/src/ui/TGComponentAndUPPAALQuery.java b/src/ui/TGComponentAndUPPAALQuery.java
index 4e22d98470dac928f017d71a9d2cb804cb903d73..1ab896ffde534922192d3f44d32dc0f74149fb25 100755
--- a/src/ui/TGComponentAndUPPAALQuery.java
+++ b/src/ui/TGComponentAndUPPAALQuery.java
@@ -47,8 +47,6 @@
 
 package ui;
 
-import java.util.*;
-
 public class TGComponentAndUPPAALQuery {
     public TGComponent tgc;
     public String uppaalQuery;
diff --git a/src/ui/TGComponentManager.java b/src/ui/TGComponentManager.java
index 31ba78ff195f7a07d0537bbd667e71eebb7eccc6..50e4b7d1e054268680f1602e253f498b1ea48726 100755
--- a/src/ui/TGComponentManager.java
+++ b/src/ui/TGComponentManager.java
@@ -48,51 +48,44 @@
 package ui;
 
 //import java.awt.*;
-import java.util.*;
-import myutil.*;
 
 import ui.ad.*;
+import ui.atd.*;
+import ui.avatarad.*;
+import ui.avatarbd.*;
+import ui.avatarcd.*;
+import ui.avatardd.*;
+import ui.avatarmad.*;
+import ui.avatarmethodology.*;
+import ui.avatarpd.*;
+import ui.avatarrd.*;
+import ui.avatarsmd.*;
 import ui.cd.*;
-import ui.dd.*;
+import ui.dd.TDDArtifact;
+import ui.dd.TDDNode;
+import ui.dd.TGConnectorLinkNode;
+import ui.diplodocusmethodology.*;
+import ui.ebrdd.*;
 import ui.iod.*;
-import ui.sd.*;
-import ui.sd2.*;
-import ui.ucd.*;
-
+import ui.ncdd.*;
+import ui.osad.*;
+import ui.oscd.*;
+import ui.procsd.*;
+import ui.prosmd.*;
 import ui.req.*;
-import ui.ebrdd.*;
-
-import ui.atd.*;
-
-
-// DIPLODOCUS
+import ui.sysmlsecmethodology.*;
 import ui.tmlad.*;
 import ui.tmlcd.*;
-import ui.tmldd.*;
 import ui.tmlcompd.*;
 import ui.tmlcp.*;
+import ui.tmldd.*;
 import ui.tmlsd.*;
-import ui.diplodocusmethodology.*;
-
-import ui.procsd.*;
-import ui.prosmd.*;
-
-import ui.oscd.*;
-import ui.osad.*;
-
-import ui.ncdd.*;
+import ui.ucd.*;
 
-import ui.avatarmethodology.*;
-import ui.avatarmad.*;
-import ui.avatarbd.*;
-import ui.avatardd.*;
-import ui.avatarsmd.*;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
-import ui.avatarcd.*; // Context Diagram
-import ui.avatarad.*; // Activity Diagram
+import java.util.LinkedList;
+import java.util.Vector;
 
-import ui.sysmlsecmethodology.*;
+// DIPLODOCUS
 
 public class TGComponentManager {
 
diff --git a/src/ui/TGConnectingPoint.java b/src/ui/TGConnectingPoint.java
index f2d623655badb7cc8a5015e344a7c9329b8e485d..39a822675d9e65ac045741f89e505496f0416007 100755
--- a/src/ui/TGConnectingPoint.java
+++ b/src/ui/TGConnectingPoint.java
@@ -47,9 +47,9 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GraphicLib;
 
-import myutil.*;
+import java.awt.*;
 
 public class TGConnectingPoint implements CDElement {
 
diff --git a/src/ui/TGConnectingPointTwoFathers.java b/src/ui/TGConnectingPointTwoFathers.java
index 861e969f288fe4f8b2d5baaaaac64620d727c259..d37fa7ad7923883d68ad2d606b59ae4f27f9e860 100755
--- a/src/ui/TGConnectingPointTwoFathers.java
+++ b/src/ui/TGConnectingPointTwoFathers.java
@@ -46,8 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-import myutil.*;
 
 public class TGConnectingPointTwoFathers extends TGConnectingPoint{
 	protected CDElement container2;
diff --git a/src/ui/TGConnector.java b/src/ui/TGConnector.java
index 8ec0c91430dad23c7b2bd744c7b9eeef25f87fae..566b0e0bac18cda1c4ab596a72f1a669754ca71a 100755
--- a/src/ui/TGConnector.java
+++ b/src/ui/TGConnector.java
@@ -47,13 +47,14 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.GraphicLib;
 
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+import java.util.Vector;
 
 public abstract class TGConnector extends TGCScalableWithInternalComponent      {
 
diff --git a/src/ui/TGConnectorAttribute.java b/src/ui/TGConnectorAttribute.java
index 959028644d90bb0257e322c03bb72cd6e69eaaae..3b6ba49d38181ea477d3e276d10a61b44d55d830 100755
--- a/src/ui/TGConnectorAttribute.java
+++ b/src/ui/TGConnectorAttribute.java
@@ -46,11 +46,12 @@
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorAttribute extends TGConnector {
     
diff --git a/src/ui/TGConnectorComment.java b/src/ui/TGConnectorComment.java
index a33dea21b68d4ba8187c475551209f673941768b..3301d0a1a14c032ea451a2e0512b6097853ea3af 100755
--- a/src/ui/TGConnectorComment.java
+++ b/src/ui/TGConnectorComment.java
@@ -46,11 +46,12 @@
 
 package ui;
 
+import myutil.GraphicLib;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorComment extends TGConnector {
 
diff --git a/src/ui/TGConnectorFullArrow.java b/src/ui/TGConnectorFullArrow.java
index f9f72e0c8d46b470969e088d2543783e64418dab..0d641185825ea53c0ede90754066d135db88873d 100755
--- a/src/ui/TGConnectorFullArrow.java
+++ b/src/ui/TGConnectorFullArrow.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
 
-import myutil.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorFullArrow extends TGConnector implements TGConnectorBetweenElementsInterface {
 	protected int arrowLength = 10;
diff --git a/src/ui/TGConnectorInfo.java b/src/ui/TGConnectorInfo.java
index fc3e52e8acdbbe56150d4cabc3f604402a3fc140..29f77682d2e12bc7a1a212507f28636db78e3bda 100644
--- a/src/ui/TGConnectorInfo.java
+++ b/src/ui/TGConnectorInfo.java
@@ -47,14 +47,6 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
-
 public  class TGConnectorInfo  {
     
     public TGConnector connector;
diff --git a/src/ui/TGConnectorWithCommentConnectionPoints.java b/src/ui/TGConnectorWithCommentConnectionPoints.java
index 55ea937dda6b9424b60e4597c3fe6b6ea3887faf..646027a30cb186a1dfaaa49f8ddd6840933b8415 100755
--- a/src/ui/TGConnectorWithCommentConnectionPoints.java
+++ b/src/ui/TGConnectorWithCommentConnectionPoints.java
@@ -46,11 +46,11 @@
 
 package ui;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.TraceManager;
+
+import java.util.Vector;
 
-import myutil.*;
+//import java.awt.geom.*;
 
 
 public abstract class TGConnectorWithCommentConnectionPoints extends TGConnector {
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index e81df94cac1f165d5f697333e56a9380dd8f628b..6f341c06a373f9fe5b2de19aaeb4a6c77ca9c96a 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -46,14 +46,12 @@
 
 package ui;
 
+import javax.swing.*;
+import javax.swing.event.EventListenerList;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 
-import javax.swing.*;
-
-import javax.swing.event.EventListenerList;
-
 
 public class TGUIAction extends AbstractAction {
     
diff --git a/src/ui/TMLArchiPanel.java b/src/ui/TMLArchiPanel.java
index 159ea9072da431b2fd3eeedfb92ef3e15fd7af70..3c8141b271fe5b626c09eeac07f030ca2d75f56d 100755
--- a/src/ui/TMLArchiPanel.java
+++ b/src/ui/TMLArchiPanel.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiDiagramToolBar;
 
-import java.util.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class TMLArchiPanel extends TURTLEPanel {
     public TMLArchiDiagramPanel tmlap; 
diff --git a/src/ui/TMLCommunicationPatternPanel.java b/src/ui/TMLCommunicationPatternPanel.java
index 2bd6d7fc8ae981322832877d6b472231efa3ab8a..c74e29dc9132825c6c5b4438d7bff5734638467a 100755
--- a/src/ui/TMLCommunicationPatternPanel.java
+++ b/src/ui/TMLCommunicationPatternPanel.java
@@ -46,16 +46,17 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
+import ui.tmlcp.TMLCPPanel;
+import ui.tmlcp.TMLCPToolBar;
+import ui.tmlsd.TMLSDPanel;
+import ui.tmlsd.TMLSDToolBar;
 
-import java.util.*;
-
-import ui.tmlcp.*;
-import ui.tmlsd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
 
 public class TMLCommunicationPatternPanel extends TURTLEPanel {
     public TMLCPPanel tmlcpp;
diff --git a/src/ui/TMLComponentDesignPanel.java b/src/ui/TMLComponentDesignPanel.java
index bf7641e0fba6f03d45b8a0f9f4a051ac8ae346d6..de97df5707fa8f099eac3f561a6dedbb80274cfc 100755
--- a/src/ui/TMLComponentDesignPanel.java
+++ b/src/ui/TMLComponentDesignPanel.java
@@ -47,16 +47,21 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.TMLActivityDiagramToolBar;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcompd.TMLComponentTaskDiagramToolBar;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import java.util.*;
-import ui.tmlcompd.*;
-import ui.tmlad.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class TMLComponentDesignPanel extends TURTLEPanel {
     
diff --git a/src/ui/TMLDesignPanel.java b/src/ui/TMLDesignPanel.java
index d2a0f5d9eb55d747101bac5dd2f6e0cd3109101c..4f16f65db315fe0beb2a48ad64869210b9d98dc4 100755
--- a/src/ui/TMLDesignPanel.java
+++ b/src/ui/TMLDesignPanel.java
@@ -47,16 +47,21 @@
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.TMLActivityDiagramToolBar;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramToolBar;
+import ui.tmlcd.TMLTaskOperator;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import java.util.*;
-import ui.tmlcd.*;
-import ui.tmlad.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class TMLDesignPanel extends TURTLEPanel {
     public TMLTaskDiagramPanel tmltdp;
diff --git a/src/ui/TMLTaskInterface.java b/src/ui/TMLTaskInterface.java
index 9c6e04f1972c131609eddd9c0e947fc6a8602e78..473c3b775717e402a7015a86aea0bdcb7d18edaf 100755
--- a/src/ui/TMLTaskInterface.java
+++ b/src/ui/TMLTaskInterface.java
@@ -48,7 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui;
 
 
-import ui.tmlad.*;
+import ui.tmlad.TMLActivityDiagramPanel;
 
 public interface TMLTaskInterface  {
     public String getTaskName();
diff --git a/src/ui/TToolUpdater.java b/src/ui/TToolUpdater.java
index cb4e7545d4692a1b3175681a6d1c1d8d3d805408..9276991575a5d7394398cf9f516d0d1459114289 100755
--- a/src/ui/TToolUpdater.java
+++ b/src/ui/TToolUpdater.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import java.io.*;
-import java.net.*;
 import javax.swing.*;
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
 
 
 public class TToolUpdater extends Thread {
diff --git a/src/ui/TURTLEModelingDrawer.java b/src/ui/TURTLEModelingDrawer.java
index 1c2db407c9c0e106cb4d01a78621dd6c221e8b9b..dbd9a92e504b7c272a346cea24804abb162390ca 100755
--- a/src/ui/TURTLEModelingDrawer.java
+++ b/src/ui/TURTLEModelingDrawer.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.util.*;
-
 import translator.*;
-import ui.cd.*;
 import ui.ad.*;
+import ui.cd.TCDCompositionOperatorWithSynchro;
+import ui.cd.TCDTClass;
+
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class TURTLEModelingDrawer {
     private MainGUI mgui;
diff --git a/src/ui/TURTLEOSDesignPanel.java b/src/ui/TURTLEOSDesignPanel.java
index 452a1106b7aa3800eeb8b2ad9c0cc7213d96430e..ae29ac04deb635e1daffa22e19f66223ed014de1 100755
--- a/src/ui/TURTLEOSDesignPanel.java
+++ b/src/ui/TURTLEOSDesignPanel.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
-import ui.oscd.*;
-import ui.osad.*;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.osad.TURTLEOSActivityDiagramToolBar;
+import ui.oscd.TURTLEOSClassDiagramPanel;
+import ui.oscd.TURTLEOSClassDiagramToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 public class TURTLEOSDesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterface {
     //public Vector validated, ignored;
diff --git a/src/ui/TURTLEPanel.java b/src/ui/TURTLEPanel.java
index 3c0f39bd6bfe5737f80d56518128f4e6df9ce662..c6326075e8e207c6830af2620d87809b82713b66 100755
--- a/src/ui/TURTLEPanel.java
+++ b/src/ui/TURTLEPanel.java
@@ -46,11 +46,13 @@
 
 package ui;
 
-import java.awt.*;
+import myutil.GenericTree;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import myutil.*;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public abstract class TURTLEPanel implements GenericTree {
     public JTabbedPane tabbedPane;
diff --git a/src/ui/TURTLEPanelPopupListener.java b/src/ui/TURTLEPanelPopupListener.java
index 6efdf669c8155d100d0f1fdfc90293dd7228c053..8e46244ab5bc1952203a88f8927ecf7404d53a66 100755
--- a/src/ui/TURTLEPanelPopupListener.java
+++ b/src/ui/TURTLEPanelPopupListener.java
@@ -46,12 +46,14 @@
 
 package ui;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import ui.ucd.UseCaseDiagramPanel;
 
-import ui.ucd.*;
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 
 public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto tabs */ {
diff --git a/src/ui/ThreadGUIElement.java b/src/ui/ThreadGUIElement.java
index 0638fd2d19ed2e32e87392830991b44781a95b5c..75f319169bd5b88bed142f1ee5722efcc5b31881 100755
--- a/src/ui/ThreadGUIElement.java
+++ b/src/ui/ThreadGUIElement.java
@@ -47,13 +47,17 @@
 
 package ui;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.ExternalCall;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+import ui.graph.RG;
+import ui.window.JDialogCancel;
+import ui.window.JFrameStatistics;
 
-import myutil.*;
-import ui.window.*;
-import ui.graph.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public class ThreadGUIElement extends Thread {
diff --git a/src/ui/VectorLRArtifactTClassGate.java b/src/ui/VectorLRArtifactTClassGate.java
index 7f104cf3c1e170ed467f955388737e57f8ee5091..7ff616f5b4a25fcfe137cd8a11d55783f22a8297 100755
--- a/src/ui/VectorLRArtifactTClassGate.java
+++ b/src/ui/VectorLRArtifactTClassGate.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui;
 
-import java.util.*;
+import ui.cd.TCDTClass;
 
-import ui.cd.*;
+import java.util.Collection;
+import java.util.Vector;
 
 
 public class VectorLRArtifactTClassGate extends Vector {
diff --git a/src/ui/ad/TADActionState.java b/src/ui/ad/TADActionState.java
index 890a6c49ae09765512f31853595057135e21fe80..7a352c2713b6f4e15ec73442902f14d1270f9684 100755
--- a/src/ui/ad/TADActionState.java
+++ b/src/ui/ad/TADActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, ActionStateErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ad/TADArrayGetState.java b/src/ui/ad/TADArrayGetState.java
index 80f8eb3a5af947d4f4f11c288f7c887bf5efb6c2..fb913627928f3eaad613989d9506445daecb90b2 100755
--- a/src/ui/ad/TADArrayGetState.java
+++ b/src/ui/ad/TADArrayGetState.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogArrayGet;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TADArrayGetState extends TGCWithoutInternalComponent implements BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/ad/TADArraySetState.java b/src/ui/ad/TADArraySetState.java
index 2aab31333c109eb534fc3dcd5d2078c913de2d4b..cf415af4ba5828fb5603e6db3a2bc701642567c5 100755
--- a/src/ui/ad/TADArraySetState.java
+++ b/src/ui/ad/TADArraySetState.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogArraySet;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TADArraySetState extends TGCWithoutInternalComponent implements BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/ad/TADChoice.java b/src/ui/ad/TADChoice.java
index f69817bd55db36a361064a4384fc53bc0f15c096..10a4c6ad3aa3a007138943b1c980347c73199128 100755
--- a/src/ui/ad/TADChoice.java
+++ b/src/ui/ad/TADChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TADChoice extends TGCWithInternalComponent  {
     private int lineLength = 10;
diff --git a/src/ui/ad/TADDeterministicDelay.java b/src/ui/ad/TADDeterministicDelay.java
index 5c4a21572a9c18a8df9fa52f6fc3933335c7fb00..e97ddb51e561aafef615e58aee96302047d79519 100755
--- a/src/ui/ad/TADDeterministicDelay.java
+++ b/src/ui/ad/TADDeterministicDelay.java
@@ -46,11 +46,11 @@
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TADDeterministicDelay extends TGCWithInternalComponent {
     private int lineLength = 5;
diff --git a/src/ui/ad/TADJunction.java b/src/ui/ad/TADJunction.java
index 961f8a86af336f7f6e116eb888bc397f4e1db3f0..6ae55001b91ad5511dd434686a1a1ae0d3f2825a 100755
--- a/src/ui/ad/TADJunction.java
+++ b/src/ui/ad/TADJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TADJunction extends TGCWithoutInternalComponent {
 	
diff --git a/src/ui/ad/TADNonDeterministicDelay.java b/src/ui/ad/TADNonDeterministicDelay.java
index c82d67593eb8bc3c3a8f6f34fd90d54c671ed5f9..1fccd4d0d10ee384b8e752cf20f6aca516a18bdb 100755
--- a/src/ui/ad/TADNonDeterministicDelay.java
+++ b/src/ui/ad/TADNonDeterministicDelay.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADNonDeterministicDelay extends TGCWithInternalComponent{
     private int lineLength = 5;
     private int textX = 5;
diff --git a/src/ui/ad/TADParallel.java b/src/ui/ad/TADParallel.java
index 6ab2e92bbb9ae9f98c5ed9f74342bf6561fc25e4..dada738cf1ebb5569d9c88ae8d1d5c1fd66e98b4 100755
--- a/src/ui/ad/TADParallel.java
+++ b/src/ui/ad/TADParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADParallel extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/ad/TADPreemption.java b/src/ui/ad/TADPreemption.java
index b150477fa0f33c6684721a09f01722779b4795ea..01aba1b7242702fadb56704c1b800f09bdf48135 100755
--- a/src/ui/ad/TADPreemption.java
+++ b/src/ui/ad/TADPreemption.java
@@ -47,11 +47,11 @@
 
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADPreemption extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/ad/TADSequence.java b/src/ui/ad/TADSequence.java
index eea17e72e38bf797ba769786807fdb3d77b7f96f..b027992e04339db29a366565dbd2220b94561e51 100755
--- a/src/ui/ad/TADSequence.java
+++ b/src/ui/ad/TADSequence.java
@@ -47,12 +47,11 @@
 
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADSequence extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/ad/TADStartState.java b/src/ui/ad/TADStartState.java
index 999c90f2577e6d14289357cfce2294177fde665e..0505ee7b86ced9fb26db328a0ee7b63b0a6f3a9d 100755
--- a/src/ui/ad/TADStartState.java
+++ b/src/ui/ad/TADStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/ad/TADStopState.java b/src/ui/ad/TADStopState.java
index 9338e0e6d42b3e1bc6f054371c3a4eb64c3fa22b..a35d25960f02c35c5c37da59d9ffbedabcdba215 100755
--- a/src/ui/ad/TADStopState.java
+++ b/src/ui/ad/TADStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TADStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/ad/TADTimeCapture.java b/src/ui/ad/TADTimeCapture.java
index ba80e25bdf9170b2e2dad3bfcacac96d5a1ba09b..d64fb0a93a46f348c6c8302268b3673f8fda76a6 100755
--- a/src/ui/ad/TADTimeCapture.java
+++ b/src/ui/ad/TADTimeCapture.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeCapture extends TGCOneLineText implements ActionStateErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ad/TADTimeInterval.java b/src/ui/ad/TADTimeInterval.java
index 9813c53328b2190a1d89866d3c6f51a9e2485fc2..c6397b6988f685b49472808f1855f8043611ce23 100755
--- a/src/ui/ad/TADTimeInterval.java
+++ b/src/ui/ad/TADTimeInterval.java
@@ -46,13 +46,12 @@
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeInterval extends TGCWithInternalComponent{
     private int lineLength = 5;
     private int textX, textY;
diff --git a/src/ui/ad/TADTimeLimitedOffer.java b/src/ui/ad/TADTimeLimitedOffer.java
index cd3d595e62c914f82b05c550c8cbcd0c64ecc096..6bdabe8c9fd04b677859b6a2170be5749db56fcd 100755
--- a/src/ui/ad/TADTimeLimitedOffer.java
+++ b/src/ui/ad/TADTimeLimitedOffer.java
@@ -47,13 +47,13 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeLimitedOffer extends TGCWithInternalComponent implements ActionStateErrorHighlight  {
 	protected int lineLength = 25;
 	protected int lineDistance = 10;
diff --git a/src/ui/ad/TADTimeLimitedOfferWithLatency.java b/src/ui/ad/TADTimeLimitedOfferWithLatency.java
index b42e37340a50f17695817c2bae80c2e9e142314d..3926683b0f65814b7555c7089dcaceea26e14823 100755
--- a/src/ui/ad/TADTimeLimitedOfferWithLatency.java
+++ b/src/ui/ad/TADTimeLimitedOfferWithLatency.java
@@ -47,13 +47,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TADTimeLimitedOfferWithLatency extends TGCWithInternalComponent implements ActionStateErrorHighlight {
     protected int lineLength = 25;
     protected int lineLengthLatency = 5;
diff --git a/src/ui/ad/TActivityDiagramPanel.java b/src/ui/ad/TActivityDiagramPanel.java
index 3de459a5f73bc288c6aee5faf2357ebbb4436a7f..6c6f185ec91ec72fd04c58d3fe9df334eaae3af9 100755
--- a/src/ui/ad/TActivityDiagramPanel.java
+++ b/src/ui/ad/TActivityDiagramPanel.java
@@ -46,12 +46,12 @@
 
 package ui.ad;
 
-import java.util.*;
-
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 public class TActivityDiagramPanel extends TDiagramPanel implements ActivityDiagramPanelInterface {
     
     public  TActivityDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ad/TActivityDiagramToolBar.java b/src/ui/ad/TActivityDiagramToolBar.java
index c48020e6aa302a4ed07e98d3a774b8d760bd42aa..c04d47443e7459cfa21a80de37200b569564717f 100755
--- a/src/ui/ad/TActivityDiagramToolBar.java
+++ b/src/ui/ad/TActivityDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TActivityDiagramToolBar extends TToolBar {
     
     
diff --git a/src/ui/ad/TGConnectingPointAD.java b/src/ui/ad/TGConnectingPointAD.java
index 8a0127e7874360765cde614898039d150a8f125b..492d70778d62ef14ff6fb049753d3d31ce4cd85a 100755
--- a/src/ui/ad/TGConnectingPointAD.java
+++ b/src/ui/ad/TGConnectingPointAD.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.ad;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointAD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/atd/ATDAttack.java b/src/ui/atd/ATDAttack.java
index 352b34517a354e5ba684270cd1055534a3b4d772..04168746f13630962adc54794fd198c396d083a9 100755
--- a/src/ui/atd/ATDAttack.java
+++ b/src/ui/atd/ATDAttack.java
@@ -46,14 +46,16 @@
 
 package ui.atd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttack;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ATDAttack extends TGCScalableWithInternalComponent implements SwallowedTGComponent, WithAttributes, CheckableAccessibility, CanBeDisabled {
     private int textY1 = 3;
diff --git a/src/ui/atd/ATDAttackConnectingPoint.java b/src/ui/atd/ATDAttackConnectingPoint.java
index 36b703953c6a7a64c309499de6c8999089ecdd8c..6f5961e91676b42e2a8dd7fdba26b49bea910708 100755
--- a/src/ui/atd/ATDAttackConnectingPoint.java
+++ b/src/ui/atd/ATDAttackConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.atd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class ATDAttackConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/atd/ATDAttackConnector.java b/src/ui/atd/ATDAttackConnector.java
index 31891fd6c7fe75979716b38d34be12009e504723..1c17b0795b1dd278ce364ef19944fa796c3b13c7 100755
--- a/src/ui/atd/ATDAttackConnector.java
+++ b/src/ui/atd/ATDAttackConnector.java
@@ -47,18 +47,14 @@
 package ui.atd;
 
 
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class ATDAttackConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/atd/ATDBlock.java b/src/ui/atd/ATDBlock.java
index a7ec4447c9e5d66e894edee0bdaffed1791ff625..0587375f85869e2481c3cb15d3142aca5a4b696e 100755
--- a/src/ui/atd/ATDBlock.java
+++ b/src/ui/atd/ATDBlock.java
@@ -46,15 +46,12 @@
 
 package ui.atd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public class ATDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent {
diff --git a/src/ui/atd/ATDCompositionConnectingPoint.java b/src/ui/atd/ATDCompositionConnectingPoint.java
index 08127de7249e2afb59bae798c02ee873272e5614..ecf965c77a86f73baf5776388cc484b5445cfcab 100755
--- a/src/ui/atd/ATDCompositionConnectingPoint.java
+++ b/src/ui/atd/ATDCompositionConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.atd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class ATDCompositionConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/atd/ATDCompositionConnector.java b/src/ui/atd/ATDCompositionConnector.java
index ccf7a848a8ed1d76c94f539c5c15e95d0a7efe77..e890bcb21ce0fe983b3ee89d4f2c3b808fa978d2 100755
--- a/src/ui/atd/ATDCompositionConnector.java
+++ b/src/ui/atd/ATDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.atd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class ATDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/atd/ATDConstraint.java b/src/ui/atd/ATDConstraint.java
index b74800dfec81fea0dcd705865a05892969acc3d6..11e145a0bbeb2b25f55f0969d2a09d2ca94b3149 100755
--- a/src/ui/atd/ATDConstraint.java
+++ b/src/ui/atd/ATDConstraint.java
@@ -46,14 +46,15 @@
 
 package ui.atd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraintText;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ATDConstraint extends TGCScalableWithInternalComponent implements  SwallowedTGComponent, ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/atd/AttackTreeDiagramPanel.java b/src/ui/atd/AttackTreeDiagramPanel.java
index 50d14c6c329372388acb63fd27e8e7e0deb220d6..6806733cdb21f261d4ce51655cdbb908f1aadb41 100644
--- a/src/ui/atd/AttackTreeDiagramPanel.java
+++ b/src/ui/atd/AttackTreeDiagramPanel.java
@@ -47,14 +47,16 @@
 package ui.atd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttributes{
     
     public  AttackTreeDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/atd/AttackTreeDiagramToolbar.java b/src/ui/atd/AttackTreeDiagramToolbar.java
index 2343a48afd859a06e9890ec2f8610ed5845f31ee..c3318ef1a5f62aad49a4696a003fa93f25558cda 100755
--- a/src/ui/atd/AttackTreeDiagramToolbar.java
+++ b/src/ui/atd/AttackTreeDiagramToolbar.java
@@ -46,12 +46,15 @@
 
 package ui.atd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AttackTreeDiagramToolbar extends TToolBar {
 
     public AttackTreeDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/avatarad/AvatarADAcceptEventAction.java b/src/ui/avatarad/AvatarADAcceptEventAction.java
index c5c7bef0e8694145c5a7657988adecac6b12ca09..901cc5a54fae46b1f73f17b4f0b86cd21d2399e6 100755
--- a/src/ui/avatarad/AvatarADAcceptEventAction.java
+++ b/src/ui/avatarad/AvatarADAcceptEventAction.java
@@ -46,15 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class AvatarADAcceptEventAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADAction.java b/src/ui/avatarad/AvatarADAction.java
index f67c21b74263763a9e2e5deeabfa92cfe232776c..88ca981c89fe14831ac9ebdaaad68858bbcbdc16 100755
--- a/src/ui/avatarad/AvatarADAction.java
+++ b/src/ui/avatarad/AvatarADAction.java
@@ -46,13 +46,13 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarADAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/avatarad/AvatarADActivity.java b/src/ui/avatarad/AvatarADActivity.java
index a412e75ee6903da9b766346e001011cd06208e3f..b7b95626c0d6f446efeee102434c51db646977ab 100644
--- a/src/ui/avatarad/AvatarADActivity.java
+++ b/src/ui/avatarad/AvatarADActivity.java
@@ -46,15 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 
 public class AvatarADActivity extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarad/AvatarADAssociationConnector.java b/src/ui/avatarad/AvatarADAssociationConnector.java
index 558caf1771b8af8e6af6c0b3f04f5c4228721780..b084074273a4eceebaae1f1a6370dd1183875aff 100755
--- a/src/ui/avatarad/AvatarADAssociationConnector.java
+++ b/src/ui/avatarad/AvatarADAssociationConnector.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class AvatarADAssociationConnector extends TGConnector {
     int w, h;
     
diff --git a/src/ui/avatarad/AvatarADBasicComponent.java b/src/ui/avatarad/AvatarADBasicComponent.java
index 6c505b8e0009b05ceb7b6d7ca47ceac51ba577f8..4228c59228d45090c2cb796f94f849f471e6b2c8 100644
--- a/src/ui/avatarad/AvatarADBasicComponent.java
+++ b/src/ui/avatarad/AvatarADBasicComponent.java
@@ -46,10 +46,6 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
 import ui.*;
 
 public abstract class AvatarADBasicComponent extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
diff --git a/src/ui/avatarad/AvatarADChoice.java b/src/ui/avatarad/AvatarADChoice.java
index 90e60339efd81680938376154d63eb9396274c32..34d89632e5740ff7f0d1655571eb823850bb9d89 100755
--- a/src/ui/avatarad/AvatarADChoice.java
+++ b/src/ui/avatarad/AvatarADChoice.java
@@ -47,12 +47,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarADChoice extends TGCScalableWithInternalComponent implements SwallowedTGComponent, EmbeddedComment, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/avatarad/AvatarADConnectingPoint.java b/src/ui/avatarad/AvatarADConnectingPoint.java
index c74268d4f611b1dff630392dd25545c5914649c4..e757fdf7a61ba33b84d564098ec206adcfc0d170 100644
--- a/src/ui/avatarad/AvatarADConnectingPoint.java
+++ b/src/ui/avatarad/AvatarADConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarad;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarADConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarad/AvatarADJunction.java b/src/ui/avatarad/AvatarADJunction.java
index 860e8602f23ce557690afb582d775c372d8f69bc..7e5a6f100025a8ed2f01814f35f6ff5e25de5fb7 100755
--- a/src/ui/avatarad/AvatarADJunction.java
+++ b/src/ui/avatarad/AvatarADJunction.java
@@ -46,11 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class AvatarADJunction extends AvatarADBasicComponent {
 
diff --git a/src/ui/avatarad/AvatarADPanel.java b/src/ui/avatarad/AvatarADPanel.java
index 51a7da508aab561bb98e6ab8cd886049b3ef65cb..bea5ec927911f0838fcda0beefb48c1a6e86c70b 100644
--- a/src/ui/avatarad/AvatarADPanel.java
+++ b/src/ui/avatarad/AvatarADPanel.java
@@ -47,14 +47,16 @@
 package ui.avatarad;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarADPanel extends TDiagramPanel implements TDPWithAttributes{
     
 	public static int ARC = 20;
diff --git a/src/ui/avatarad/AvatarADParallel.java b/src/ui/avatarad/AvatarADParallel.java
index 2cc1d7d6cf62d4c18e676160f3c6eacb14dd0094..9520563a074020cbbee719f1a5266de08d674fc4 100755
--- a/src/ui/avatarad/AvatarADParallel.java
+++ b/src/ui/avatarad/AvatarADParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarad;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADParallel extends AvatarADBasicComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/avatarad/AvatarADPartition.java b/src/ui/avatarad/AvatarADPartition.java
index 9a3e68172cfe09b5289c719215a4d2e8cf309276..0642eb11ddee22de369d5b51f5f801932b4d5aad 100755
--- a/src/ui/avatarad/AvatarADPartition.java
+++ b/src/ui/avatarad/AvatarADPartition.java
@@ -46,12 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADPartition extends AvatarADBasicComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/avatarad/AvatarADSendSignalAction.java b/src/ui/avatarad/AvatarADSendSignalAction.java
index fd9f1f9c67a9611c132f93196a10e469d6afd884..b2255463a50fdca6b3ba36e491bd8b5e30fb8050 100755
--- a/src/ui/avatarad/AvatarADSendSignalAction.java
+++ b/src/ui/avatarad/AvatarADSendSignalAction.java
@@ -46,15 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class AvatarADSendSignalAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADStartState.java b/src/ui/avatarad/AvatarADStartState.java
index 177807958c754d8eb7920fa1043722919a40c729..0c1bea85251b972a9314f080095027b72338d254 100755
--- a/src/ui/avatarad/AvatarADStartState.java
+++ b/src/ui/avatarad/AvatarADStartState.java
@@ -46,12 +46,12 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarADStartState extends AvatarADBasicComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/avatarad/AvatarADStopFlow.java b/src/ui/avatarad/AvatarADStopFlow.java
index dc9c8fd300539f665772733389c2f52bf9701c75..ee4858adc9f67382a4bbde90f0aa076e8d1cc4df 100755
--- a/src/ui/avatarad/AvatarADStopFlow.java
+++ b/src/ui/avatarad/AvatarADStopFlow.java
@@ -46,11 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADStopFlow extends AvatarADBasicComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADStopState.java b/src/ui/avatarad/AvatarADStopState.java
index 525e919d7999635e9850a4a2275c3cd0cd9a462b..c176c9f8b0e33595cd460c1f3a873f231f275d58 100755
--- a/src/ui/avatarad/AvatarADStopState.java
+++ b/src/ui/avatarad/AvatarADStopState.java
@@ -46,11 +46,11 @@
 
 package ui.avatarad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarADStopState extends AvatarADBasicComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADToolBar.java b/src/ui/avatarad/AvatarADToolBar.java
index f0dfcb0c7cf3d4200526b78795dfffc8591b38fa..7f05f0702a8c44400bd5737730dac6a3d9727547 100644
--- a/src/ui/avatarad/AvatarADToolBar.java
+++ b/src/ui/avatarad/AvatarADToolBar.java
@@ -47,12 +47,15 @@
 
 package ui.avatarad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarADToolBar extends TToolBar {
 
     public AvatarADToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarbd/AvatarBDBlock.java b/src/ui/avatarbd/AvatarBDBlock.java
index 6f967fed604daf3b799f7c5c42d7905b19d724ab..9ba8593fffa49d840bf36c7a521a4034699e26e0 100644
--- a/src/ui/avatarbd/AvatarBDBlock.java
+++ b/src/ui/avatarbd/AvatarBDBlock.java
@@ -46,16 +46,21 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import ui.avatarsmd.*;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.window.JDialogAvatarBlock;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 
 public class AvatarBDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, GenericTree, AvatarBDStateMachineOwner {
diff --git a/src/ui/avatarbd/AvatarBDCompositionConnector.java b/src/ui/avatarbd/AvatarBDCompositionConnector.java
index e25495aac9bd3cc53a6358900683bc9fcf1ef2b2..bef4f0f6d82c9e4d136b3912070e9c53fccf6184 100644
--- a/src/ui/avatarbd/AvatarBDCompositionConnector.java
+++ b/src/ui/avatarbd/AvatarBDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarbd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class AvatarBDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/avatarbd/AvatarBDConnectingPoint.java b/src/ui/avatarbd/AvatarBDConnectingPoint.java
index 1aecc576a15cd646ea43778ad0b5798b0902e4a0..165ac9167fa5a8ad6ec6cde05944ad2f8b253950 100644
--- a/src/ui/avatarbd/AvatarBDConnectingPoint.java
+++ b/src/ui/avatarbd/AvatarBDConnectingPoint.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarbd;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarBDConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarbd/AvatarBDDataType.java b/src/ui/avatarbd/AvatarBDDataType.java
index 7c32aaead911b24fa62664699810dfb6209b831f..0ee1a6d10f6b63b0d7d231222aa94e0ca04822ab 100644
--- a/src/ui/avatarbd/AvatarBDDataType.java
+++ b/src/ui/avatarbd/AvatarBDDataType.java
@@ -46,15 +46,17 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarBlock;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 
 public class AvatarBDDataType extends TGCScalableWithInternalComponent implements GenericTree  {
diff --git a/src/ui/avatarbd/AvatarBDFirewall.java b/src/ui/avatarbd/AvatarBDFirewall.java
index cf0e6286d23d4b42240a9ef65afb506c2c5d8a21..863e5538cdd629cd0fd829c07ef7a846fa808333 100755
--- a/src/ui/avatarbd/AvatarBDFirewall.java
+++ b/src/ui/avatarbd/AvatarBDFirewall.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarbd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarFirewall;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class AvatarBDFirewall extends TGCScalableWithoutInternalComponent {
     private int textY1 = 15;
diff --git a/src/ui/avatarbd/AvatarBDLibraryFunction.java b/src/ui/avatarbd/AvatarBDLibraryFunction.java
index ebdd8128e044249727e1a1134f87ca58bba6d7ca..363b19b0b60c55746eb20062abea9c1f7836efb1 100644
--- a/src/ui/avatarbd/AvatarBDLibraryFunction.java
+++ b/src/ui/avatarbd/AvatarBDLibraryFunction.java
@@ -38,38 +38,20 @@
 
 package ui.avatarbd;
 
-import java.util.LinkedList;
-import java.util.Iterator;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-
-import java.awt.Graphics;
-import java.awt.Font;
-import java.awt.Color;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
 import myutil.GraphicLib;
 import myutil.TraceManager;
-
-import ui.TGCScalableWithoutInternalComponent;
-import ui.TAttribute;
-import ui.TGComponent;
-import ui.TDiagramPanel;
-import ui.MalformedModelingException;
-import ui.TGConnectingPoint;
-import ui.IconManager;
-import ui.ColorManager;
-import ui.TGComponentManager;
-import ui.AvatarSignal;
-import ui.AvatarMethod;
-import ui.AvatarDesignPanel;
-import ui.SwallowedTGComponent;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 import ui.avatarsmd.AvatarSMDPanel;
 import ui.window.JDialogAvatarLibraryFunction;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+
 /**
  * This class represent a Library Function block on an avatar block diagram.
  *
diff --git a/src/ui/avatarbd/AvatarBDPanel.java b/src/ui/avatarbd/AvatarBDPanel.java
index 6b549008a2b6888d06a40b4a69752f47eedf7eca..4453eabd4b908138ac39f495708962d35842ef79 100644
--- a/src/ui/avatarbd/AvatarBDPanel.java
+++ b/src/ui/avatarbd/AvatarBDPanel.java
@@ -47,13 +47,16 @@
 package ui.avatarbd;
 
 
-import org.w3c.dom.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.avatardd.*;
-import java.util.*;
+import ui.avatardd.ADDDiagramPanel;
 import ui.avatarsmd.AvatarSMDPanel;
-import myutil.*;
+
+import java.util.*;
 
 public class AvatarBDPanel extends TDiagramPanel {
     private LinkedList<AvatarBDStateMachineOwner> validated, ignored;
diff --git a/src/ui/avatarbd/AvatarBDPortConnector.java b/src/ui/avatarbd/AvatarBDPortConnector.java
index f0cd48240d8d605116d51781e5f7d8bfd2d80d3e..e1e47e22d298035ec9053d44dbba9443a7dba774 100644
--- a/src/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/ui/avatarbd/AvatarBDPortConnector.java
@@ -47,15 +47,18 @@
 package ui.avatarbd;
 
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSignalAssociation;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarbd/AvatarBDPragma.java b/src/ui/avatarbd/AvatarBDPragma.java
index f5d37a3ad7f4a7cbdcb6484dd2fd095ae27859a7..f52a95d6cf3bd27de5ddd02dfc1bb9a799ad9692 100755
--- a/src/ui/avatarbd/AvatarBDPragma.java
+++ b/src/ui/avatarbd/AvatarBDPragma.java
@@ -46,17 +46,20 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import avatartranslator.*;
+import ui.window.JDialogPragma;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
 
 public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
 
diff --git a/src/ui/avatarbd/AvatarBDSafetyPragma.java b/src/ui/avatarbd/AvatarBDSafetyPragma.java
index f380252b493c51f2957435441135ffcbce669bc8..60968b838dd464cdea18ec944c4b4339dc245893 100644
--- a/src/ui/avatarbd/AvatarBDSafetyPragma.java
+++ b/src/ui/avatarbd/AvatarBDSafetyPragma.java
@@ -46,16 +46,20 @@
 
 package ui.avatarbd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.window.JDialogSafetyPragma;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
 
 public class AvatarBDSafetyPragma extends TGCScalableWithoutInternalComponent {
 
diff --git a/src/ui/avatarbd/AvatarBDStateMachineOwner.java b/src/ui/avatarbd/AvatarBDStateMachineOwner.java
index dcd5d68652642605b3bfb0a7c6b65560242e2688..e917269d75ec64286455e0ac29692024b5769341 100755
--- a/src/ui/avatarbd/AvatarBDStateMachineOwner.java
+++ b/src/ui/avatarbd/AvatarBDStateMachineOwner.java
@@ -38,13 +38,13 @@
 
 package ui.avatarbd;
 
-import java.util.LinkedList;
-
-import ui.AvatarSignal;
 import ui.AvatarMethod;
+import ui.AvatarSignal;
 import ui.TAttribute;
 import ui.avatarsmd.AvatarSMDPanel;
 
+import java.util.LinkedList;
+
 /**
  * This interface represent block diagram elements that are associated to a state machine.
  * It defines the functions so that a state machine can deal transparently no matter if
diff --git a/src/ui/avatarbd/AvatarBDToolBar.java b/src/ui/avatarbd/AvatarBDToolBar.java
index 6f0710d5e531cea8e434dce1f800ada3db437197..7e9c23674a90cafba008a4ba8d84de212cb21a74 100644
--- a/src/ui/avatarbd/AvatarBDToolBar.java
+++ b/src/ui/avatarbd/AvatarBDToolBar.java
@@ -46,12 +46,15 @@
 
 package ui.avatarbd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarBDToolBar extends TToolBar {
 
     public AvatarBDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarcd/AvatarCDActorBox.java b/src/ui/avatarcd/AvatarCDActorBox.java
index 94494d262b34f4e63056eac5d81f720b97fb478c..2e703766edecad171a31c5409fd2f4a3b91af454 100755
--- a/src/ui/avatarcd/AvatarCDActorBox.java
+++ b/src/ui/avatarcd/AvatarCDActorBox.java
@@ -46,11 +46,11 @@
 
 package ui.avatarcd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarCDActorBox extends TGCScalableOneLineText {
     /*protected int lineLength = 5;
       protected int textX =  5;
diff --git a/src/ui/avatarcd/AvatarCDActorStickman.java b/src/ui/avatarcd/AvatarCDActorStickman.java
index c16ebd26b650aba7910d0354837ac137b4df032a..6130fcaa0f67e12b71545230994eb3e01f62f108 100755
--- a/src/ui/avatarcd/AvatarCDActorStickman.java
+++ b/src/ui/avatarcd/AvatarCDActorStickman.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarCDActorStickman extends TGCScalableOneLineText {
     /*protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/avatarcd/AvatarCDAssociationConnector.java b/src/ui/avatarcd/AvatarCDAssociationConnector.java
index 711a3f1e61ea7b4594ed4b968305a07701584498..5e42439905553e6508b34076eebea53854c92e3b 100755
--- a/src/ui/avatarcd/AvatarCDAssociationConnector.java
+++ b/src/ui/avatarcd/AvatarCDAssociationConnector.java
@@ -46,13 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.util.Vector;
+
 public  class AvatarCDAssociationConnector extends TGConnector {
     int w, h;
     
diff --git a/src/ui/avatarcd/AvatarCDBlock.java b/src/ui/avatarcd/AvatarCDBlock.java
index 3fc4860b35f1df79a3e4f13b7d68449adc0e3183..a23bfa643d37110bcea75fb36b90370d96e14a78 100644
--- a/src/ui/avatarcd/AvatarCDBlock.java
+++ b/src/ui/avatarcd/AvatarCDBlock.java
@@ -46,15 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 
 public class AvatarCDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarcd/AvatarCDCompositionConnector.java b/src/ui/avatarcd/AvatarCDCompositionConnector.java
index d5b5783ce62c001c76e6387dc54f51c99a04edb3..d3b84113937d6d55f87dd081b890e8751a945651 100644
--- a/src/ui/avatarcd/AvatarCDCompositionConnector.java
+++ b/src/ui/avatarcd/AvatarCDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarcd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class AvatarCDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/avatarcd/AvatarCDConnectingPoint.java b/src/ui/avatarcd/AvatarCDConnectingPoint.java
index fde9bb32a5951ea03482addf2b4d930d081cd035..5b5a8227b8084612b65306e91af5074a98d13383 100644
--- a/src/ui/avatarcd/AvatarCDConnectingPoint.java
+++ b/src/ui/avatarcd/AvatarCDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarcd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarCDConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarcd/AvatarCDPanel.java b/src/ui/avatarcd/AvatarCDPanel.java
index 841c61b593f9394f651beb3bd2c28d723a1b81a5..05d23913ca3bea8067cf2da362b70e4c451ca7d1 100644
--- a/src/ui/avatarcd/AvatarCDPanel.java
+++ b/src/ui/avatarcd/AvatarCDPanel.java
@@ -47,14 +47,16 @@
 package ui.avatarcd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarCDPanel extends TDiagramPanel implements TDPWithAttributes{
     
 	public static int ARC = 20;
diff --git a/src/ui/avatarcd/AvatarCDToolBar.java b/src/ui/avatarcd/AvatarCDToolBar.java
index 4dc7fd392c672b7c4a3cae3162562a6b8349cfee..ffc5b989222d43bc7efa1e9de2d370f9cdf8266a 100644
--- a/src/ui/avatarcd/AvatarCDToolBar.java
+++ b/src/ui/avatarcd/AvatarCDToolBar.java
@@ -47,12 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarcd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarCDToolBar extends TToolBar {
     
     public AvatarCDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatardd/ADDArtifact.java b/src/ui/avatardd/ADDArtifact.java
index 68970020ffd03388d09e308d18dd21843e9f7ff0..2d3c303c6c50181999391a556208bc548035664d 100755
--- a/src/ui/avatardd/ADDArtifact.java
+++ b/src/ui/avatardd/ADDArtifact.java
@@ -46,15 +46,14 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
     protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDBlockArtifact.java b/src/ui/avatardd/ADDBlockArtifact.java
index 029ff259eb23ec4bfacffede5d403f750645da88..e01df3a3d4a750cfe85f485c802b8979f82b6d5b 100755
--- a/src/ui/avatardd/ADDBlockArtifact.java
+++ b/src/ui/avatardd/ADDBlockArtifact.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarBlockArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDBlockArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDBridgeNode.java b/src/ui/avatardd/ADDBridgeNode.java
index 96c51ffe91db06a0b30534528a9a75db557c394e..77221cc8822e46c3c878bc891a11d1459ce6d6e3 100755
--- a/src/ui/avatardd/ADDBridgeNode.java
+++ b/src/ui/avatardd/ADDBridgeNode.java
@@ -47,13 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class ADDBridgeNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
     private int textY2 = 30;
diff --git a/src/ui/avatardd/ADDBusNode.java b/src/ui/avatardd/ADDBusNode.java
index d9e39f35430506ca150f2d928bc6b11ff56a48c8..8b957a72507d806255908d00daad31ab19eea354 100755
--- a/src/ui/avatardd/ADDBusNode.java
+++ b/src/ui/avatardd/ADDBusNode.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDBusNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDBusNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDCPUNode.java b/src/ui/avatardd/ADDCPUNode.java
index 6d069f595f468c29b723954e3c82c8648225e357..99fa5c88bdb235af9ea83ab303af4742862f8008 100755
--- a/src/ui/avatardd/ADDCPUNode.java
+++ b/src/ui/avatardd/ADDCPUNode.java
@@ -46,15 +46,16 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCPUNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDChannelArtifact.java b/src/ui/avatardd/ADDChannelArtifact.java
index e6895003758b4de3c467b6936b429db3418a1cf0..f3a13ae7ac3bbd234cc28367d89392431b246aad 100755
--- a/src/ui/avatardd/ADDChannelArtifact.java
+++ b/src/ui/avatardd/ADDChannelArtifact.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarChannelArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDChannelArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDCommunicationNode.java b/src/ui/avatardd/ADDCommunicationNode.java
index db8330745da9920b9bbade6a9d456a93f747968e..84ad9885eb954dcf0224b8ec0bb8b9bcf4c947c5 100755
--- a/src/ui/avatardd/ADDCommunicationNode.java
+++ b/src/ui/avatardd/ADDCommunicationNode.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import ui.*;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public abstract class ADDCommunicationNode extends ADDNode {
     
diff --git a/src/ui/avatardd/ADDConnectingPoint.java b/src/ui/avatardd/ADDConnectingPoint.java
index 910aac4699c4dba7d97bced6fed5edabdaf9f6a9..6fea3c22ec32e8a54e69f268e345e4b40bc3e3b0 100755
--- a/src/ui/avatardd/ADDConnectingPoint.java
+++ b/src/ui/avatardd/ADDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatardd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class ADDConnectingPoint extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/avatardd/ADDConnector.java b/src/ui/avatardd/ADDConnector.java
index f6c95c0f5639b0757f5ef8e1d82891342c5cc654..909e37b37c1982267cccae5f06227ab54a76071a 100755
--- a/src/ui/avatardd/ADDConnector.java
+++ b/src/ui/avatardd/ADDConnector.java
@@ -47,16 +47,17 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatardd;
 
 
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public  class ADDConnector extends TGConnector  {
     public static final String NO_SPY = "Remove spy";
diff --git a/src/ui/avatardd/ADDCoproMWMRNode.java b/src/ui/avatardd/ADDCoproMWMRNode.java
index 0d5c84d9e6711ac9361a29a7c7272e55cc89776d..8a7fe9a3aa300aed4f8a407b949a39246cbc479b 100755
--- a/src/ui/avatardd/ADDCoproMWMRNode.java
+++ b/src/ui/avatardd/ADDCoproMWMRNode.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCoproMWMRNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDCoproMWMRNode extends ADDCommunicationNode implements WithAttributes {
 	private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDCrossbarNode.java b/src/ui/avatardd/ADDCrossbarNode.java
index 07c90966f217726a4a2f5a338135fea2ecdca851..6bee4e3d2a0d0bc351d2e0c84d418d94423e39d0 100755
--- a/src/ui/avatardd/ADDCrossbarNode.java
+++ b/src/ui/avatardd/ADDCrossbarNode.java
@@ -46,17 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCrossbarNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDCrossbarNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDDMANode.java b/src/ui/avatardd/ADDDMANode.java
index 2b3e733feba7cce0f9caa02e98f1027a2630b101..a30b5bda76e50683a9018a402b24cc7be97a3a14 100755
--- a/src/ui/avatardd/ADDDMANode.java
+++ b/src/ui/avatardd/ADDDMANode.java
@@ -46,17 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDDMANode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDDiagramPanel.java b/src/ui/avatardd/ADDDiagramPanel.java
index efaab8cda574474ba40b5b1beeabbcd7740a50b9..72a31697e23f377dab59e1c1eeb50b3ad9f8b28d 100755
--- a/src/ui/avatardd/ADDDiagramPanel.java
+++ b/src/ui/avatardd/ADDDiagramPanel.java
@@ -48,11 +48,12 @@
 package ui.avatardd;
 
 
-import org.w3c.dom.*;
-import java.util.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
 import ui.*;
-import myutil.*;
+
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
     private int masterClockFrequency = 200; // in MHz
diff --git a/src/ui/avatardd/ADDDiagramToolBar.java b/src/ui/avatardd/ADDDiagramToolBar.java
index a87b2f9c9d5d5c54beb4cd4a824a87f6aae15150..c7697c8d8e30922d18c81a74f71d6ec83d10a7f4 100755
--- a/src/ui/avatardd/ADDDiagramToolBar.java
+++ b/src/ui/avatardd/ADDDiagramToolBar.java
@@ -49,12 +49,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class ADDDiagramToolBar extends TToolBar {
     
     public ADDDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatardd/ADDICUNode.java b/src/ui/avatardd/ADDICUNode.java
index 92093ad67989698d6cbbb2713f3dcf4a0fd889b7..87fa5a5a03304af234eaf74f8c0f2b9b827ee47d 100755
--- a/src/ui/avatardd/ADDICUNode.java
+++ b/src/ui/avatardd/ADDICUNode.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDICUNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDICUNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDMemoryNode.java b/src/ui/avatardd/ADDMemoryNode.java
index 1f7ac056efd863825c1308440775865f99c25d83..3811760de6ee0584be2a2078de0c04cd700fed3f 100755
--- a/src/ui/avatardd/ADDMemoryNode.java
+++ b/src/ui/avatardd/ADDMemoryNode.java
@@ -46,16 +46,16 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwMemory;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDMemoryNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public abstract class ADDMemoryNode extends ADDCommunicationNode implements WithAttributes {
     protected int textY1 = 15;
diff --git a/src/ui/avatardd/ADDNode.java b/src/ui/avatardd/ADDNode.java
index b04b8fae2cc6001ff6fb8f9f58a73e8d6e029d8c..d1188f19a6edbe7cef726547eb3a990184aeaf16 100755
--- a/src/ui/avatardd/ADDNode.java
+++ b/src/ui/avatardd/ADDNode.java
@@ -46,17 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import tmltranslator.HwNode;
+import ui.TDiagramPanel;
+import ui.TGCWithInternalComponent;
+import ui.TGComponent;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public abstract class ADDNode extends TGCWithInternalComponent  {
     protected int clockRatio = HwNode.DEFAULT_CLOCK_RATIO;
diff --git a/src/ui/avatardd/ADDRAMNode.java b/src/ui/avatardd/ADDRAMNode.java
index 808d31213aa0bcaece689e8f18de55c6d6b8bb54..ff2fecff8a32291d72c1783588cb52da093b733f 100755
--- a/src/ui/avatardd/ADDRAMNode.java
+++ b/src/ui/avatardd/ADDRAMNode.java
@@ -46,10 +46,10 @@
 
 package ui.avatardd;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Vector;
+
 
 public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, WithAttributes {
 
diff --git a/src/ui/avatardd/ADDROMNode.java b/src/ui/avatardd/ADDROMNode.java
index 7f6de6c0834893a1d1327db0944049ca0f7c075a..59615234fc3c630399e20e120e2bf6b8d2bcc925 100755
--- a/src/ui/avatardd/ADDROMNode.java
+++ b/src/ui/avatardd/ADDROMNode.java
@@ -46,17 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
 
 public class ADDROMNode extends ADDMemoryNode implements  WithAttributes {
     
diff --git a/src/ui/avatardd/ADDTTYNode.java b/src/ui/avatardd/ADDTTYNode.java
index aa290d699bbbf9898d47f8944fc6c27fb36b1ee4..c57881e0b10f7c5bdc107b501968338b60448bfa 100755
--- a/src/ui/avatardd/ADDTTYNode.java
+++ b/src/ui/avatardd/ADDTTYNode.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDTTYNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDTTYNode extends ADDNode implements WithAttributes {
 	private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDTimerNode.java b/src/ui/avatardd/ADDTimerNode.java
index 73d63c80f65701fd84ce9a0a8d0af14ae593b636..35d34bb6a21023318210cf892e1bfa885c2e5a6d 100755
--- a/src/ui/avatardd/ADDTimerNode.java
+++ b/src/ui/avatardd/ADDTimerNode.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDTimerNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDVgmnNode.java b/src/ui/avatardd/ADDVgmnNode.java
index 2062efdda87dccde9383813c63634ba0abd69069..110eb317ff70c84c3dd46da334f64f3738b2f991 100755
--- a/src/ui/avatardd/ADDVgmnNode.java
+++ b/src/ui/avatardd/ADDVgmnNode.java
@@ -46,14 +46,15 @@
 
 package ui.avatardd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDVgmnNode;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class ADDVgmnNode extends ADDCommunicationNode implements WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
index c009f7e9ed521f07f8dd3488197e2d7b284c4e10..29c0a018b29acb37c8cb1c377996ab88b2af66e6 100755
--- a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
+++ b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
+import ui.IconManager;
+import ui.TAction;
 
 import javax.swing.*;
 import javax.swing.event.EventListenerList;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class AvatarInteractiveSimulationActions extends AbstractAction {
     // Actions
diff --git a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
index 87ffd43de487d7b82e05ed849d21f117105b91a9..5705b80097532f6a3064cc126adf56411dc0d58e 100755
--- a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
+++ b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
@@ -46,9 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import javax.swing.*;
-
-import avatartranslator.*;
+import avatartranslator.AvatarRelation;
 
 
 public  class AvatarInteractiveSimulationFIFOData  {
diff --git a/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java b/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
index 5f318836ba00a7347d7cf3f0013e5e1880be0706..0ee7598c2a87c95d0b560f712ba754aa2932f855 100755
--- a/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
+++ b/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarinteractivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarMainCommandsToolBar extends AvatarInteractiveSimulationBar {
     
     
diff --git a/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java b/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
index caa103e5e183e65e8e3459fbf7db43e3f0ef1347..5ccbe32118ecbd912ed2e42161cb2f2c3458202e 100755
--- a/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
+++ b/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
@@ -48,8 +48,6 @@ package ui.avatarinteractivesimulation;
 
 import javax.swing.*;
 
-import ui.*;
-
 public class AvatarSaveCommandsToolBar extends AvatarInteractiveSimulationBar {
     
     
diff --git a/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java b/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
index 65b7686e82039b791bb9c1b182102656a4d65a5d..9d0db4ee813522e7296984588aae13f202d57819 100644
--- a/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
+++ b/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
@@ -48,18 +48,21 @@
 
 package ui.avatarinteractivesimulation;
 
+import avatartranslator.*;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSimulationTransaction;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
+import myutil.GraphicLib;
+import ui.ColorManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
-import java.util.*;
-
-import java.awt.image.*;
-
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import myutil.*;
-import ui.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Vector;
 
 public class AvatarSpecificationSimulationSDPanel extends JPanel implements MouseMotionListener  {
 
diff --git a/src/ui/avatarinteractivesimulation/BlockTableModel.java b/src/ui/avatarinteractivesimulation/BlockTableModel.java
index 5ecfe4f768927cdd74240c5870979fe1a141a748..77a0e529c4a0c26c09ce8c2c9112be93cf2d66a6 100755
--- a/src/ui/avatarinteractivesimulation/BlockTableModel.java
+++ b/src/ui/avatarinteractivesimulation/BlockTableModel.java
@@ -46,11 +46,10 @@
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
 
-import myutil.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
 
 public class BlockTableModel extends AbstractTableModel {
     private AvatarSpecificationSimulation ass;
diff --git a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 8720e96bf45c336a22124e0c74d7c8e54b29b24e..d3d01d9b7ab5eaa2010a4ef3184d257c77ee993e 100755
--- a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -45,21 +45,24 @@
 
 package ui.avatarinteractivesimulation;
 
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.io.*;
-import java.util.*;
-
-
+import avatartranslator.*;
+import avatartranslator.directsimulation.*;
 import myutil.*;
 import ui.*;
+import ui.avatarbd.AvatarBDPortConnector;
 
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import ui.avatarbd.*;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public  class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarSimulationInteraction, ActionListener, Runnable, MouseListener, ItemListener, ListSelectionListener, WindowListener/*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
     private static int TRACED_TRANSACTIONS = 1000;
diff --git a/src/ui/avatarinteractivesimulation/MetElementsTableModel.java b/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
index 22ff4838fe888b64a8fd971229c33f6722551a8d..614bc17467564552c7cdbc9c46d9cf314ef540a7 100755
--- a/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
+++ b/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
@@ -46,13 +46,13 @@
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.AvatarState;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
+import ui.avatarsmd.AvatarSMDState;
 
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import ui.avatarsmd.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class MetElementsTableModel extends AbstractTableModel {
     private static String ERROR_STRING = "-";
diff --git a/src/ui/avatarinteractivesimulation/TransactionTableModel.java b/src/ui/avatarinteractivesimulation/TransactionTableModel.java
index 5b279d0d8f875d824d833590e00354872a91d704..c335a90ee6a8f9a3402d1556fdf1fa110788ff53 100755
--- a/src/ui/avatarinteractivesimulation/TransactionTableModel.java
+++ b/src/ui/avatarinteractivesimulation/TransactionTableModel.java
@@ -46,13 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.directsimulation.AvatarSimulationTransaction;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
 
-import ui.*;
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
 
 public class TransactionTableModel extends AbstractTableModel {
 	private static String ERROR_STRING = "-"; 
diff --git a/src/ui/avatarinteractivesimulation/VariableTableModel.java b/src/ui/avatarinteractivesimulation/VariableTableModel.java
index 6ef74636a9ead43165694b57f79a8c6e9aea3510..0c12b3bc087c84a7f469f8609023db624150b4cb 100755
--- a/src/ui/avatarinteractivesimulation/VariableTableModel.java
+++ b/src/ui/avatarinteractivesimulation/VariableTableModel.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarinteractivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
 
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class VariableTableModel extends AbstractTableModel {
 	private static String ERROR_STRING = "-"; 
diff --git a/src/ui/avatarmad/AvatarMADAssumption.java b/src/ui/avatarmad/AvatarMADAssumption.java
index 02d7db9c856b2aacb397c0ebbbe0ad83cc905518..57b922cdd27eb736955054dde29780ba1562623b 100644
--- a/src/ui/avatarmad/AvatarMADAssumption.java
+++ b/src/ui/avatarmad/AvatarMADAssumption.java
@@ -47,15 +47,17 @@
 package ui.avatarmad;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAssumption;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarMADAssumption extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java b/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
index b6f86e2a986b0ea42bb5f742f92c83208653645c..a24056b13900021f48d60f141497085d7f852edd 100644
--- a/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.avatarmad;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMADAssumptionConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java b/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
index 86f4e65d45d5ccb175a492db9f56edf2c105e1c1..154936a51a6a2625ea484f86eebcf8839a8f9480 100644
--- a/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
+++ b/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
@@ -47,17 +47,10 @@
 package ui.avatarmad;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.cd.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.util.Vector;
 
 public  class AvatarMADBelongsToCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 12;
diff --git a/src/ui/avatarmad/AvatarMADCompositionConnector.java b/src/ui/avatarmad/AvatarMADCompositionConnector.java
index c78da26ff4751165f0d494347fd95497185251c2..cdfa0465a6b726e92288e68d93985942aef515ef 100644
--- a/src/ui/avatarmad/AvatarMADCompositionConnector.java
+++ b/src/ui/avatarmad/AvatarMADCompositionConnector.java
@@ -46,13 +46,12 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMADCompositionConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmad/AvatarMADDiagramReference.java b/src/ui/avatarmad/AvatarMADDiagramReference.java
index 0ee7a4e1bad3e8f8455471dbae10ab3190a26955..117780c774cf2bfb2d98139f6f1ec25b37b59868 100644
--- a/src/ui/avatarmad/AvatarMADDiagramReference.java
+++ b/src/ui/avatarmad/AvatarMADDiagramReference.java
@@ -47,16 +47,11 @@
 package ui.avatarmad;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarMADDiagramReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADElementReference.java b/src/ui/avatarmad/AvatarMADElementReference.java
index 4b497e889db13c2c1aac7ec1ba103c9b02b499b9..0425ad544d4a79e32a527bab9927c491c6fdc0d6 100644
--- a/src/ui/avatarmad/AvatarMADElementReference.java
+++ b/src/ui/avatarmad/AvatarMADElementReference.java
@@ -47,16 +47,11 @@
 package ui.avatarmad;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarMADElementReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADImpactConnector.java b/src/ui/avatarmad/AvatarMADImpactConnector.java
index 8b4e28ec59e9e16c3f9decc45dfaf7fa7152d67d..5e453796f083d89663b08e8744136cdb1616d616 100644
--- a/src/ui/avatarmad/AvatarMADImpactConnector.java
+++ b/src/ui/avatarmad/AvatarMADImpactConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMADImpactConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmad/AvatarMADMeetConnector.java b/src/ui/avatarmad/AvatarMADMeetConnector.java
index 2fab7cb36ec01d6a3b8a599597ee04824c0294f4..33b4fa707ea75f4df31317c8239ea40ee7b473e8 100644
--- a/src/ui/avatarmad/AvatarMADMeetConnector.java
+++ b/src/ui/avatarmad/AvatarMADMeetConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMADMeetConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmad/AvatarMADPanel.java b/src/ui/avatarmad/AvatarMADPanel.java
index aa30f5716b81ea9a1480f8caa3e083a720334f66..d5d0234f9c504538e3bc7a8b72b2deda4e455364 100644
--- a/src/ui/avatarmad/AvatarMADPanel.java
+++ b/src/ui/avatarmad/AvatarMADPanel.java
@@ -47,7 +47,6 @@
 package ui.avatarmad;
 
 //import java.awt.*;
-import java.util.*;
 
 import ui.*;
 
diff --git a/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java b/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
index 11f75bf41547ce5ed96e5f82077da790d080e790..1c5199301888251c60994386ef67829465ef6373 100644
--- a/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
@@ -49,7 +49,10 @@ package ui.avatarmad;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMADToAssumptionsConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java b/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
index 13496965bcbc9167900e18cf8e1913a422eab3e2..5d1d4c7db0db2eaecb6f21756c9dd1b1304059b3 100644
--- a/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
@@ -49,7 +49,10 @@ package ui.avatarmad;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMADToOthersConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmad/AvatarMADToolBar.java b/src/ui/avatarmad/AvatarMADToolBar.java
index 6b28feb05b65c1138061d348d3bc51e8399c612d..80042aa4f815955106f56c11274c73cfdbeb8cab 100644
--- a/src/ui/avatarmad/AvatarMADToolBar.java
+++ b/src/ui/avatarmad/AvatarMADToolBar.java
@@ -46,12 +46,15 @@
 
 package ui.avatarmad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarMADToolBar extends TToolBar {
 
     public AvatarMADToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarmad/AvatarMADVersioningConnector.java b/src/ui/avatarmad/AvatarMADVersioningConnector.java
index ee195fb03d63f8553c6b5dba867fc84a2ec67aba..9a118120a70bc9fda74d87deb196855640a3e64d 100644
--- a/src/ui/avatarmad/AvatarMADVersioningConnector.java
+++ b/src/ui/avatarmad/AvatarMADVersioningConnector.java
@@ -46,17 +46,17 @@
 
 package ui.avatarmad;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogVersioningConnector;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public  class AvatarMADVersioningConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h, w1;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java b/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
index f2bb3282439dbe0823074fa52cd8d7a6e9362c78..7335072a4c41a2b4bfbf7d8ccff8a000a4f92c0b 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.avatarmethodology;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarMethodologyConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarmethodology/AvatarMethodologyConnector.java b/src/ui/avatarmethodology/AvatarMethodologyConnector.java
index 2b5426ce5dbf92c75345f3c4e087ad15539c57d8..b2e3e9664a7e05e80f9c0d91ef69c5a63b57091d 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyConnector.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
index 3bdc0987adf9b3c55f7e6d90569699e0d5023bc1..18e528e3353fd09e012e0681a7095ce9cb358667 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
@@ -47,12 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent { 
     //protected boolean emptyText;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
index 0baea57fa643cdbc8b2301aa7d128cfa1c42f4a2..26cc2ce45b8b96114e961afb632a2cf505ec0c16 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
@@ -47,7 +47,6 @@
 package ui.avatarmethodology;
 
 import org.w3c.dom.Element;
-
 import ui.*;
 
 public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
index 37acee7b05793586e3ff4bb46f44447824d548d4..5884e4eeb940d1a66d8ce7c12bda002dd28a46cd 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
@@ -48,14 +48,16 @@
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent  {
     public String oldValue;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
index 23bf7568456e89e8480a6d8facea9b1ba39845d6..f507e085fe1366cce1d42542889a7d581a14a9ee 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarmethodology;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarMethodologyDiagramToolbar extends TToolBar {
     
     public AvatarMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
index 2e9f9fe29302ba293a540d1dd13012c8e017f2a0..8d73ed846fa3653f0424e45ba7a6d17394ff1aba 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
index cd8e9f2d8cbf055ab20d43e1892558c7e5795ed6..5e2078cceb728861f7916833cb53328430b3083c 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToAssumptions extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
index a5e6ca989b0dea8909d46651cc8abd916ab9b97a..8c8e85fbb87287b93b6822521f141fbf1584ed23 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToDesign extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
index f7bdc9557a9a7e4e302ccf6cec0cd8afe970e388..6b88fc05b9fdeb271790f201f2ad44f2c22be29c 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToProperties extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
index 79908b115bb580cbe48062b594a5bce2fc491f8e..f375b5358bfe4d00733434de346b07bb5aca3750 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToPrototype extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
index c5b99a6b7e78aab76cdb5e3044e6ba1b677118ba..c8cf199f4e7026105e3da9a6713487c906ff7c0f 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class AvatarMethodologyReferenceToRequirement extends AvatarMethodologyDiagramReference  {
    
diff --git a/src/ui/avatarpd/AvatarPDAlias.java b/src/ui/avatarpd/AvatarPDAlias.java
index 4e2e4f1eba37490332c99df9d131fb11347fa36e..c073fd81e6580f148a48111fdeb73cd94edf8d9c 100644
--- a/src/ui/avatarpd/AvatarPDAlias.java
+++ b/src/ui/avatarpd/AvatarPDAlias.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDAlias extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDAttribute.java b/src/ui/avatarpd/AvatarPDAttribute.java
index a71f345dfc6c00021e57dbfb471651d0525103db..29cd0fbbff2a26cfa3e5428c20a9fd55845fcb77 100644
--- a/src/ui/avatarpd/AvatarPDAttribute.java
+++ b/src/ui/avatarpd/AvatarPDAttribute.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDAttribute extends AvatarPDToggle implements SwallowedTGComponent {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java b/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
index f847bee4ad2cc2ac798c6386ae5e55bdd71bf146..6b6e6ce53adce743c9100a5522783d32b6a39571 100644
--- a/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDAttributeConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDAttributeConnector.java b/src/ui/avatarpd/AvatarPDAttributeConnector.java
index 0f67c3ad5628893697ca72dcbf2a67a9c1ff5b93..71f3daf6d753a47c955eee01d661accd50925eac 100644
--- a/src/ui/avatarpd/AvatarPDAttributeConnector.java
+++ b/src/ui/avatarpd/AvatarPDAttributeConnector.java
@@ -48,18 +48,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class AvatarPDAttributeConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDAttributeSetting.java b/src/ui/avatarpd/AvatarPDAttributeSetting.java
index af8dfe76f7906daf83106ef72e307a5397534561..93cfbef74a49ba7b2171ffa18c66c86833b35dbe 100644
--- a/src/ui/avatarpd/AvatarPDAttributeSetting.java
+++ b/src/ui/avatarpd/AvatarPDAttributeSetting.java
@@ -46,15 +46,11 @@
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDAttributeSetting extends AvatarPDToggle implements ConstraintListInterface {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDBlock.java b/src/ui/avatarpd/AvatarPDBlock.java
index ef60830f26706efb0d2d062d998c073a6ccbd477..ef1f1237c33b92513e9fd80b8fb4bf47df7224e6 100644
--- a/src/ui/avatarpd/AvatarPDBlock.java
+++ b/src/ui/avatarpd/AvatarPDBlock.java
@@ -46,15 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class AvatarPDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarpd/AvatarPDBoolEq.java b/src/ui/avatarpd/AvatarPDBoolEq.java
index 80d36ddf4a27693b1d5603fadc5bba50e342d3a9..ba5780c9be3c3b2ff93b3fb6eef2fdee7a58b9f9 100644
--- a/src/ui/avatarpd/AvatarPDBoolEq.java
+++ b/src/ui/avatarpd/AvatarPDBoolEq.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDBoolEq extends AvatarPDToggle implements ConstraintListInterface {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDCompositionConnector.java b/src/ui/avatarpd/AvatarPDCompositionConnector.java
index ae3b69c007d161bfdf4f5e807249294df8dc166c..6b6a14c59fce9019c3a8b2c16219d4b1a482fbd0 100644
--- a/src/ui/avatarpd/AvatarPDCompositionConnector.java
+++ b/src/ui/avatarpd/AvatarPDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
 
 public  class AvatarPDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
     protected int d = 20;
diff --git a/src/ui/avatarpd/AvatarPDConnectingPoint.java b/src/ui/avatarpd/AvatarPDConnectingPoint.java
index d58b72267049f00f80adfee5b9ca24a9bab4d74a..65f1909d78c27b6214f134259a52936dff184d77 100644
--- a/src/ui/avatarpd/AvatarPDConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java b/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
index 35a8c8348bacced8b56b7f4cb2d12b822ab83338..208785f6c588ff440884bf5b619ef5d29885ed64 100644
--- a/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDForbiddenSignalConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDLogicalConstraint.java b/src/ui/avatarpd/AvatarPDLogicalConstraint.java
index ef7c0a6b280205360dbfad441f343bb0a539995a..cf8da6374c88d8662ba0680eb7ebe36e8c615c69 100644
--- a/src/ui/avatarpd/AvatarPDLogicalConstraint.java
+++ b/src/ui/avatarpd/AvatarPDLogicalConstraint.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraint;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDLogicalConstraint extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDPanel.java b/src/ui/avatarpd/AvatarPDPanel.java
index fac816b62b187cd3b424eff3ddfa4363c5da11bd..5bad652df429d2147ee74db84b0727ed7fd2aa0b 100644
--- a/src/ui/avatarpd/AvatarPDPanel.java
+++ b/src/ui/avatarpd/AvatarPDPanel.java
@@ -47,14 +47,16 @@
 package ui.avatarpd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarPDPanel extends TDiagramPanel implements TDPWithAttributes{
     
 	public static int ARC = 20;
diff --git a/src/ui/avatarpd/AvatarPDProperty.java b/src/ui/avatarpd/AvatarPDProperty.java
index 7f195e55c719760d2868804f225653844fb90537..3dfc572e6b4be79e3b5e5d54afc1f83ecb9b2303 100644
--- a/src/ui/avatarpd/AvatarPDProperty.java
+++ b/src/ui/avatarpd/AvatarPDProperty.java
@@ -46,14 +46,16 @@
 
 package ui.avatarpd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarProperty;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDProperty extends TGCScalableWithInternalComponent implements  WithAttributes {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java b/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
index 5fa134d712ff7c2d184499c863d48a92b770a817..76dabe0cf71c2f57231cb61b6b0cf791b819915f 100644
--- a/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDPropertyConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDPropertyConnector.java b/src/ui/avatarpd/AvatarPDPropertyConnector.java
index 4e881e35e0bc9e1bd0c80658162abd026c96fcea..7a58062907194cad91c6635b93ff640c4bc69b21 100644
--- a/src/ui/avatarpd/AvatarPDPropertyConnector.java
+++ b/src/ui/avatarpd/AvatarPDPropertyConnector.java
@@ -47,15 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import myutil.GraphicLib;
+import ui.*;
+import ui.window.JDialogAvatarPropertyConnector;
 
-import java.awt.*;
-import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class AvatarPDPropertyConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDPropertyRelation.java b/src/ui/avatarpd/AvatarPDPropertyRelation.java
index 509b5ea2743cf5909fd7f9da82375ce2a4399fd7..e4bf5c3ee190cd77539c4de6cb5bac3efddd65cc 100644
--- a/src/ui/avatarpd/AvatarPDPropertyRelation.java
+++ b/src/ui/avatarpd/AvatarPDPropertyRelation.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraint;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDPropertyRelation extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDSignal.java b/src/ui/avatarpd/AvatarPDSignal.java
index a860f3db478480da8bbcd5e00f359400290568a5..2fda7601e18e3119fe6fe9197f170927f6ef96d9 100644
--- a/src/ui/avatarpd/AvatarPDSignal.java
+++ b/src/ui/avatarpd/AvatarPDSignal.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDSignal extends TGCScalableWithInternalComponent implements SwallowedTGComponent  {
     private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java b/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
index 662f1425e79c3501fe261ccaad6d41c304289153..06c59638c880491a655adc6a3d28c3738c929cf7 100644
--- a/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarPDSignalConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarpd/AvatarPDSignalConnector.java b/src/ui/avatarpd/AvatarPDSignalConnector.java
index 02af2491bc31c659828ed15df2f967169e71c76d..4acbb027f43b9c6bf0e7c405530424bab8ec0c28 100644
--- a/src/ui/avatarpd/AvatarPDSignalConnector.java
+++ b/src/ui/avatarpd/AvatarPDSignalConnector.java
@@ -47,18 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarpd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class AvatarPDSignalConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
     //protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDTemporalConstraint.java b/src/ui/avatarpd/AvatarPDTemporalConstraint.java
index b39f9b2d0f4f4c09dacd76b66030b87a840281ae..b47457f50dfc1c922a4378dacb84a99955e1147c 100644
--- a/src/ui/avatarpd/AvatarPDTemporalConstraint.java
+++ b/src/ui/avatarpd/AvatarPDTemporalConstraint.java
@@ -46,16 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-import java.awt.geom.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class AvatarPDTemporalConstraint extends TGCScalableWithInternalComponent implements ConstraintListInterface {
     private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDToggle.java b/src/ui/avatarpd/AvatarPDToggle.java
index 6874b7b103aa5002545363384fd0504433e8caab..a23900cae862cca7e5324485a7235ab77c77e1ec 100644
--- a/src/ui/avatarpd/AvatarPDToggle.java
+++ b/src/ui/avatarpd/AvatarPDToggle.java
@@ -46,15 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public abstract class  AvatarPDToggle extends TGCScalableWithInternalComponent {
 	
diff --git a/src/ui/avatarpd/AvatarPDToolBar.java b/src/ui/avatarpd/AvatarPDToolBar.java
index a0c03535bed76e0b8d476b5fffda6a003adaa7bf..b8ebd516581cd61ab6bdca757a068dd6be3028c5 100644
--- a/src/ui/avatarpd/AvatarPDToolBar.java
+++ b/src/ui/avatarpd/AvatarPDToolBar.java
@@ -47,12 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarpd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarPDToolBar extends TToolBar {
     
     public AvatarPDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarrd/AvatarRDCompositionConnector.java b/src/ui/avatarrd/AvatarRDCompositionConnector.java
index 85817ce3533284a22e0d0169904b854d63fc9318..951f01ef689e5de9e699c181ec341cbd30d9220f 100644
--- a/src/ui/avatarrd/AvatarRDCompositionConnector.java
+++ b/src/ui/avatarrd/AvatarRDCompositionConnector.java
@@ -46,13 +46,12 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDCompositionConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointDerive.java b/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
index 513b91ea3f0e48c0b8aad2ee0c5c5805d89b7362..3f256cd673fb52685e088c5c9f5b6de5e0aecbb4 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
@@ -48,7 +48,9 @@ package ui.avatarrd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarRDConnectingPointDerive extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java b/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
index dea95fcd48a4405565fe9208b2c94fef7b2e87ae..cd666e1b6af39f370a011c0c6f1dc66a760d30ff 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
@@ -49,7 +49,9 @@ package ui.avatarrd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarRDConnectingPointSatisfy extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointVerify.java b/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
index 24f93a2dd160d6956f16863d817995b66f064beb..dc33803f01a1499cfec2b8ed0262eb1a8fb9b823 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
@@ -48,7 +48,9 @@ package ui.avatarrd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarRDConnectingPointVerify extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/avatarrd/AvatarRDCopyConnector.java b/src/ui/avatarrd/AvatarRDCopyConnector.java
index b64bd53a6f1da6c22e884fc1015c4e87f2cd32c7..1ca77d94674adb34a63a2f88d79daeee42171922 100755
--- a/src/ui/avatarrd/AvatarRDCopyConnector.java
+++ b/src/ui/avatarrd/AvatarRDCopyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDCopyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDDeriveConnector.java b/src/ui/avatarrd/AvatarRDDeriveConnector.java
index ff4b2b4379e4bee03f991c39e6abeab712f4b0a0..73f3313f2c69186d75fe4283c984b15275a0b809 100755
--- a/src/ui/avatarrd/AvatarRDDeriveConnector.java
+++ b/src/ui/avatarrd/AvatarRDDeriveConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDDeriveConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDElementReference.java b/src/ui/avatarrd/AvatarRDElementReference.java
index 488a2f7c36dfab4e84a16c3b1902e5fbb871f398..72db3f7b66cb03847da165da2369078e49e11c07 100644
--- a/src/ui/avatarrd/AvatarRDElementReference.java
+++ b/src/ui/avatarrd/AvatarRDElementReference.java
@@ -47,16 +47,11 @@
 package ui.avatarrd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarRDElementReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDPanel.java b/src/ui/avatarrd/AvatarRDPanel.java
index 9bded347721662aba219170d34cb99c20f008ed7..c54ebe6a4b4d6b448910dabb65331cd8aa5b2bfa 100755
--- a/src/ui/avatarrd/AvatarRDPanel.java
+++ b/src/ui/avatarrd/AvatarRDPanel.java
@@ -47,10 +47,13 @@
 package ui.avatarrd;
 
 //import java.awt.*;
-import java.util.*;
 
 import ui.*;
 
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
+
 public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
     public Vector validated, ignored;
     
diff --git a/src/ui/avatarrd/AvatarRDProperty.java b/src/ui/avatarrd/AvatarRDProperty.java
index a017e1f87fe6c67eb78c783f56d002e0d46b0ebb..7c6420e9ffa1d17cf0e6da1159b1c132db533248 100755
--- a/src/ui/avatarrd/AvatarRDProperty.java
+++ b/src/ui/avatarrd/AvatarRDProperty.java
@@ -47,16 +47,11 @@
 package ui.avatarrd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
 
 public class AvatarRDProperty extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDRefineConnector.java b/src/ui/avatarrd/AvatarRDRefineConnector.java
index 01307813543cdcb3a15596156d5efa0c82393378..e6c767db173fb3eb29e1510c1c73443a59518af5 100755
--- a/src/ui/avatarrd/AvatarRDRefineConnector.java
+++ b/src/ui/avatarrd/AvatarRDRefineConnector.java
@@ -46,13 +46,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDRefineConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDRequirement.java b/src/ui/avatarrd/AvatarRDRequirement.java
index e9cebc2a41e578c291c371856b3c74dba3c3e689..175821a1161168293861228c0ecafd6af80d796b 100755
--- a/src/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/ui/avatarrd/AvatarRDRequirement.java
@@ -47,15 +47,19 @@
 package ui.avatarrd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class AvatarRDRequirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDSatisfyConnector.java b/src/ui/avatarrd/AvatarRDSatisfyConnector.java
index ff11f0093c021a7fabae2831e321ffff5e85f5c3..66c9c5e36f58399b5dcf21dece22ea40d7672884 100755
--- a/src/ui/avatarrd/AvatarRDSatisfyConnector.java
+++ b/src/ui/avatarrd/AvatarRDSatisfyConnector.java
@@ -47,13 +47,13 @@
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDSatisfyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarrd/AvatarRDToolBar.java b/src/ui/avatarrd/AvatarRDToolBar.java
index c1b0c30c75b2a07cf1d85b1513be3417eb6b136b..652560b18c573477fc3ca3c1cf9d091ec651aac9 100755
--- a/src/ui/avatarrd/AvatarRDToolBar.java
+++ b/src/ui/avatarrd/AvatarRDToolBar.java
@@ -46,12 +46,15 @@
 
 package ui.avatarrd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarRDToolBar extends TToolBar {
 
     public AvatarRDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarrd/AvatarRDVerifyConnector.java b/src/ui/avatarrd/AvatarRDVerifyConnector.java
index a6462c04470af79e97400eb3cd122dc2235e735b..5458fb420178980386bef9c0446e79a3d56451dc 100755
--- a/src/ui/avatarrd/AvatarRDVerifyConnector.java
+++ b/src/ui/avatarrd/AvatarRDVerifyConnector.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarrd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class AvatarRDVerifyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/avatarsmd/AvatarSMDBasicComponent.java b/src/ui/avatarsmd/AvatarSMDBasicComponent.java
index 7619ec116a1d9ea89cb744031f16b9ed043afa36..1440d9e331e87a6dafeca3daeb07aa0d909e760c 100644
--- a/src/ui/avatarsmd/AvatarSMDBasicComponent.java
+++ b/src/ui/avatarsmd/AvatarSMDBasicComponent.java
@@ -46,10 +46,6 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
 import ui.*;
 
 public abstract class AvatarSMDBasicComponent extends TGCWithoutInternalComponent implements SwallowedTGComponent {
diff --git a/src/ui/avatarsmd/AvatarSMDChoice.java b/src/ui/avatarsmd/AvatarSMDChoice.java
index 6a25ce126f8bdb33f5ee4efd58d61b09309ede39..9dd3cc34727d37c141598f63a0bdfce80b977a1d 100755
--- a/src/ui/avatarsmd/AvatarSMDChoice.java
+++ b/src/ui/avatarsmd/AvatarSMDChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarSMDChoice extends AvatarSMDBasicComponent implements EmbeddedComment, BasicErrorHighlight, PartOfInvariant {
     private int lineLength = 10;
     private int lineOutLength = 10;
diff --git a/src/ui/avatarsmd/AvatarSMDConnectingPoint.java b/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
index 362ea8a650a3edd596212d16d6f8d73fc0771233..95b182c2f57496350a36772fbd795321664278aa 100644
--- a/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
+++ b/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.avatarsmd;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class AvatarSMDConnectingPoint extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/avatarsmd/AvatarSMDConnector.java b/src/ui/avatarsmd/AvatarSMDConnector.java
index e7729795181d97d4110e9ea487d87b2683e551c4..b18678b60a92d7f4579e341b35ec4fa569f2c71a 100644
--- a/src/ui/avatarsmd/AvatarSMDConnector.java
+++ b/src/ui/avatarsmd/AvatarSMDConnector.java
@@ -46,14 +46,14 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class AvatarSMDConnector extends TGConnectorWithCommentConnectionPoints {
     protected int arrowLength = 10;
     //protected AvatarSMDTransitionInfo myTransitionInfo;
diff --git a/src/ui/avatarsmd/AvatarSMDExpireTimer.java b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
index 74eee38370025868d586c9a74b58cf6c6f7954b4..2cbee164c74e9fd0ff9dab238d04dcde6ee84102 100644
--- a/src/ui/avatarsmd/AvatarSMDExpireTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
@@ -46,15 +46,15 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDExpireTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java b/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
index c3fc4986a3a84ff56ae7a9d15aaed8c3dfabdc0f..c32869b8b77758dc14cad32c435dba3045b04c89 100644
--- a/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
+++ b/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
@@ -38,36 +38,18 @@
 
 package ui.avatarsmd;
 
-import java.util.LinkedList;
-
-import java.awt.Graphics;
-import java.awt.Color;
-
-import javax.swing.JFrame;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element; 
-
 import myutil.GraphicLib;
-
-import ui.TAttribute;
-import ui.AvatarSignal;
-import ui.BasicErrorHighlight;
-import ui.TGCScalableWithoutInternalComponent;
-import ui.TGComponent;
-import ui.TDiagramPanel;
-import ui.TGConnectingPoint;
-import ui.IconManager;
-import ui.ErrorHighlight;
-import ui.ColorManager;
-import ui.TGComponentManager;
-import ui.MalformedModelingException;
-import ui.MainGUI;
-import ui.TURTLEPanel;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 import ui.avatarbd.AvatarBDLibraryFunction;
 import ui.window.JDialogSMDLibraryFunctionCall;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+
 /**
 * @version 1.0 04.18.2016
 * @author Florian LUGOU
diff --git a/src/ui/avatarsmd/AvatarSMDPanel.java b/src/ui/avatarsmd/AvatarSMDPanel.java
index bb93faa155ec768888c72507a9afbf1a17a3faa1..512ea7cf25032194fca540035753251cdb171a61 100755
--- a/src/ui/avatarsmd/AvatarSMDPanel.java
+++ b/src/ui/avatarsmd/AvatarSMDPanel.java
@@ -47,14 +47,15 @@
 package ui.avatarsmd;
 
 //import java.awt.*;
+
+import ui.*;
+
 import java.util.*;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class AvatarSMDPanel extends TDiagramPanel implements TDPWithAttributes {
     
     public  AvatarSMDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/avatarsmd/AvatarSMDParallel.java b/src/ui/avatarsmd/AvatarSMDParallel.java
index fc6743afdd747cbd28425518de2232746af567bf..620d360f48d2109c742a3eb67093e9cf5ddbc55e 100755
--- a/src/ui/avatarsmd/AvatarSMDParallel.java
+++ b/src/ui/avatarsmd/AvatarSMDParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarSMDParallel extends AvatarSMDBasicComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/avatarsmd/AvatarSMDRandom.java b/src/ui/avatarsmd/AvatarSMDRandom.java
index f61dba44010040600d05d2194e1a7a94815cf6f2..67a797b24f0626aff81187411960e6c8bc6f33bf 100755
--- a/src/ui/avatarsmd/AvatarSMDRandom.java
+++ b/src/ui/avatarsmd/AvatarSMDRandom.java
@@ -46,15 +46,16 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLADRandom;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class AvatarSMDRandom  extends AvatarSMDBasicComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDReceiveSignal.java b/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
index 0f7bf69d8ca39fe76b1cb93fd7999cb8a81f00e9..5098b6f7816e6c5ec99417b0b9a0336ddf87f12a 100644
--- a/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
+++ b/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarSignal;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDReceiveSignal extends AvatarSMDBasicComponent implements CheckableAccessibility, CheckableLatency, BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDResetTimer.java b/src/ui/avatarsmd/AvatarSMDResetTimer.java
index bfd106d458b157d90117f20e2c13ee954058dc5e..89655cc42517fce94a09da432733fe8e84e796f7 100644
--- a/src/ui/avatarsmd/AvatarSMDResetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDResetTimer.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDResetTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDSendSignal.java b/src/ui/avatarsmd/AvatarSMDSendSignal.java
index 0525f72509dbb5f2b4d8afd9d305ab2c3d1693bf..53ff79352fc76af9fa6ae2e76375c709cefbab2b 100644
--- a/src/ui/avatarsmd/AvatarSMDSendSignal.java
+++ b/src/ui/avatarsmd/AvatarSMDSendSignal.java
@@ -46,15 +46,14 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarSignal;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDSendSignal extends AvatarSMDBasicComponent implements CheckableAccessibility, CheckableLatency, BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDSetTimer.java b/src/ui/avatarsmd/AvatarSMDSetTimer.java
index b302328678da014f6e420231e528cb697b4db926..15f998301da8b8c2f51f80c05632193e8fab8447 100644
--- a/src/ui/avatarsmd/AvatarSMDSetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDSetTimer.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
 
 public class AvatarSMDSetTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
     protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDStartState.java b/src/ui/avatarsmd/AvatarSMDStartState.java
index 6cda1f995dd354b3426eb7ccfde4350e4111c104..dfe2becdf2acac24d68e23367257be994498a658 100644
--- a/src/ui/avatarsmd/AvatarSMDStartState.java
+++ b/src/ui/avatarsmd/AvatarSMDStartState.java
@@ -46,12 +46,12 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class AvatarSMDStartState extends AvatarSMDBasicComponent implements EmbeddedComment, PartOfInvariant{
     private int lineLength = 5;
     
diff --git a/src/ui/avatarsmd/AvatarSMDState.java b/src/ui/avatarsmd/AvatarSMDState.java
index c81e3676a4f0299eb60e5f2ade326ef6267bfbf5..f9deccf91b18a77fd38393d9de671726efbe9981 100644
--- a/src/ui/avatarsmd/AvatarSMDState.java
+++ b/src/ui/avatarsmd/AvatarSMDState.java
@@ -46,15 +46,18 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarState;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class AvatarSMDState extends TGCScalableWithInternalComponent implements AllowedBreakpoint, CheckableAccessibility, CheckableLatency, CheckableInvariant, SwallowTGComponent, SwallowedTGComponent, PartOfInvariant, PartOfHighInvariant, WithAttributes {
diff --git a/src/ui/avatarsmd/AvatarSMDStopState.java b/src/ui/avatarsmd/AvatarSMDStopState.java
index 93a7f097e4475359d7196642471811e38d29f8b1..b723fcb7d823a4fb4786a051c2e6c6426dc9077b 100644
--- a/src/ui/avatarsmd/AvatarSMDStopState.java
+++ b/src/ui/avatarsmd/AvatarSMDStopState.java
@@ -46,11 +46,11 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class AvatarSMDStopState extends AvatarSMDBasicComponent implements EmbeddedComment, AllowedBreakpoint, PartOfInvariant, PartOfHighInvariant {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDToolBar.java b/src/ui/avatarsmd/AvatarSMDToolBar.java
index 0acdbb160a4b370a7fc41a973fd9b371957918fd..1153973756abc99262920aa5d92d3bc0c4cbd10b 100755
--- a/src/ui/avatarsmd/AvatarSMDToolBar.java
+++ b/src/ui/avatarsmd/AvatarSMDToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.avatarsmd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class AvatarSMDToolBar extends TToolBar {
     
     
diff --git a/src/ui/avatarsmd/AvatarSMDTransitionInfo.java b/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
index d7b5f9ad5d9053f57677620bec9fbda59560cf24..b974a0ca03e0818ba2ecbe883ac881db63f68768 100755
--- a/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
+++ b/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
@@ -47,16 +47,20 @@
 
 package ui.avatarsmd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogAvatarTransition;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent {
 
diff --git a/src/ui/cd/TCDActivityDiagramBox.java b/src/ui/cd/TCDActivityDiagramBox.java
index 15a7f0c220c1f806dcd27649766e60962882e811..3be26df1db884e0c9c90a2c27b76f2daffd0155d 100755
--- a/src/ui/cd/TCDActivityDiagramBox.java
+++ b/src/ui/cd/TCDActivityDiagramBox.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TCDActivityDiagramBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/cd/TCDAttributeBox.java b/src/ui/cd/TCDAttributeBox.java
index b0ef7175908370ef5bd7c8cc199739a1aac5f3cc..7e2607051401fd85686eca5918496329a05ef0c7 100755
--- a/src/ui/cd/TCDAttributeBox.java
+++ b/src/ui/cd/TCDAttributeBox.java
@@ -48,12 +48,13 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.util.*;
+import ui.*;
+import ui.window.JDialogAttribute;
 
+import java.util.Iterator;
+import java.util.List;
 
 //import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TCDAttributeBox extends TGCAttributeBox {
     
diff --git a/src/ui/cd/TCDAttributeBoxNoConnection.java b/src/ui/cd/TCDAttributeBoxNoConnection.java
index 09455ea4933907e6419f0b6b99377eafce02f54e..76b797c84638cbed29f4ab120f4a37c97f01a08f 100755
--- a/src/ui/cd/TCDAttributeBoxNoConnection.java
+++ b/src/ui/cd/TCDAttributeBoxNoConnection.java
@@ -49,7 +49,7 @@ package ui.cd;
 
 
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TCDAttributeBoxNoConnection extends TCDAttributeBox {
     
diff --git a/src/ui/cd/TCDAttributeGateBox.java b/src/ui/cd/TCDAttributeGateBox.java
index 5dd47780114e8470c51aa042879d63e1233e25f5..c05a2a58fd71c3449a3af579146080d965d520a8 100755
--- a/src/ui/cd/TCDAttributeGateBox.java
+++ b/src/ui/cd/TCDAttributeGateBox.java
@@ -48,9 +48,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TCDAttributeGateBox extends TGCAttributeBox {
     
diff --git a/src/ui/cd/TCDCompositionOperator.java b/src/ui/cd/TCDCompositionOperator.java
index 8966620d74508f01fe569202150f04e64aac89b4..3d4188271d34b7a6d7f8068a28b410005c42eb7b 100755
--- a/src/ui/cd/TCDCompositionOperator.java
+++ b/src/ui/cd/TCDCompositionOperator.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.cd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TCDCompositionOperator extends TGCWithInternalComponent implements CompositionOperatorInterface {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/cd/TCDCompositionOperatorWithSynchro.java b/src/ui/cd/TCDCompositionOperatorWithSynchro.java
index 59cf62a6932bb1c36e42e6914e77c919d4fbaef0..5fd9693909f2f1839da710b81c4be5eee332dcb8 100755
--- a/src/ui/cd/TCDCompositionOperatorWithSynchro.java
+++ b/src/ui/cd/TCDCompositionOperatorWithSynchro.java
@@ -48,10 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.LinkedList;
+
 public abstract class TCDCompositionOperatorWithSynchro extends TCDCompositionOperator {
 	protected TClassSynchroInterface t1;
 	protected TClassSynchroInterface t2;
diff --git a/src/ui/cd/TCDInvocationOperator.java b/src/ui/cd/TCDInvocationOperator.java
index 8833465d403e2d2bf0b0215265ca6716ddf7c106..9a2f92fb4d7bd4e562fa0f11c69c8e065d46aba2 100755
--- a/src/ui/cd/TCDInvocationOperator.java
+++ b/src/ui/cd/TCDInvocationOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TCDInvocationOperator extends TCDCompositionOperatorWithSynchro {
     protected TClassSynchroInterface oldt1;
     protected TClassSynchroInterface oldt2;
diff --git a/src/ui/cd/TCDOperationBox.java b/src/ui/cd/TCDOperationBox.java
index 59773fa6d2d64ed9f5e4974c9cf18b83211ea4d1..29ad5756d2c784790192817d7bff728204fdea08 100755
--- a/src/ui/cd/TCDOperationBox.java
+++ b/src/ui/cd/TCDOperationBox.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.cd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TCDOperationBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/cd/TCDOperationBoxNoConnection.java b/src/ui/cd/TCDOperationBoxNoConnection.java
index 7f789e5348c084372354292f96f2356a41dd5e92..0d1eade44401fae35ecce64cb7daa1bd1e8ccf58 100755
--- a/src/ui/cd/TCDOperationBoxNoConnection.java
+++ b/src/ui/cd/TCDOperationBoxNoConnection.java
@@ -51,7 +51,11 @@ package ui.cd;
 //import javax.swing.*;
 
 //import myutil.*;
-import ui.*;
+
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TCDOperationBoxNoConnection extends TCDOperationBox {
     
diff --git a/src/ui/cd/TCDParallelOperator.java b/src/ui/cd/TCDParallelOperator.java
index 5e09da1c02821842af479215f5cfdd49c2825d75..fd659353459f318d22b857d85b6d7105ec9506ba 100755
--- a/src/ui/cd/TCDParallelOperator.java
+++ b/src/ui/cd/TCDParallelOperator.java
@@ -50,7 +50,10 @@ package ui.cd;
 //import java.awt.*;
 //import javax.swing.*;
 
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public class TCDParallelOperator extends TCDCompositionOperator {
 
diff --git a/src/ui/cd/TCDPreemptionOperator.java b/src/ui/cd/TCDPreemptionOperator.java
index e3fc1475fec8fb99c8321b8d780f2abceab1c78e..369f763f7cc0da1f905b4e9d0c869314379c5525 100755
--- a/src/ui/cd/TCDPreemptionOperator.java
+++ b/src/ui/cd/TCDPreemptionOperator.java
@@ -48,7 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public class TCDPreemptionOperator extends TCDCompositionOperator {
 
diff --git a/src/ui/cd/TCDReducedAttributeBox.java b/src/ui/cd/TCDReducedAttributeBox.java
index 0985000b70f8cbc84b581aba2a96e54a371431fc..270c9fc9ff4b1455043bad21f0adb6e496601be5 100755
--- a/src/ui/cd/TCDReducedAttributeBox.java
+++ b/src/ui/cd/TCDReducedAttributeBox.java
@@ -49,13 +49,14 @@ package ui.cd;
 
 //import java.awt.*;
 //import javax.swing.*;
-import java.util.*;
 
-//import org.w3c.dom.*;
+import ui.*;
+import ui.window.JDialogReducedAttribute;
+
+import java.util.List;
 
+//import org.w3c.dom.*;
 //import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TCDReducedAttributeBox extends TGCReducedAttributeBox {
     
diff --git a/src/ui/cd/TCDReducedAttributeGateBox.java b/src/ui/cd/TCDReducedAttributeGateBox.java
index 07aea5e64fde164140310dcd3732c63368f13da4..33b63123fa39a09fb95a3ebfe10bd9f3cefd22de 100755
--- a/src/ui/cd/TCDReducedAttributeGateBox.java
+++ b/src/ui/cd/TCDReducedAttributeGateBox.java
@@ -47,10 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogReducedAttribute;
+
+import java.awt.*;
 
 public class TCDReducedAttributeGateBox extends TGCReducedAttributeBox {
     protected Color myColor;
diff --git a/src/ui/cd/TCDSequenceOperator.java b/src/ui/cd/TCDSequenceOperator.java
index ad8b80dcb907ab3a0c3ce5e75c0eec67664ac320..540440ae6d5546c639dc1126bb636c60865eb122 100755
--- a/src/ui/cd/TCDSequenceOperator.java
+++ b/src/ui/cd/TCDSequenceOperator.java
@@ -48,8 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
 public class TCDSequenceOperator extends TCDCompositionOperator {
     
diff --git a/src/ui/cd/TCDSynchroGateList.java b/src/ui/cd/TCDSynchroGateList.java
index 9dff70c1a68565f584441689e9ce8d7c8b0e7a21..27858ddc6ceede9d10aa1fc6e7c9b593a3975f82 100755
--- a/src/ui/cd/TCDSynchroGateList.java
+++ b/src/ui/cd/TCDSynchroGateList.java
@@ -46,16 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogSynchro;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.awt.geom.*;
 
 public class TCDSynchroGateList extends TGCWithoutInternalComponent {
     protected TClassSynchroInterface t1;
diff --git a/src/ui/cd/TCDSynchroOperator.java b/src/ui/cd/TCDSynchroOperator.java
index 54a4f6a0c12bd03c530cbdec3d728a1f7be1f8a7..3af2fc52d1bd93ae8f539f55399417a5f5c0fd4c 100755
--- a/src/ui/cd/TCDSynchroOperator.java
+++ b/src/ui/cd/TCDSynchroOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TCDSynchroOperator extends TCDCompositionOperatorWithSynchro {
     protected TClassSynchroInterface oldt1;
     protected TClassSynchroInterface oldt2;
diff --git a/src/ui/cd/TCDTClass.java b/src/ui/cd/TCDTClass.java
index 69e319ec6a6a3154e2e06cbaf2f0527f1613033a..8ffed2999ea55fb35cae6a902d4cb589a396694b 100755
--- a/src/ui/cd/TCDTClass.java
+++ b/src/ui/cd/TCDTClass.java
@@ -47,16 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.ad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.ad.TActivityDiagramPanel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TCDTClass extends TGCWithInternalComponent implements TClassInterface, TClassSynchroInterface {
     public String oldValue;
diff --git a/src/ui/cd/TCDTData.java b/src/ui/cd/TCDTData.java
index ae07cd4cc5acd7ce76c45912d3573ff34b2f0e66..514f523ec81f853595f635bb29e45a95ae905a7d 100755
--- a/src/ui/cd/TCDTData.java
+++ b/src/ui/cd/TCDTData.java
@@ -47,15 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.awt.*;
-//import java.awt.event.*;
+import myutil.GraphicLib;
+import ui.*;
+
 import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.util.LinkedList;
 
+//import java.awt.event.*;
 //import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
 //import ui.ad.*;
 //import ui.window.*;
 
diff --git a/src/ui/cd/TCDTObject.java b/src/ui/cd/TCDTObject.java
index 2f9de5566f99cdd2c613b514300ce81ef1bfe744..5a151a97a08e30b0e28e0cefbc7f3410aaef8a93 100755
--- a/src/ui/cd/TCDTObject.java
+++ b/src/ui/cd/TCDTObject.java
@@ -47,17 +47,20 @@
 package ui.cd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.ad.*;
-import ui.window.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.window.JDialogTObjectName;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TCDTObject extends TGCWithInternalComponent implements TClassInterface, TClassSynchroInterface {
     public String oldValue;
diff --git a/src/ui/cd/TCDWatchdogGateList.java b/src/ui/cd/TCDWatchdogGateList.java
index 4839322a70e842f3933af06bf83d8d6cece41bf6..d36e404bc6f6616a5c67f224be5db1478b24acf5 100755
--- a/src/ui/cd/TCDWatchdogGateList.java
+++ b/src/ui/cd/TCDWatchdogGateList.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public class TCDWatchdogGateList extends TGCWithoutInternalComponent {
     protected TClassInterface t1;
diff --git a/src/ui/cd/TCDWatchdogOperator.java b/src/ui/cd/TCDWatchdogOperator.java
index 35a6c0af8e0163a60f029ca31dd6fac2c0f10f86..7d9869fbb8a119ac784b715461c5c9783d92ef47 100755
--- a/src/ui/cd/TCDWatchdogOperator.java
+++ b/src/ui/cd/TCDWatchdogOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TCDWatchdogOperator extends TCDCompositionOperatorWithSynchro {
     protected TClassInterface oldt1;
     
diff --git a/src/ui/cd/TClassDiagramPanel.java b/src/ui/cd/TClassDiagramPanel.java
index 1b85b89a83e7faf0deaa7dc9c8c78303c02c6179..0ec9383717578e08e208e1929d263340eeef4ba4 100755
--- a/src/ui/cd/TClassDiagramPanel.java
+++ b/src/ui/cd/TClassDiagramPanel.java
@@ -47,13 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import java.util.*;
-
-import org.w3c.dom.*;
-
-
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+
 public class TClassDiagramPanel extends TDiagramPanel implements ClassDiagramPanelInterface {
     
     public  TClassDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/cd/TClassDiagramToolBar.java b/src/ui/cd/TClassDiagramToolBar.java
index 101263dfd9fc13792c2955d11e52943276d900d6..b70514322c06862811a0cf6208fc38ba73c6c9fd 100755
--- a/src/ui/cd/TClassDiagramToolBar.java
+++ b/src/ui/cd/TClassDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TClassDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/cd/TGCReducedAttributeBox.java b/src/ui/cd/TGCReducedAttributeBox.java
index 5c403d26bc5897d2b14d252adb200be0812287d9..2877bf733b2492a031bd9245a910b4040f6c385a 100755
--- a/src/ui/cd/TGCReducedAttributeBox.java
+++ b/src/ui/cd/TGCReducedAttributeBox.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.cd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogReducedAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public abstract class TGCReducedAttributeBox extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/cd/TGConnectingPointAssociation.java b/src/ui/cd/TGConnectingPointAssociation.java
index 80c9ea5c017480773e7d5aa0b5eafd21dfd4265c..4a3a20607d08037668e8c714db17557a68e8ef71 100755
--- a/src/ui/cd/TGConnectingPointAssociation.java
+++ b/src/ui/cd/TGConnectingPointAssociation.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointAssociation extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/cd/TGConnectingPointCompositionOperator.java b/src/ui/cd/TGConnectingPointCompositionOperator.java
index ad31bbb22a5a877a791c34d09f97a9336045fb0b..fc81b70f8663499211c0e462aa4efd8e5130039f 100755
--- a/src/ui/cd/TGConnectingPointCompositionOperator.java
+++ b/src/ui/cd/TGConnectingPointCompositionOperator.java
@@ -47,8 +47,9 @@
 package ui.cd;
 
 
-
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointCompositionOperator extends  TGConnectingPoint{
     
diff --git a/src/ui/cd/TGConnectingPointTClasses.java b/src/ui/cd/TGConnectingPointTClasses.java
index 1d137f64eb8e6d6f7f19032fb0941556544081f7..381cca2880fa891d4bc06f6562b481d8206e945f 100755
--- a/src/ui/cd/TGConnectingPointTClasses.java
+++ b/src/ui/cd/TGConnectingPointTClasses.java
@@ -47,8 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.cd;
 
 
-
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTClasses extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/cd/TGConnectorAssociation.java b/src/ui/cd/TGConnectorAssociation.java
index 5a1f085da4880e5ac3c71444cee6be551739c6a0..6f06e575fc8ee4c813bd5629caab5b378e3f4436 100755
--- a/src/ui/cd/TGConnectorAssociation.java
+++ b/src/ui/cd/TGConnectorAssociation.java
@@ -45,15 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
  */
  
 package ui.cd;
-  
+
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
+//import java.awt.geom.*;
 //import myutil.*;
 
-import ui.*;
-
 public  class TGConnectorAssociation extends TGConnector {
 	protected TGConnectingPointGroup tg;
 
diff --git a/src/ui/cd/TGConnectorAssociationWithNavigation.java b/src/ui/cd/TGConnectorAssociationWithNavigation.java
index 529c6a72418203ff34821a928b2b9b545c190514..0e7adfd3a5ac94c649717c89c64d8306071ea002 100755
--- a/src/ui/cd/TGConnectorAssociationWithNavigation.java
+++ b/src/ui/cd/TGConnectorAssociationWithNavigation.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.cd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorAssociationWithNavigation extends TGConnectorAssociation {
 	protected int arrowLength = 15;
diff --git a/src/ui/dd/TDDArtifact.java b/src/ui/dd/TDDArtifact.java
index 8da5fd0510526e43d255a7a354e5f895616c4ae1..2450b6b8161eebc5984a63b021894cb4a864c746 100755
--- a/src/ui/dd/TDDArtifact.java
+++ b/src/ui/dd/TDDArtifact.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.dd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import ui.cd.*;
+import ui.cd.TCDTClass;
+import ui.window.JDialogArtifact;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class TDDArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/dd/TDDNode.java b/src/ui/dd/TDDNode.java
index ffc317ceb1cff9ace7bc7003bcaff6b1a1d87611..ff0018cdc80234ccfc3777d03d72042337ee80da 100755
--- a/src/ui/dd/TDDNode.java
+++ b/src/ui/dd/TDDNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.dd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class TDDNode extends TGCWithInternalComponent implements SwallowTGComponent {
     private int textY1 = 15;
diff --git a/src/ui/dd/TDeploymentDiagramPanel.java b/src/ui/dd/TDeploymentDiagramPanel.java
index e00318d910a3fce201b1a3273bd204df11d6a0b0..479dc96240475f2efc3400138acc28ed89f7143b 100755
--- a/src/ui/dd/TDeploymentDiagramPanel.java
+++ b/src/ui/dd/TDeploymentDiagramPanel.java
@@ -47,10 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.dd;
 
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 public class TDeploymentDiagramPanel extends TDiagramPanel {
     
     public  TDeploymentDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/dd/TDeploymentDiagramToolBar.java b/src/ui/dd/TDeploymentDiagramToolBar.java
index 193c27c97e01d59389b3e4b47e81448530223778..3933e13cf810dabfb32a055295836e957d453eef 100755
--- a/src/ui/dd/TDeploymentDiagramToolBar.java
+++ b/src/ui/dd/TDeploymentDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.dd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TDeploymentDiagramToolBar extends TToolBar {
     
     public TDeploymentDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/dd/TGConnectingPointDD.java b/src/ui/dd/TGConnectingPointDD.java
index 9e10fff1d0318c31a3309666ebe6f0f3493b109f..70ed18e6e8197d8425e5e18d69075f309bea29c6 100755
--- a/src/ui/dd/TGConnectingPointDD.java
+++ b/src/ui/dd/TGConnectingPointDD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.dd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointDD extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/dd/TGConnectorLinkNode.java b/src/ui/dd/TGConnectorLinkNode.java
index 82ab26309534a5d6242dc84d28a5516c75cb663e..2e7eeeac8a8d7e738349aa09166501369852010d 100755
--- a/src/ui/dd/TGConnectorLinkNode.java
+++ b/src/ui/dd/TGConnectorLinkNode.java
@@ -47,18 +47,19 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.dd;
 
 
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.cd.TCDTClass;
+import ui.window.JDialogLinkNode;
 
-import java.awt.*;
-import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorLinkNode extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
index c777c9431f1e74eac3503505e379c73fde2ae0b7..a2750b4ecdec25b7c4df983ccb5c123e8e517257 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.diplodocusmethodology;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class DiplodocusMethodologyConnectingPoint extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
index bc591e1dd69840715f9231cde369f0dc6d471687..4b1e8b88ae94a66ef1ca159ca7a595ab07d2715b 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.diplodocusmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class DiplodocusMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
index 102952c4c7e878743ead885b542d54c792874cb2..38360932bc907f5a991075ad28b5f0595ec9192b 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
@@ -47,12 +47,14 @@
 
 package ui.diplodocusmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     //protected boolean emptyText;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
index da2cd00c4488bde4011c71da9b917b0fac868b9c..3af9ffc572ca07cdf402e66ddd9072077525724a 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
@@ -47,7 +47,6 @@
 package ui.diplodocusmethodology;
 
 import org.w3c.dom.Element;
-
 import ui.*;
 
 public class DiplodocusMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
index 46a7f54ccfdbe10bd4e160bd19b954613b88f881..a96642041acf75c7d9dbd7978d339418ec8501c0 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
@@ -49,14 +49,16 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public abstract class DiplodocusMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent  {
     public String oldValue;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
index b70992ba40663ec67e1b88ba606895c2a2c5477b..8b0b8db18dfdead93794b7d6a1ff5d3eeaa8ec97 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
@@ -48,15 +48,9 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class DiplodocusMethodologyDiagramReferenceToApplication extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
index f27edfbf1862488173e2188ccdfde68294c0e240..cece2c8b1b4ec5cba150a5caf72261dad124e4d2 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
@@ -48,15 +48,7 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class DiplodocusMethodologyDiagramReferenceToArchitecture extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
index b1360780e6f8632b92a587f1b7115beb952a02e0..952304e1ba93655215721949c3b015be04269c84 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
@@ -48,15 +48,7 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class DiplodocusMethodologyDiagramReferenceToCP extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
index 7de4812802930e5b60d07e67b165d03974203b03..2530ca2f2c36deb0b88c74c1936b6e46c4a3f273 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
@@ -48,15 +48,9 @@
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMethodologyDiagramReference  {
 
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
index 0f24bfc46d31960efd16bfecdb9c07ac0b471ec3..0f05ed609c3ae5094af2f8cef345cb133a68548b 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.diplodocusmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class DiplodocusMethodologyDiagramReferenceToRequirement extends DiplodocusMethodologyDiagramReference  {
    
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
index f45f0ec96af7310d06b6381eed6f03bc2dc17f49..d6359be81d38ee52d2df91aee6343d3f11214b45 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.diplodocusmethodology;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class DiplodocusMethodologyDiagramToolbar extends TToolBar {
     
     public DiplodocusMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/ebrdd/EBRDDActionState.java b/src/ui/ebrdd/EBRDDActionState.java
index 6604d6985c32b3e8c73dc1776b4e34fbc37804a5..5f352f60a46d0e93036c7cf7be9d87cdde6f71c2 100755
--- a/src/ui/ebrdd/EBRDDActionState.java
+++ b/src/ui/ebrdd/EBRDDActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class EBRDDActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ebrdd/EBRDDAttributeBox.java b/src/ui/ebrdd/EBRDDAttributeBox.java
index 8ac6fb6785f5b8ec19af56e17360dcb0fd5581d6..c70404c5213e4cdc330901adb23004eea254bcbf 100644
--- a/src/ui/ebrdd/EBRDDAttributeBox.java
+++ b/src/ui/ebrdd/EBRDDAttributeBox.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 //import tmltranslator.*;
 
diff --git a/src/ui/ebrdd/EBRDDChoice.java b/src/ui/ebrdd/EBRDDChoice.java
index 3d72d03537a9c56997801c4ed7893c0a94a7c00d..57f321863e1254572394019574a18739864d99aa 100755
--- a/src/ui/ebrdd/EBRDDChoice.java
+++ b/src/ui/ebrdd/EBRDDChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class EBRDDChoice extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/ebrdd/EBRDDERB.java b/src/ui/ebrdd/EBRDDERB.java
index b2b0c1bc674b55fbb9d1e4ee1c6c57ae680c9eda..7fc375635a533006b6477dc3231e5ddf07b2fca1 100644
--- a/src/ui/ebrdd/EBRDDERB.java
+++ b/src/ui/ebrdd/EBRDDERB.java
@@ -46,16 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogERB;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class EBRDDERB extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDERC.java b/src/ui/ebrdd/EBRDDERC.java
index 0b857e847bab02aa72a2b720f96ee8e641678b57..d31bad6e739743b3f023d3f5a945da600731f166 100644
--- a/src/ui/ebrdd/EBRDDERC.java
+++ b/src/ui/ebrdd/EBRDDERC.java
@@ -46,18 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.Vector;
 
 public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGComponent {
     /*private int textY1 = 15;
diff --git a/src/ui/ebrdd/EBRDDESO.java b/src/ui/ebrdd/EBRDDESO.java
index be5ff92f7be01d19fbe18cc79ae7b9a1d3bb20d0..25ff87caeaf775ad2688551c405f13a59c014641 100644
--- a/src/ui/ebrdd/EBRDDESO.java
+++ b/src/ui/ebrdd/EBRDDESO.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogESO;
 
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class EBRDDESO extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private int lineLength = 0;
diff --git a/src/ui/ebrdd/EBRDDForLoop.java b/src/ui/ebrdd/EBRDDForLoop.java
index 676e3cc0840bae0b9a006ba5ccba6cc6f83314d2..aafe5274f30cd40a31e43dd11e15566044c27b15 100755
--- a/src/ui/ebrdd/EBRDDForLoop.java
+++ b/src/ui/ebrdd/EBRDDForLoop.java
@@ -46,15 +46,16 @@
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class EBRDDForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDPanel.java b/src/ui/ebrdd/EBRDDPanel.java
index e343c34053ca4aeb878d0083574fb260b82315b9..b76f990e9103df01a0391cc57b8d9566ec01ccaa 100644
--- a/src/ui/ebrdd/EBRDDPanel.java
+++ b/src/ui/ebrdd/EBRDDPanel.java
@@ -47,14 +47,17 @@
 package ui.ebrdd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class EBRDDPanel extends TDiagramPanel {
     
     public  EBRDDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ebrdd/EBRDDSequence.java b/src/ui/ebrdd/EBRDDSequence.java
index 7ecf7a3a6fbf87af78b95a156b67e2b878821a34..e240745ae6dfa4ab51004d48b077256e890a10ae 100644
--- a/src/ui/ebrdd/EBRDDSequence.java
+++ b/src/ui/ebrdd/EBRDDSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class EBRDDSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int lineLength = 0;
 	private int textX, textY;
diff --git a/src/ui/ebrdd/EBRDDStartState.java b/src/ui/ebrdd/EBRDDStartState.java
index c1ed1bfc01d0ffc8b90bbde71976d16417789b31..be841646f3abd0d0ce35e5264cc9b9465f8fd4fc 100755
--- a/src/ui/ebrdd/EBRDDStartState.java
+++ b/src/ui/ebrdd/EBRDDStartState.java
@@ -46,12 +46,12 @@
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class EBRDDStartState extends TGCWithoutInternalComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/ebrdd/EBRDDStopState.java b/src/ui/ebrdd/EBRDDStopState.java
index 7b66c4718d8b5d801df205e25f36c6d20dbc0921..93243660b2906e6a972013da9197e38c307b991e 100755
--- a/src/ui/ebrdd/EBRDDStopState.java
+++ b/src/ui/ebrdd/EBRDDStopState.java
@@ -46,11 +46,11 @@
 
 package ui.ebrdd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class EBRDDStopState extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDToolBar.java b/src/ui/ebrdd/EBRDDToolBar.java
index 86f4bf94b802c7535639cd6f1de20cf8af562588..ce2dad67c0fe20a8dce11dd9ce2c18bf298480ca 100755
--- a/src/ui/ebrdd/EBRDDToolBar.java
+++ b/src/ui/ebrdd/EBRDDToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class EBRDDToolBar extends TToolBar {
     
     
diff --git a/src/ui/ebrdd/TGConnectingPointEBRDD.java b/src/ui/ebrdd/TGConnectingPointEBRDD.java
index 294e6670acec3ac7f3ff238e8048da80bfcb4646..2a7046cb8aac5226c6c31cf264ce97ff1cec3878 100755
--- a/src/ui/ebrdd/TGConnectingPointEBRDD.java
+++ b/src/ui/ebrdd/TGConnectingPointEBRDD.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ebrdd;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointEBRDD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ebrdd/TGConnectingPointEBRDDERC.java b/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
index a53245f6e3d7b23cd40fe2e6045307dc16d337cf..90bc03f4972e504ad26780a311576b8982747fe6 100755
--- a/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
+++ b/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ebrdd;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointEBRDDERC extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ebrdd/TGConnectorEBRDD.java b/src/ui/ebrdd/TGConnectorEBRDD.java
index 0abf8dba0fd40a62277a0a87c6fb5d20069dcd0b..04ac08dddd5d368f5dd2dcbd51260841980a8ea3 100755
--- a/src/ui/ebrdd/TGConnectorEBRDD.java
+++ b/src/ui/ebrdd/TGConnectorEBRDD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorEBRDD extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/ebrdd/TGConnectorEBRDDERC.java b/src/ui/ebrdd/TGConnectorEBRDDERC.java
index 05dc8c02d123c6058153b9ee0d0621feeafb3797..ae2e05116ac7cfc31f719837c1d676816093e608 100755
--- a/src/ui/ebrdd/TGConnectorEBRDDERC.java
+++ b/src/ui/ebrdd/TGConnectorEBRDDERC.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ebrdd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
-import org.w3c.dom.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorEBRDDERC extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/file/AUTFileFilter.java b/src/ui/file/AUTFileFilter.java
index fa5581fc39f708dcef5c8041cb422fdde72c6129..d58803d3b80849364885994774795647fc99429b 100755
--- a/src/ui/file/AUTFileFilter.java
+++ b/src/ui/file/AUTFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class AUTFileFilter extends FileFilter {
diff --git a/src/ui/file/BCGFileFilter.java b/src/ui/file/BCGFileFilter.java
index 9a158b4ab884d5a6078055c965b9ff659d9ac7c0..021a5fb5d1347a4e514b74ee25809b315f10c154 100755
--- a/src/ui/file/BCGFileFilter.java
+++ b/src/ui/file/BCGFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class BCGFileFilter extends FileFilter {
diff --git a/src/ui/file/DTAFileFilter.java b/src/ui/file/DTAFileFilter.java
index 9e03a5edd879468081f660ddad9f7d9ad6bfe541..ed6922edbd43d6aaf3f5f6ae6907b49af21f8302 100755
--- a/src/ui/file/DTAFileFilter.java
+++ b/src/ui/file/DTAFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class DTAFileFilter extends FileFilter {
diff --git a/src/ui/file/MSCFilter.java b/src/ui/file/MSCFilter.java
index dcb590f5ac7974e2165dd7aadf10bac50a99fe4b..2bda288452696433e5f6bf278e29c7ce65f849b9 100755
--- a/src/ui/file/MSCFilter.java
+++ b/src/ui/file/MSCFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class MSCFilter extends FileFilter {
diff --git a/src/ui/file/PNGFilter.java b/src/ui/file/PNGFilter.java
index c5e7abba0596a5ef4225ea2f63ff40ba07a2a59b..d05dfbb02964b3303315779109e0d2277adcb406 100755
--- a/src/ui/file/PNGFilter.java
+++ b/src/ui/file/PNGFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class PNGFilter extends FileFilter {
diff --git a/src/ui/file/RGFileFilter.java b/src/ui/file/RGFileFilter.java
index aefef6dbb1b640e2d14b6f3a3fce71db22408843..004f2c9dbca2b7d59aa29469cf029e4db9dfdec6 100755
--- a/src/ui/file/RGFileFilter.java
+++ b/src/ui/file/RGFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class RGFileFilter extends FileFilter {
diff --git a/src/ui/file/RTLFileFilter.java b/src/ui/file/RTLFileFilter.java
index 0daa93022d75195f81ecd39ecbcae32abcc1149d..632b1c857b8b7bd971b6a79a6c60c2ebbe81b45f 100755
--- a/src/ui/file/RTLFileFilter.java
+++ b/src/ui/file/RTLFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class RTLFileFilter extends FileFilter {
diff --git a/src/ui/file/TDotFilter.java b/src/ui/file/TDotFilter.java
index 4366c9b8de0508fc31d3fd3a5e5a4ca6d617fe49..d3317c5ad81d3ce1016a92cdd89b185c5c004dad 100755
--- a/src/ui/file/TDotFilter.java
+++ b/src/ui/file/TDotFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TDotFilter extends FileFilter {
diff --git a/src/ui/file/TFileFilter.java b/src/ui/file/TFileFilter.java
index b54dfbbbece1d0201ecd63c61a5efec76a87b519..d4d5b0640f34556d7db2b0674e13bbd6584a3e33 100755
--- a/src/ui/file/TFileFilter.java
+++ b/src/ui/file/TFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TFileFilter extends FileFilter {
diff --git a/src/ui/file/TImgFilter.java b/src/ui/file/TImgFilter.java
index 1f84bf39f332a0548e2819b150e309b986343af4..6df923a4ee7d32a1a6efaae583bc530c0d7310a4 100755
--- a/src/ui/file/TImgFilter.java
+++ b/src/ui/file/TImgFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TImgFilter extends FileFilter {
diff --git a/src/ui/file/TLSAFileFilter.java b/src/ui/file/TLSAFileFilter.java
index f3fbc8532a72240f045a5c81b23fa942e876ce9c..5cb22fbbc5c98ff08b1edd2da45a2f4bf828aae6 100755
--- a/src/ui/file/TLSAFileFilter.java
+++ b/src/ui/file/TLSAFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TLSAFileFilter extends FileFilter {
diff --git a/src/ui/file/TLibFilter.java b/src/ui/file/TLibFilter.java
index af865c62d95876bb515b155ac75d60555cc9c78c..3d5beb269a5c1162156a75ac03f534534da5822b 100755
--- a/src/ui/file/TLibFilter.java
+++ b/src/ui/file/TLibFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TLibFilter extends FileFilter {
diff --git a/src/ui/file/TSVGFilter.java b/src/ui/file/TSVGFilter.java
index 805ff98addd294a293e4fee969c7acd5c3678796..f6c78c2f127885b1a99b517019a66f5d4db9fa65 100755
--- a/src/ui/file/TSVGFilter.java
+++ b/src/ui/file/TSVGFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TSVGFilter extends FileFilter {
diff --git a/src/ui/file/TTIFFilter.java b/src/ui/file/TTIFFilter.java
index 1093c9cbedae64e12424442655292876a597c16f..ed3ea3a860e95862574396ad4ff0ac61fa0595d2 100755
--- a/src/ui/file/TTIFFilter.java
+++ b/src/ui/file/TTIFFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.file;
 
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
 import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
 
 
 public class TTIFFilter extends FileFilter {
diff --git a/src/ui/graph/AUTBlock.java b/src/ui/graph/AUTBlock.java
index 03160d0dd4e07c914b2297b6253f199e7d4f9493..93ffd7dc5000305dceda3e943e60e8e8815387e8 100755
--- a/src/ui/graph/AUTBlock.java
+++ b/src/ui/graph/AUTBlock.java
@@ -45,9 +45,9 @@
 
 package ui.graph;
 
-import myutil.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 
 public class AUTBlock  implements Comparable<AUTBlock> {
 
diff --git a/src/ui/graph/AUTElement.java b/src/ui/graph/AUTElement.java
index 2bc8c1783dfd9fbe3af544bc209be70569d71dbc..a5bbf0b1a9bd37bbdd8e38f2bdd712ec350e62fd 100755
--- a/src/ui/graph/AUTElement.java
+++ b/src/ui/graph/AUTElement.java
@@ -45,8 +45,6 @@
 
 package ui.graph;
 
-import java.util.*;
-
 public class AUTElement implements Comparable<AUTElement> {
 
     public String value;
diff --git a/src/ui/graph/AUTGraph.java b/src/ui/graph/AUTGraph.java
index bdc4b016141c494327d9575f611d9d0eacd4eeb7..35d2d519fb95fae9b5d5fc5c240202793c29c4e2 100755
--- a/src/ui/graph/AUTGraph.java
+++ b/src/ui/graph/AUTGraph.java
@@ -45,10 +45,13 @@
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
+import myutil.Conversion;
+import myutil.GraphAlgorithms;
+import myutil.TraceManager;
 
-import myutil.*;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.*;
 
 public class AUTGraph implements myutil.Graph {
 
diff --git a/src/ui/graph/AUTGraphDisplay.java b/src/ui/graph/AUTGraphDisplay.java
index bdd7f8938033704cd3706a7de0448b319804ee1c..dd3026e124a758e6afa6807e4e2f822b290cb3b9 100755
--- a/src/ui/graph/AUTGraphDisplay.java
+++ b/src/ui/graph/AUTGraphDisplay.java
@@ -45,31 +45,25 @@
 
 package ui.graph;
 
-import ui.*;
-import ui.file.*;
-import java.util.*;
-import java.io.*;
-
-import java.awt.event.MouseListener;
-import java.awt.event.MouseEvent;
-
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
-import java.util.logging.*;
-
-
-import myutil.*;
+import myutil.TraceManager;
 import org.graphstream.graph.implementations.*;
+import org.graphstream.graph.implementations.MultiGraph;
 import org.graphstream.ui.view.*;
+import org.graphstream.ui.view.Viewer;
 import org.graphstream.ui.view.Viewer.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.PNGFilter;
 
-import org.graphstream.graph.Graph;
-import org.graphstream.graph.implementations.MultiGraph;
-import org.graphstream.ui.view.Viewer;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.logging.Logger;
 
 
 public class AUTGraphDisplay  implements MouseListener, ViewerListener, Runnable {
diff --git a/src/ui/graph/AUTMappingGraph.java b/src/ui/graph/AUTMappingGraph.java
index c7bdad6ce5cc4a63d7416ff58605b3083e785add..40144402cf0a5900be086370d867cbf7b65352a3 100755
--- a/src/ui/graph/AUTMappingGraph.java
+++ b/src/ui/graph/AUTMappingGraph.java
@@ -46,10 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.graph;
 
 import java.awt.*;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
+import java.util.ArrayList;
 
 public class AUTMappingGraph  extends AUTGraph {
 	
diff --git a/src/ui/graph/AUTPartition.java b/src/ui/graph/AUTPartition.java
index 4bf62d23ca609eb8f013b33f4145b10b64e79fa6..800383e07edbda7d801d796620c49de5bc486371 100755
--- a/src/ui/graph/AUTPartition.java
+++ b/src/ui/graph/AUTPartition.java
@@ -45,7 +45,8 @@
 
 package ui.graph;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
 
 public class AUTPartition  {
 
diff --git a/src/ui/graph/AUTSplitter.java b/src/ui/graph/AUTSplitter.java
index 5e24e7083957d1ce55bd23d6901b3de1bcc4a6e5..d081cd13fc219e68fd2b7bf1d2a7b018c9b38f2b 100755
--- a/src/ui/graph/AUTSplitter.java
+++ b/src/ui/graph/AUTSplitter.java
@@ -45,7 +45,7 @@
 
 package ui.graph;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class AUTSplitter  {
 
diff --git a/src/ui/graph/AUTState.java b/src/ui/graph/AUTState.java
index 77f6b7570f575191df059d846ca6260f021a6d34..bd3df194413620dfd42761c75fd7c76883695276 100755
--- a/src/ui/graph/AUTState.java
+++ b/src/ui/graph/AUTState.java
@@ -45,7 +45,9 @@
 
 package ui.graph;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Random;
 
 public class AUTState implements Comparable<AUTState> {
 
diff --git a/src/ui/graph/CorePowerConsumption.java b/src/ui/graph/CorePowerConsumption.java
index 85a8c0f47127b8ef03ee1b06b6872e5853fd3798..f505467d5896b7f94d51922d6229f8ae525d4fd0 100755
--- a/src/ui/graph/CorePowerConsumption.java
+++ b/src/ui/graph/CorePowerConsumption.java
@@ -45,12 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-import vcd.*;
-
 public class CorePowerConsumption  {
     
 	private int nbOfModes;
diff --git a/src/ui/graph/RG.java b/src/ui/graph/RG.java
index b0e7e1993a93a01b6ee2514a77666046f2689d74..4e9ac075d9847f57a52db54799836d8433c7b646 100755
--- a/src/ui/graph/RG.java
+++ b/src/ui/graph/RG.java
@@ -45,11 +45,6 @@
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-
 public class RG {
 
     public String name;
diff --git a/src/ui/graph/VCDGenerator.java b/src/ui/graph/VCDGenerator.java
index 777db440189560a2a8e8c8a1990a2654cab293ea..bfd817ff990274350aa7f01f0e0a303b2bf5adc3 100755
--- a/src/ui/graph/VCDGenerator.java
+++ b/src/ui/graph/VCDGenerator.java
@@ -45,11 +45,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.graph;
 
-import java.util.*;
-import java.io.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import vcd.VCDContent;
+import vcd.VCDTimeChange;
+import vcd.VCDVariable;
 
-import myutil.*;
-import vcd.*;
+import java.util.ArrayList;
 
 public class VCDGenerator  {
     
diff --git a/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java b/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
index 73fe55624bfec40bb2eb8ba9d81088e34dae2ae8..8debc09cb6d491cf7a8149c202325db52095604b 100755
--- a/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
+++ b/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class BenchmarkCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/BusTableModel.java b/src/ui/interactivesimulation/BusTableModel.java
index 18feb4428c83961fb15bff542f6fbd5741a1619f..5ed5d3d7fec3080f18fe61f3859c3309b904d279 100755
--- a/src/ui/interactivesimulation/BusTableModel.java
+++ b/src/ui/interactivesimulation/BusTableModel.java
@@ -46,11 +46,13 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.HwBus;
+import tmltranslator.HwNode;
+import tmltranslator.TMLMapping;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
 
 public class BusTableModel extends AbstractTableModel {
     private TMLMapping tmap;
diff --git a/src/ui/interactivesimulation/CPUTableModel.java b/src/ui/interactivesimulation/CPUTableModel.java
index 7ae4d0fb94e2da368a036b0c3970044a77a6d969..f2c605aef853cf91ddc113f071c0e9ba245df19c 100755
--- a/src/ui/interactivesimulation/CPUTableModel.java
+++ b/src/ui/interactivesimulation/CPUTableModel.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
 import tmltranslator.*;
 
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
+
 public class CPUTableModel extends AbstractTableModel {
 	private TMLMapping tmap;
 	ArrayList<HwExecutionNode> cpus;
diff --git a/src/ui/interactivesimulation/FormalVerificationToolBar.java b/src/ui/interactivesimulation/FormalVerificationToolBar.java
index bab8b09d65cb6b9023aabcb0bbabd30fdd25c321..a2f077c594ca70adf275b2589332e30ced3caff7 100755
--- a/src/ui/interactivesimulation/FormalVerificationToolBar.java
+++ b/src/ui/interactivesimulation/FormalVerificationToolBar.java
@@ -47,11 +47,10 @@
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class FormalVerificationToolBar extends InteractiveSimulationBar {
 
 
diff --git a/src/ui/interactivesimulation/GenericTransaction.java b/src/ui/interactivesimulation/GenericTransaction.java
index 771dfaa6d25ac1394a51056d95252001d7ed2b3c..381409da4fb5e64b9847f688cc1ffc18d93ccd37 100755
--- a/src/ui/interactivesimulation/GenericTransaction.java
+++ b/src/ui/interactivesimulation/GenericTransaction.java
@@ -46,12 +46,6 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
 public class GenericTransaction  {
 
     public final static int NOT_DEFINED = 0;
diff --git a/src/ui/interactivesimulation/InteractiveSimulationActions.java b/src/ui/interactivesimulation/InteractiveSimulationActions.java
index c168e0b906515a3238223193bc2d6ed6822e1600..867c72c98a176d3f7ff19f506e3c65caf4536b3a 100755
--- a/src/ui/interactivesimulation/InteractiveSimulationActions.java
+++ b/src/ui/interactivesimulation/InteractiveSimulationActions.java
@@ -46,14 +46,13 @@
 
 package ui.interactivesimulation;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
+import ui.IconManager;
+import ui.TAction;
 
 import javax.swing.*;
 import javax.swing.event.EventListenerList;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class InteractiveSimulationActions extends AbstractAction {
     // Actions
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index ae8f7d8399d6d400bf198ef0004988720e20d502..e495b38e70c7bad20a0b0e386895bd54860bc688 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -45,91 +45,35 @@
 
 package ui.interactivesimulation;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Vector;
-import java.util.Collections;
-
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSlider;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
-
-import java.util.Date;
-import java.text.*;
-
-import launcher.LauncherException;
-import launcher.RshClient;
-import myutil.Conversion;
-import myutil.GraphicLib;
-import myutil.ScrolledJTextArea;
-import myutil.TableSorter;
-import myutil.TraceManager;
 import remotesimulation.CommandParser;
 import remotesimulation.RemoteConnection;
 import remotesimulation.RemoteConnectionException;
-import tmltranslator.HwA;
-import tmltranslator.HwBus;
-import tmltranslator.HwCPU;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.TMLElement;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLTask;
-import ui.ColorManager;
-import ui.ConfigurationTTool;
-import ui.IconManager;
-import ui.MainGUI;
-import ui.TGComponent;
+import tmltranslator.*;
+import ui.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.List;
 
 public class JFrameInteractiveSimulation extends JFrame implements ActionListener, Runnable, MouseListener, ItemListener, ChangeListener/*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
 
diff --git a/src/ui/interactivesimulation/JFrameSimulationSDPanel.java b/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
index 42a0dc7e335dff65a5f1ae2042d72a2ec9865d67..90bce05ea7803e0bfb47844d454f16a085506588 100755
--- a/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
+++ b/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
@@ -46,27 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 //import java.io.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
 
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import myutil.TraceManager;
+import ui.ColorManager;
+import ui.MainGUI;
 
-import tmltranslator.*; 
-
-import launcher.*;
-import remotesimulation.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
 
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+//import javax.swing.event.*;
 
 
 public	class JFrameSimulationSDPanel extends JFrame implements ActionListener {
diff --git a/src/ui/interactivesimulation/JPanelBreakPoints.java b/src/ui/interactivesimulation/JPanelBreakPoints.java
index f2b07f7230e443b02f579c49a42cfb37ee4b180c..60ac8e339c1ac207eab5ce5b560293a84a707956 100755
--- a/src/ui/interactivesimulation/JPanelBreakPoints.java
+++ b/src/ui/interactivesimulation/JPanelBreakPoints.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public	class JPanelBreakPoints extends JPanel implements ActionListener, ListSelectionListener  {
 	
diff --git a/src/ui/interactivesimulation/JPanelSetVariables.java b/src/ui/interactivesimulation/JPanelSetVariables.java
index 6fb2681fb32e3112d87fc44577d0312212de88de..2d012ad6c350f135d16f6a29be63b8d00b27dc37 100755
--- a/src/ui/interactivesimulation/JPanelSetVariables.java
+++ b/src/ui/interactivesimulation/JPanelSetVariables.java
@@ -46,27 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 //import java.io.*;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
-
-import tmltranslator.*; 
-
-import launcher.*;
-import remotesimulation.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Hashtable;
 
 
 public	class JPanelSetVariables extends JPanel implements ActionListener  {
diff --git a/src/ui/interactivesimulation/JPanelTransactions.java b/src/ui/interactivesimulation/JPanelTransactions.java
index 6c1de9601a7e8249c46923f2de8af42864e9f757..e1eabff2257d6862a9e9240cacda6415765ceb3a 100755
--- a/src/ui/interactivesimulation/JPanelTransactions.java
+++ b/src/ui/interactivesimulation/JPanelTransactions.java
@@ -46,27 +46,12 @@
 package ui.interactivesimulation;
 
 //import java.io.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
 
-import tmltranslator.*;
+import myutil.TableSorter;
 
-import launcher.*;
-import remotesimulation.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 
 public  class JPanelTransactions extends JPanel  {
diff --git a/src/ui/interactivesimulation/JSimulationSDPanel.java b/src/ui/interactivesimulation/JSimulationSDPanel.java
index f069c8142cbc61451389c5c084b4ea7defd9e6dc..694836a0ad2e653d36882727f0af6d3e0b31b643 100644
--- a/src/ui/interactivesimulation/JSimulationSDPanel.java
+++ b/src/ui/interactivesimulation/JSimulationSDPanel.java
@@ -48,19 +48,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.ColorManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
 import java.io.*;
-import java.util.*;
-
-import java.awt.image.*;
-
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import myutil.*;
-import ui.*;
+import java.util.Hashtable;
+import java.util.Vector;
 
 public class JSimulationSDPanel extends JPanel implements MouseMotionListener, Runnable  {
 	
diff --git a/src/ui/interactivesimulation/LatencyTableModel.java b/src/ui/interactivesimulation/LatencyTableModel.java
index 6403531f9c86da2e684b2017073b22ad33389d29..c0b47e90be3c66c155b2f132713d311a506f0f12 100755
--- a/src/ui/interactivesimulation/LatencyTableModel.java
+++ b/src/ui/interactivesimulation/LatencyTableModel.java
@@ -46,11 +46,8 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class LatencyTableModel extends AbstractTableModel {
     private JFrameInteractiveSimulation jfis;
diff --git a/src/ui/interactivesimulation/MainCommandsToolBar.java b/src/ui/interactivesimulation/MainCommandsToolBar.java
index b5bedc78b6211564209fa38224bcaa1aaf4aae97..55076d5592033e0fec260542d4597c86133e2117 100755
--- a/src/ui/interactivesimulation/MainCommandsToolBar.java
+++ b/src/ui/interactivesimulation/MainCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class MainCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/MemTableModel.java b/src/ui/interactivesimulation/MemTableModel.java
index 9243cbc95b3358a989ebade68c5c77d350678619..da0b9dd8011ed1f985b5ee209267bc611130c8f0 100755
--- a/src/ui/interactivesimulation/MemTableModel.java
+++ b/src/ui/interactivesimulation/MemTableModel.java
@@ -46,11 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.HwMemory;
+import tmltranslator.HwNode;
+import tmltranslator.TMLMapping;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
 
 public class MemTableModel extends AbstractTableModel {
 	private TMLMapping tmap;
diff --git a/src/ui/interactivesimulation/SaveCommandsToolBar.java b/src/ui/interactivesimulation/SaveCommandsToolBar.java
index 4a49687d3a4057218568a0b2f518a2794d7323c5..32ece84c9c52846527d6d3c347d2abf03187c599 100755
--- a/src/ui/interactivesimulation/SaveCommandsToolBar.java
+++ b/src/ui/interactivesimulation/SaveCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class SaveCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/SimulationLatency.java b/src/ui/interactivesimulation/SimulationLatency.java
index 6a3e0a2b8bdb36334acd54988916eadf98ad374c..4420e801240a4ac21e31d78ae858f385ae303b07 100644
--- a/src/ui/interactivesimulation/SimulationLatency.java
+++ b/src/ui/interactivesimulation/SimulationLatency.java
@@ -46,12 +46,6 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
 public class SimulationLatency  {
 
     public String trans1;
diff --git a/src/ui/interactivesimulation/SimulationTransaction.java b/src/ui/interactivesimulation/SimulationTransaction.java
index 784ab6e8f3c1338ed5a3f27fbe096ef0b235e1cd..f2880707739db22190c832cb80956b5844000cbc 100755
--- a/src/ui/interactivesimulation/SimulationTransaction.java
+++ b/src/ui/interactivesimulation/SimulationTransaction.java
@@ -46,12 +46,6 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
 public class SimulationTransaction  {
 
     public final static int NODE_TYPE_CPU = 0;
diff --git a/src/ui/interactivesimulation/StateCommandsToolBar.java b/src/ui/interactivesimulation/StateCommandsToolBar.java
index 2f298f2f5846e9c3e2a9caf7375d0971983df607..3e0228f943b19d16275863d60bbdb78a584b1b0d 100755
--- a/src/ui/interactivesimulation/StateCommandsToolBar.java
+++ b/src/ui/interactivesimulation/StateCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.interactivesimulation;
 
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class StateCommandsToolBar extends InteractiveSimulationBar {
     
     
diff --git a/src/ui/interactivesimulation/TaskTableModel.java b/src/ui/interactivesimulation/TaskTableModel.java
index 1f86334b635d424cedef46888ddc97f87b9e0591..11a3a088ab18136b2542f5b5fe564b0e807d32b1 100755
--- a/src/ui/interactivesimulation/TaskTableModel.java
+++ b/src/ui/interactivesimulation/TaskTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Hashtable;
 
 public class TaskTableModel extends AbstractTableModel {
 	private TMLModeling tmlm;
diff --git a/src/ui/interactivesimulation/TaskVariableTableModel.java b/src/ui/interactivesimulation/TaskVariableTableModel.java
index c821905efb7f54fb38578e2e1b896adbdcad7f42..ab73931c3689fa4efe89f7f98c1bae4919064d95 100755
--- a/src/ui/interactivesimulation/TaskVariableTableModel.java
+++ b/src/ui/interactivesimulation/TaskVariableTableModel.java
@@ -46,11 +46,11 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
 
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Hashtable;
 
 public class TaskVariableTableModel extends AbstractTableModel {
     private TMLModeling tmlm;
diff --git a/src/ui/interactivesimulation/TransactionTableModel.java b/src/ui/interactivesimulation/TransactionTableModel.java
index ac1c590ca624cda8f7c927bdb3ae6f2326d02ed7..2587282a37b751fc77248ba860bc2d2ca5e6aeaa 100755
--- a/src/ui/interactivesimulation/TransactionTableModel.java
+++ b/src/ui/interactivesimulation/TransactionTableModel.java
@@ -46,11 +46,8 @@
 
 package ui.interactivesimulation;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
 
 public class TransactionTableModel extends AbstractTableModel {
     private JFrameInteractiveSimulation jfis;
diff --git a/src/ui/iod/IODChoice.java b/src/ui/iod/IODChoice.java
index e89cae1a13080119ecd43037ba85363d7c29c0cb..ab7a4b86a1e0cc3802857cf2ebdf4b8823d8a07f 100755
--- a/src/ui/iod/IODChoice.java
+++ b/src/ui/iod/IODChoice.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class IODChoice extends TGCWithInternalComponent {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/iod/IODJunction.java b/src/ui/iod/IODJunction.java
index 93056ae7b6e86119c5f638fd9eb54a2f173ee03f..9f747fbef2f5630a9acb8afce30a505720bdeee1 100755
--- a/src/ui/iod/IODJunction.java
+++ b/src/ui/iod/IODJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class IODJunction extends TGCWithoutInternalComponent {
 	
diff --git a/src/ui/iod/IODParallel.java b/src/ui/iod/IODParallel.java
index ec45a744726a8ad6337456e697d763e425108a1e..48a317db50d390918fcbefe330ce8193c3993121 100755
--- a/src/ui/iod/IODParallel.java
+++ b/src/ui/iod/IODParallel.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODParallel extends TGCWithoutInternalComponent{
 	private int lineLength = 0;
 	//private int textX, textY;
diff --git a/src/ui/iod/IODPreemption.java b/src/ui/iod/IODPreemption.java
index 8281a902e067b39be3cc6dd4a57f644cb5fff5b7..5299d2eb206b7c2e8a1ec23b8848eda5d0dc4859 100755
--- a/src/ui/iod/IODPreemption.java
+++ b/src/ui/iod/IODPreemption.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODPreemption extends TGCWithoutInternalComponent{
     private int lineLength = 0;
     //private int textX, textY;
diff --git a/src/ui/iod/IODRefIOD.java b/src/ui/iod/IODRefIOD.java
index 3f19360a7df3a006e5cb0d4578a0214164cfc2af..d710bb747e4b98f854f39d18cf6e85e78a5acfe2 100755
--- a/src/ui/iod/IODRefIOD.java
+++ b/src/ui/iod/IODRefIOD.java
@@ -46,14 +46,15 @@
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
 public class IODRefIOD extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/iod/IODRefSD.java b/src/ui/iod/IODRefSD.java
index f213ced949796309f9cdb43c9813053b2d1a4ed9..980850fe156401599e0276aa2e9754b99e1dd350 100755
--- a/src/ui/iod/IODRefSD.java
+++ b/src/ui/iod/IODRefSD.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
 public class IODRefSD extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/iod/IODSequence.java b/src/ui/iod/IODSequence.java
index 86087c5ba3ac9a1eebed294e218811e26288711b..1ffefbdbbb2d5bc19ed18d0af9f95fed72b26631 100755
--- a/src/ui/iod/IODSequence.java
+++ b/src/ui/iod/IODSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODSequence extends TGCWithoutInternalComponent{
     private int lineLength = 0;
     //private int textX, textY;
diff --git a/src/ui/iod/IODStartState.java b/src/ui/iod/IODStartState.java
index 93a2fc5f7f76647321cb46b38d6cb7baca695c0f..10ec9c13e74c25d6f91eeedee9abe12059e73ddd 100755
--- a/src/ui/iod/IODStartState.java
+++ b/src/ui/iod/IODStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class IODStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/iod/IODStopState.java b/src/ui/iod/IODStopState.java
index e34d4a3a724f9a7d94ecf160f72d4120ec148dd8..1543b87dca8904c3ca8d37205219a2b41c204b9f 100755
--- a/src/ui/iod/IODStopState.java
+++ b/src/ui/iod/IODStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.iod;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class IODStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/iod/InteractionOverviewDiagramPanel.java b/src/ui/iod/InteractionOverviewDiagramPanel.java
index 2997de2f10f3051794d6ca1687ecacb3a23ee1ab..690db273b3042896470fb6350068134cfb5c6c61 100755
--- a/src/ui/iod/InteractionOverviewDiagramPanel.java
+++ b/src/ui/iod/InteractionOverviewDiagramPanel.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 public class InteractionOverviewDiagramPanel extends TDiagramPanel {
     
     public  InteractionOverviewDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/iod/InteractionOverviewDiagramToolBar.java b/src/ui/iod/InteractionOverviewDiagramToolBar.java
index 484b2ee82331aceaf07244453f647ea1462fb81f..8025bc4abd007f799cf3c84492e3aefd45756617 100755
--- a/src/ui/iod/InteractionOverviewDiagramToolBar.java
+++ b/src/ui/iod/InteractionOverviewDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class InteractionOverviewDiagramToolBar extends TToolBar {
     
     public InteractionOverviewDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/iod/TGConnectingPointIOD.java b/src/ui/iod/TGConnectingPointIOD.java
index 7f125789b34bef2937019f2a5e64d44c0c704a66..cd1449104a79e8d90085e1ce0957f44a5d9514cb 100755
--- a/src/ui/iod/TGConnectingPointIOD.java
+++ b/src/ui/iod/TGConnectingPointIOD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.iod;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointIOD extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/iod/TGConnectorInteraction.java b/src/ui/iod/TGConnectorInteraction.java
index 8adc10a3163d7e8d422df65f06d182c30bcc2b9b..3685d317c80d6c8ae325838ee2b39e82d62b66c2 100755
--- a/src/ui/iod/TGConnectorInteraction.java
+++ b/src/ui/iod/TGConnectorInteraction.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.iod;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorInteraction extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/ncdd/NCConnectorNode.java b/src/ui/ncdd/NCConnectorNode.java
index 29b87c14a99ae5b3f2c8cef2ee75e30d8f376c9d..0bc21562581b6d93b6e48afd9d5ef7744b19464f 100755
--- a/src/ui/ncdd/NCConnectorNode.java
+++ b/src/ui/ncdd/NCConnectorNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogLinkNCNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public  class NCConnectorNode extends TGConnector implements WithAttributes {
     protected int arrowLength = 10;
diff --git a/src/ui/ncdd/NCDiagramPanel.java b/src/ui/ncdd/NCDiagramPanel.java
index 43192c7a23d49ed9ca342b7289020ecf9e5d8fa5..039dcdbae5863c0fcdc19aff77fef89073b8ca7a 100755
--- a/src/ui/ncdd/NCDiagramPanel.java
+++ b/src/ui/ncdd/NCDiagramPanel.java
@@ -47,11 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ncdd;
 
 
-import org.w3c.dom.*;
-import java.util.*;
-
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.ListIterator;
+
 public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
 	
     public  NCDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ncdd/NCDiagramToolBar.java b/src/ui/ncdd/NCDiagramToolBar.java
index 018a345a1d2acf26601c146e3ea2d548d4c58027..af993c5c0997abdd215a47a00d702ebadd9defe3 100755
--- a/src/ui/ncdd/NCDiagramToolBar.java
+++ b/src/ui/ncdd/NCDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class NCDiagramToolBar extends TToolBar {
     
     public NCDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/ncdd/NCEqNode.java b/src/ui/ncdd/NCEqNode.java
index 4f22a9f71786ccf8b6aa1e0fcc8d56449303bb46..8492abf71fdb0535d766cc770a36a2f6cd887a21 100755
--- a/src/ui/ncdd/NCEqNode.java
+++ b/src/ui/ncdd/NCEqNode.java
@@ -46,13 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCEqNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class NCEqNode extends TGCWithInternalComponent implements SwallowTGComponent/*, WithAttributes*/ {
diff --git a/src/ui/ncdd/NCNodeConnectingPoint.java b/src/ui/ncdd/NCNodeConnectingPoint.java
index 3ba4ba2c6647f988443790c869f9722ccf34c082..98e443e76354ffbe254f3e74f729d4a0ed789c39 100755
--- a/src/ui/ncdd/NCNodeConnectingPoint.java
+++ b/src/ui/ncdd/NCNodeConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ncdd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class NCNodeConnectingPoint extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/ncdd/NCRoute.java b/src/ui/ncdd/NCRoute.java
index f3f9ca5c30588b02740f6f1b60873dc82e32112d..a9c9c86d3583bac8f02695c85836b2a33a58711d 100755
--- a/src/ui/ncdd/NCRoute.java
+++ b/src/ui/ncdd/NCRoute.java
@@ -46,17 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-
 public class NCRoute {
     public String inputInterface = "";
 	public String traffic = "";
diff --git a/src/ui/ncdd/NCRouteArtifact.java b/src/ui/ncdd/NCRouteArtifact.java
index 4b00e9c96e856ab31beb2ca2d8941f2bca377802..bee7b1e97cee834d9e2109508781d401a7c14fa7 100755
--- a/src/ui/ncdd/NCRouteArtifact.java
+++ b/src/ui/ncdd/NCRouteArtifact.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCRoute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public class NCRouteArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
 	protected int lineLength = 5;
diff --git a/src/ui/ncdd/NCSwitchNode.java b/src/ui/ncdd/NCSwitchNode.java
index 63b2a6695434215cfafb2111dbd173355947f474..74052e6ebef2c93f7cdd5db2688426ebad71a077 100755
--- a/src/ui/ncdd/NCSwitchNode.java
+++ b/src/ui/ncdd/NCSwitchNode.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCSwitchNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class NCSwitchNode extends TGCWithInternalComponent implements SwallowTGComponent, WithAttributes {
diff --git a/src/ui/ncdd/NCTrafficArtifact.java b/src/ui/ncdd/NCTrafficArtifact.java
index 8fa43ce15d030b4452aa1b19d35bcfd9007167c5..e90e497c0bcfbadd5c1f188a0120d8aaa31471e5 100755
--- a/src/ui/ncdd/NCTrafficArtifact.java
+++ b/src/ui/ncdd/NCTrafficArtifact.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ncdd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCTraffic;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class NCTrafficArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
     protected int lineLength = 5;
diff --git a/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java b/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
index 96213d3cc6b6e57ea866deb5bac83c743abae5fc..ec9dbfd5379e8d1b9868bf4986c6d58106e9d4c9 100644
--- a/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
+++ b/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
@@ -47,16 +47,19 @@
 
 package ui.networkmodelloader;
 
+import myutil.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.JTextAreaWriter;
+import ui.MainGUI;
+
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
 import java.io.File;
-import java.util.*;
-import javax.swing.*;
-import java.net.*;
-import java.io.*;
-
-import ui.*;
-import myutil.*;
+import java.util.ArrayList;
 
 public class JDialogLoadingNetworkModel extends javax.swing.JFrame implements ActionListener, Runnable, LoaderFacilityInterface, CallbackLoaderInterface  {
 
diff --git a/src/ui/networkmodelloader/NetworkModel.java b/src/ui/networkmodelloader/NetworkModel.java
index d91fbabb4565c70fd8e7b3cd5df6f40c0d3dd4ac..35d3b83efc4872da37bedd5a3d83d1ea7ed5bb11 100644
--- a/src/ui/networkmodelloader/NetworkModel.java
+++ b/src/ui/networkmodelloader/NetworkModel.java
@@ -47,9 +47,7 @@
 
 package ui.networkmodelloader;
 
-import javax.swing.*;
-import java.io.File;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 
 
 public class NetworkModel  {
diff --git a/src/ui/networkmodelloader/NetworkModelPanel.java b/src/ui/networkmodelloader/NetworkModelPanel.java
index b8d0ad0c08c33424f2f20f3bca2efa0e60526586..bc3509a214911e4c6b194546e643c459b492c805 100644
--- a/src/ui/networkmodelloader/NetworkModelPanel.java
+++ b/src/ui/networkmodelloader/NetworkModelPanel.java
@@ -47,15 +47,20 @@
 
 package ui.networkmodelloader;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import java.util.*;
+import myutil.GraphicLib;
+import myutil.ImageManager;
+import myutil.LoaderFacilityInterface;
+import myutil.TraceManager;
+import ui.ColorManager;
 
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import javax.swing.border.BevelBorder;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.ArrayList;
 
 
 
diff --git a/src/ui/osad/TOSADActionState.java b/src/ui/osad/TOSADActionState.java
index 6d65f9bcdaf333d6e6f0600d6e290faab7e88545..f607c5a3a427ca170d081f7c37e002e0966d7156 100755
--- a/src/ui/osad/TOSADActionState.java
+++ b/src/ui/osad/TOSADActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADActionState extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/osad/TOSADChoice.java b/src/ui/osad/TOSADChoice.java
index 2c05c57606d2af3ebd7ff418c5febdc4bcc33eba..713114fa103663ddab96ea00e75ecedbc04c6aef 100755
--- a/src/ui/osad/TOSADChoice.java
+++ b/src/ui/osad/TOSADChoice.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADChoice extends TGCWithInternalComponent{
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/osad/TOSADConnectingPoint.java b/src/ui/osad/TOSADConnectingPoint.java
index c4ed8c516755d4c856689e4a59e54880b36273af..ff90020a47a5b34a070dbb2579a2dc1cfe0b275b 100755
--- a/src/ui/osad/TOSADConnectingPoint.java
+++ b/src/ui/osad/TOSADConnectingPoint.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.osad;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TOSADConnectingPoint extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/osad/TOSADConnector.java b/src/ui/osad/TOSADConnector.java
index f6002a65bb5e176dabbbba4330795727b6a5fad6..256d3003136a9c61d17a7eadcf95bbe1655d94df 100755
--- a/src/ui/osad/TOSADConnector.java
+++ b/src/ui/osad/TOSADConnector.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TOSADConnector extends TGConnector implements TGConnectorBetweenElementsInterface {
     protected int arrowLength = 10;
     
diff --git a/src/ui/osad/TOSADIntTimeInterval.java b/src/ui/osad/TOSADIntTimeInterval.java
index 6522dac62f299b06506a0678f53244264732da44..a24170cbb1e35901d968e605701d59aa13b115cd 100755
--- a/src/ui/osad/TOSADIntTimeInterval.java
+++ b/src/ui/osad/TOSADIntTimeInterval.java
@@ -46,9 +46,12 @@
 
 package ui.osad;
 
-import java.awt.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
-import ui.*;
+import java.awt.*;
 
 public class TOSADIntTimeInterval extends TOSADTimeInterval {
     private int lineLength = 5;
diff --git a/src/ui/osad/TOSADJunction.java b/src/ui/osad/TOSADJunction.java
index ad588026aad9b9ffba5555ea95aae1f453dcd9d5..042701db5c69d33e824dae53666e614f04e25dec 100755
--- a/src/ui/osad/TOSADJunction.java
+++ b/src/ui/osad/TOSADJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.osad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TOSADJunction extends TGCWithoutInternalComponent {
 	
diff --git a/src/ui/osad/TOSADStartState.java b/src/ui/osad/TOSADStartState.java
index c7c8f8c01db9753dea056caad5325a6f385b91b5..dc7b7086227c8c20ffe4f8f157e93ca187bda1a2 100755
--- a/src/ui/osad/TOSADStartState.java
+++ b/src/ui/osad/TOSADStartState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/osad/TOSADStopState.java b/src/ui/osad/TOSADStopState.java
index 36bd58ae8707fab2087fa19d7919427cf43e2962..2a871495587812a4cc778ad0e1b90d1889ce9678 100755
--- a/src/ui/osad/TOSADStopState.java
+++ b/src/ui/osad/TOSADStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/osad/TOSADTimeInterval.java b/src/ui/osad/TOSADTimeInterval.java
index 4d7b3c7a09379d647ce0e7157879a856e6e8a35d..e12b68ff710e6fdc74b21e82c250579c5ede3c9f 100755
--- a/src/ui/osad/TOSADTimeInterval.java
+++ b/src/ui/osad/TOSADTimeInterval.java
@@ -46,11 +46,11 @@
 
 package ui.osad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSADTimeInterval extends TGCWithInternalComponent {
     private int lineLength = 5;
     private int textX, textY;
diff --git a/src/ui/osad/TURTLEOSActivityDiagramToolBar.java b/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
index d09d7d2056a1d13a0576902199aa24d881d2cdf6..d0684c06c70798d26926323b8ccd82147ba85747 100755
--- a/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
+++ b/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.osad;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TURTLEOSActivityDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/oscd/TGCTOSAttributeBox.java b/src/ui/oscd/TGCTOSAttributeBox.java
index d7de567256ec6ace2bdae928234ea00d0adad893..85322bb0c86f7e233cceb2243db17da9c2272b1d 100755
--- a/src/ui/oscd/TGCTOSAttributeBox.java
+++ b/src/ui/oscd/TGCTOSAttributeBox.java
@@ -54,7 +54,10 @@ package ui.oscd;
 
 //import myutil.*;
 
-import ui.*;
+import ui.TDiagramPanel;
+import ui.TGCAttributeBox;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
 
 //import ui.window.*;
 
diff --git a/src/ui/oscd/TGConnectingPointTOSAssociation.java b/src/ui/oscd/TGConnectingPointTOSAssociation.java
index 23f67db93dc771f40ca0eed8d7d749607c52b363..4c73765da8323c73999cb01126fd6d50b655deee 100755
--- a/src/ui/oscd/TGConnectingPointTOSAssociation.java
+++ b/src/ui/oscd/TGConnectingPointTOSAssociation.java
@@ -48,7 +48,9 @@ package ui.oscd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointTOSAssociation extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/oscd/TGConnectingPointTOSClasses.java b/src/ui/oscd/TGConnectingPointTOSClasses.java
index 2689f5acb369509caf9cdde92ffea9f360b81044..8726ecc870552c50003a199de50200948cd7fc48 100755
--- a/src/ui/oscd/TGConnectingPointTOSClasses.java
+++ b/src/ui/oscd/TGConnectingPointTOSClasses.java
@@ -48,7 +48,9 @@ package ui.oscd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTOSClasses extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java b/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
index 43f65bccfcdbe7edda22303e9320f36c46c27b33..9a7faaa892c7c71662f7235508413a0f851a0ac3 100755
--- a/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
+++ b/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
@@ -48,7 +48,9 @@ package ui.oscd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTOSCompositionOperator extends  TGConnectingPoint{
     
diff --git a/src/ui/oscd/TOSCDActivityDiagramBox.java b/src/ui/oscd/TOSCDActivityDiagramBox.java
index 78f2e36b1ec500ef5c352122e6d3d2712f811918..9f0afd8a7c782cb3effbd3bf1164eae0c4ce558f 100755
--- a/src/ui/oscd/TOSCDActivityDiagramBox.java
+++ b/src/ui/oscd/TOSCDActivityDiagramBox.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSCDActivityDiagramBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/oscd/TOSCDAttributeBox.java b/src/ui/oscd/TOSCDAttributeBox.java
index d950153535e2893a97af31f4319f2421c2dc9d92..d73f066010411cd0840341fe347bab3e9a78c8e4 100755
--- a/src/ui/oscd/TOSCDAttributeBox.java
+++ b/src/ui/oscd/TOSCDAttributeBox.java
@@ -48,7 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TOSCDAttributeBox extends TGCAttributeBox {
     
diff --git a/src/ui/oscd/TOSCDAttributeGateBox.java b/src/ui/oscd/TOSCDAttributeGateBox.java
index 3a1a7cede81a034cb79e01fc9403ac2d157e830d..b225f6753e7dc3ccb317de81df498e8831dc5739 100755
--- a/src/ui/oscd/TOSCDAttributeGateBox.java
+++ b/src/ui/oscd/TOSCDAttributeGateBox.java
@@ -52,8 +52,9 @@ package ui.oscd;
 //import java.util.*;
 
 //import myutil.*;
+
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
 
 public class TOSCDAttributeGateBox extends TGCAttributeBox {
     
diff --git a/src/ui/oscd/TOSCDOperationBox.java b/src/ui/oscd/TOSCDOperationBox.java
index 8a658120628fe8c7e42ece00201acbfa56c97649..ecb082aceda8d90acfeda74b50be717d9af93acc 100755
--- a/src/ui/oscd/TOSCDOperationBox.java
+++ b/src/ui/oscd/TOSCDOperationBox.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.oscd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TOSCDOperationBox extends TGCWithoutInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/oscd/TOSCallInfo.java b/src/ui/oscd/TOSCallInfo.java
index c2a86fbed0e872402bc93d8de62a73d6eb82196b..d1f2b946e00509cb6bdfacb9e85fe43b43899e1e 100755
--- a/src/ui/oscd/TOSCallInfo.java
+++ b/src/ui/oscd/TOSCallInfo.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TOSCallInfo extends TGCWithoutInternalComponent{
     
diff --git a/src/ui/oscd/TOSCallOperator.java b/src/ui/oscd/TOSCallOperator.java
index 002956d0d4827364f6f1e98815c6876bd9f4d6c4..18095c4acbafbe859d8cff90a36b14f1a802e56b 100755
--- a/src/ui/oscd/TOSCallOperator.java
+++ b/src/ui/oscd/TOSCallOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TOSCallOperator extends TOSCompositionOperator {
 
     public TOSCallOperator(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/oscd/TOSClass.java b/src/ui/oscd/TOSClass.java
index 0f1b6efc4341dedc1e085bbccdf2df1277c7e876..3b0da239fc447e0ea5e8a700e8e4e68d71d81d2e 100755
--- a/src/ui/oscd/TOSClass.java
+++ b/src/ui/oscd/TOSClass.java
@@ -47,17 +47,19 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.osad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.window.JDialogTOSClass;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TOSClass extends TGCWithInternalComponent implements TClassInterface {
     public String oldValue;
diff --git a/src/ui/oscd/TOSCompositionOperator.java b/src/ui/oscd/TOSCompositionOperator.java
index ca8a34acbe0fd927cd752a1b5ffd19f29f811893..228d6d750633c84315788a42ba392afb9ea77cce 100755
--- a/src/ui/oscd/TOSCompositionOperator.java
+++ b/src/ui/oscd/TOSCompositionOperator.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.oscd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TOSCompositionOperator extends TGCWithInternalComponent {
 	public String oldValue;
 	protected int textX = 5;
diff --git a/src/ui/oscd/TOSConnectorAssociation.java b/src/ui/oscd/TOSConnectorAssociation.java
index ff04ff33964f577ce1ee2fd744b0c5b8798a996d..3101db0c343d5fcc12b5d83aa93a924bae22a6c4 100755
--- a/src/ui/oscd/TOSConnectorAssociation.java
+++ b/src/ui/oscd/TOSConnectorAssociation.java
@@ -46,14 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
+//import java.awt.geom.*;
 //import myutil.*;
 
-import ui.*;
-
 public  class TOSConnectorAssociation extends TGConnector {
 	protected TGConnectingPointGroup tg;
 
diff --git a/src/ui/oscd/TOSConnectorAssociationWithNavigation.java b/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
index 9fe65ea78dbbe48c91d8b00c0059a42aeea2bfd1..ac2508ea6a98a334823e8c3f6b7d196560d212aa 100755
--- a/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
+++ b/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.oscd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TOSConnectorAssociationWithNavigation extends TOSConnectorAssociation {
 	protected int arrowLength = 15;
diff --git a/src/ui/oscd/TOSConnectorCompositionOperator.java b/src/ui/oscd/TOSConnectorCompositionOperator.java
index 06307c37a0c51e86f53877b18407588d4b05f0be..8c2ce7a2711fdce3b513377063a83df8cfc06798 100755
--- a/src/ui/oscd/TOSConnectorCompositionOperator.java
+++ b/src/ui/oscd/TOSConnectorCompositionOperator.java
@@ -46,12 +46,13 @@
 
 package ui.oscd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TOSConnectorCompositionOperator extends TGConnector {
     
diff --git a/src/ui/oscd/TOSEvtInfo.java b/src/ui/oscd/TOSEvtInfo.java
index 97d1fe2b34d790f193487d0efa029824da3a358e..c97002a49ecaedf685b6cb13568d85e3ed3f5101 100755
--- a/src/ui/oscd/TOSEvtInfo.java
+++ b/src/ui/oscd/TOSEvtInfo.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class TOSEvtInfo extends TGCWithoutInternalComponent{
     
diff --git a/src/ui/oscd/TOSEvtOperator.java b/src/ui/oscd/TOSEvtOperator.java
index c18c2a750b8167c7cb7efb0291a3c1d57255b052..7317f1d1f5a72ccb05a3a54acdda00c1384495a2 100755
--- a/src/ui/oscd/TOSEvtOperator.java
+++ b/src/ui/oscd/TOSEvtOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
-import java.awt.*;
-
-
 import ui.*;
 
+import java.awt.*;
+
 public class TOSEvtOperator extends TOSCompositionOperator {
 
     public TOSEvtOperator(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/oscd/TURTLEOSClassDiagramPanel.java b/src/ui/oscd/TURTLEOSClassDiagramPanel.java
index b431b81cbe61011aee6ad376eda9c4a98e564711..0349dffb5b2c4da370d812fc4052d3ae7f50dee8 100755
--- a/src/ui/oscd/TURTLEOSClassDiagramPanel.java
+++ b/src/ui/oscd/TURTLEOSClassDiagramPanel.java
@@ -47,14 +47,16 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.oscd;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class TURTLEOSClassDiagramPanel extends TDiagramPanel implements ClassDiagramPanelInterface {
     
     public TURTLEOSClassDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/oscd/TURTLEOSClassDiagramToolBar.java b/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
index 898b5889a17275918d96693d9a66309e2ee03bb9..2e37ec54d3d15013be7bee12af472b820c1bbc18 100755
--- a/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
+++ b/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.oscd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TURTLEOSClassDiagramToolBar extends TToolBar {
     
     public TURTLEOSClassDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/procsd/JDialogAttributeProCSD.java b/src/ui/procsd/JDialogAttributeProCSD.java
index fc2cb4245e34298b12bb5e687654e7ad79e09cf8..78106fbd37c9b7ebcbeceea9f611ce0bb33f606c 100644
--- a/src/ui/procsd/JDialogAttributeProCSD.java
+++ b/src/ui/procsd/JDialogAttributeProCSD.java
@@ -46,13 +46,16 @@
 
 package ui.procsd;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogAttributeProCSD extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java b/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
index 43f01e1bb2107ade90e65b02a9c1c362db860a36..ec6db1b8202a3ee743ba87a150b2b837bacb40d1 100644
--- a/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
+++ b/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
@@ -1,10 +1,10 @@
 package ui.procsd;
 
-import java.util.Vector;
-
 import ui.MainGUI;
 import ui.TToolBar;
 
+import java.util.Vector;
+
 public class ProActiveCompSpecificationCSDPanel extends ProactiveCSDPanel{
 
 	/*
diff --git a/src/ui/procsd/ProCSDComponent.java b/src/ui/procsd/ProCSDComponent.java
index 8cc762dff569a61899e1422089918212364dbabe..e67c8c770c8843679e3ec76fa2bc469dc36b09c1 100755
--- a/src/ui/procsd/ProCSDComponent.java
+++ b/src/ui/procsd/ProCSDComponent.java
@@ -46,25 +46,25 @@
 
 package ui.procsd;
 
-import java.awt.*;
-import java.util.*;
-import java.util.List;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-
 import ui.prosmd.ProSMDStartState;
 import ui.prosmd.ProSMDStopState;
 import ui.prosmd.ProSMDSubmachine;
 import ui.prosmd.ProactiveSMDPanel;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
 
 public class ProCSDComponent extends TGCWithInternalComponent implements
 		SwallowTGComponent, SwallowedTGComponent, ActionListener {
diff --git a/src/ui/procsd/ProCSDDelegatePort.java b/src/ui/procsd/ProCSDDelegatePort.java
index d5e6e3699b7d3ae4db84be845ff76db245d49be3..26cd430ea1b3cdda12b37574aa1d96e94b6b46db 100644
--- a/src/ui/procsd/ProCSDDelegatePort.java
+++ b/src/ui/procsd/ProCSDDelegatePort.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
 
 public class ProCSDDelegatePort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
    // private int textY1 = 15;
diff --git a/src/ui/procsd/ProCSDInPort.java b/src/ui/procsd/ProCSDInPort.java
index 742f38275d4ab8f9a8a63d5abdea99f513f015f3..62d6c0167aadaccd18b88221dc11fad8ed60396d 100644
--- a/src/ui/procsd/ProCSDInPort.java
+++ b/src/ui/procsd/ProCSDInPort.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import myutil.*;
-import ui.*;
 
 
 public class ProCSDInPort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
diff --git a/src/ui/procsd/ProCSDInterface.java b/src/ui/procsd/ProCSDInterface.java
index 6da463049e384c5e83b0464bf500d9a8e5544dd1..088e78f08b84285aa3184c17ff7c8bfb5bfdb3eb 100644
--- a/src/ui/procsd/ProCSDInterface.java
+++ b/src/ui/procsd/ProCSDInterface.java
@@ -44,30 +44,21 @@
  * @see
  */
 package ui.procsd;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-
-
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
 
+import myutil.GraphicLib;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import ui.*;
+import ui.cd.TCDCompositionOperator;
+import ui.cd.TCDTClass;
 
-import myutil.GraphicLib;
-
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Collection;
 import java.util.LinkedList;
-import ui.cd.TCDCompositionOperator;
-import ui.cd.TCDTClass;
-import ui.*;
 
 public class ProCSDInterface extends TCDCompositionOperator implements  ActionListener {
     
diff --git a/src/ui/procsd/ProCSDOutPort.java b/src/ui/procsd/ProCSDOutPort.java
index 6c79dfada495590b8824f8cdead3be2db21b874e..eada46f90d4f6b9820fc9f13897db5f59758f926 100644
--- a/src/ui/procsd/ProCSDOutPort.java
+++ b/src/ui/procsd/ProCSDOutPort.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import myutil.*;
-import ui.*;
 
 public class ProCSDOutPort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
    // private int textY1 = 15;
diff --git a/src/ui/procsd/ProCSDPort.java b/src/ui/procsd/ProCSDPort.java
index 96baabad19a49d474f1ab8f2e0ca47280de792ba..a208e6652789944125d58a12f6bedd20c59b8d1f 100644
--- a/src/ui/procsd/ProCSDPort.java
+++ b/src/ui/procsd/ProCSDPort.java
@@ -47,30 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGCWithoutInternalComponent;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnectorAttribute;
-
-import java.awt.Point;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.lang.reflect.Method;
-import java.util.Vector;
-import ui.TAttribute;
 import java.util.List;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import java.util.Vector;
 
 public abstract class ProCSDPort  extends TGCWithoutInternalComponent implements ActionListener {
 
diff --git a/src/ui/procsd/ProactiveCSDPanel.java b/src/ui/procsd/ProactiveCSDPanel.java
index 4e1e8e4e04d4027f3c44faf823a4ee3b3b96cdc9..a747dd3ac0afc9f51670c07a24eae94705f70932 100755
--- a/src/ui/procsd/ProactiveCSDPanel.java
+++ b/src/ui/procsd/ProactiveCSDPanel.java
@@ -46,13 +46,13 @@
 
 package ui.procsd;
 
+import ui.*;
+
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.*;
-
-import javax.swing.JMenuItem;
-
-import ui.*;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class ProactiveCSDPanel extends TDiagramPanel implements ActionListener {
     public static int NORMAL_FONT=1;
diff --git a/src/ui/procsd/ProactiveCSDToolBar.java b/src/ui/procsd/ProactiveCSDToolBar.java
index bc3ba46def2847002892e889bc62022f7fb853ef..9fcce872c29f5683a2d7ece35cbf87c94d07583f 100755
--- a/src/ui/procsd/ProactiveCSDToolBar.java
+++ b/src/ui/procsd/ProactiveCSDToolBar.java
@@ -46,9 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
-import javax.swing.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class ProactiveCSDToolBar extends TToolBar {
     
diff --git a/src/ui/procsd/TGConnectingPointAssociationProCSD.java b/src/ui/procsd/TGConnectingPointAssociationProCSD.java
index 04c975421f0b453ce65a500770b187e5dc439203..aff90b80e48b43506b07040598e20c3ccd33e525 100755
--- a/src/ui/procsd/TGConnectingPointAssociationProCSD.java
+++ b/src/ui/procsd/TGConnectingPointAssociationProCSD.java
@@ -48,7 +48,8 @@ package ui.procsd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointAssociationProCSD extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/procsd/TGConnectingPointProCSD.java b/src/ui/procsd/TGConnectingPointProCSD.java
index 734b171651f6aebe76bfee780168822e0258cafb..91efeaf2c07ca16209978982dd9580b48a752dc9 100644
--- a/src/ui/procsd/TGConnectingPointProCSD.java
+++ b/src/ui/procsd/TGConnectingPointProCSD.java
@@ -47,7 +47,10 @@
 package ui.procsd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponent;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointProCSD extends  TGConnectingPointWidthHeight{
     private TGComponent myOwnerComp;
diff --git a/src/ui/procsd/TGConnectorAssociationProCSD.java b/src/ui/procsd/TGConnectorAssociationProCSD.java
index 7aa44aa11ae9610139532d4b93864ce0ef0655a5..75b8dc526023ad9b1dd2dc5783fdced15be051d4 100644
--- a/src/ui/procsd/TGConnectorAssociationProCSD.java
+++ b/src/ui/procsd/TGConnectorAssociationProCSD.java
@@ -45,15 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
  */
  
 package ui.procsd;
-  
+
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
+//import java.awt.geom.*;
 //import myutil.*;
 
-import ui.*;
-
 public  class TGConnectorAssociationProCSD extends TGConnector {
 	protected TGConnectingPointGroup tg;
 	// Added by Solange
diff --git a/src/ui/procsd/TGConnectorDelegateProCSD.java b/src/ui/procsd/TGConnectorDelegateProCSD.java
index 4ab22ac293003a1c32ef138b925ab10c98ad5949..896fde9a48137bb0a5088267df3e154d44f2fc5f 100644
--- a/src/ui/procsd/TGConnectorDelegateProCSD.java
+++ b/src/ui/procsd/TGConnectorDelegateProCSD.java
@@ -51,13 +51,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.cd.TGConnectorAssociation;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorDelegateProCSD extends TGConnectorProCSD {
     protected int arrowLength = 10;
diff --git a/src/ui/procsd/TGConnectorPortInterface.java b/src/ui/procsd/TGConnectorPortInterface.java
index 516441b25fa2aa553f62993b05b778bcb1e6683f..2a1b046fa0a0b2644bb5967c57cf7a904b45702d 100644
--- a/src/ui/procsd/TGConnectorPortInterface.java
+++ b/src/ui/procsd/TGConnectorPortInterface.java
@@ -1,18 +1,12 @@
 package ui.procsd;
 
-import java.awt.Point;
-import java.util.Vector;
-
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import ui.*;
 
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnectorAttribute;
+import java.awt.*;
+import java.util.Vector;
 
 public class TGConnectorPortInterface extends TGConnectorAttribute{
 
diff --git a/src/ui/procsd/TGConnectorProCSD.java b/src/ui/procsd/TGConnectorProCSD.java
index 12b8ca574a4cfafd3d15f340f9c050d7a47bdeb9..a4b6dd743cff6b27ea11fbd6f31d9cff51b1e333 100644
--- a/src/ui/procsd/TGConnectorProCSD.java
+++ b/src/ui/procsd/TGConnectorProCSD.java
@@ -51,17 +51,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.procsd;
 
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.geom.*;
-import java.util.*;
-
-import javax.swing.JPopupMenu;
-
-import myutil.*;
-import ui.*;
-import ui.cd.TGConnectorAssociation;
+import java.util.Vector;
 
 //this is a binding 
 //from a port to another port
diff --git a/src/ui/prosmd/ProSMDAction.java b/src/ui/prosmd/ProSMDAction.java
index 0e9ead789edf2aed99233d3d041cdcb4661e93aa..b05b00ebd734727511bf475e88e09ec911872ade 100644
--- a/src/ui/prosmd/ProSMDAction.java
+++ b/src/ui/prosmd/ProSMDAction.java
@@ -46,16 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
 
 public class   ProSMDAction extends TGCOneLineText {
     protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDChoice.java b/src/ui/prosmd/ProSMDChoice.java
index 1b35b976ccd42ac3745375f85e57eb08601a7158..e6938e02c8e139bf166f980238123ad67d637033 100644
--- a/src/ui/prosmd/ProSMDChoice.java
+++ b/src/ui/prosmd/ProSMDChoice.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.ad.TGConnectingPointAD;
-import ui.window.*;
+
+import java.awt.*;
 
 public class ProSMDChoice extends TGCWithInternalComponent {
     protected int lineLength = 0;
diff --git a/src/ui/prosmd/ProSMDGetMsg.java b/src/ui/prosmd/ProSMDGetMsg.java
index 87245fac8e8d54393e7bfc6a68ddc29bb78c0aff..41e758b0827dd86bb56d00bfce339b7fd7b7e35e 100755
--- a/src/ui/prosmd/ProSMDGetMsg.java
+++ b/src/ui/prosmd/ProSMDGetMsg.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class ProSMDGetMsg extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/prosmd/ProSMDJunction.java b/src/ui/prosmd/ProSMDJunction.java
index d5ef0ada19fd67f1291b2afda290648b62d1315f..98576d802d223c0f85ba584465ed2dc8ce70d065 100644
--- a/src/ui/prosmd/ProSMDJunction.java
+++ b/src/ui/prosmd/ProSMDJunction.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.ad.TGConnectingPointAD;
-import ui.window.*;
+
+import java.awt.*;
 
 public class ProSMDJunction extends TGCWithoutInternalComponent {
     protected int lineLength = 10;
diff --git a/src/ui/prosmd/ProSMDParallel.java b/src/ui/prosmd/ProSMDParallel.java
index 91af2528af9b0ab5f32c867d188d9ffdfd2438c8..255ff64517a5b6d43e36ad74c53ff58f82209ca7 100644
--- a/src/ui/prosmd/ProSMDParallel.java
+++ b/src/ui/prosmd/ProSMDParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class ProSMDParallel extends TGCWithInternalComponent{
     private int lineLength = 0;
     private int textX, textY;
diff --git a/src/ui/prosmd/ProSMDSendMsg.java b/src/ui/prosmd/ProSMDSendMsg.java
index 9286354e47063d3c0c3ecc6c7325bfbcd0b0eb3e..3ac3656625c025744a980a8dc6210289a08475a7 100755
--- a/src/ui/prosmd/ProSMDSendMsg.java
+++ b/src/ui/prosmd/ProSMDSendMsg.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class ProSMDSendMsg extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/prosmd/ProSMDStartState.java b/src/ui/prosmd/ProSMDStartState.java
index 0b5b9652b6d433179b6b1903c2387bfab96181db..72e5649c5b7b605bbf507c45b54323c82eb34002 100755
--- a/src/ui/prosmd/ProSMDStartState.java
+++ b/src/ui/prosmd/ProSMDStartState.java
@@ -46,11 +46,11 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class ProSMDStartState extends TGCWithoutInternalComponent{
     private int lineLength = 5;
     
diff --git a/src/ui/prosmd/ProSMDState.java b/src/ui/prosmd/ProSMDState.java
index ef8c5a8bc329c5799bea53d9be448aee86217592..5ea204d1a1405c491208e5d0021bea34f0d73e7c 100644
--- a/src/ui/prosmd/ProSMDState.java
+++ b/src/ui/prosmd/ProSMDState.java
@@ -46,16 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
 
 public class ProSMDState extends TGCOneLineText {
     protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDStopState.java b/src/ui/prosmd/ProSMDStopState.java
index b30f6675c8ae3c09d4804b8fb08bfd406efaf4d8..f4030c04de4b1e8ffd375ce1d492952fb29be411 100755
--- a/src/ui/prosmd/ProSMDStopState.java
+++ b/src/ui/prosmd/ProSMDStopState.java
@@ -46,11 +46,11 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class ProSMDStopState extends TGCWithoutInternalComponent{
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDSubmachine.java b/src/ui/prosmd/ProSMDSubmachine.java
index 63a1cc45478ca6675c9f32617c8b6d45644bed0e..25f0d8776178aff581de62ecd6c99685888e78ae 100644
--- a/src/ui/prosmd/ProSMDSubmachine.java
+++ b/src/ui/prosmd/ProSMDSubmachine.java
@@ -46,20 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.geom.*;
-import java.util.*;
-
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.procsd.ProActiveCompSpecificationCSDPanel;
-import ui.window.*;
+import java.util.Vector;
 
 public class  ProSMDSubmachine extends TGCOneLineText implements ActionListener {
     protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProactiveSMDPanel.java b/src/ui/prosmd/ProactiveSMDPanel.java
index f3caeba0d0f2edbe3c8ce99748ce7c7b1d071c8b..07d4cb17a33ca186a98deaebcbbe0f9afce70831 100755
--- a/src/ui/prosmd/ProactiveSMDPanel.java
+++ b/src/ui/prosmd/ProactiveSMDPanel.java
@@ -46,17 +46,11 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
 import fr.inria.oasis.vercors.cttool.model.Behaviour;
-
-import javax.xml.parsers.*;
-
-import ui.*;
+import ui.MainGUI;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TToolBar;
 
 public class ProactiveSMDPanel extends TDiagramPanel implements Behaviour {
     
diff --git a/src/ui/prosmd/ProactiveSMDToolBar.java b/src/ui/prosmd/ProactiveSMDToolBar.java
index ccf516172278daefc5c088ef5d8cb0cd1854c3b1..022fc87a66cc33e8b0dec8d7f6060a2d90a6eb77 100755
--- a/src/ui/prosmd/ProactiveSMDToolBar.java
+++ b/src/ui/prosmd/ProactiveSMDToolBar.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class ProactiveSMDToolBar extends TToolBar {
     
diff --git a/src/ui/prosmd/TGConnectingPointProSMD.java b/src/ui/prosmd/TGConnectingPointProSMD.java
index 97cf5ab3146642a0cb50ed7a8fe71567d7c5fffb..6d3f67fb664e36a06ff70aa8389d9c399b3327ab 100755
--- a/src/ui/prosmd/TGConnectingPointProSMD.java
+++ b/src/ui/prosmd/TGConnectingPointProSMD.java
@@ -46,8 +46,9 @@
 
 package ui.prosmd;
 
-import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointProSMD extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/prosmd/TGConnectorProSMD.java b/src/ui/prosmd/TGConnectorProSMD.java
index 501100b7174252aa904f1697a7db22a7ef277cc8..ba33f06b3402083dac26c52455dea27fc5f9eba6 100755
--- a/src/ui/prosmd/TGConnectorProSMD.java
+++ b/src/ui/prosmd/TGConnectorProSMD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.prosmd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorProSMD extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/prosmd/util/CorrespondanceSMDManager.java b/src/ui/prosmd/util/CorrespondanceSMDManager.java
index 037fc30b449e92a635e1c0d4a7ad649303f1a736..199c1970c8d9d5383f60bcf8a65fece9fc126458 100644
--- a/src/ui/prosmd/util/CorrespondanceSMDManager.java
+++ b/src/ui/prosmd/util/CorrespondanceSMDManager.java
@@ -1,13 +1,13 @@
 package ui.prosmd.util;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
 import translator.ADComponent;
 import ui.TGComponent;
 import ui.prosmd.ProSMDState;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 public class CorrespondanceSMDManager {
 
 	List <CorrespondanceSMDElement> elements;
diff --git a/src/ui/req/EBRDDObserver.java b/src/ui/req/EBRDDObserver.java
index 40ed7b5f2af59d5baf50d32590aa646f9de36aab..be3a7789b471bee9ec098dd2fbb3ba5c61a0736d 100755
--- a/src/ui/req/EBRDDObserver.java
+++ b/src/ui/req/EBRDDObserver.java
@@ -47,15 +47,11 @@
 package ui.req;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class EBRDDObserver extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/req/Requirement.java b/src/ui/req/Requirement.java
index c3d03f6d77aaec044c4bea559b17d4799acc29dc..1255bbb5984b2b4166d1da2c88cacac88694817d 100755
--- a/src/ui/req/Requirement.java
+++ b/src/ui/req/Requirement.java
@@ -47,15 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.req;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class Requirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/req/RequirementDiagramPanel.java b/src/ui/req/RequirementDiagramPanel.java
index e96317eaf841d1d16b02c3487b8bd15a2b0564ca..8772dc870f58ad9b4f3e94559d2daef6b71cc033 100755
--- a/src/ui/req/RequirementDiagramPanel.java
+++ b/src/ui/req/RequirementDiagramPanel.java
@@ -46,10 +46,12 @@
 
 package ui.req;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Vector;
+
 public class RequirementDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
     
 	public Vector<Requirement> validated, ignored;
diff --git a/src/ui/req/RequirementDiagramToolBar.java b/src/ui/req/RequirementDiagramToolBar.java
index db4f8ff146104e1b2f5bc569f189fea0bbfee8eb..8a8512e76c215e9635075ed87bb26bc2f4e6303d 100755
--- a/src/ui/req/RequirementDiagramToolBar.java
+++ b/src/ui/req/RequirementDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.req;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class RequirementDiagramToolBar extends TToolBar {
     
     public RequirementDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/req/RequirementObserver.java b/src/ui/req/RequirementObserver.java
index c22d6e319618fa4bf3628362997cd7dca9c9a569..194cd71246421220a3aec1c5fdee75ceda55904e 100755
--- a/src/ui/req/RequirementObserver.java
+++ b/src/ui/req/RequirementObserver.java
@@ -47,15 +47,17 @@
 package ui.req;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogObserver;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class RequirementObserver extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
     public String oldValue;
diff --git a/src/ui/req/TAttributeObserver.java b/src/ui/req/TAttributeObserver.java
index b7e0f2bde67d7a40a82856e88e47f598bc78b952..04c2e4aa5978a7d61fa53b78a5407c72ae9b5a86 100755
--- a/src/ui/req/TAttributeObserver.java
+++ b/src/ui/req/TAttributeObserver.java
@@ -46,15 +46,16 @@
 
 package ui.req;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogObserver;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TAttributeObserver extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/req/TAttributeRequirement.java b/src/ui/req/TAttributeRequirement.java
index 2dded69a8e731ac8ed3079b21b9fbc0604c6471f..619103f7f6b8d59c9730afecc6ee360aa6649562 100755
--- a/src/ui/req/TAttributeRequirement.java
+++ b/src/ui/req/TAttributeRequirement.java
@@ -46,15 +46,15 @@
 
 package ui.req;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TAttributeRequirement extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/req/TGConnectingPointDerive.java b/src/ui/req/TGConnectingPointDerive.java
index 63b54d1950dba0032712a53076c1f44f40f54217..9605b52adf3d3a4c1d0a3b23b82286867049e855 100755
--- a/src/ui/req/TGConnectingPointDerive.java
+++ b/src/ui/req/TGConnectingPointDerive.java
@@ -48,7 +48,9 @@ package ui.req;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointDerive extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/req/TGConnectingPointVerify.java b/src/ui/req/TGConnectingPointVerify.java
index f2dfb145251b3adb67a62197d7e31fbd945942fc..5f0597491ffacb4f88836a9348314df98872f6c2 100755
--- a/src/ui/req/TGConnectingPointVerify.java
+++ b/src/ui/req/TGConnectingPointVerify.java
@@ -48,7 +48,9 @@ package ui.req;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointVerify extends  TGConnectingPointWidthHeight {
     
diff --git a/src/ui/req/TGConnectorComposition.java b/src/ui/req/TGConnectorComposition.java
index ee6e4005c6a18412d169982acce036664e413d24..135ca6bd2add16f707c7b6e769d0fe9306670d9f 100755
--- a/src/ui/req/TGConnectorComposition.java
+++ b/src/ui/req/TGConnectorComposition.java
@@ -47,13 +47,12 @@
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorComposition extends TGConnector {
     int w, h;
diff --git a/src/ui/req/TGConnectorCopy.java b/src/ui/req/TGConnectorCopy.java
index 3986d28cb3cf7d0d7bd27e3473f0f978c62e50e8..0b9a87d14003b0df25b4c53a555ff103a570830f 100755
--- a/src/ui/req/TGConnectorCopy.java
+++ b/src/ui/req/TGConnectorCopy.java
@@ -46,13 +46,13 @@
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorCopy extends TGConnector {
     int w, h;
diff --git a/src/ui/req/TGConnectorDerive.java b/src/ui/req/TGConnectorDerive.java
index 7ef414a3a652911ee865421d51a46be62d0afe8e..24cfd95d3f014b5d6d0a733d3b49dd26677f6795 100755
--- a/src/ui/req/TGConnectorDerive.java
+++ b/src/ui/req/TGConnectorDerive.java
@@ -46,13 +46,13 @@
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorDerive extends TGConnector {
     int w, h;
diff --git a/src/ui/req/TGConnectorVerify.java b/src/ui/req/TGConnectorVerify.java
index 8c73759c6fcce9a19a1e9663fe486654bfc489d3..d13b2829a0befbbecfa1a6c5920ee42164dc0331 100755
--- a/src/ui/req/TGConnectorVerify.java
+++ b/src/ui/req/TGConnectorVerify.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.req;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorVerify extends TGConnector {
     int w, h;
diff --git a/src/ui/sd/SDAbsoluteTimeConstraint.java b/src/ui/sd/SDAbsoluteTimeConstraint.java
index 77a3f5a01e4502338cb41e46e3cf4a221430d537..38f69473fd769f572f9559cbe73c19e0162c4e59 100755
--- a/src/ui/sd/SDAbsoluteTimeConstraint.java
+++ b/src/ui/sd/SDAbsoluteTimeConstraint.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDAbsoluteTimeConstraint extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String minConstraint = "0";
diff --git a/src/ui/sd/SDActionState.java b/src/ui/sd/SDActionState.java
index 33bd5acdf26a69733150ac9203bf40488db59a64..70c9b0fd82e3a145d003e36b439037d7d697a287 100755
--- a/src/ui/sd/SDActionState.java
+++ b/src/ui/sd/SDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDActionState extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd/SDCoregion.java b/src/ui/sd/SDCoregion.java
index 28f9f02a16c6282c8e4dc110d1bf8b460d7145ab..fd4364a83e7a448726e793bb4b810ff7ed751a17 100755
--- a/src/ui/sd/SDCoregion.java
+++ b/src/ui/sd/SDCoregion.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDCoregion extends TGCOneLineText implements SwallowedTGComponent {
     
     public SDCoregion(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd/SDGuard.java b/src/ui/sd/SDGuard.java
index a9a35a5d7c34986213d0b0eb0984b814e6b8190d..19f9e845fd6a8deb6ce038e9299f423267d699da 100755
--- a/src/ui/sd/SDGuard.java
+++ b/src/ui/sd/SDGuard.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDGuard extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd/SDInstance.java b/src/ui/sd/SDInstance.java
index 0f9c38a8ed1d28ece77a6fa15b5403391785604c..672654728c522206bee98056d46ff88fb4e49080 100755
--- a/src/ui/sd/SDInstance.java
+++ b/src/ui/sd/SDInstance.java
@@ -47,13 +47,15 @@
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSDInstance;
+
+import javax.swing.*;
+import java.awt.*;
 
 
 
diff --git a/src/ui/sd/SDRelativeTimeConstraint.java b/src/ui/sd/SDRelativeTimeConstraint.java
index 23796a4fec0b9f27680ba367d9fd67c1021ea3c0..7f86175ab8411b0099ec4b499ea78aca2eac1e5e 100755
--- a/src/ui/sd/SDRelativeTimeConstraint.java
+++ b/src/ui/sd/SDRelativeTimeConstraint.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDRelativeTimeConstraint extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     
     public SDRelativeTimeConstraint(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd/SDTimeInterval.java b/src/ui/sd/SDTimeInterval.java
index 3f5c483c2971c1689e29bb563de108bc07226457..39d1c12e47ff41ab0dff13576a9415d9dd47905f 100755
--- a/src/ui/sd/SDTimeInterval.java
+++ b/src/ui/sd/SDTimeInterval.java
@@ -46,11 +46,11 @@
 
 package ui.sd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDTimeInterval extends TGCTimeInterval implements SwallowedTGComponent {
     private int textX, textY;
     private int incrementY = 3;
diff --git a/src/ui/sd/SDTimerCancellation.java b/src/ui/sd/SDTimerCancellation.java
index 3a74047b5cf6d3e80e8472e455087570160ac39d..d3834ee42afdf6885d6f16e56e001b80b7ae2f1b 100755
--- a/src/ui/sd/SDTimerCancellation.java
+++ b/src/ui/sd/SDTimerCancellation.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerCancellation extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd/SDTimerExpiration.java b/src/ui/sd/SDTimerExpiration.java
index 0c8fbefbf123bebc00b3000ec856a1610a12049d..db255c072bab8fcc4ea1da7bb8daae540923886e 100755
--- a/src/ui/sd/SDTimerExpiration.java
+++ b/src/ui/sd/SDTimerExpiration.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerExpiration extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd/SDTimerSetting.java b/src/ui/sd/SDTimerSetting.java
index beae54e76458a3f407397e77ec5524d2a487875e..3a1b2d024b1e2ef50b75b5f0e8d738d02b70d7cd 100755
--- a/src/ui/sd/SDTimerSetting.java
+++ b/src/ui/sd/SDTimerSetting.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDTimerSetting extends TGCWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
diff --git a/src/ui/sd/SequenceDiagramPanel.java b/src/ui/sd/SequenceDiagramPanel.java
index 687ebe8a9f8173e0acd5fa0b71df86d976884858..da37d99bb8887f968413f4d931e461498e4824ba 100755
--- a/src/ui/sd/SequenceDiagramPanel.java
+++ b/src/ui/sd/SequenceDiagramPanel.java
@@ -46,12 +46,12 @@
 
 package ui.sd;
 
-import myutil.*;
+import ui.*;
 
-//import java.awt.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.*;
 
 public class SequenceDiagramPanel extends TDiagramPanel{
 
diff --git a/src/ui/sd/SequenceDiagramToolBar.java b/src/ui/sd/SequenceDiagramToolBar.java
index 0c05a8376b8098cd95bf2937fca4dbb3e1489722..4429e696c77b43b0c23ff1a6e2adc611c60f54d0 100755
--- a/src/ui/sd/SequenceDiagramToolBar.java
+++ b/src/ui/sd/SequenceDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class SequenceDiagramToolBar extends TToolBar {
     
     public SequenceDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/sd/TGConnectingPointMessageSD.java b/src/ui/sd/TGConnectingPointMessageSD.java
index b3a68496060e7b56ea63f304de545abf550bd35a..acdb1d0d8aabdb8b71910b2e5631de697cdd279b 100755
--- a/src/ui/sd/TGConnectingPointMessageSD.java
+++ b/src/ui/sd/TGConnectingPointMessageSD.java
@@ -48,7 +48,9 @@ package ui.sd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointMessageSD extends  TGConnectingPoint{
     
diff --git a/src/ui/sd/TGConnectingPointTimeConstraintSD.java b/src/ui/sd/TGConnectingPointTimeConstraintSD.java
index f18a28c95714391849df546c6463ed85129c1274..de40e34caf5c2ac5d64c4a41869a24fb50c0904f 100755
--- a/src/ui/sd/TGConnectingPointTimeConstraintSD.java
+++ b/src/ui/sd/TGConnectingPointTimeConstraintSD.java
@@ -48,7 +48,9 @@ package ui.sd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTimeConstraintSD extends  TGConnectingPoint{
     
diff --git a/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
index cf570321285b40785cba827ab3bc98f528e9cc87..f9ab23508333438ea2ff7a6a0edef0e9d2a6544c 100755
--- a/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
+++ b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
@@ -47,13 +47,13 @@
 package ui.sd;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 
 public  class TGConnectorMessageAsyncOrSyncSD extends TGConnectorMessageSD {
     public boolean isAsync;
diff --git a/src/ui/sd/TGConnectorMessageAsyncSD.java b/src/ui/sd/TGConnectorMessageAsyncSD.java
index 0f05d0570cd0447e302263ed16c1c556d72f81da..a305ed6de4183550c1ec5a878cdc24b9646afc8d 100755
--- a/src/ui/sd/TGConnectorMessageAsyncSD.java
+++ b/src/ui/sd/TGConnectorMessageAsyncSD.java
@@ -47,17 +47,15 @@
 package ui.sd;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 
 public  class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
 
diff --git a/src/ui/sd/TGConnectorMessageSD.java b/src/ui/sd/TGConnectorMessageSD.java
index 50d01fa9dd1991ce37d5e968c9ab185b95105c92..653d1974f6c6949b976b5885594b08e3653cbdb3 100755
--- a/src/ui/sd/TGConnectorMessageSD.java
+++ b/src/ui/sd/TGConnectorMessageSD.java
@@ -47,14 +47,15 @@
 package ui.sd;
 
 
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
 
-import java.awt.event.*;
-//import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public abstract class TGConnectorMessageSD extends TGConnector {
     public final String TO_SYNC = "To synchronous message";
diff --git a/src/ui/sd/TGConnectorMessageSyncSD.java b/src/ui/sd/TGConnectorMessageSyncSD.java
index ac6d3d43a64eac25e3f0736ecb7ed052a64fdb66..d22179906a7d2a075f662b76562788ba63485acf 100755
--- a/src/ui/sd/TGConnectorMessageSyncSD.java
+++ b/src/ui/sd/TGConnectorMessageSyncSD.java
@@ -46,15 +46,15 @@
 
 package ui.sd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
     protected int arrowLength = 10;
 
diff --git a/src/ui/sd/TGConnectorRelativeTimeSD.java b/src/ui/sd/TGConnectorRelativeTimeSD.java
index a416c5e8b630362de8eef86d072441e96f88d0a8..c4db1fa6951316c763bcfd8779087e41aff306da 100755
--- a/src/ui/sd/TGConnectorRelativeTimeSD.java
+++ b/src/ui/sd/TGConnectorRelativeTimeSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorRelativeTimeSD extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/sd2/SDAbsoluteTimeConstraint.java b/src/ui/sd2/SDAbsoluteTimeConstraint.java
index 9a3aba780a1551eae2005fb94b6163f41be9a66a..102b4dbfba0a33e3f38ada0bc69d1e6789356f93 100755
--- a/src/ui/sd2/SDAbsoluteTimeConstraint.java
+++ b/src/ui/sd2/SDAbsoluteTimeConstraint.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDAbsoluteTimeConstraint extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String minConstraint = "0";
diff --git a/src/ui/sd2/SDActionState.java b/src/ui/sd2/SDActionState.java
index 3b704f946c9c529d6fac4bc21d16af29e1ed6a21..aba112b6420820aca6c0fd820a2af689084f25cd 100755
--- a/src/ui/sd2/SDActionState.java
+++ b/src/ui/sd2/SDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDActionState extends TGCScalableOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd2/SDCoregion.java b/src/ui/sd2/SDCoregion.java
index 99050c05b7045b0512588b46c90b7ae47fd14bd0..a6aa1261d30f3f534e803669c6dec18f0fafe3f6 100755
--- a/src/ui/sd2/SDCoregion.java
+++ b/src/ui/sd2/SDCoregion.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDCoregion extends TGCScalableOneLineText implements SwallowedTGComponent {
 
     public SDCoregion(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd2/SDGuard.java b/src/ui/sd2/SDGuard.java
index 94b385a97d4320105ab96693bc0b60c9f6d9bbb9..399c3766d4823cdd46d22b6fb18cf224501c8432 100755
--- a/src/ui/sd2/SDGuard.java
+++ b/src/ui/sd2/SDGuard.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDGuard extends TGCScalableOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/sd2/SDInstance.java b/src/ui/sd2/SDInstance.java
index dfe342ae99fd8baa047f6d66b4a5d28242ce4a41..1f981748b8b8f3b4ce332a75806e215c000c0d8f 100755
--- a/src/ui/sd2/SDInstance.java
+++ b/src/ui/sd2/SDInstance.java
@@ -47,13 +47,16 @@
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSDInstance;
+
+import javax.swing.*;
+import java.awt.*;
 
 
 
diff --git a/src/ui/sd2/SDPortForMessage.java b/src/ui/sd2/SDPortForMessage.java
index 0a5f94472b1113d31a5de9db8e4babaf20c41081..73c6c6c03d715eab0ddecb39cdebe7c11aecc688 100755
--- a/src/ui/sd2/SDPortForMessage.java
+++ b/src/ui/sd2/SDPortForMessage.java
@@ -47,13 +47,10 @@
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
 
 
 
diff --git a/src/ui/sd2/SDRelativeTimeConstraint.java b/src/ui/sd2/SDRelativeTimeConstraint.java
index 29a1ee80029cdf47a50fe297cd586fc59f5a479d..ce802a83b3c2f5dfa6fcf6f80c75c93f8a92df42 100755
--- a/src/ui/sd2/SDRelativeTimeConstraint.java
+++ b/src/ui/sd2/SDRelativeTimeConstraint.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDRelativeTimeConstraint extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
 
     public SDRelativeTimeConstraint(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
diff --git a/src/ui/sd2/SDTimeInterval.java b/src/ui/sd2/SDTimeInterval.java
index 5b43e9a1b34d3d62efaf342b33f01a4286770b22..969d7a5ddc3c60f747364820c869ea75ab4c5d01 100755
--- a/src/ui/sd2/SDTimeInterval.java
+++ b/src/ui/sd2/SDTimeInterval.java
@@ -46,11 +46,11 @@
 
 package ui.sd2;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class SDTimeInterval extends TGCTimeInterval implements SwallowedTGComponent {
     private int textX, textY;
     private int incrementY = 3;
diff --git a/src/ui/sd2/SDTimerCancellation.java b/src/ui/sd2/SDTimerCancellation.java
index 78026027f8fca14ffb7c89d8d61eded76d68b587..4af5ae45e0cf149fffd701b3e5a76f84ecfdffb0 100755
--- a/src/ui/sd2/SDTimerCancellation.java
+++ b/src/ui/sd2/SDTimerCancellation.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerCancellation extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd2/SDTimerExpiration.java b/src/ui/sd2/SDTimerExpiration.java
index fe4ab461431f90c5c90db7b4777685e62e59da6e..76c8a195d7fcc29973a49f6b1897df17c4467198 100755
--- a/src/ui/sd2/SDTimerExpiration.java
+++ b/src/ui/sd2/SDTimerExpiration.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class SDTimerExpiration extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
     private int widthValue, heightValue;
diff --git a/src/ui/sd2/SDTimerSetting.java b/src/ui/sd2/SDTimerSetting.java
index 576ec89d4a8982166f2045ac51957fe398b5cef1..dbda903cbdac9d0baa1ec9732706a3f3f2eab6ae 100755
--- a/src/ui/sd2/SDTimerSetting.java
+++ b/src/ui/sd2/SDTimerSetting.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class SDTimerSetting extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     private String timer = "myTimer";
diff --git a/src/ui/sd2/SequenceDiagramPanel.java b/src/ui/sd2/SequenceDiagramPanel.java
index 3f17dde1bd192886593e64cd71c875e1cc113bf7..26ffe3cb2dce307c4679d512413e09768af1d16b 100755
--- a/src/ui/sd2/SequenceDiagramPanel.java
+++ b/src/ui/sd2/SequenceDiagramPanel.java
@@ -46,12 +46,12 @@
 
 package ui.sd2;
 
-import myutil.*;
+import ui.*;
 
-//import java.awt.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.*;
 
 public class SequenceDiagramPanel extends TDiagramPanel {
 
diff --git a/src/ui/sd2/SequenceDiagramToolBar.java b/src/ui/sd2/SequenceDiagramToolBar.java
index 0b3513ec124f12588644383af827dc72bb4173c3..2ce7ea997e7632e4b36d83fc80bbade02d8f69e1 100755
--- a/src/ui/sd2/SequenceDiagramToolBar.java
+++ b/src/ui/sd2/SequenceDiagramToolBar.java
@@ -46,9 +46,11 @@
 
 package ui.sd2;
 
-import javax.swing.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class SequenceDiagramToolBar extends TToolBar {
 
diff --git a/src/ui/sd2/TGConnectingPointMessageSD.java b/src/ui/sd2/TGConnectingPointMessageSD.java
index a15c6e0baf2185dfadcca6227c4947c2a7e04343..e9c42c049cf62fca842f0b620f1d1a2c690da605 100755
--- a/src/ui/sd2/TGConnectingPointMessageSD.java
+++ b/src/ui/sd2/TGConnectingPointMessageSD.java
@@ -48,9 +48,9 @@ package ui.sd2;
 
 //import java.awt.*;
 
-import ui.*;
-
-import myutil.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointMessageSD extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/sd2/TGConnectingPointTimeConstraintSD.java b/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
index b856937c3bd35a618f15b16d75ec93bb5a5f80a8..37cfa5e79f7db941a974dfabb4fa47da9f63bc4e 100755
--- a/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
+++ b/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
@@ -48,7 +48,9 @@ package ui.sd2;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTimeConstraintSD extends  TGConnectingPoint{
     
diff --git a/src/ui/sd2/TGConnectorMessageAsyncSD.java b/src/ui/sd2/TGConnectorMessageAsyncSD.java
index 7e7ac3afa682de8c86ae2ffc12e5ae9e423977a1..7d5119a9cdeefbbd0b0baa7d3b9c0550661c683d 100755
--- a/src/ui/sd2/TGConnectorMessageAsyncSD.java
+++ b/src/ui/sd2/TGConnectorMessageAsyncSD.java
@@ -47,17 +47,15 @@
 package ui.sd2;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 
 public  class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
 
diff --git a/src/ui/sd2/TGConnectorMessageSD.java b/src/ui/sd2/TGConnectorMessageSD.java
index 5ecbcbe51838be3a8cdc7deab74e4e21ea6fe329..01e881332c737632fcb5ef1617f0b7fc8231dcc4 100755
--- a/src/ui/sd2/TGConnectorMessageSD.java
+++ b/src/ui/sd2/TGConnectorMessageSD.java
@@ -47,14 +47,15 @@
 package ui.sd2;
 
 
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
 
-import java.awt.event.*;
-//import java.awt.geom.*;
 import javax.swing.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.util.Vector;
 
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
 
 public abstract class TGConnectorMessageSD extends TGConnector {
     public final String TO_SYNC = "To synchronous message";
diff --git a/src/ui/sd2/TGConnectorMessageSyncSD.java b/src/ui/sd2/TGConnectorMessageSyncSD.java
index 67a46993c294caedafeae3e2f2d56495fa71ed87..2f69db6b4d104ee7c09cb2e7b017cfd051cb5ab9 100755
--- a/src/ui/sd2/TGConnectorMessageSyncSD.java
+++ b/src/ui/sd2/TGConnectorMessageSyncSD.java
@@ -46,15 +46,15 @@
 
 package ui.sd2;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
     protected int arrowLength = 10;
 
diff --git a/src/ui/sd2/TGConnectorRelativeTimeSD.java b/src/ui/sd2/TGConnectorRelativeTimeSD.java
index d1892ea0c0912c092ba10702e1cda492ec98d7fd..02af51598de26cf89bc10d09bd89bfac668e77e7 100755
--- a/src/ui/sd2/TGConnectorRelativeTimeSD.java
+++ b/src/ui/sd2/TGConnectorRelativeTimeSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.sd2;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public  class TGConnectorRelativeTimeSD extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
index 8b4ff183900199f4ca6ba62d305c90331bdaa5c5..c13ea2847e29ca29b0b1e90741db65382c94dc35 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.sysmlsecmethodology;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class SysmlsecMethodologyConnectingPoint extends  TGConnectingPointWidthHeight {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
index dc95b9e027e865bf362fceadcfbc8add4e8d75e5..933c5c39254bf086d77a08a871fa681d9a718aaa 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
@@ -46,13 +46,13 @@
 
 package ui.sysmlsecmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
 
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
 
-import ui.*;
+//import java.awt.geom.*;
 
 public  class SysmlsecMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
     int w, h;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
index 571793a95b41c4f1c9e3eb24650feb12969880b9..41dae503b390a9aeb907ceffe886f5f3c3a5b46d 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
@@ -47,12 +47,14 @@
 
 package ui.sysmlsecmethodology;
 
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
 import javax.swing.*;
+import java.awt.*;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public class SysmlsecMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
     //protected boolean emptyText;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
index e5a824631fa1761d414a9297b32fac183e11f835..c0b7281b8699c2f04bb130dc76e005abc9e14e05 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
@@ -46,11 +46,9 @@
 
 package ui.sysmlsecmethodology;
 
-import ui.*;
-
+import myutil.TraceManager;
 import org.w3c.dom.Element;
-
-import myutil.*;
+import ui.*;
 
 public class SysmlsecMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
     //public Vector validated, ignored;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
index fe6cc995c4a2ae70e5cd34a88bf0c460256a90ad..fad16bcc122a87f9bcbd2ab3879ade527c66258c 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
@@ -48,14 +48,16 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public abstract class SysmlsecMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent  {
     public String oldValue;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
index 0485b44b0bd52118a8a3b6920ec4013016db3622..d7341bf91ed821381eb1fbdd9dacf1e6bff54254 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@
 
 package ui.sysmlsecmethodology;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class SysmlsecMethodologyDiagramToolbar extends TToolBar {
 
     public SysmlsecMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
index b9478b4fefe806935816d3071b3945d3903a03a0..cae9d4773e88160fae35d4845ace4e08532929fc 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToAnalysis extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
index 4011a64625be335cf98d9f184424b6b8eb7ba8d9..e3ea50c797110d1c79ac40cafba990ed70f81c5e 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
@@ -48,15 +48,9 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
index a61ea4c84d51ce15d71420b5ddf4314f8cf9fe13..63d2678fbcd7bf824f21781754f46e1fdb77f60a 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToArchitecture extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
index 70f1053cf5c288704bf2d90891b637f93dbd7fff..c75a964cb3975441758deda1ab82ea1b295431ce 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToAssumptions extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
index 71a0522921ebaf8d29219d0b8b68693ca3b91b66..e6b5402683a20193d514a71c981de8d4397086cc 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToAttack extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
index fafde7816c80be4cddc05b16154f08d8d73a9167..243fd37445073a10d55da29f98ede28bf081e7ee 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToCP extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
index dc1ab7f4f7d7b4b48f6c65b22eabf07b5f1f62cf..7b9651504d3cab862350edceee059e65fa910c7d 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToDesign extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
index 364c562017924cb60edb018e91e81708d5a9d9d5..d0f700fba3b174c88111ce46103c4b3df46afa6d 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
@@ -48,15 +48,9 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
 
 public class SysmlsecMethodologyReferenceToMapping extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
index a1a8bac6aa5584831f52818d6e5852570415fb81..bc3b02aefc7204664699d595c0a533cb3f5cae7e 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToProperties extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
index 2c0df38c048024e84671e435b2fd9f63e7e126b9..e59bf578a8a025445699dd24af5070e53a7ebf8a 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToPrototype extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
index a68809e14b3779bdb85d22d1018f8ddb17bd1650..804ff79c98ae31b92c91ada36fbfdd250d0ce35b 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
@@ -48,15 +48,7 @@
 package ui.sysmlsecmethodology;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.window.*;
 
 public class SysmlsecMethodologyReferenceToRequirement extends SysmlsecMethodologyDiagramReference  {
 
diff --git a/src/ui/tmlad/TGConnectingPointTMLAD.java b/src/ui/tmlad/TGConnectingPointTMLAD.java
index afe80aceb7dc6c7ea934d41af153ba5d16e32451..59837d40399db466343b2a6418135ced369e4b7b 100755
--- a/src/ui/tmlad/TGConnectingPointTMLAD.java
+++ b/src/ui/tmlad/TGConnectingPointTMLAD.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlad;
 
 //import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTMLAD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/tmlad/TGConnectorTMLAD.java b/src/ui/tmlad/TGConnectorTMLAD.java
index 291b36d8fb2dade011d4cd0f07303bf2fa514835..982929ced51e9e21e43c943e96e6c00f5f4dace1 100755
--- a/src/ui/tmlad/TGConnectorTMLAD.java
+++ b/src/ui/tmlad/TGConnectorTMLAD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
 public  class TGConnectorTMLAD extends TGConnector {
     protected int arrowLength = 10;
     
diff --git a/src/ui/tmlad/TMLADActionState.java b/src/ui/tmlad/TMLADActionState.java
index 70c35adedc789f459b7218582e40759bd622f00f..78e54d65b3b3c2ee939825387e04043a0a49e9fb 100755
--- a/src/ui/tmlad/TMLADActionState.java
+++ b/src/ui/tmlad/TMLADActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/tmlad/TMLADChoice.java b/src/ui/tmlad/TMLADChoice.java
index 23a536434a6a3df9c6a06e53131997d9032e4002..2a22b76d67d11d09981d476044bf4b1841375425 100755
--- a/src/ui/tmlad/TMLADChoice.java
+++ b/src/ui/tmlad/TMLADChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADChoice extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/tmlad/TMLADDecrypt.java b/src/ui/tmlad/TMLADDecrypt.java
index 06512ea0ffc901be334d1f5a5749f2490485f108..dd7c551786e22e37c0dc1f126d440dc496a39c8a 100755
--- a/src/ui/tmlad/TMLADDecrypt.java
+++ b/src/ui/tmlad/TMLADDecrypt.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import myutil.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADDecrypt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADDelay.java b/src/ui/tmlad/TMLADDelay.java
index 8a448675a5b72a484aa5eef75001e8568d0e8763..b9e82d22937661abe52b3c85532c076f6db65667 100755
--- a/src/ui/tmlad/TMLADDelay.java
+++ b/src/ui/tmlad/TMLADDelay.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADDelay extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {    private int lineLength = 5;
     private int textX, textY;
diff --git a/src/ui/tmlad/TMLADDelayInterval.java b/src/ui/tmlad/TMLADDelayInterval.java
index ddd8ba9d650c852affb0feec30af315ec716fe4c..dc3ad45152ddb95edf1400e14a9abbc064b5ec0d 100755
--- a/src/ui/tmlad/TMLADDelayInterval.java
+++ b/src/ui/tmlad/TMLADDelayInterval.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADDelayInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADEncrypt.java b/src/ui/tmlad/TMLADEncrypt.java
index f79128e1d9a0936e8bb97b4499d9e7fca82c64ea..4b1320879013e6abc4861257428618c6fca01bd6 100755
--- a/src/ui/tmlad/TMLADEncrypt.java
+++ b/src/ui/tmlad/TMLADEncrypt.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import myutil.*;
+import ui.window.JDialogCryptographicConfiguration;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADEncrypt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecC.java b/src/ui/tmlad/TMLADExecC.java
index e3116be6537cd2ebc6d6565d23df2602bfb29e18..dd8b566992e1a99e7918af609c46da376c1bb282 100755
--- a/src/ui/tmlad/TMLADExecC.java
+++ b/src/ui/tmlad/TMLADExecC.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecC extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecCInterval.java b/src/ui/tmlad/TMLADExecCInterval.java
index 06a35375ef9be832d23f8b638f8e939ae5923726..4f706afe7c942c56aaedc5fd5ee4e08825c5f6c9 100755
--- a/src/ui/tmlad/TMLADExecCInterval.java
+++ b/src/ui/tmlad/TMLADExecCInterval.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecCInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecI.java b/src/ui/tmlad/TMLADExecI.java
index 30c673149112b67e3f069eafb2994063b1e60d58..7229e1aadbd19071a0b9798f46af389dcc00ead7 100755
--- a/src/ui/tmlad/TMLADExecI.java
+++ b/src/ui/tmlad/TMLADExecI.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecI extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecIInterval.java b/src/ui/tmlad/TMLADExecIInterval.java
index 96253ca21358b15355808f66caa5caaecfbf4533..e53f54e22aabb51869e01cf082956e71bf2ae9c1 100755
--- a/src/ui/tmlad/TMLADExecIInterval.java
+++ b/src/ui/tmlad/TMLADExecIInterval.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
 import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADExecIInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADForEverLoop.java b/src/ui/tmlad/TMLADForEverLoop.java
index bf19be6ea947dcb400967be550e2995c1f0e31d0..e5c5c2c5cd65e3dd4d9fb2a2a912363e59cb915e 100755
--- a/src/ui/tmlad/TMLADForEverLoop.java
+++ b/src/ui/tmlad/TMLADForEverLoop.java
@@ -46,15 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADForEverLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADForLoop.java b/src/ui/tmlad/TMLADForLoop.java
index cf10bbbdfbfdb1f96d7463f22357b31bc46b2f62..3263b7926bff148cbec99529252b97afa951dca5 100755
--- a/src/ui/tmlad/TMLADForLoop.java
+++ b/src/ui/tmlad/TMLADForLoop.java
@@ -46,15 +46,16 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
 
diff --git a/src/ui/tmlad/TMLADForStaticLoop.java b/src/ui/tmlad/TMLADForStaticLoop.java
index 8065058ee8cc80dc2faa90e0a260d0cb08dc7e12..c0e1c2dac21a9ce5876eb2ce6fe7f9a1778a2c92 100755
--- a/src/ui/tmlad/TMLADForStaticLoop.java
+++ b/src/ui/tmlad/TMLADForStaticLoop.java
@@ -46,15 +46,12 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADForStaticLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private final static String IN_LOOP = "inside loop";
diff --git a/src/ui/tmlad/TMLADNotifiedEvent.java b/src/ui/tmlad/TMLADNotifiedEvent.java
index 388d35905548703b1c263d8c0299c974ac952f48..012b955333f676624b09ced60a12ccb71f3db0e7 100755
--- a/src/ui/tmlad/TMLADNotifiedEvent.java
+++ b/src/ui/tmlad/TMLADNotifiedEvent.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADNotifiedEvent extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADRandom.java b/src/ui/tmlad/TMLADRandom.java
index c84467dcc66b151075ac2d40328b22cb1100c7a7..fa58d8be9ebd97bb5b419cca5ec144eb21598d5c 100755
--- a/src/ui/tmlad/TMLADRandom.java
+++ b/src/ui/tmlad/TMLADRandom.java
@@ -46,15 +46,16 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLADRandom;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADRandom extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADReadChannel.java b/src/ui/tmlad/TMLADReadChannel.java
index eea3d30256442068da1f1262ab1d8f3db330a917..c9f1df43b9c7509745185a2b0dd92dc470bc8ea3 100755
--- a/src/ui/tmlad/TMLADReadChannel.java
+++ b/src/ui/tmlad/TMLADReadChannel.java
@@ -46,16 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADReadChannel extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADReadRequestArg.java b/src/ui/tmlad/TMLADReadRequestArg.java
index ec8fb33a2b6b7657f5f45985272beaf9dd3df88c..4bc663fa855965ae5d4a481c3cfd818c0116fe02 100755
--- a/src/ui/tmlad/TMLADReadRequestArg.java
+++ b/src/ui/tmlad/TMLADReadRequestArg.java
@@ -46,15 +46,16 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLADReadRequestArg extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSelectEvt.java b/src/ui/tmlad/TMLADSelectEvt.java
index cbac4a263f8fba1e62b840b6cdbe7204e53e7608..8fbba0df97fb658aca5b5c26f2af6d2f456cdce6 100755
--- a/src/ui/tmlad/TMLADSelectEvt.java
+++ b/src/ui/tmlad/TMLADSelectEvt.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADSelectEvt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/tmlad/TMLADSendEvent.java b/src/ui/tmlad/TMLADSendEvent.java
index 2f6761a9ffb08b2fcf66a1b4e62c1119c24a2189..60de946f9b08f7a04d38f01d0532899fecd9b876 100755
--- a/src/ui/tmlad/TMLADSendEvent.java
+++ b/src/ui/tmlad/TMLADSendEvent.java
@@ -46,17 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADSendEvent extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSendRequest.java b/src/ui/tmlad/TMLADSendRequest.java
index 3b79c3fa65fcbd72a443538773089fe89508c579..82ae9777fa397c03d87ad4ab8ae97b3058a84e27 100755
--- a/src/ui/tmlad/TMLADSendRequest.java
+++ b/src/ui/tmlad/TMLADSendRequest.java
@@ -46,16 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADSendRequest extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSequence.java b/src/ui/tmlad/TMLADSequence.java
index 9993058e628a8b5adabe4103df4b89d598bfb7da..02afcdca0c976d6132dbf24a5eeb49ac47e53435 100755
--- a/src/ui/tmlad/TMLADSequence.java
+++ b/src/ui/tmlad/TMLADSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLADSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int lineLength = 0;
   private int textX, textY;
diff --git a/src/ui/tmlad/TMLADStartState.java b/src/ui/tmlad/TMLADStartState.java
index 1f0c8c6a274d7673561ea1553e14ea47db3be884..1074981e6011f119309c51f067ba063c04932d53 100755
--- a/src/ui/tmlad/TMLADStartState.java
+++ b/src/ui/tmlad/TMLADStartState.java
@@ -46,12 +46,12 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLADStartState extends TGCWithoutInternalComponent implements EmbeddedComment{
     private int lineLength = 5;
     
diff --git a/src/ui/tmlad/TMLADStopState.java b/src/ui/tmlad/TMLADStopState.java
index f0518affe1870c5ea9543e8b8f8290b1c487e1a6..0c9959ba5a61a2bb697bf5e3e608971e3c4216d8 100755
--- a/src/ui/tmlad/TMLADStopState.java
+++ b/src/ui/tmlad/TMLADStopState.java
@@ -46,11 +46,11 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLADStopState extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int internalCircleSize = 16;
     private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADUnorderedSequence.java b/src/ui/tmlad/TMLADUnorderedSequence.java
index d0578a0805215863669644b028f04e7e4705826e..c7204def0f8f08910ab3565ecdb9d2d2ad5506f3 100755
--- a/src/ui/tmlad/TMLADUnorderedSequence.java
+++ b/src/ui/tmlad/TMLADUnorderedSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLADUnorderedSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
     private int lineLength = 0;
   private int textX, textY;
diff --git a/src/ui/tmlad/TMLADWaitEvent.java b/src/ui/tmlad/TMLADWaitEvent.java
index 169e1e7380fdcc6049963961a1d6b824f62bc323..ed59de9e52b347f0557f39bf5a6bdff9bf28fd92 100755
--- a/src/ui/tmlad/TMLADWaitEvent.java
+++ b/src/ui/tmlad/TMLADWaitEvent.java
@@ -46,16 +46,17 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADWaitEvent extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADWriteChannel.java b/src/ui/tmlad/TMLADWriteChannel.java
index 97b7cd14a0752379cac3740536d502153bb9f3de..ebef1a88c953c9ff9cb5d9b1accdb9ec9c29f194 100755
--- a/src/ui/tmlad/TMLADWriteChannel.java
+++ b/src/ui/tmlad/TMLADWriteChannel.java
@@ -46,16 +46,18 @@
 
 package ui.tmlad;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
 
 public class TMLADWriteChannel extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLActivityDiagramPanel.java b/src/ui/tmlad/TMLActivityDiagramPanel.java
index e5886e344e29a8d1db8c9d6e29a103525f41ae03..3fcd606c108975793b9aec9456da27aba0b32d94 100755
--- a/src/ui/tmlad/TMLActivityDiagramPanel.java
+++ b/src/ui/tmlad/TMLActivityDiagramPanel.java
@@ -47,14 +47,18 @@
 package ui.tmlad;
 
 //import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
 
 //import org.w3c.dom.*;
 //import org.xml.sax.*;
 //import javax.xml.parsers.*;
 
-import ui.*;
-
 public class TMLActivityDiagramPanel extends TDiagramPanel {
     
     public  TMLActivityDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlad/TMLActivityDiagramToolBar.java b/src/ui/tmlad/TMLActivityDiagramToolBar.java
index f8718c6f9e9c6c0920e4d6c343706a4ac3cc1007..57c8d2cc11c863337f3e753c7d911a5553fba452 100755
--- a/src/ui/tmlad/TMLActivityDiagramToolBar.java
+++ b/src/ui/tmlad/TMLActivityDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlad;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TMLActivityDiagramToolBar extends TToolBar {
     
     
diff --git a/src/ui/tmlcd/TGConnectingPointTMLAssociation.java b/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
index 227e38f94e786d08fb93544999251d5b61c30f69..bc1635da8a8c51a45669582334359af83adde3ae 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
 
 public class TGConnectingPointTMLAssociation extends  TGConnectingPointTwoFathers{
     
diff --git a/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java b/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
index 0434caf568938418163b0ab696ec0138e4d7164b..8212a68fda8c2ff75e2e42e031f08e96cbed7a92 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTMLCompositionOperator extends  TGConnectingPoint{
 
diff --git a/src/ui/tmlcd/TGConnectingPointTMLTask.java b/src/ui/tmlcd/TGConnectingPointTMLTask.java
index fdc64f1d80e43b2a438c27848d3b74bb3ea80d5b..f6888389952885c03bfe99b8fd33d98d5960a0c8 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLTask.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLTask.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTMLTask extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/tmlcd/TGConnectorTMLAssociationNav.java b/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
index 00bc4413d237c230c6e04ee3523ea0ca1e4c9233..660c7ec70119b6232abe261934c574665a6f4151 100755
--- a/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
+++ b/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
@@ -46,14 +46,15 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
 public  class TGConnectorTMLAssociationNav extends TGConnector {
     protected int arrowLength = 15;
     protected TGConnectingPointGroup tg;
diff --git a/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java b/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
index c978e8136150a3aed245c8d33746224f8d7c5539..cd9f4194b4d7a5d9f367bbbc7cf0b0cd7de58bee 100755
--- a/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
+++ b/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
@@ -46,12 +46,13 @@
 
 package ui.tmlcd;
 
+import myutil.GraphicLib;
+import ui.*;
+
 import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
 
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
 
 public  class TGConnectorTMLCompositionOperator extends TGConnector {
     
diff --git a/src/ui/tmlcd/TMLActivityDiagramBox.java b/src/ui/tmlcd/TMLActivityDiagramBox.java
index 7afa9fc64c904a2c8b7b1a6a1f4a23111aeae131..d2a20ddf3d790449ea354cc3c785b5ade27d01f1 100755
--- a/src/ui/tmlcd/TMLActivityDiagramBox.java
+++ b/src/ui/tmlcd/TMLActivityDiagramBox.java
@@ -48,11 +48,11 @@
 package ui.tmlcd;
 
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLActivityDiagramBox extends TGCWithoutInternalComponent {
     public String oldValue;
     protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLAttributeBox.java b/src/ui/tmlcd/TMLAttributeBox.java
index 8afe88fd4cf4170e90786414237f1607f719e90e..3be09d67f9c3328f7dfbe265b4bd74a31d86e426 100755
--- a/src/ui/tmlcd/TMLAttributeBox.java
+++ b/src/ui/tmlcd/TMLAttributeBox.java
@@ -47,15 +47,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public class TMLAttributeBox extends TGCWithoutInternalComponent {
     public String oldValue;
diff --git a/src/ui/tmlcd/TMLChannelOperator.java b/src/ui/tmlcd/TMLChannelOperator.java
index 9cc61207b7a0458740cd6b440f0a4b4f0ee66299..bf2dc2dfc7dc3df76098cd97e35f9bf62fcdb630 100755
--- a/src/ui/tmlcd/TMLChannelOperator.java
+++ b/src/ui/tmlcd/TMLChannelOperator.java
@@ -47,10 +47,10 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
 import ui.*;
 
+import java.awt.*;
+
 public class TMLChannelOperator extends TMLCompositionOperator {
     
     
diff --git a/src/ui/tmlcd/TMLChannelProperties.java b/src/ui/tmlcd/TMLChannelProperties.java
index fe8e524557c7ad173b3cd5ce28ffb2fb63917a26..599334d9b0e3aa2df9f59798de60b7f2b245e492 100755
--- a/src/ui/tmlcd/TMLChannelProperties.java
+++ b/src/ui/tmlcd/TMLChannelProperties.java
@@ -46,16 +46,18 @@
 
 package ui.tmlcd;
 
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogChannel;
+
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
 //import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TMLChannelProperties extends TGCWithoutInternalComponent {
     
diff --git a/src/ui/tmlcd/TMLCompositionOperator.java b/src/ui/tmlcd/TMLCompositionOperator.java
index a3e8a2a93afa971b819d4a0a8b317074b79aca11..efd98b8dcc480014814422a9a288994974f5865b 100755
--- a/src/ui/tmlcd/TMLCompositionOperator.java
+++ b/src/ui/tmlcd/TMLCompositionOperator.java
@@ -47,12 +47,11 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public abstract class TMLCompositionOperator extends TGCWithInternalComponent {
     public String oldValue;
     protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLDataFlowType.java b/src/ui/tmlcd/TMLDataFlowType.java
index 252f620eb6dc8d2b79fa4c9835316325facda201..c9581163037e38894c210335f51b1e8b089052db 100755
--- a/src/ui/tmlcd/TMLDataFlowType.java
+++ b/src/ui/tmlcd/TMLDataFlowType.java
@@ -46,16 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
 public abstract class TMLDataFlowType	{
 
     public static final String UINT_16 = "uint_16";
diff --git a/src/ui/tmlcd/TMLEventOperator.java b/src/ui/tmlcd/TMLEventOperator.java
index daa0c68a99d047f8ae41a7f9d3a9bdf5d760b0c4..460db46a2679941b1795dd181c7f3f4a46261cd1 100755
--- a/src/ui/tmlcd/TMLEventOperator.java
+++ b/src/ui/tmlcd/TMLEventOperator.java
@@ -47,10 +47,10 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
 import ui.*;
 
+import java.awt.*;
+
 public class TMLEventOperator extends TMLCompositionOperator {
     
     
diff --git a/src/ui/tmlcd/TMLEventProperties.java b/src/ui/tmlcd/TMLEventProperties.java
index 283a2ddc0b5bf2184b6f0e0fb0d3776e65651d98..2b5b02c04a1daefbb01dbb9150f33f76de0816dd 100755
--- a/src/ui/tmlcd/TMLEventProperties.java
+++ b/src/ui/tmlcd/TMLEventProperties.java
@@ -46,14 +46,15 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogParamFIFO;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLEventProperties extends TGCWithoutInternalComponent {
     
diff --git a/src/ui/tmlcd/TMLOperationBox.java b/src/ui/tmlcd/TMLOperationBox.java
index 4ff5a403dd86594d999e4dd5d816939a811a0b34..6ab091a7ce12ec7a021ad6f0fd474276a9b4d5a1 100755
--- a/src/ui/tmlcd/TMLOperationBox.java
+++ b/src/ui/tmlcd/TMLOperationBox.java
@@ -47,12 +47,12 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class TMLOperationBox extends TGCWithoutInternalComponent {
     public String oldValue;
     protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLRequestOperator.java b/src/ui/tmlcd/TMLRequestOperator.java
index 3df64ce9210d5fa8370180e66ca725143bbb6249..cbd48d1f55e823c08fe4867f2a9e7e78150af59c 100755
--- a/src/ui/tmlcd/TMLRequestOperator.java
+++ b/src/ui/tmlcd/TMLRequestOperator.java
@@ -47,10 +47,10 @@
 
 package ui.tmlcd;
 
-import java.awt.*;
-
 import ui.*;
 
+import java.awt.*;
+
 public class TMLRequestOperator extends TMLCompositionOperator {
     
     
diff --git a/src/ui/tmlcd/TMLRequestProperties.java b/src/ui/tmlcd/TMLRequestProperties.java
index 656670ede0fca86a0dc85cb310e4c270faaec2e8..0a1172f70dc6364ca128161b79f9fe55b1fb6fe1 100755
--- a/src/ui/tmlcd/TMLRequestProperties.java
+++ b/src/ui/tmlcd/TMLRequestProperties.java
@@ -46,16 +46,18 @@
 
 package ui.tmlcd;
 
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogParam;
+
+import javax.swing.*;
 import java.awt.*;
+
 //import java.awt.geom.*;
 //import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
 
 public class TMLRequestProperties extends TGCWithoutInternalComponent {
     
diff --git a/src/ui/tmlcd/TMLTaskDiagramPanel.java b/src/ui/tmlcd/TMLTaskDiagramPanel.java
index 1eedf34beb7a0bd6afeba22468390c17c9bb154b..6a32aa53128fbc9f0f1887d4e5b8ebe9884a7781 100755
--- a/src/ui/tmlcd/TMLTaskDiagramPanel.java
+++ b/src/ui/tmlcd/TMLTaskDiagramPanel.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcd;
 
 
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
 import ui.*;
-import ui.tmldd.*;
-import ui.tmlcd.*;
-import java.util.*;
+import ui.tmldd.TMLArchiDiagramPanel;
+
+import java.util.ArrayList;
+import java.util.Iterator;
 
 public class TMLTaskDiagramPanel extends TDiagramPanel {
     
diff --git a/src/ui/tmlcd/TMLTaskDiagramToolBar.java b/src/ui/tmlcd/TMLTaskDiagramToolBar.java
index a4508e6db8f9b229c9e56dbfca8b040b460cec04..ece88c8fe444eb54679adc9dc073acd447b1a3c3 100755
--- a/src/ui/tmlcd/TMLTaskDiagramToolBar.java
+++ b/src/ui/tmlcd/TMLTaskDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcd;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TMLTaskDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/tmlcd/TMLTaskOperator.java b/src/ui/tmlcd/TMLTaskOperator.java
index 0b26f80838eadd839841671312621554d3f8ba73..d5f1d1c950885e222c0d42855186c47e17b8ac24 100755
--- a/src/ui/tmlcd/TMLTaskOperator.java
+++ b/src/ui/tmlcd/TMLTaskOperator.java
@@ -47,16 +47,18 @@
 package ui.tmlcd;
 
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.tmlad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.tmlad.TMLActivityDiagramPanel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class TMLTaskOperator extends TGCWithInternalComponent implements TMLTaskInterface {
     public String oldValue;
diff --git a/src/ui/tmlcompd/TMLCChannelFacility.java b/src/ui/tmlcompd/TMLCChannelFacility.java
index 5455961f763196e4a443eea1acfa438baf5c450b..96a177d758bb13232d931a6ab16cda0dd2017bde 100755
--- a/src/ui/tmlcompd/TMLCChannelFacility.java
+++ b/src/ui/tmlcompd/TMLCChannelFacility.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public abstract class TMLCChannelFacility extends TGCScalableWithInternalComponent {
     protected Color myColor, portColor;
diff --git a/src/ui/tmlcompd/TMLCChannelOutPort.java b/src/ui/tmlcompd/TMLCChannelOutPort.java
index a2d206535cb4885b0a5e3a602c92595c2caca601..6822fe562c573636a16c186ead7c76888b912388 100755
--- a/src/ui/tmlcompd/TMLCChannelOutPort.java
+++ b/src/ui/tmlcompd/TMLCChannelOutPort.java
@@ -46,17 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCChannelOutPort extends TMLCPrimitivePort {
 	
diff --git a/src/ui/tmlcompd/TMLCCompositeComponent.java b/src/ui/tmlcompd/TMLCCompositeComponent.java
index fc91b5ad81c9404873fe6dda2e4320d070926cff..ad40b71e44369929965e0eae16e5dadd976bd2c5 100755
--- a/src/ui/tmlcompd/TMLCCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCCompositeComponent.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.ListIterator;
+
 public class TMLCCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, HiddenInternalComponents {
 	private int maxFontSize = 20;
 	private int minFontSize = 4;
diff --git a/src/ui/tmlcompd/TMLCCompositePort.java b/src/ui/tmlcompd/TMLCCompositePort.java
index 12744bf26122fc03812f907f4a2fb627ee558ec6..a0eff4ba596daa2cc8abfe4b6547a0e6eead5c1a 100755
--- a/src/ui/tmlcompd/TMLCCompositePort.java
+++ b/src/ui/tmlcompd/TMLCCompositePort.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedTGComponent, WithAttributes {
 	//private Color myColor, portColor;
diff --git a/src/ui/tmlcompd/TMLCFork.java b/src/ui/tmlcompd/TMLCFork.java
index 877aa4f35f692dc0ca510ab81c4a051e70de0f5c..11c42b00b821172926c33722e49f0439c53fd996 100755
--- a/src/ui/tmlcompd/TMLCFork.java
+++ b/src/ui/tmlcompd/TMLCFork.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCFork extends TMLCChannelFacility implements WithAttributes {
     protected int radius = 11;
diff --git a/src/ui/tmlcompd/TMLCJoin.java b/src/ui/tmlcompd/TMLCJoin.java
index 921a23e95d9c93616fc7ce360f267caf7b7fe399..3ed5daeb447b7834773f49da3eeb6498df32cc0a 100755
--- a/src/ui/tmlcompd/TMLCJoin.java
+++ b/src/ui/tmlcompd/TMLCJoin.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
 
-import tmltranslator.*;
+import java.awt.*;
 
 public class TMLCJoin extends TMLCChannelFacility implements WithAttributes {
     protected int radius = 11;
diff --git a/src/ui/tmlcompd/TMLCPath.java b/src/ui/tmlcompd/TMLCPath.java
index 917e4f4825b24ad26946607b172b4b15ae06aea5..305e8ecbbfc9376f67ec4a20a50bc6d5b41414ad 100755
--- a/src/ui/tmlcompd/TMLCPath.java
+++ b/src/ui/tmlcompd/TMLCPath.java
@@ -46,17 +46,10 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import ui.TGComponent;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class TMLCPath  {
 
diff --git a/src/ui/tmlcompd/TMLCPortConnectingPoint.java b/src/ui/tmlcompd/TMLCPortConnectingPoint.java
index cfb609b723e762779200ab0a4f20b889a78ed12c..ccd237b984d4054ad93084fb0cb27df5b6e42ce3 100755
--- a/src/ui/tmlcompd/TMLCPortConnectingPoint.java
+++ b/src/ui/tmlcompd/TMLCPortConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcompd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TMLCPortConnectingPoint extends TGConnectingPointWidthHeight{
     public TMLCPrimitivePort port;
diff --git a/src/ui/tmlcompd/TMLCPortConnector.java b/src/ui/tmlcompd/TMLCPortConnector.java
index 2c3df9b8291bc232bbbb45550d4df6d670884ed0..d9eb9f0282e23e04720a5fb11649b4f83a811bf6 100755
--- a/src/ui/tmlcompd/TMLCPortConnector.java
+++ b/src/ui/tmlcompd/TMLCPortConnector.java
@@ -47,17 +47,10 @@
 package ui.tmlcompd;
 
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
 import ui.*;
-import ui.cd.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.util.Vector;
 
 public  class TMLCPortConnector extends TGConnector implements ScalableTGComponent, SpecificActionAfterAdd,  SpecificActionAfterMove{
     //protected int arrowLength = 10;
diff --git a/src/ui/tmlcompd/TMLCPrimitiveComponent.java b/src/ui/tmlcompd/TMLCPrimitiveComponent.java
index 2843b2159b6466e1bd418f8ddf2fd257d992ac86..0d068e8398783c5a2c29e5e6dd8263e15e737c07 100755
--- a/src/ui/tmlcompd/TMLCPrimitiveComponent.java
+++ b/src/ui/tmlcompd/TMLCPrimitiveComponent.java
@@ -46,15 +46,19 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
     private int maxFontSize = 14;
diff --git a/src/ui/tmlcompd/TMLCPrimitivePort.java b/src/ui/tmlcompd/TMLCPrimitivePort.java
index b09f2061ef4d2eec46b702eaddbf98e746b22084..6a6fd9229e47dfe4d10bba60a57baeab7e0ff9cb 100755
--- a/src/ui/tmlcompd/TMLCPrimitivePort.java
+++ b/src/ui/tmlcompd/TMLCPrimitivePort.java
@@ -46,15 +46,17 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLCompositePort;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent implements SwallowedTGComponent, WithAttributes {
     protected Color myColor;
diff --git a/src/ui/tmlcompd/TMLCRecordComponent.java b/src/ui/tmlcompd/TMLCRecordComponent.java
index f31f4d2cc0fb2e357ad60e0084b1f85592326e30..95421cda33bff724102b3e386460bd3c25dad19f 100755
--- a/src/ui/tmlcompd/TMLCRecordComponent.java
+++ b/src/ui/tmlcompd/TMLCRecordComponent.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
 
 public class TMLCRecordComponent extends TGCScalableWithInternalComponent implements SwallowedTGComponent {
 	private int maxFontSize = 14;
diff --git a/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java b/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
index 8de4fe9e312d48d95a00cd437366d1bcf5c40a14..cc20c2f4c1f98444c36da912c509c0453a3fc7a1 100755
--- a/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
+++ b/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcompd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponent;
 
 public class TMLCReferencePortConnectingPoint extends TMLCPortConnectingPoint{
     
diff --git a/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java b/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
index e234ac11bf61d11c33ecfac3b504c151e5b23671..65da41344f361a86d92734894b400ad9f7f7466a 100755
--- a/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLRemoteCompositeComponent;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class TMLCRemoteCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
 	private int maxFontSize = 20;
diff --git a/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java b/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
index aa3b24e5e316ad2c7b29a158ca1203a654b30644..73837a26e17284bb97066f9deb689992e2a3ff6c 100644
--- a/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
@@ -46,13 +46,11 @@
 
 package ui.tmlcompd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCRemotePortCompositeComponent extends TGCWithInternalComponent implements SwallowedTGComponent, WithAttributes {
     private TMLCCompositePort port;
 	TMLCReferencePortConnectingPoint point;
diff --git a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
index 4860d8cd513c013a2374e3d28fec84955f11ef16..db47f3614839693dfce3101f3596b59757c25f40 100755
--- a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
+++ b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
@@ -48,13 +48,12 @@
 package ui.tmlcompd;
 
 
-import org.w3c.dom.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
 import ui.*;
-import ui.tmldd.*;
-import java.util.*;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import myutil.*;
+import java.util.*;
 
 public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
 
diff --git a/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java b/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
index eecb34aa86c927677c5f4ba616c5bc60f7aca974..dd1c72f47b57422268ea11611a0f049df04abd46 100755
--- a/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
+++ b/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcompd;
 
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
+import javax.swing.*;
 
 public class TMLComponentTaskDiagramToolBar extends TToolBar {
     
diff --git a/src/ui/tmlcp/TGConnectingPointTMLCP.java b/src/ui/tmlcp/TGConnectingPointTMLCP.java
index 03056539a2513d0ea1b3e0874608a28d792d0327..b7ed057de91cb68b27cc679df7ce4475f5ce2a75 100755
--- a/src/ui/tmlcp/TGConnectingPointTMLCP.java
+++ b/src/ui/tmlcp/TGConnectingPointTMLCP.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlcp;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointTMLCP extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/tmlcp/TGConnectorTMLCP.java b/src/ui/tmlcp/TGConnectorTMLCP.java
index d3e6a7c9a5518a5de155af84790e7487f53a8554..57ea9326e4fe0c1673e13a1905a820a3392cd641 100755
--- a/src/ui/tmlcp/TGConnectorTMLCP.java
+++ b/src/ui/tmlcp/TGConnectorTMLCP.java
@@ -46,14 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public class TGConnectorTMLCP extends TGConnector {
     protected int arrowLength = 10;
diff --git a/src/ui/tmlcp/TMLCPChoice.java b/src/ui/tmlcp/TMLCPChoice.java
index f9996540764421a4a19dd58d478fef41a7bd0f47..9861d9ebce72e161ad6ec82ef9a07d1b17fa4777 100755
--- a/src/ui/tmlcp/TMLCPChoice.java
+++ b/src/ui/tmlcp/TMLCPChoice.java
@@ -47,13 +47,13 @@
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
+
 public class TMLCPChoice extends TGCWithInternalComponent {
     private int lineLength = 10;
     private int lineOutLength = 25;
diff --git a/src/ui/tmlcp/TMLCPForLoop.java b/src/ui/tmlcp/TMLCPForLoop.java
index bd8658e60f7e3b0195026cd480edd49698084193..ce9b37d33f0e3af52e831a2ec23254ccf2f95f4e 100755
--- a/src/ui/tmlcp/TMLCPForLoop.java
+++ b/src/ui/tmlcp/TMLCPForLoop.java
@@ -46,15 +46,16 @@
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
 
 public class TMLCPForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, BasicErrorHighlight {
     protected int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPFork.java b/src/ui/tmlcp/TMLCPFork.java
index f8a660906b0bdb955397bf552dd5c4745384d3d2..969c166c03ec7088f907b3de74f73a34b5379b61 100755
--- a/src/ui/tmlcp/TMLCPFork.java
+++ b/src/ui/tmlcp/TMLCPFork.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCPFork extends TGCWithoutInternalComponent{
 	
 	private int lineLength = 0;
diff --git a/src/ui/tmlcp/TMLCPJoin.java b/src/ui/tmlcp/TMLCPJoin.java
index 5f21cc41acc4599f488eed824343a08d9f335db9..61a06c50fc7e3b4b0bf8ce4b7d3ba01195ea8938 100755
--- a/src/ui/tmlcp/TMLCPJoin.java
+++ b/src/ui/tmlcp/TMLCPJoin.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCPJoin extends TGCWithoutInternalComponent{
 
 	private int lineLength = 0;
diff --git a/src/ui/tmlcp/TMLCPJunction.java b/src/ui/tmlcp/TMLCPJunction.java
index f0e75a53eb970d5f102c9f7ed9e823bbaf65a6cd..270dc78ffa8b124c916ea2fd362e65cbbc1e1355 100755
--- a/src/ui/tmlcp/TMLCPJunction.java
+++ b/src/ui/tmlcp/TMLCPJunction.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 
 public class TMLCPJunction extends TGCWithoutInternalComponent {
 
diff --git a/src/ui/tmlcp/TMLCPPanel.java b/src/ui/tmlcp/TMLCPPanel.java
index 6010937cb9d4fb31f5dc0a9d4675a751edddacf2..b97257a7052aa953f76352e6f4ca6d35d3d3bc1b 100755
--- a/src/ui/tmlcp/TMLCPPanel.java
+++ b/src/ui/tmlcp/TMLCPPanel.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcp;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 public class TMLCPPanel extends TDiagramPanel {
     
     public  TMLCPPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlcp/TMLCPRefAD.java b/src/ui/tmlcp/TMLCPRefAD.java
index 490bee270cc60baf4eb9420f6d6cd094a4cd2d50..024717bfe8c4ba6e0e0c284110d5788b7525f234 100755
--- a/src/ui/tmlcp/TMLCPRefAD.java
+++ b/src/ui/tmlcp/TMLCPRefAD.java
@@ -47,14 +47,15 @@
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
 public class TMLCPRefAD extends TGCOneLineText {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/tmlcp/TMLCPRefSD.java b/src/ui/tmlcp/TMLCPRefSD.java
index 0f0308677b5b5a046571a09d6b916a7a532f451a..d6c6d86732918f862a1a3e7dca55425dd9b18d73 100755
--- a/src/ui/tmlcp/TMLCPRefSD.java
+++ b/src/ui/tmlcp/TMLCPRefSD.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
+import ui.tmlsd.TMLSDPanel;
 
-import ui.tmlsd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
 
 public class TMLCPRefSD extends TGCOneLineText {
     protected int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPStartState.java b/src/ui/tmlcp/TMLCPStartState.java
index 9c48cbb7b37388540b90ca6e41bdd5d7114f5e6d..f2018df4edb6f1d18fb92148f3684746889565b6 100755
--- a/src/ui/tmlcp/TMLCPStartState.java
+++ b/src/ui/tmlcp/TMLCPStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.awt.geom.Line2D;
+
 public class TMLCPStartState extends TGCWithoutInternalComponent{
 	private int lineLength = 5;
 
diff --git a/src/ui/tmlcp/TMLCPStopState.java b/src/ui/tmlcp/TMLCPStopState.java
index 5cefc70c880a03b3a96765e7acdbf9607c838594..2e0319eb2f3b1c4f624f1f61a07e991b5b6479ca 100755
--- a/src/ui/tmlcp/TMLCPStopState.java
+++ b/src/ui/tmlcp/TMLCPStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.tmlcp;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLCPStopState extends TGCWithoutInternalComponent{
 	private int internalCircleSize = 16;
 	private int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPToolBar.java b/src/ui/tmlcp/TMLCPToolBar.java
index 75bf1c216bba47bb3c36bc11473bfea7346636ce..73bd394d9a438cabbfeaf6b42f995fc540562882 100755
--- a/src/ui/tmlcp/TMLCPToolBar.java
+++ b/src/ui/tmlcp/TMLCPToolBar.java
@@ -47,12 +47,15 @@
 
 package ui.tmlcp;
 
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-
 public class TMLCPToolBar extends TToolBar {
 
     public TMLCPToolBar(MainGUI _mgui) {
diff --git a/src/ui/tmldd/TMLArchiArtifact.java b/src/ui/tmldd/TMLArchiArtifact.java
index 0887f068d7c5e0050dbad6fcd3839689e5872c95..793c9b4747d891533688a8cb2c9ad37fa0d7c133 100755
--- a/src/ui/tmldd/TMLArchiArtifact.java
+++ b/src/ui/tmldd/TMLArchiArtifact.java
@@ -46,15 +46,17 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import tmltranslator.modelcompiler.*;
+import ui.*;
+import ui.window.JDialogTMLTaskArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiTaskInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiBUSNode.java b/src/ui/tmldd/TMLArchiBUSNode.java
index 6f303dbfbfb5840910ea7720cf67567c9af46ccf..397096e58aad757ee5ba5add396fdcd7b5dedd3f 100755
--- a/src/ui/tmldd/TMLArchiBUSNode.java
+++ b/src/ui/tmldd/TMLArchiBUSNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogBUSNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiBUSNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiBridgeNode.java b/src/ui/tmldd/TMLArchiBridgeNode.java
index 4a3f9aba4176789a017d9f596c3e3fdf9411d6d0..2c6504ac42405fcdebf7054fed2526ba1ecab4fa 100755
--- a/src/ui/tmldd/TMLArchiBridgeNode.java
+++ b/src/ui/tmldd/TMLArchiBridgeNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBridge;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogBridgeNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiBridgeNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiCPNode.java b/src/ui/tmldd/TMLArchiCPNode.java
index 9f8861642a368605df53dab197f07ba8b4aa43ce..0343a108f93da87a3aad4e4a3fc92fc5d42a03cc 100755
--- a/src/ui/tmldd/TMLArchiCPNode.java
+++ b/src/ui/tmldd/TMLArchiCPNode.java
@@ -46,17 +46,22 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.modelcompiler.CPMEC;
+import tmltranslator.modelcompiler.CpuMemoryCopyMEC;
+import tmltranslator.modelcompiler.DoubleDmaMEC;
+import tmltranslator.modelcompiler.SingleDmaMEC;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogCommPatternMapping;
 
-import tmltranslator.modelcompiler.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.ListIterator;
+import java.util.Vector;
 
 public class TMLArchiCPNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiCPInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiCPUNode.java b/src/ui/tmldd/TMLArchiCPUNode.java
index 7e03e7e7395346e78d56e0881f9fb2450edd71e3..fd71988ea29169c2b442b46746f32df8454e605d 100755
--- a/src/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/ui/tmldd/TMLArchiCPUNode.java
@@ -46,34 +46,19 @@
 
 package ui.tmldd;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Polygon;
-import java.util.Vector;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
+import myutil.GraphicLib;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-import myutil.GraphicLib;
 import tmltranslator.HwCPU;
 import tmltranslator.modelcompiler.ArchUnitMEC;
-import ui.ColorManager;
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.WithAttributes;
+import ui.*;
 import ui.window.JDialogCPUNode;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
+
 public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
     private int textY2 = 30;
diff --git a/src/ui/tmldd/TMLArchiCommunicationArtifact.java b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
index c6145723ea5aad35aee17f495105a469878b5dce..20b9c31f217ef0f2a8ae73d42ac204fcb40d23d8 100755
--- a/src/ui/tmldd/TMLArchiCommunicationArtifact.java
+++ b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
@@ -46,14 +46,15 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogCommunicationArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiCommunicationArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiChannelInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiCommunicationNode.java b/src/ui/tmldd/TMLArchiCommunicationNode.java
index d1b4da2f97a136d3d7bfc114e9f0bfe52b74047c..817f063558bde28d115e685fd4463fccba3f14e8 100755
--- a/src/ui/tmldd/TMLArchiCommunicationNode.java
+++ b/src/ui/tmldd/TMLArchiCommunicationNode.java
@@ -47,17 +47,12 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import ui.SwallowTGComponent;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
 
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
 
 public abstract class TMLArchiCommunicationNode extends TMLArchiNode implements SwallowTGComponent {
 
diff --git a/src/ui/tmldd/TMLArchiConnectingPoint.java b/src/ui/tmldd/TMLArchiConnectingPoint.java
index 51d583dc905a12c89296a44cbdfcd6b14f7211f3..3755b74440052cb052fbec77b0527ee27443a01b 100755
--- a/src/ui/tmldd/TMLArchiConnectingPoint.java
+++ b/src/ui/tmldd/TMLArchiConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmldd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TMLArchiConnectingPoint extends  TGConnectingPointWidthHeight{
     
diff --git a/src/ui/tmldd/TMLArchiConnectorNode.java b/src/ui/tmldd/TMLArchiConnectorNode.java
index 464b17201ef4e0594600c8d7b9a8e153eddac0c7..00cb3a59049225741306261b5d5481814a541dae 100755
--- a/src/ui/tmldd/TMLArchiConnectorNode.java
+++ b/src/ui/tmldd/TMLArchiConnectorNode.java
@@ -46,31 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmldd;
 
-import java.awt.Graphics;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Vector;
-
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-import myutil.GraphicLib;
-import myutil.TraceManager;
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnector;
-import ui.WithAttributes;
+import ui.*;
 import ui.window.JDialogTMLConnectorNode;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
 public  class TMLArchiConnectorNode extends TGConnector implements WithAttributes {
     protected int arrowLength = 10;
     protected int widthValue, heightValue, maxWidthValue, h;
diff --git a/src/ui/tmldd/TMLArchiCrossbarNode.java b/src/ui/tmldd/TMLArchiCrossbarNode.java
index ec8eef3276442bcb75ee43862a19298e0b77f185..fc786c30b7786e03c08a3e0862e96636f5d49e94 100755
--- a/src/ui/tmldd/TMLArchiCrossbarNode.java
+++ b/src/ui/tmldd/TMLArchiCrossbarNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogCrossbarNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiCrossbarNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiDMANode.java b/src/ui/tmldd/TMLArchiDMANode.java
index c191b60301ad34f304b7beef5b87d30a63fe3afd..f891cff9bb93889437661abe2bbbbd8a506dd9a3 100755
--- a/src/ui/tmldd/TMLArchiDMANode.java
+++ b/src/ui/tmldd/TMLArchiDMANode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwDMA;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogDMANode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiDMANode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiDiagramPanel.java b/src/ui/tmldd/TMLArchiDiagramPanel.java
index ecdc1bf26f5f9c803eda4bd1d44fb04b10ecdc7a..ef95665964d361c460c0db4703e198c4ba03c464 100755
--- a/src/ui/tmldd/TMLArchiDiagramPanel.java
+++ b/src/ui/tmldd/TMLArchiDiagramPanel.java
@@ -47,12 +47,15 @@
 
 package ui.tmldd;
 
-import myutil.*;
-import org.w3c.dom.*;
-import java.util.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
 import ui.*;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
 public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
 
     public static final int VIEW_ALL = 0;
diff --git a/src/ui/tmldd/TMLArchiDiagramToolBar.java b/src/ui/tmldd/TMLArchiDiagramToolBar.java
index 72153a44702103d35c445422895366b670a6945e..0e68e3868e387fac7ae8cd12ffadc1a1b384dccc 100755
--- a/src/ui/tmldd/TMLArchiDiagramToolBar.java
+++ b/src/ui/tmldd/TMLArchiDiagramToolBar.java
@@ -47,12 +47,14 @@
 
 package ui.tmldd;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
-import myutil.*;
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class TMLArchiDiagramToolBar extends TToolBar  implements ActionListener {
 
diff --git a/src/ui/tmldd/TMLArchiEventArtifact.java b/src/ui/tmldd/TMLArchiEventArtifact.java
index 6485f64abab7f587c36d2120245fa21f958c73ff..d858b08b1d2f17e27db31b4b577e2bb56d525179 100755
--- a/src/ui/tmldd/TMLArchiEventArtifact.java
+++ b/src/ui/tmldd/TMLArchiEventArtifact.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogEventArtifact;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiEventArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
 	protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiFirewallNode.java b/src/ui/tmldd/TMLArchiFirewallNode.java
index 8d3044ffa66e074c213e8842f2174bb3b0eb04ce..152e050edd2b7b39b393bbc487c76a0e2f1d0de0 100644
--- a/src/ui/tmldd/TMLArchiFirewallNode.java
+++ b/src/ui/tmldd/TMLArchiFirewallNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogFirewallNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
 
 public class TMLArchiFirewallNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiHWANode.java b/src/ui/tmldd/TMLArchiHWANode.java
index 2facd8976a1c937343cf864d474a6059458283e7..35d3a55f2f48a9d892d105d378c41d57ce7232a4 100755
--- a/src/ui/tmldd/TMLArchiHWANode.java
+++ b/src/ui/tmldd/TMLArchiHWANode.java
@@ -46,17 +46,17 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwCPU;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogHwANode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
 
 public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiKey.java b/src/ui/tmldd/TMLArchiKey.java
index 8da759fc78b8a68096ee68de0fcfc007481544d5..7671bc65705584a9db6d6c0a13a4130f22491051 100755
--- a/src/ui/tmldd/TMLArchiKey.java
+++ b/src/ui/tmldd/TMLArchiKey.java
@@ -46,14 +46,15 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogArchiKey;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiKey extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiSecurityInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiMemoryNode.java b/src/ui/tmldd/TMLArchiMemoryNode.java
index 22b2742e4b43d30b069ec0a03825f8effe6e47ed..a2d324a294865fbd1effeb1a4a54c25a83d46c09 100755
--- a/src/ui/tmldd/TMLArchiMemoryNode.java
+++ b/src/ui/tmldd/TMLArchiMemoryNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwMemory;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogMemoryNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
 
diff --git a/src/ui/tmldd/TMLArchiNode.java b/src/ui/tmldd/TMLArchiNode.java
index 4a041faf35bd1840ba43f34797441b73424d30f3..9b86ac1ab051b473644f64b3e7db8267ff3402dc 100755
--- a/src/ui/tmldd/TMLArchiNode.java
+++ b/src/ui/tmldd/TMLArchiNode.java
@@ -46,8 +46,6 @@
 
 package ui.tmldd;
 
-import java.util.ArrayList;
-
 import tmltranslator.HwNode;
 import tmltranslator.modelcompiler.ArchUnitMEC;
 import tmltranslator.modelcompiler.CpuMEC;
@@ -56,6 +54,8 @@ import ui.TDiagramPanel;
 import ui.TGCWithInternalComponent;
 import ui.TGComponent;
 
+import java.util.ArrayList;
+
 public abstract class TMLArchiNode extends TGCWithInternalComponent implements SwallowTGComponent {
     protected int clockRatio = HwNode.DEFAULT_CLOCK_RATIO;
 
diff --git a/src/ui/tmldd/TMLArchiPortArtifact.java b/src/ui/tmldd/TMLArchiPortArtifact.java
index fc484a44c9ffd2b768844842dc219e7bcd6331f3..7fed235656caffdb8a4699e2c0ff3788984eacbf 100644
--- a/src/ui/tmldd/TMLArchiPortArtifact.java
+++ b/src/ui/tmldd/TMLArchiPortArtifact.java
@@ -46,16 +46,20 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import tmltranslator.modelcompiler.*;
+import ui.*;
+import ui.window.JDialogPortArtifact;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
 public class TMLArchiPortArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiPortInterface {
     protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiVGMNNode.java b/src/ui/tmldd/TMLArchiVGMNNode.java
index b258f634bde9f5536eecda24fa3a361ade6b3cac..a234fb5bfe98da072f321cd4c4fab04c1000a24c 100755
--- a/src/ui/tmldd/TMLArchiVGMNNode.java
+++ b/src/ui/tmldd/TMLArchiVGMNNode.java
@@ -46,16 +46,16 @@
 
 package ui.tmldd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogVGMNNode;
 
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class TMLArchiVGMNNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
     private int textY1 = 15;
diff --git a/src/ui/tmlsd/TGConnectingPointTMLSD.java b/src/ui/tmlsd/TGConnectingPointTMLSD.java
index a0fea910d0b84d468fa72601c6cc3dc74fafcc6f..41476c22428afbb9c1fc51d98fcac136c8f96765 100755
--- a/src/ui/tmlsd/TGConnectingPointTMLSD.java
+++ b/src/ui/tmlsd/TGConnectingPointTMLSD.java
@@ -48,7 +48,9 @@ package ui.tmlsd;
 
 //import java.awt.*;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
 
 public class TGConnectingPointTMLSD extends  TGConnectingPoint{
     
diff --git a/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java b/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
index ffef9251c3f3170d4a635af7c97b980a1f50aa46..cb9fdecd389b4ffe2ab261548e6eaf2758b9124a 100755
--- a/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
+++ b/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
@@ -47,14 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlsd;
 
 
+import myutil.GraphicLib;
+import ui.*;
 
 import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
-import ui.*;
-import tmltranslator.tmlcp.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
 
 public class TGConnectorMessageAsyncTMLSD extends TGConnectorMessageTMLSD {
 
diff --git a/src/ui/tmlsd/TGConnectorMessageTMLSD.java b/src/ui/tmlsd/TGConnectorMessageTMLSD.java
index 3b2a1bb01f6976cc98e597d431eb177c8b82760e..17ae5c36ac674bab474d99d15ee570a6126709f1 100755
--- a/src/ui/tmlsd/TGConnectorMessageTMLSD.java
+++ b/src/ui/tmlsd/TGConnectorMessageTMLSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.*;
-
-import java.awt.Point;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
-import ui.window.*;
-import org.w3c.dom.*;
+import ui.window.JDialogMultiStringCP;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
 
 public abstract class TGConnectorMessageTMLSD extends TGConnector {
 	protected int arrowLength = 10;
diff --git a/src/ui/tmlsd/TMLSDActionState.java b/src/ui/tmlsd/TMLSDActionState.java
index dab73d32029d51ca768fa29b93e46fdbcada0c13..1157d89eb964191560314ea6148725cacad13a04 100755
--- a/src/ui/tmlsd/TMLSDActionState.java
+++ b/src/ui/tmlsd/TMLSDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class TMLSDActionState extends TGCOneLineText implements SwallowedTGComponent {
     protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/tmlsd/TMLSDControllerInstance.java b/src/ui/tmlsd/TMLSDControllerInstance.java
index afb59ce2a90386530271d0dc40824b512ea73d79..69c68c3aee742256e1b0e39bab521838f555eb35 100755
--- a/src/ui/tmlsd/TMLSDControllerInstance.java
+++ b/src/ui/tmlsd/TMLSDControllerInstance.java
@@ -47,17 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.JFrame;
-
 import myutil.GraphicLib;
-import ui.IconManager;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
+import ui.*;
 import ui.window.JDialogTMLCPControllerInstance;
 
+import javax.swing.*;
+
 public class TMLSDControllerInstance extends TMLSDInstance implements SwallowTGComponent {
 
     public TMLSDControllerInstance(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
diff --git a/src/ui/tmlsd/TMLSDInstance.java b/src/ui/tmlsd/TMLSDInstance.java
index 7c7dc494b6d4a3292641fd3a7819f71a4ff3bafb..8ead775a2f33a650799c68d834666554b934bc67 100755
--- a/src/ui/tmlsd/TMLSDInstance.java
+++ b/src/ui/tmlsd/TMLSDInstance.java
@@ -47,15 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-import java.awt.event.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+
 //Abstract class, getType() and editOndoubleClick( JFrame ) are abstract
 public abstract class TMLSDInstance extends TGCWithInternalComponent implements SwallowTGComponent {
 
diff --git a/src/ui/tmlsd/TMLSDPanel.java b/src/ui/tmlsd/TMLSDPanel.java
index 685d44347fb9c846988b8778b7207bf802398a17..8bdd728a8a40589932be186ad1d426f1bf651bea 100755
--- a/src/ui/tmlsd/TMLSDPanel.java
+++ b/src/ui/tmlsd/TMLSDPanel.java
@@ -47,10 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.tmlsd;
 
 //import java.awt.*;
-import java.util.*;
 
 import ui.*;
 
+import java.util.Iterator;
+
 public class TMLSDPanel extends TDiagramPanel {
     
     public  TMLSDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlsd/TMLSDStorageInstance.java b/src/ui/tmlsd/TMLSDStorageInstance.java
index 37e6b4191524549de5a5ba4392517d8c333f60b4..e2a92987fa12affb1b7c38d4d8353d0a4187a576 100755
--- a/src/ui/tmlsd/TMLSDStorageInstance.java
+++ b/src/ui/tmlsd/TMLSDStorageInstance.java
@@ -47,17 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.JFrame;
-
 import myutil.GraphicLib;
-import ui.IconManager;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
+import ui.*;
 import ui.window.JDialogTMLCPStorageInstance;
 
+import javax.swing.*;
+
 public class TMLSDStorageInstance extends TMLSDInstance implements SwallowTGComponent {
 	
     public TMLSDStorageInstance( int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
diff --git a/src/ui/tmlsd/TMLSDToolBar.java b/src/ui/tmlsd/TMLSDToolBar.java
index 3112f28b3e0a12606ffe4dad66c2816ad42f1ae5..b1a3c45ee93d6d0d382c7952a68b7d73accc610a 100755
--- a/src/ui/tmlsd/TMLSDToolBar.java
+++ b/src/ui/tmlsd/TMLSDToolBar.java
@@ -48,13 +48,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
 import javax.swing.*;
+
 //import java.awt.*;
 //import java.awt.event.*;
 
-import ui.*;
-import myutil.*;
-
 public class TMLSDToolBar extends TToolBar {
     
     public TMLSDToolBar(MainGUI _mgui) {
diff --git a/src/ui/tmlsd/TMLSDTransferInstance.java b/src/ui/tmlsd/TMLSDTransferInstance.java
index 6a34ab6aa3152d05ebdd47daed931e9a20e2f2f5..f3e1336176513f616d4a8b60afc39906d6493e92 100755
--- a/src/ui/tmlsd/TMLSDTransferInstance.java
+++ b/src/ui/tmlsd/TMLSDTransferInstance.java
@@ -47,10 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tmlsd;
 
-import javax.swing.*;
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLCPTransferInstance;
+
+import javax.swing.*;
 
 public class TMLSDTransferInstance extends TMLSDInstance implements SwallowTGComponent {
 
diff --git a/src/ui/tree/CorrespondanceValidationDataTree.java b/src/ui/tree/CorrespondanceValidationDataTree.java
index 81a04c284f0dfb52dc75ac025e7122650cf3f4f1..2efa79e331339b92028375c667b2f049389b3fd1 100755
--- a/src/ui/tree/CorrespondanceValidationDataTree.java
+++ b/src/ui/tree/CorrespondanceValidationDataTree.java
@@ -45,8 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import translator.*;
-import myutil.*;
+import myutil.GenericTree;
+import translator.GroupOfGates;
+import translator.MasterGateManager;
 
 public class CorrespondanceValidationDataTree implements GenericTree {
     	
diff --git a/src/ui/tree/DiagramTreeModel.java b/src/ui/tree/DiagramTreeModel.java
index 501d4e7db495e58ee38bcff50acaff442f55634e..9f4423ce13292a1cfd92d07bff103181881f4ebd 100755
--- a/src/ui/tree/DiagramTreeModel.java
+++ b/src/ui/tree/DiagramTreeModel.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import javax.swing.event.*;
-import javax.swing.tree.*;
-import java.util.Vector;
-
-import translator.*;
+import myutil.GenericTree;
+import translator.GroupOfGates;
 import ui.*;
-import myutil.*;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDDataType;
 
-import ui.avatarbd.*;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+import java.util.Vector;
 
 public class DiagramTreeModel implements TreeModel {
     private MainGUI mgui;
diff --git a/src/ui/tree/DiagramTreeRenderer.java b/src/ui/tree/DiagramTreeRenderer.java
index 7c05cab39bf4254e93e352ec7eb0202e17baad77..29ca54c8af52ef5dbda7644dceb51fc86ff210b8 100755
--- a/src/ui/tree/DiagramTreeRenderer.java
+++ b/src/ui/tree/DiagramTreeRenderer.java
@@ -46,49 +46,42 @@
 
 package ui.tree;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.tree.*;
-
-import translator.*;
+import translator.GroupOfGates;
 import ui.*;
-import ui.ad.*;
-import ui.atd.*;
-import ui.cd.*;
-import ui.iod.*;
-import ui.ebrdd.*;
-import ui.req.*;
-import ui.sd.*;
-import ui.dd.*;
-import ui.ucd.*;
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmldd.*;
-import ui.tmlcompd.*;
-import ui.tmlcp.*;
-import ui.tmlsd.*;
-
-import ui.ncdd.*;
-
-import ui.graph.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.atd.AttackTreeDiagramPanel;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarbd.AvatarBDPanel;
+import ui.avatarcd.AvatarCDPanel;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatarmad.AvatarMADPanel;
+import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
+import ui.avatarpd.AvatarPDPanel;
+import ui.avatarrd.AvatarRDPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.cd.TClassDiagramPanel;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
+import ui.ebrdd.EBRDDPanel;
+import ui.graph.RG;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.ncdd.NCDiagramPanel;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.oscd.TURTLEOSClassDiagramPanel;
+import ui.req.RequirementDiagramPanel;
+import ui.sd.SequenceDiagramPanel;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcp.TMLCPPanel;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmlsd.TMLSDPanel;
+import ui.ucd.UseCaseDiagramPanel;
 
-import ui.oscd.*;
-import ui.osad.*;
-
-import ui.avatarbd.*;
-import ui.avatarsmd.*;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
-import ui.avatarmad.*;
-import ui.avatarad.*;
-import ui.avatarcd.*;
-import ui.avatardd.*;
-
-import ui.diplodocusmethodology.*;
-import ui.avatarmethodology.*;
-import ui.sysmlsecmethodology.*;
-
-import ui.graph.*;
+import javax.swing.*;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import java.awt.*;
 
 
 
diff --git a/src/ui/tree/GraphTree.java b/src/ui/tree/GraphTree.java
index 4162b83936e04a111e95bb5411b021327d9d6519..c7425b72c2ff2ec584c07d0268536cf9684ca9ae 100755
--- a/src/ui/tree/GraphTree.java
+++ b/src/ui/tree/GraphTree.java
@@ -45,11 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
-import ui.graph.*;
+import myutil.GenericTree;
+import ui.MainGUI;
+import ui.graph.RG;
 
-import java.util.*;
+import java.util.List;
 
 public class GraphTree implements GenericTree {
     
diff --git a/src/ui/tree/InvariantDataTree.java b/src/ui/tree/InvariantDataTree.java
index 4fc05e02869dcd8db0fc5baef8b0525044a43dc6..9a53a729606093c6a09bcdaa34894624611e2fb4 100755
--- a/src/ui/tree/InvariantDataTree.java
+++ b/src/ui/tree/InvariantDataTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.Invariant;
+import ui.MainGUI;
 
-import java.util.*;
+import java.util.List;
 
 public class InvariantDataTree implements GenericTree {
     
diff --git a/src/ui/tree/JDiagramTree.java b/src/ui/tree/JDiagramTree.java
index 4ef494e32b7ccf6d169ba4b94676908cb3e4f19e..95d7485b5c645fc08ace6e482061bc81db9ffa5c 100755
--- a/src/ui/tree/JDiagramTree.java
+++ b/src/ui/tree/JDiagramTree.java
@@ -47,16 +47,26 @@
 package ui.tree;
 
 //import java.awt.*;
-import java.awt.event.*;
+
+import ui.*;
+import ui.graph.RG;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
-import java.util.*;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 //import translator.*;
-import ui.*;
-import ui.graph.*;
-import myutil.*;
 
 
 public class JDiagramTree extends javax.swing.JTree implements ActionListener, MouseListener, TreeExpansionListener, TreeSelectionListener, Runnable   {
diff --git a/src/ui/tree/SearchTree.java b/src/ui/tree/SearchTree.java
index 45c6548ab0a7ad4293662306840c711694980055..a45ae633a60b352bb4543d156458f4e2626cb8b9 100755
--- a/src/ui/tree/SearchTree.java
+++ b/src/ui/tree/SearchTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import java.util.*;
+import myutil.GenericTree;
+import myutil.TraceManager;
+import ui.MainGUI;
 
-import ui.*;
-import myutil.*;
+import java.util.Vector;
 
 public class SearchTree implements GenericTree {
     
diff --git a/src/ui/tree/SyntaxAnalysisErrorTree.java b/src/ui/tree/SyntaxAnalysisErrorTree.java
index 7f4028540a38b1d299581de7505d43047a4e5dd3..abceff4841aca969d771e4a5b6d721085e8e05b3 100755
--- a/src/ui/tree/SyntaxAnalysisErrorTree.java
+++ b/src/ui/tree/SyntaxAnalysisErrorTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import java.util.List;
+import myutil.GenericTree;
+import ui.CheckingError;
+import ui.MainGUI;
 
-import ui.*;
-import myutil.*;
+import java.util.List;
 
 public class SyntaxAnalysisErrorTree implements GenericTree {
     
diff --git a/src/ui/tree/SyntaxAnalysisTree.java b/src/ui/tree/SyntaxAnalysisTree.java
index 1b111a39eb983920c654b736886a85fb5838b1f3..cfe75fb398977c17a3d17c99c901ea54b3e6c598 100755
--- a/src/ui/tree/SyntaxAnalysisTree.java
+++ b/src/ui/tree/SyntaxAnalysisTree.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
 
 public class SyntaxAnalysisTree implements GenericTree {
     
diff --git a/src/ui/tree/SyntaxAnalysisWarningTree.java b/src/ui/tree/SyntaxAnalysisWarningTree.java
index 6f7278b9eb505c671c17239e77447b74384b0415..a2d6c08cd326bbb4a76ea7149e4bf0441ade5160 100755
--- a/src/ui/tree/SyntaxAnalysisWarningTree.java
+++ b/src/ui/tree/SyntaxAnalysisWarningTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import java.util.List;
+import myutil.GenericTree;
+import ui.CheckingError;
+import ui.MainGUI;
 
-import ui.*;
-import myutil.*;
+import java.util.List;
 
 public class SyntaxAnalysisWarningTree implements GenericTree {
     
diff --git a/src/ui/tree/TClassesValidationDataTree.java b/src/ui/tree/TClassesValidationDataTree.java
index a5d4e4b907a37367fce4ff1b6f748420b440d8ad..e72e60d9dd8a3d049f1265c6ebfc58eda9588429 100755
--- a/src/ui/tree/TClassesValidationDataTree.java
+++ b/src/ui/tree/TClassesValidationDataTree.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
 
 
 public class TClassesValidationDataTree<T> implements GenericTree {
diff --git a/src/ui/tree/ValidationDataTree.java b/src/ui/tree/ValidationDataTree.java
index b33fc53d2fa703b9106f170aedb52acffd7ce66c..2d798135ce5778ef1e11327c0c5752f8bc9d3a3d 100755
--- a/src/ui/tree/ValidationDataTree.java
+++ b/src/ui/tree/ValidationDataTree.java
@@ -45,8 +45,8 @@
 
 package ui.tree;
 
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
 
 public class ValidationDataTree implements GenericTree {
 
diff --git a/src/ui/ucd/TGConnectingPointActorUCD.java b/src/ui/ucd/TGConnectingPointActorUCD.java
index 5f2802cb8ba03edcf30fbb8c0ba65baa10439c71..9c4f366b8e8f7f038999403aeb9b5d392c7b497f 100755
--- a/src/ui/ucd/TGConnectingPointActorUCD.java
+++ b/src/ui/ucd/TGConnectingPointActorUCD.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointActorUCD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ucd/TGConnectingPointUCD.java b/src/ui/ucd/TGConnectingPointUCD.java
index a614eb2ac39f9e076290c8c9f3250df492c96898..cb282490329579b100c912cddb2c2fd4033a25fc 100755
--- a/src/ui/ucd/TGConnectingPointUCD.java
+++ b/src/ui/ucd/TGConnectingPointUCD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.ucd;
 
 
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
 
 public class TGConnectingPointUCD extends  TGConnectingPointWidthHeight{
 
diff --git a/src/ui/ucd/TGConnectorExtend.java b/src/ui/ucd/TGConnectorExtend.java
index f0f09e7c2296506b49848e810ad99481d8d8a3a0..dd4f8ebf171ad947f09ca7bbb2154a02b63513ff 100755
--- a/src/ui/ucd/TGConnectorExtend.java
+++ b/src/ui/ucd/TGConnectorExtend.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.util.*;
-
-
 import ui.*;
 
+import java.util.Vector;
+
 public  class TGConnectorExtend extends TGConnectorUC {
     
     public TGConnectorExtend(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorInclude.java b/src/ui/ucd/TGConnectorInclude.java
index f7da1580234e0c9ddf1e038b92c0c8242e0c23e8..7d512a47b75bc1a3c791d81f631aea68b9b2a15c 100755
--- a/src/ui/ucd/TGConnectorInclude.java
+++ b/src/ui/ucd/TGConnectorInclude.java
@@ -46,10 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.Vector;
+
 public  class TGConnectorInclude extends TGConnectorUC {
     
     public TGConnectorInclude(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorSpecialization.java b/src/ui/ucd/TGConnectorSpecialization.java
index ac83ff85bd25a2cc16962cb215363ac6ef7c5380..8bb40f4a00ea29a8983a980774c7a4a730039d83 100755
--- a/src/ui/ucd/TGConnectorSpecialization.java
+++ b/src/ui/ucd/TGConnectorSpecialization.java
@@ -46,13 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+import java.util.Vector;
+
 public  class TGConnectorSpecialization extends TGConnector {
     
     public TGConnectorSpecialization(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorUC.java b/src/ui/ucd/TGConnectorUC.java
index 5c5fcade5201bcdf5fdaea694ada9c214ff7e688..b87548bfb2516f7142f3fdbba6f195375f788014 100755
--- a/src/ui/ucd/TGConnectorUC.java
+++ b/src/ui/ucd/TGConnectorUC.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
+import ui.TGConnector;
 
-import ui.*;
+import java.awt.*;
+import java.util.Vector;
 
 public  abstract class TGConnectorUC extends TGConnector {
     int w, h;
diff --git a/src/ui/ucd/TGConnectorUseCase.java b/src/ui/ucd/TGConnectorUseCase.java
index 919e45c1f85b97edde8e1b1f232d48727843afe0..1421a04845ddd3343a0f13482e26be05c9c8952d 100755
--- a/src/ui/ucd/TGConnectorUseCase.java
+++ b/src/ui/ucd/TGConnectorUseCase.java
@@ -46,12 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import java.util.*;
-
-
 import ui.*;
 
+import java.awt.*;
+import java.util.Vector;
+
 public  class TGConnectorUseCase extends TGConnector {
     
     public TGConnectorUseCase(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/UCDActor.java b/src/ui/ucd/UCDActor.java
index 7f6eca4790d9100544153cba7df176b2ebcbbdd9..1649bf69788a6ca784ef58579440e68df9d7aa56 100755
--- a/src/ui/ucd/UCDActor.java
+++ b/src/ui/ucd/UCDActor.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class UCDActor extends TGCScalableWithoutInternalComponentOneLineText {
     /*protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ucd/UCDActorBox.java b/src/ui/ucd/UCDActorBox.java
index 8808c4f8e09d5525567ef7cb459b1b4d5101091d..7732107026c0722323d47c87da91403c8fbc299d 100755
--- a/src/ui/ucd/UCDActorBox.java
+++ b/src/ui/ucd/UCDActorBox.java
@@ -46,11 +46,11 @@
 
 package ui.ucd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class UCDActorBox extends TGCScalableWithoutInternalComponentOneLineText {
     /*protected int lineLength = 5;
       protected int textX =  5;
diff --git a/src/ui/ucd/UCDBorder.java b/src/ui/ucd/UCDBorder.java
index 944b43e4a8b95dcfe48ad208d8716878fa9b97b0..8535ebf79a6e6db11db52c7441e6ab9aef55d16e 100755
--- a/src/ui/ucd/UCDBorder.java
+++ b/src/ui/ucd/UCDBorder.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
 import ui.*;
 
+import java.awt.*;
+
 public class UCDBorder extends TGCScalableWithoutInternalComponentOneLineText {
     /*protected int lineLength = 5;
     protected int textX =  5;
diff --git a/src/ui/ucd/UCDUseCase.java b/src/ui/ucd/UCDUseCase.java
index 6f36d1146536fa027b65c0c7a73ad8378e6c9441..da64012039d7f94cf42ddd915bf8ea68f1871023 100755
--- a/src/ui/ucd/UCDUseCase.java
+++ b/src/ui/ucd/UCDUseCase.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.ucd;
 
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import ui.*;
+import ui.window.JDialogUseCase;
 
-import ui.window.*;
+import javax.swing.*;
+import java.awt.*;
 
 public class UCDUseCase extends TGCScalableWithoutInternalComponent {
     protected int lineLength = 5;
diff --git a/src/ui/ucd/UseCaseDiagramPanel.java b/src/ui/ucd/UseCaseDiagramPanel.java
index e4002e0755f08acd22a89f904cc22e12c620a880..e9c38786f79a7ca8779786b2d2c93b351a424875 100755
--- a/src/ui/ucd/UseCaseDiagramPanel.java
+++ b/src/ui/ucd/UseCaseDiagramPanel.java
@@ -46,10 +46,10 @@
 
 package ui.ucd;
 
-import java.util.*;
-
 import ui.*;
 
+import java.util.ListIterator;
+
 public class UseCaseDiagramPanel extends TDiagramPanel {
 
     public  UseCaseDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ucd/UseCaseDiagramToolBar.java b/src/ui/ucd/UseCaseDiagramToolBar.java
index f41cb1035960dfd46b9e72b80d81e37bb9b5ab74..4dfa23ba65e5abfc1989e964c91da95f1223ec08 100755
--- a/src/ui/ucd/UseCaseDiagramToolBar.java
+++ b/src/ui/ucd/UseCaseDiagramToolBar.java
@@ -46,11 +46,12 @@
 
 package ui.ucd;
 
-import javax.swing.*;
-
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
 
-import ui.*;
-import myutil.*;
+import javax.swing.*;
 
 public class UseCaseDiagramToolBar extends TToolBar {
 
diff --git a/src/ui/window/DeadlockItem.java b/src/ui/window/DeadlockItem.java
index accc4b8d2a96378d5f075e21f48e80796f79d760..cb46ab476243fba30d3d358334d724272df87c55 100755
--- a/src/ui/window/DeadlockItem.java
+++ b/src/ui/window/DeadlockItem.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
-import java.util.*;
+import java.util.Vector;
 
 public class DeadlockItem implements Comparable {
     private String name;
diff --git a/src/ui/window/DeadlockTableModel.java b/src/ui/window/DeadlockTableModel.java
index 05dafb21f9200335576dbc2c9928d462f32bdf91..8109a9d7a2b6551dc492be2351949c80407675fd 100755
--- a/src/ui/window/DeadlockTableModel.java
+++ b/src/ui/window/DeadlockTableModel.java
@@ -46,11 +46,14 @@
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import ui.graph.*;
+import myutil.DijkstraState;
+import myutil.GraphAlgorithms;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.Collections;
+import java.util.Vector;
 
 public class DeadlockTableModel extends AbstractTableModel {
     Vector deadlockData;
diff --git a/src/ui/window/EquipmentsNCTableModel.java b/src/ui/window/EquipmentsNCTableModel.java
index a203d7aefa70b670cfe79231578d7fb87ea54406..bd824e1644c690aa67a2cf24808c03c706bbc84f 100755
--- a/src/ui/window/EquipmentsNCTableModel.java
+++ b/src/ui/window/EquipmentsNCTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCEquipment;
+import nc.NCPath;
+import nc.NCStructure;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class EquipmentsNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/GateSimulationTrace.java b/src/ui/window/GateSimulationTrace.java
index 73c55388f1e04316ffb506a042414709a45452a5..6468afcc55d68c68aaa80aee16ac6f3ea175feff 100755
--- a/src/ui/window/GateSimulationTrace.java
+++ b/src/ui/window/GateSimulationTrace.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
-import java.util.*;
+import translator.Gate;
+import translator.GroupOfGates;
 
-import translator.*;
+import java.util.Vector;
 
 
 public class GateSimulationTrace extends Vector {
diff --git a/src/ui/window/GeneralInfoNCTableModel.java b/src/ui/window/GeneralInfoNCTableModel.java
index d22dda1fb1febce4fe86ee43a5e4b6bcce8032b6..d40f5d915c2e91e61d33d39acc089b4d7cbd6bc1 100755
--- a/src/ui/window/GeneralInfoNCTableModel.java
+++ b/src/ui/window/GeneralInfoNCTableModel.java
@@ -46,11 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class GeneralInfoNCTableModel extends AbstractTableModel {
 	
diff --git a/src/ui/window/JBirdPanel.java b/src/ui/window/JBirdPanel.java
index 09f07cb169683ecd3c9a8a82afcc144778cbf872..9c9c5a4b53e47bfb0e5b09e651f3acad355aa1c6 100755
--- a/src/ui/window/JBirdPanel.java
+++ b/src/ui/window/JBirdPanel.java
@@ -46,11 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.ColorManager;
+import ui.MainGUI;
+import ui.TDiagramPanel;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 
 
 public class JBirdPanel extends JPanel implements MouseListener, MouseMotionListener {
diff --git a/src/ui/window/JDialogADConnector.java b/src/ui/window/JDialogADConnector.java
index ad8c4d44101562bb560bd46e92cd0623eb860a81..530e6a583a239074ceb5b26bde8458cc2d76ec8c 100755
--- a/src/ui/window/JDialogADConnector.java
+++ b/src/ui/window/JDialogADConnector.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import javax.swing.*;
-
 import myutil.GraphicLib;
-import ui.*;
+import ui.IconManager;
+
+import javax.swing.*;
+import java.awt.*;
 
 public class JDialogADConnector extends JDialog {//implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDBusNode.java b/src/ui/window/JDialogADDBusNode.java
index ff4f324d9ec749a42618c29056aa3140287d2070..3730f0b123a8ae510281a744dbb6c8a13c01824a 100755
--- a/src/ui/window/JDialogADDBusNode.java
+++ b/src/ui/window/JDialogADDBusNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDBusNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDBusNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDCPUNode.java b/src/ui/window/JDialogADDCPUNode.java
index 2c419665d1690a0dcc55f0d6c3234a0ce6dedc85..895a8ef4fd44143b00caeec291af8dd952ddf479 100755
--- a/src/ui/window/JDialogADDCPUNode.java
+++ b/src/ui/window/JDialogADDCPUNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCPUNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDCPUNode extends javax.swing.JDialog implements ActionListener {
 	 private static String[] tracemodeTab = {"VCI logger"};
diff --git a/src/ui/window/JDialogADDCoproMWMRNode.java b/src/ui/window/JDialogADDCoproMWMRNode.java
index 1250fa265fc1f25b8e9c7710c1050247f408b7d5..a47431d943c7f47e799ca3f81ba0728b09d2ff80 100755
--- a/src/ui/window/JDialogADDCoproMWMRNode.java
+++ b/src/ui/window/JDialogADDCoproMWMRNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCoproMWMRNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDCoproMWMRNode extends javax.swing.JDialog implements ActionListener  {
 		
diff --git a/src/ui/window/JDialogADDCrossbarNode.java b/src/ui/window/JDialogADDCrossbarNode.java
index 2347d60857242ecb1dcbbb61bd7c49ddabe94bc1..c3d6ce66e6b9d47c76d39c6be61ec35c8a9a02d6 100755
--- a/src/ui/window/JDialogADDCrossbarNode.java
+++ b/src/ui/window/JDialogADDCrossbarNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCrossbarNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDCrossbarNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDICUNode.java b/src/ui/window/JDialogADDICUNode.java
index 748a81703b5d175061e0b486b85fb1b5425c5d7c..1d4b622d91dcc2b7d6fe33a3cd76af47e8c9f9db 100755
--- a/src/ui/window/JDialogADDICUNode.java
+++ b/src/ui/window/JDialogADDICUNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDICUNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDICUNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDMemoryNode.java b/src/ui/window/JDialogADDMemoryNode.java
index 67c1f9b3792c1d0e6111cab8e074d089a3f3907b..3408d4a1268494be0348fd7f05624f056f8d28e5 100755
--- a/src/ui/window/JDialogADDMemoryNode.java
+++ b/src/ui/window/JDialogADDMemoryNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDMemoryNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDMemoryNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogADDTTYNode.java b/src/ui/window/JDialogADDTTYNode.java
index 74274b02deb830404ef5493a8713e5f8228265fd..dea4ed1004da86fc3ac25221bae0b5199fc84800 100755
--- a/src/ui/window/JDialogADDTTYNode.java
+++ b/src/ui/window/JDialogADDTTYNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDTTYNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDTTYNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDTimerNode.java b/src/ui/window/JDialogADDTimerNode.java
index 2d70c47a20bfa4a571a51f4ed0313ffca2aea6d2..12945249f362c497075dccb20a7b4a244bd772c6 100755
--- a/src/ui/window/JDialogADDTimerNode.java
+++ b/src/ui/window/JDialogADDTimerNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDTimerNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDTimerNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogADDVgmnNode.java b/src/ui/window/JDialogADDVgmnNode.java
index 5adfbd23b8f5daf4aab9b98fbc2fa68f5368cc46..ccef5877539bb093f3d78a514daafa2aaf66956f 100755
--- a/src/ui/window/JDialogADDVgmnNode.java
+++ b/src/ui/window/JDialogADDVgmnNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDVgmnNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatardd.*;
-
 
 public class JDialogADDVgmnNode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogArchiKey.java b/src/ui/window/JDialogArchiKey.java
index 273a3054f0394a97d10d989c470144ce081ad04c..fd9c71a89aa3b61e05369aa05adf2880164427c0 100644
--- a/src/ui/window/JDialogArchiKey.java
+++ b/src/ui/window/JDialogArchiKey.java
@@ -46,17 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiKey;
 
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
 
-import myutil.*;
+//import javax.swing.event.*;
 
 
 public class JDialogArchiKey extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogArrayGet.java b/src/ui/window/JDialogArrayGet.java
index 53957c2bbae0014da5d681dca7b3a26017b41829..ed417d2e2bebfef3e6731839e36a261030d50226 100755
--- a/src/ui/window/JDialogArrayGet.java
+++ b/src/ui/window/JDialogArrayGet.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogArrayGet extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogArraySet.java b/src/ui/window/JDialogArraySet.java
index cc8ae45a031833494046e946e5ddce474a620282..e889b1c22940aa835982dcda36b06a037df087bc 100755
--- a/src/ui/window/JDialogArraySet.java
+++ b/src/ui/window/JDialogArraySet.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogArraySet extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogArtifact.java b/src/ui/window/JDialogArtifact.java
index 9257f847a0bad996798c613bce368719e0366b5b..5e649f594fbb53145a3a360020686ad058e67b8d 100755
--- a/src/ui/window/JDialogArtifact.java
+++ b/src/ui/window/JDialogArtifact.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogArtifact extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogAssumption.java b/src/ui/window/JDialogAssumption.java
index d994ff78be99249860a627be9fd11193d06cffa4..9dd99ee4b2b45cab3b55116cf76a9e8a2937e3db 100755
--- a/src/ui/window/JDialogAssumption.java
+++ b/src/ui/window/JDialogAssumption.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatarmad.AvatarMADAssumption;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-import ui.avatarmad.*;
-
 
 public class JDialogAssumption extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogAttack.java b/src/ui/window/JDialogAttack.java
index 536a613107d3366580d63bbfc92dc57d14dca8ed..e648c6802a3c48510cdc24e29e281dfacbe50c54 100755
--- a/src/ui/window/JDialogAttack.java
+++ b/src/ui/window/JDialogAttack.java
@@ -46,15 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.atd.ATDAttack;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.atd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogAttack extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogAttribute.java b/src/ui/window/JDialogAttribute.java
index dfd97f61ec66d4d91c8915226df85d238143d1e2..499a6755a901faa88b3ab7b2f672584ba9b291ad 100755
--- a/src/ui/window/JDialogAttribute.java
+++ b/src/ui/window/JDialogAttribute.java
@@ -46,13 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogAttribute extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogAvatarBlock.java b/src/ui/window/JDialogAvatarBlock.java
index fdaa9acb718ffd80f26322846d1e0c9841f2f906..f7fb1130bc967d972cfcdc314037dd126459e05b 100755
--- a/src/ui/window/JDialogAvatarBlock.java
+++ b/src/ui/window/JDialogAvatarBlock.java
@@ -46,14 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogAvatarBlockArtifact.java b/src/ui/window/JDialogAvatarBlockArtifact.java
index 48de272178150c84b6925134539a5a967e0700bb..81d8a6207dd41bd1250704a47843a22465d92789 100755
--- a/src/ui/window/JDialogAvatarBlockArtifact.java
+++ b/src/ui/window/JDialogAvatarBlockArtifact.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatardd.ADDBlockArtifact;
+import ui.avatardd.ADDDiagramPanel;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.avatardd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogAvatarBlockArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogAvatarChannelArtifact.java b/src/ui/window/JDialogAvatarChannelArtifact.java
index baa9659a20a78230e41d15ef2923afd8d92cd41a..ceb60637cdf2129e9a0832b952d6dd54db3f3835 100755
--- a/src/ui/window/JDialogAvatarChannelArtifact.java
+++ b/src/ui/window/JDialogAvatarChannelArtifact.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatardd.ADDChannelArtifact;
+import ui.avatardd.ADDDiagramPanel;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.avatardd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogAvatarChannelArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogAvatarExecutableCodeGeneration.java b/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
index 41d471a32a5880f19e803aa5f4866cbcae103fcb..67b366cf11fc214b0dca9ef589462432ce2a717d 100644
--- a/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
+++ b/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
@@ -47,46 +47,23 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
 import avatartranslator.AvatarSpecification;
 import avatartranslator.toexecutable.AVATAR2CPOSIX;
 import launcher.LauncherException;
 import launcher.RshClient;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.MasterProcessInterface;
-import myutil.ScrolledJTextArea;
-import myutil.TraceManager;
+import myutil.*;
+import ui.ConfigurationTTool;
 import ui.IconManager;
 import ui.JTextAreaWriter;
 import ui.MainGUI;
-import ui.ConfigurationTTool;
 import ui.interactivesimulation.JFrameSimulationSDPanel;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
 public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface  {
 
     private static String[] unitTab = {"usec", "msec", "sec"};
diff --git a/src/ui/window/JDialogAvatarFirewall.java b/src/ui/window/JDialogAvatarFirewall.java
index e975ef4ae303e1dffab1c3c70da2acc6c39c0d33..fd7980edf27a88c20304fb82c72ebe7f049d5945 100644
--- a/src/ui/window/JDialogAvatarFirewall.java
+++ b/src/ui/window/JDialogAvatarFirewall.java
@@ -46,18 +46,23 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDFirewall;
+import ui.avatarbd.AvatarBDPanel;
+
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.avatarbd.*;
-
 
 public class JDialogAvatarFirewall extends javax.swing.JDialog implements ActionListener,ListSelectionListener  {
     
diff --git a/src/ui/window/JDialogAvatarLibraryFunction.java b/src/ui/window/JDialogAvatarLibraryFunction.java
index b9de4d50e255d6ee084e79786b3c8f3f42fe23d2..41dec4c4b37b8b4c43541194f730b3f5c3027d69 100755
--- a/src/ui/window/JDialogAvatarLibraryFunction.java
+++ b/src/ui/window/JDialogAvatarLibraryFunction.java
@@ -38,41 +38,21 @@
 
 package ui.window;
 
-import java.util.LinkedList;
-import java.util.Collections;
-
-import javax.swing.JFrame;
-import javax.swing.JComboBox;
-import javax.swing.JTextField;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.ListSelectionModel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JOptionPane;
-import javax.swing.event.ListSelectionListener;
-
 import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDLibraryFunction;
 
+import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagLayout;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.Container;
-import java.awt.Font;
-import java.awt.Color;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
-import ui.TAttribute;
-import ui.IconManager;
-import ui.AvatarMethod;
-import ui.AvatarSignal;
-import ui.avatarbd.AvatarBDLibraryFunction;
+import java.util.Collections;
+import java.util.LinkedList;
 
 /**
  * Dialog for managing parameters, return values, attributes, methods and signals of Avatar Library Functions
diff --git a/src/ui/window/JDialogAvatarModelChecker.java b/src/ui/window/JDialogAvatarModelChecker.java
index 77120562763851fd9388f710999445d3304d2d0d..dc5f0339232603f87c73c3642ba1a49a2fd3cf06 100644
--- a/src/ui/window/JDialogAvatarModelChecker.java
+++ b/src/ui/window/JDialogAvatarModelChecker.java
@@ -46,23 +46,28 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import avatartranslator.AvatarSpecification;
+import avatartranslator.AvatarStateMachineElement;
+import avatartranslator.modelchecker.AvatarModelChecker;
+import avatartranslator.modelchecker.SpecificationReachability;
+import avatartranslator.modelchecker.SpecificationReachabilityType;
+import myutil.*;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.TGComponent;
+import ui.graph.RG;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimerTask;
-import java.io.*;
-
-import java.text.*;
-
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.modelchecker.*;
-import ui.*;
 import java.util.concurrent.TimeUnit;
 
-import ui.graph.*;
-
 public class JDialogAvatarModelChecker extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface  {
     private final static String [] INFOS = {"Not started", "Running", "Stopped by user", "Finished"};
     private final static Color []  COLORS = {Color.darkGray, Color.magenta, Color.red, Color.blue};
diff --git a/src/ui/window/JDialogAvatarProperty.java b/src/ui/window/JDialogAvatarProperty.java
index 1a2fafd5e6bfd87aea33ef52923a6b3b34ebe43e..acd66a81f2a6a66968b95d463c92bbe53a7c0b0e 100755
--- a/src/ui/window/JDialogAvatarProperty.java
+++ b/src/ui/window/JDialogAvatarProperty.java
@@ -46,11 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogAvatarProperty extends javax.swing.JDialog implements ActionListener  {
     private JPanel panel1;
diff --git a/src/ui/window/JDialogAvatarPropertyConnector.java b/src/ui/window/JDialogAvatarPropertyConnector.java
index 8c269c2150e6cf9446f0e9a57b18f88e61f3ee22..51b1ac19d7c27dfbc62de469e7cddac34bc5fc66 100755
--- a/src/ui/window/JDialogAvatarPropertyConnector.java
+++ b/src/ui/window/JDialogAvatarPropertyConnector.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogAvatarPropertyConnector extends javax.swing.JDialog implements ActionListener  {
     private JPanel panel1;
diff --git a/src/ui/window/JDialogAvatarSignal.java b/src/ui/window/JDialogAvatarSignal.java
index 65090fc8186b3f16fbd4e432c325041386972164..5052b7413be3bee5856d70363d5ca8c655879765 100755
--- a/src/ui/window/JDialogAvatarSignal.java
+++ b/src/ui/window/JDialogAvatarSignal.java
@@ -46,12 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.AvatarSignal;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class JDialogAvatarSignal extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogAvatarState.java b/src/ui/window/JDialogAvatarState.java
index 434d36760df6592b539d07bf702a6686834c5468..8c0f0ca6702a9d1c9eb6326a939764588141a20e 100755
--- a/src/ui/window/JDialogAvatarState.java
+++ b/src/ui/window/JDialogAvatarState.java
@@ -46,13 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.IconManager;
 
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogAvatarState extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogAvatarTimer.java b/src/ui/window/JDialogAvatarTimer.java
index 7837524131727ac7c3eac7bd349a06df2d7d40af..af1d74410ca336b3370bd2b57768e8b6a0b3fa06 100755
--- a/src/ui/window/JDialogAvatarTimer.java
+++ b/src/ui/window/JDialogAvatarTimer.java
@@ -46,12 +46,13 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class JDialogAvatarTimer extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogAvatarTransition.java b/src/ui/window/JDialogAvatarTransition.java
index 9f4bfda9b08c73a65647013c2962f5301e4cb3a5..637a1c00076836a6a54c8b8d1077bae0543bd7a8 100755
--- a/src/ui/window/JDialogAvatarTransition.java
+++ b/src/ui/window/JDialogAvatarTransition.java
@@ -46,13 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.IconManager;
+import ui.TAttribute;
 
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public class JDialogAvatarTransition extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java b/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
index f2762df03c7176a08ca2172dd5f796676e51e297..1627c93ce147859993a33643302c1b0406be8b0d 100755
--- a/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
+++ b/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
@@ -48,23 +48,27 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
-
+import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.AvatarddSpecification;
+import ddtranslatorSoclib.toSoclib.TasksAndMainGenerator;
+import ddtranslatorSoclib.toTopCell.TopCellGenerator;
+import launcher.LauncherException;
+import launcher.RshClient;
 import myutil.*;
-import ui.*;
-
+import ui.AvatarDeploymentPanelTranslator;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.avatardd.ADDDiagramPanel;
+import ui.interactivesimulation.JFrameSimulationSDPanel;
 
-import avatartranslator.*;
-import launcher.*;
-
-import ui.interactivesimulation.*;
-import ddtranslatorSoclib.toSoclib.*;
-import ddtranslatorSoclib.toTopCell.*;
-import ddtranslatorSoclib.*;
-import ui.avatardd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.StringWriter;
+import java.io.Writer;
 
 public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface  {
 
diff --git a/src/ui/window/JDialogBUSNode.java b/src/ui/window/JDialogBUSNode.java
index b50cff438fd82991ec6ee999d949bb3dbb414368..14a751fc73642331ef4ecfbcc65c2bff7ab4527d 100755
--- a/src/ui/window/JDialogBUSNode.java
+++ b/src/ui/window/JDialogBUSNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiBUSNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogBUSNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogBisimulation.java b/src/ui/window/JDialogBisimulation.java
index fdd23b3288929dee740b6bdfe6b9a3b7fe57037d..6dd36637559e93484680eada7380f307a8df07b9 100755
--- a/src/ui/window/JDialogBisimulation.java
+++ b/src/ui/window/JDialogBisimulation.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
 
 
 public class JDialogBisimulation extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogBisimulationBisimulator.java b/src/ui/window/JDialogBisimulationBisimulator.java
index 2d60e96d5b400b129e8d8c98bdc5d3c00db7dd3f..8e2aa686f461de1a60ecd207d0adc46c60544310 100755
--- a/src/ui/window/JDialogBisimulationBisimulator.java
+++ b/src/ui/window/JDialogBisimulationBisimulator.java
@@ -46,15 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
+import ui.file.BCGFileFilter;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
 
 
 public class JDialogBisimulationBisimulator extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogBridgeNode.java b/src/ui/window/JDialogBridgeNode.java
index e8309cac608106c9144c8f417b3892d44b7b5245..182b95454e1d84f85fd27e3edde2635dc281455a 100755
--- a/src/ui/window/JDialogBridgeNode.java
+++ b/src/ui/window/JDialogBridgeNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiBridgeNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogBridgeNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogCCodeGeneration.java b/src/ui/window/JDialogCCodeGeneration.java
index 82935498e041b8665b3b6124632f6af1b9933804..1fcd7576da90532192f22ca6c01a2dcabfb184d9 100755
--- a/src/ui/window/JDialogCCodeGeneration.java
+++ b/src/ui/window/JDialogCCodeGeneration.java
@@ -47,36 +47,6 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import launcher.LauncherException;
 import launcher.RshClient;
 import myutil.FileUtils;
@@ -87,6 +57,17 @@ import ui.GTURTLEModeling;
 import ui.IconManager;
 import ui.MainGUI;
 
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
 
 public class JDialogCCodeGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface, ListSelectionListener  {
 
diff --git a/src/ui/window/JDialogCPUNode.java b/src/ui/window/JDialogCPUNode.java
index 0aa5dc94d74c56c0a16acc2e6768aed58d1e1071..102f326ef376735e5ef236e32d44fab823a4fc88 100755
--- a/src/ui/window/JDialogCPUNode.java
+++ b/src/ui/window/JDialogCPUNode.java
@@ -46,17 +46,18 @@
 
 package ui.window;
 
+import myutil.GraphicLib;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import ui.ColorManager;
+import ui.IconManager;
+import ui.interactivesimulation.SimulationTransaction;
+import ui.tmldd.TMLArchiCPUNode;
+
+import javax.swing.*;
 import java.awt.*;
-import java.math.*;
 import java.awt.event.*;
-import javax.swing.*;
-import ui.*;
+import java.math.BigDecimal;
 import java.util.*;
-import tmltranslator.modelcompiler.*;
-import ui.tmldd.*;
-import ui.interactivesimulation.*;
-
-import myutil.*;
 
 public class JDialogCPUNode extends javax.swing.JDialog implements ActionListener  {
     //private static String[] tracemodeTab = {"vcd trace", "VCI logger", "VCI stats"};
diff --git a/src/ui/window/JDialogCancel.java b/src/ui/window/JDialogCancel.java
index fea8cdb7ebc89ee268585cabc3592886792fe27c..bce7f468fb990b24750841a1c1d02307cc920fc1 100755
--- a/src/ui/window/JDialogCancel.java
+++ b/src/ui/window/JDialogCancel.java
@@ -46,11 +46,13 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
+import ui.StoppableGUIElement;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogCancel extends javax.swing.JDialog implements ActionListener, Runnable  {
 
diff --git a/src/ui/window/JDialogChannel.java b/src/ui/window/JDialogChannel.java
index 8dc40d2cc0bed5649f2584d6dac9464b4bb6ddbc..8d80e2a7207df460be5b40a9d21610e827b64151 100755
--- a/src/ui/window/JDialogChannel.java
+++ b/src/ui/window/JDialogChannel.java
@@ -46,13 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmlcd.TMLChannelProperties;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogChannel extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogCode.java b/src/ui/window/JDialogCode.java
index cea37c71e5112f3e2e23470f3e4e909ddd97c042..6e3dd479a471431da676a74010f7e5d5764116f9 100755
--- a/src/ui/window/JDialogCode.java
+++ b/src/ui/window/JDialogCode.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogCode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogCommPatternMapping.java b/src/ui/window/JDialogCommPatternMapping.java
index ef4be802f065f82de02187e0d64ea03b2588b2a3..a239ccc2826e4eb2d95950cc345fda2698834b3a 100644
--- a/src/ui/window/JDialogCommPatternMapping.java
+++ b/src/ui/window/JDialogCommPatternMapping.java
@@ -47,21 +47,29 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLCP;
+import tmltranslator.TMLType;
+import tmltranslator.modelcompiler.CPMEC;
+import tmltranslator.tmlcp.TMLCPSequenceDiagram;
+import ui.*;
+import ui.tmldd.TMLArchiCPNode;
+import ui.tmldd.TMLArchiNode;
+import ui.tmlsd.TMLSDControllerInstance;
+import ui.tmlsd.TMLSDPanel;
+import ui.tmlsd.TMLSDStorageInstance;
+import ui.tmlsd.TMLSDTransferInstance;
+
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.*;
-import java.util.Collections;
-
-import ui.*;
-import ui.tmldd.*;
-import ui.tmlsd.*;
-import tmltranslator.modelcompiler.*;
-import tmltranslator.tmlcp.*;
-import tmltranslator.*;
-import myutil.*;
 
 public class JDialogCommPatternMapping extends JDialog /* implements ActionListener, ListSelectionListener*/  {
 	
diff --git a/src/ui/window/JDialogCommunicationArtifact.java b/src/ui/window/JDialogCommunicationArtifact.java
index f1d12ed2f87bb5cde16c4506f35381e23fa21842..57deaf1ca55bb7437639c90b25be8c1428dfe9ba 100755
--- a/src/ui/window/JDialogCommunicationArtifact.java
+++ b/src/ui/window/JDialogCommunicationArtifact.java
@@ -46,17 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiCommunicationArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import myutil.*;
+//import javax.swing.event.*;
 
 
 public class JDialogCommunicationArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogConstraint.java b/src/ui/window/JDialogConstraint.java
index 3daf7cbb947c2fed68e74de329d37bab238b4a61..394b3958bdee6a9213e64b0e3c5243919bfd3fe3 100755
--- a/src/ui/window/JDialogConstraint.java
+++ b/src/ui/window/JDialogConstraint.java
@@ -46,15 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.ConstraintListInterface;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.atd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogConstraint extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogConstraintText.java b/src/ui/window/JDialogConstraintText.java
index 9ee1986e608656982e5cebbddb9221c77f95abc4..cbd95c16ee9231b59826e2fe8b1d9fee53f86c98 100755
--- a/src/ui/window/JDialogConstraintText.java
+++ b/src/ui/window/JDialogConstraintText.java
@@ -46,15 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.ConstraintListInterface;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.atd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogConstraintText extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogCrossbarNode.java b/src/ui/window/JDialogCrossbarNode.java
index d1475899248ca95c8f1464d065113601f267f6d8..c689fd6f9522caaa9fe0f928266f2b4d192522de 100755
--- a/src/ui/window/JDialogCrossbarNode.java
+++ b/src/ui/window/JDialogCrossbarNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiCrossbarNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogCrossbarNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogCryptographicConfiguration.java b/src/ui/window/JDialogCryptographicConfiguration.java
index 2045bc4c3de84392429157a19923209d18106955..ac0ec4d7cd8a37c501dfaa8b6d5739b743d2f57a 100644
--- a/src/ui/window/JDialogCryptographicConfiguration.java
+++ b/src/ui/window/JDialogCryptographicConfiguration.java
@@ -46,12 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.Arrays;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.ArrayList;
 
 public class JDialogCryptographicConfiguration extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogDMANode.java b/src/ui/window/JDialogDMANode.java
index 7fcd842d3409478d66b3239f14c60202a6e12bc3..1131fc588283a6d410d681cc2c9203924ef63efc 100644
--- a/src/ui/window/JDialogDMANode.java
+++ b/src/ui/window/JDialogDMANode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiDMANode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogDMANode extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogDSE.java b/src/ui/window/JDialogDSE.java
index 77110e6e21dab80434b00ea1053b63784946fa1f..18258cb70c24e60c55c41ef91a655cf895d7d38e 100644
--- a/src/ui/window/JDialogDSE.java
+++ b/src/ui/window/JDialogDSE.java
@@ -47,19 +47,24 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import dseengine.DSEConfiguration;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.GraphicLib;
+import myutil.ScrolledJTextArea;
+import myutil.TraceManager;
+import tmltranslator.TMLMapping;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.*;
 
-import ui.*;
-
-import myutil.*;
-import tmltranslator.*;
-import dseengine.*;
-import launcher.*;
-
 public class JDialogDSE extends javax.swing.JDialog implements ActionListener, ListSelectionListener, Runnable  {
 
     protected MainGUI mgui;
diff --git a/src/ui/window/JDialogERB.java b/src/ui/window/JDialogERB.java
index 7e15c9a2019f1d27e096a2347b59e8ec40e7883f..2ffd199cc3856c36481298d4800a21021f9379e0 100644
--- a/src/ui/window/JDialogERB.java
+++ b/src/ui/window/JDialogERB.java
@@ -46,17 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.ebrdd.EBRDDERB;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-import ui.ebrdd.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogERB extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogESO.java b/src/ui/window/JDialogESO.java
index aca4dbe202caacf70f0d4443d14f945b131617b0..650ae42ccaf8849391d4db5bda8e870ae5f6050a 100644
--- a/src/ui/window/JDialogESO.java
+++ b/src/ui/window/JDialogESO.java
@@ -46,17 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.ebrdd.EBRDDESO;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-import ui.ebrdd.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogESO extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogEventArtifact.java b/src/ui/window/JDialogEventArtifact.java
index 98b31ea819594f47f4eb93c22b13345c8f94713c..cd382f4aa666d50d241b2b584a27430896249199 100755
--- a/src/ui/window/JDialogEventArtifact.java
+++ b/src/ui/window/JDialogEventArtifact.java
@@ -46,17 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiEventArtifact;
 
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import myutil.*;
+//import javax.swing.event.*;
 
 
 public class JDialogEventArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogFirewallNode.java b/src/ui/window/JDialogFirewallNode.java
index 138518a7a462a756990732d44c8a6e65ad22654a..74b7f27314eb63ca7c3a3e9fc9b1c53f815795a9 100644
--- a/src/ui/window/JDialogFirewallNode.java
+++ b/src/ui/window/JDialogFirewallNode.java
@@ -46,18 +46,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiFirewallNode;
+
 import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogFirewallNode extends javax.swing.JDialog implements ActionListener,ListSelectionListener  {
     
diff --git a/src/ui/window/JDialogFormalValidation.java b/src/ui/window/JDialogFormalValidation.java
index 1cba38a02d08a90848f036bb1ab9c2e9e35d48cf..4f7c600588ab32060de26970a318b5b3c5862da8 100755
--- a/src/ui/window/JDialogFormalValidation.java
+++ b/src/ui/window/JDialogFormalValidation.java
@@ -46,13 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogFormalValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
     private static boolean makeDTAChecked, makeRGChecked, makeRGAutChecked, makeTLSAChecked = false;
diff --git a/src/ui/window/JDialogGenAUT.java b/src/ui/window/JDialogGenAUT.java
index b068398d94cbf3849d6db05fb11c01be05319bfc..ea2f3644d373e1db4c31ed88ac026c167516809d 100755
--- a/src/ui/window/JDialogGenAUT.java
+++ b/src/ui/window/JDialogGenAUT.java
@@ -46,16 +46,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import myutil.SortedVector;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
 import java.util.List;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-
 public class JDialogGenAUT extends javax.swing.JDialog implements ActionListener, Runnable  {
     
     private static String path = "";
diff --git a/src/ui/window/JDialogGenAUTS.java b/src/ui/window/JDialogGenAUTS.java
index 826b4859a826562fc6f4ad2505278bb8820e544f..5ea7c349658457b1eec59c3e78823039dfcc9f6e 100755
--- a/src/ui/window/JDialogGenAUTS.java
+++ b/src/ui/window/JDialogGenAUTS.java
@@ -46,15 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-import java.io.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import myutil.SortedVector;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Iterator;
 
 public class JDialogGenAUTS extends javax.swing.JDialog implements ActionListener, Runnable  {
     
diff --git a/src/ui/window/JDialogGraphModification.java b/src/ui/window/JDialogGraphModification.java
index 4b906e947bf7c9d0491eddbc9696bb8f0df564a7..d0234c72f0e23d377ee22db4879708d81a6a118e 100755
--- a/src/ui/window/JDialogGraphModification.java
+++ b/src/ui/window/JDialogGraphModification.java
@@ -46,16 +46,19 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
+import ui.graph.AUTMappingGraph;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
-import ui.graph.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogGraphModification extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogHwANode.java b/src/ui/window/JDialogHwANode.java
index 91a8a4505e2be290d9609351ef9a0ca02625ad47..026db27d4f2c257e6e7de94099b38ce330982e65 100755
--- a/src/ui/window/JDialogHwANode.java
+++ b/src/ui/window/JDialogHwANode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiHWANode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogHwANode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogInvariantAnalysis.java b/src/ui/window/JDialogInvariantAnalysis.java
index 23bffefe935cc2cff98357f8e30a9eb3162ad26e..c4ca79ed5224ec983d016635ee0eaa3e238a054f 100644
--- a/src/ui/window/JDialogInvariantAnalysis.java
+++ b/src/ui/window/JDialogInvariantAnalysis.java
@@ -47,16 +47,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
 import myutil.*;
-import avatartranslator.*;
-import tpndescription.*;
+import tpndescription.TPN;
 import ui.*;
-import ui.avatarsmd.*;
+import ui.avatarsmd.AvatarSMDReceiveSignal;
+import ui.avatarsmd.AvatarSMDSendSignal;
+import ui.avatarsmd.AvatarSMDStartState;
+import ui.avatarsmd.AvatarSMDState;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.BitSet;
 
 
 public class JDialogInvariantAnalysis extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogJavaGeneration.java b/src/ui/window/JDialogJavaGeneration.java
index bf4836f83256cbf9ebc79c21f4802d15d48c36be..10ca4927aa64fe98b665abe294d71a1bd4cbdf58 100755
--- a/src/ui/window/JDialogJavaGeneration.java
+++ b/src/ui/window/JDialogJavaGeneration.java
@@ -46,16 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.*;
+import translator.tojava.TURTLE2Java;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import myutil.*;
-import translator.tojava.*;
-import ui.*;
-
 
 public class JDialogJavaGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
     
diff --git a/src/ui/window/JDialogJavaSimulation.java b/src/ui/window/JDialogJavaSimulation.java
index 1357ba44e682e73fa1c594e3b7fccf715ea7566b..23721968cc4f815b1d1ff64a566b82bf97fb92dc 100755
--- a/src/ui/window/JDialogJavaSimulation.java
+++ b/src/ui/window/JDialogJavaSimulation.java
@@ -46,16 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.*;
+import translator.tosimujava.TURTLE2SimuJava;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import myutil.*;
-import translator.tosimujava.*;
-import ui.*;
-
 
 public class JDialogJavaSimulation extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
     
diff --git a/src/ui/window/JDialogLOTOSAnalysis.java b/src/ui/window/JDialogLOTOSAnalysis.java
index dcfc4080ab43d494445114092394955720f9dfe6..c64a23742e984831601d059bb14f8e1bb31a589c 100755
--- a/src/ui/window/JDialogLOTOSAnalysis.java
+++ b/src/ui/window/JDialogLOTOSAnalysis.java
@@ -45,14 +45,18 @@
    */
   
   package ui.window;
-  
-  import java.awt.*;
-  import java.awt.event.*;
+
+  import launcher.LauncherException;
+  import launcher.RshClient;
+  import myutil.FileUtils;
+  import myutil.ScrolledJTextArea;
+  import ui.IconManager;
+  import ui.MainGUI;
+
   import javax.swing.*;
-  
-  import launcher.*;
-  import myutil.*;
-  import ui.*;
+  import java.awt.*;
+  import java.awt.event.ActionEvent;
+  import java.awt.event.ActionListener;
   
   public class JDialogLOTOSAnalysis extends javax.swing.JDialog implements ActionListener, Runnable  {
       private static boolean warningChecked = false;
diff --git a/src/ui/window/JDialogLOTOSValidation.java b/src/ui/window/JDialogLOTOSValidation.java
index 0abd1ba6190a5839e8c41a1210e6c3aa4bb45e17..ac05766e7187b8b8e4f9da01838f3ac3043a0952 100755
--- a/src/ui/window/JDialogLOTOSValidation.java
+++ b/src/ui/window/JDialogLOTOSValidation.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogLOTOSValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
 	private static boolean verboseChecked, monitorChecked, safetyChecked, gradualChecked, v3v4Checked, fc2Checked, distributorChecked, autChecked = true, dotChecked=true, bcgChecked = false;
diff --git a/src/ui/window/JDialogLinkNCNode.java b/src/ui/window/JDialogLinkNCNode.java
index 54c41f7b2646c5c7a2a52b9916b81688763f4671..dfbeb91fe30946aacd79bc13df41ede0a57c08ff 100755
--- a/src/ui/window/JDialogLinkNCNode.java
+++ b/src/ui/window/JDialogLinkNCNode.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogLinkNode.java b/src/ui/window/JDialogLinkNode.java
index 7452c061273cdc5589248737f404a7700e6e24c2..bc2485c0231af769f024ee6756883f83ef967ec6 100755
--- a/src/ui/window/JDialogLinkNode.java
+++ b/src/ui/window/JDialogLinkNode.java
@@ -46,16 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
 import myutil.GraphicLib;
+import ui.ArtifactTClassGate;
+import ui.IconManager;
+import ui.LRArtifactTClassGate;
 
-import java.util.*;
-
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogLinkNode extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     
diff --git a/src/ui/window/JDialogManageListOfString.java b/src/ui/window/JDialogManageListOfString.java
index 658a2fec63e5855131d27ac1b3d2cb9341a094cc..6493479827ff6b5c7483b830b1d572223c354b8a 100755
--- a/src/ui/window/JDialogManageListOfString.java
+++ b/src/ui/window/JDialogManageListOfString.java
@@ -46,13 +46,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogManageListOfString extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogMemoryNode.java b/src/ui/window/JDialogMemoryNode.java
index 356079a6b731d50c0e076db4aeda16bf4c25dacf..9c535041bb3c48fa6302abaffffed73ec8586b27 100755
--- a/src/ui/window/JDialogMemoryNode.java
+++ b/src/ui/window/JDialogMemoryNode.java
@@ -46,18 +46,19 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
 import myutil.GraphicLib;
+import tmltranslator.modelcompiler.Buffer;
+import ui.IconManager;
+import ui.tmldd.TMLArchiMemoryNode;
 
-//import javax.swing.event.*;
-import java.util.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+import java.util.Vector;
 
-import ui.*;
-import ui.tmldd.*;
-import tmltranslator.modelcompiler.*;
+//import javax.swing.event.*;
 
 
 public class JDialogMemoryNode extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogModelChecking.java b/src/ui/window/JDialogModelChecking.java
index 7236c11c467921208e29a10713746212bb875338..2bf14117f0f63a684ed22ec3be637dd73d61e05e 100755
--- a/src/ui/window/JDialogModelChecking.java
+++ b/src/ui/window/JDialogModelChecking.java
@@ -46,13 +46,18 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TClassInterface;
+import ui.TGComponent;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class JDialogModelChecking extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     public static java.util.List<TClassInterface> validated, ignored;
diff --git a/src/ui/window/JDialogMultiString.java b/src/ui/window/JDialogMultiString.java
index 496f7b67e066a364170df96d54ce8d4c0a97f1e5..280382577757cc8b39ead3c7c205d6f7669f6936 100755
--- a/src/ui/window/JDialogMultiString.java
+++ b/src/ui/window/JDialogMultiString.java
@@ -46,11 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.ArrayList;
 
 public class JDialogMultiString extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogMultiStringCP.java b/src/ui/window/JDialogMultiStringCP.java
index 82c778683dee12a8509ac5b2cfbdfbd8716b6161..a667030e13d49c28d1834c44de0e0e585a74912b 100755
--- a/src/ui/window/JDialogMultiStringCP.java
+++ b/src/ui/window/JDialogMultiStringCP.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogMultiStringCP extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogNCEqNode.java b/src/ui/window/JDialogNCEqNode.java
index fc2cd4256e8103eaa5fd5f4ef96f8bc4ef3653de..a53cac74496e245077a1678f71e7c39bcf4a900a 100755
--- a/src/ui/window/JDialogNCEqNode.java
+++ b/src/ui/window/JDialogNCEqNode.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogNCRoute.java b/src/ui/window/JDialogNCRoute.java
index 840553e1f7c4262e30bdfd135c9a4284d69237dc..fa9e47282db44b78f6ade4f1deb646d66c34d5be 100755
--- a/src/ui/window/JDialogNCRoute.java
+++ b/src/ui/window/JDialogNCRoute.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.ncdd.NCRoute;
 
-import ui.*;
-import ui.ncdd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
 
 
 public class JDialogNCRoute extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogNCSwitchNode.java b/src/ui/window/JDialogNCSwitchNode.java
index 44f3eff14bcc34220e2262a14caad41b81a372a5..1fc75aee928f6c9a780bc8e5f7090da48d612b6e 100755
--- a/src/ui/window/JDialogNCSwitchNode.java
+++ b/src/ui/window/JDialogNCSwitchNode.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogNCTraffic.java b/src/ui/window/JDialogNCTraffic.java
index 5cd185b57eaea6a586d0fcdf64d1c0fafc651ff3..c92c32fa74d3b195173a57b2ff27cf4a6f35f27e 100755
--- a/src/ui/window/JDialogNCTraffic.java
+++ b/src/ui/window/JDialogNCTraffic.java
@@ -46,13 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogNote.java b/src/ui/window/JDialogNote.java
index c64293ff7c404fbd0ac8c4d1a3f5b28a96b83aec..285cb909430f222dcc5be5823e5d6142c33d1728 100755
--- a/src/ui/window/JDialogNote.java
+++ b/src/ui/window/JDialogNote.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogNote extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogObserver.java b/src/ui/window/JDialogObserver.java
index ef51690d1a27d887feb3d869b222cb9ac25f6364..4ee4f2eac8df79aa5f53641b4c3653e614cc8c5c 100755
--- a/src/ui/window/JDialogObserver.java
+++ b/src/ui/window/JDialogObserver.java
@@ -46,11 +46,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogObserver extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogParam.java b/src/ui/window/JDialogParam.java
index 47d4683bd53ddcd111c5fbd101bc737ca52974fa..b75f30a2870ce02d6ef4c9c6601b01e2dba0a9c0 100755
--- a/src/ui/window/JDialogParam.java
+++ b/src/ui/window/JDialogParam.java
@@ -46,12 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TType;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogParam extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogParamFIFO.java b/src/ui/window/JDialogParamFIFO.java
index 1f6586e2d014ffa8f6dbcc2d25083e59ffa77ff3..b8a45aacf5576ffbf35cdaefc09bde944268c7cf 100755
--- a/src/ui/window/JDialogParamFIFO.java
+++ b/src/ui/window/JDialogParamFIFO.java
@@ -46,12 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TType;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogPortArtifact.java b/src/ui/window/JDialogPortArtifact.java
index 0998fcf9449bdec2439cbb7df52a2b08d84113fe..c6e6081bc1ada9c9bb2e889cdaa3efdd9fa1ea56 100755
--- a/src/ui/window/JDialogPortArtifact.java
+++ b/src/ui/window/JDialogPortArtifact.java
@@ -48,15 +48,19 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import tmltranslator.modelcompiler.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmldd.TMLArchiMemoryNode;
+import ui.tmldd.TMLArchiPortArtifact;
+
 import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
 import java.util.List;
-
-import ui.*;
-import ui.tmldd.*;
-import tmltranslator.modelcompiler.*;
+import java.util.Vector;
 
 
 public class JDialogPortArtifact extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogPragma.java b/src/ui/window/JDialogPragma.java
index acc9bfe2b07633f7a516b2a65bbb3fbf8134a835..15342889c7fadc32c18c2979e5307c0e3ff201a4 100755
--- a/src/ui/window/JDialogPragma.java
+++ b/src/ui/window/JDialogPragma.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.IconManager;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
 import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import ui.*;
-import java.util.*;
-import java.util.regex.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class JDialogPragma extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogProjection.java b/src/ui/window/JDialogProjection.java
index 079f67913acc121e0b4b9f12419fcaa1607c7b62..054dfe65a602ad04fa400e0dc6ef0f73f3829d9f 100755
--- a/src/ui/window/JDialogProjection.java
+++ b/src/ui/window/JDialogProjection.java
@@ -46,17 +46,23 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
-import launcher.*;
-import myutil.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
 import translator.*;
 import ui.*;
-import ui.cd.*;
+import ui.cd.TClassDiagramPanel;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class JDialogProjection extends javax.swing.JDialog implements ActionListener, ListSelectionListener, Runnable  {
diff --git a/src/ui/window/JDialogProverifVerification.java b/src/ui/window/JDialogProverifVerification.java
index 560a6aee915f271c589b261fd82f5582502b6c62..e15c8aba148dedbfb2075a3d40d0b0fe83e9460c 100644
--- a/src/ui/window/JDialogProverifVerification.java
+++ b/src/ui/window/JDialogProverifVerification.java
@@ -46,22 +46,35 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-import avatartranslator.toproverif.*;
-import avatartranslator.*;
-import proverifspec.*;
-import ui.*;
-
+import avatartranslator.AvatarPragma;
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaReachability;
+import avatartranslator.AvatarPragmaSecret;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.GraphicLib;
+import myutil.MasterProcessInterface;
+import myutil.TraceManager;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
+import proverifspec.ProVerifResultTraceStep;
+import ui.AvatarDesignPanel;
+import ui.IconManager;
+import ui.MainGUI;
 import ui.interactivesimulation.JFrameSimulationSDPanel;
 
-import launcher.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.*;
+import java.util.HashMap;
+import java.util.LinkedList;
 
 
 public class JDialogProverifVerification extends javax.swing.JDialog implements ActionListener, ListSelectionListener, MouseListener, Runnable, MasterProcessInterface  {
diff --git a/src/ui/window/JDialogReducedAttribute.java b/src/ui/window/JDialogReducedAttribute.java
index 550232057a1d4961ecac26d8afcf2a3a006d2fce..6f1c9065ee62e9a87ed030ece047898ba369609d 100755
--- a/src/ui/window/JDialogReducedAttribute.java
+++ b/src/ui/window/JDialogReducedAttribute.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 public class JDialogReducedAttribute extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
     private java.util.List<TAttribute> attributesPar, setList, unsetList, tclassAttributes;
diff --git a/src/ui/window/JDialogRequirement.java b/src/ui/window/JDialogRequirement.java
index 2a674d24d342bd820a23767d2c968e977ca74d49..c53a120e3862ff7e246b9cf772cfbb7a2b0d3542 100755
--- a/src/ui/window/JDialogRequirement.java
+++ b/src/ui/window/JDialogRequirement.java
@@ -46,14 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
 
 public class JDialogRequirement extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogRequirementTable.java b/src/ui/window/JDialogRequirementTable.java
index bc03f41716b529138993a4a2e3342403bb007db3..4408b8595716eb52719396aa046bfa2e24dafb29 100755
--- a/src/ui/window/JDialogRequirementTable.java
+++ b/src/ui/window/JDialogRequirementTable.java
@@ -46,12 +46,13 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogRequirementTable extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogSDInstance.java b/src/ui/window/JDialogSDInstance.java
index c00aab5f30eb835d7e0f4d8a7cf38ba96e3862c4..c408bf8dbac5a47ab409b4637fa5c0ca3b384aef 100644
--- a/src/ui/window/JDialogSDInstance.java
+++ b/src/ui/window/JDialogSDInstance.java
@@ -47,13 +47,12 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogSDInstance extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogSMDLibraryFunctionCall.java b/src/ui/window/JDialogSMDLibraryFunctionCall.java
index d3938e71b03392b67753519a11792043d84601ec..61a911f9563a8b34393f851ec4adceb5e840e296 100644
--- a/src/ui/window/JDialogSMDLibraryFunctionCall.java
+++ b/src/ui/window/JDialogSMDLibraryFunctionCall.java
@@ -38,35 +38,21 @@
 
 package ui.window;
 
-import java.util.LinkedList;
-import java.util.Collections;
-import java.util.Arrays;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDLibraryFunction;
+import ui.avatarsmd.AvatarSMDLibraryFunctionCall;
 
-import javax.swing.JFrame;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.ListSelectionModel;
-import javax.swing.JScrollPane;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.event.ListSelectionListener;
+import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
-
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.Container;
-import java.awt.Font;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
-import ui.TAttribute;
-import ui.IconManager;
-import ui.AvatarSignal;
-import ui.avatarbd.AvatarBDLibraryFunction;
-import ui.avatarsmd.AvatarSMDLibraryFunctionCall;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
 
 /**
 * Dialog for managing Avatar library function calls in State Machine Diagrams.
diff --git a/src/ui/window/JDialogSafetyPragma.java b/src/ui/window/JDialogSafetyPragma.java
index bccf317349a79b13167c3fb453503b4743defab6..21e7ef0d90edbf6a76193415e651aa3a14872aae 100644
--- a/src/ui/window/JDialogSafetyPragma.java
+++ b/src/ui/window/JDialogSafetyPragma.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.IconManager;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
 import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import ui.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class JDialogSafetyPragma extends javax.swing.JDialog implements ActionListener {
     
diff --git a/src/ui/window/JDialogScheduling.java b/src/ui/window/JDialogScheduling.java
index 35ed2d31966327649f9af4b8f0be86cbe8a34a84..f3bf9607a8901eabfaeca4eb58895e7f94751703 100755
--- a/src/ui/window/JDialogScheduling.java
+++ b/src/ui/window/JDialogScheduling.java
@@ -46,30 +46,16 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
 import myutil.ProcessThread;
 import myutil.ScrolledJTextArea;
 import ui.IconManager;
 import ui.MainGUI;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 public class JDialogScheduling extends javax.swing.JDialog implements ActionListener, Runnable  {
 	
 	private static boolean sampleChecked=false, channelChecked= false, eventChecked = false, requestChecked = false, execChecked = false, busTransferChecked = false, schedulingChecked = false, taskStateChecked = false, channelStateChecked = false, branchingChecked = false, terminateCPUChecked = false, terminateCPUsChecked = true, clockedChecked = false, clockedEndChecked = false, countTickChecked=false, maxCountTickChecked=false, randomTaskChecked = true;
diff --git a/src/ui/window/JDialogSearchBox.java b/src/ui/window/JDialogSearchBox.java
index 3cafd3ff7ac317e642f6dc28fa0bf872ff8e89fe..17743c30b67e9b5dd6dd57a02dcd942b1da77447 100644
--- a/src/ui/window/JDialogSearchBox.java
+++ b/src/ui/window/JDialogSearchBox.java
@@ -46,38 +46,32 @@
 
 package ui.window;
 
-import web.crawler.*;
-import myutil.TraceManager;
-
+import myutil.*;
+import myutil.externalSearch.Client;
+import myutil.externalSearch.Message;
+import myutil.externalSearch.Record;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MalformedConfigurationException;
+import ui.TDiagramMouseManager;
+import web.crawler.WebCrawler;
 
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.text.StyledDocument;
+import javax.swing.text.html.HTMLDocument;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-import myutil.GoogleSearch;
-import myutil.GraphicLib;
-import java.lang.Object;
-import java.awt.Desktop;
 import java.net.URI;
-import myutil.TableSorter;
-import java.util.*;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.text.html.HTMLDocument;
-
-import myutil.CheckConnection;
-import myutil.externalSearch.Record;
-import ui.ConfigurationTTool;
-import ui.IconManager;
-import ui.MalformedConfigurationException;
-import ui.TDiagramMouseManager;
-import myutil.externalSearch.Message;
-import myutil.externalSearch.Client;
+import java.util.ArrayList;
 
 //TODO : change display to tab.
 //TODO: decorate the text box
diff --git a/src/ui/window/JDialogSelectAvatarBlock.java b/src/ui/window/JDialogSelectAvatarBlock.java
index dcc4e6ffd98d8f0e775d4e18c87b8130ade9339c..966ea92d37f58748292e6ea42b777f8e9e35c366 100755
--- a/src/ui/window/JDialogSelectAvatarBlock.java
+++ b/src/ui/window/JDialogSelectAvatarBlock.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDStateMachineOwner;
 
-import ui.*;
-import ui.avatarbd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 
 public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectCPDiagrams.java b/src/ui/window/JDialogSelectCPDiagrams.java
index c00440bd90cdac280f535f24ca638726a27303d4..1242afdc49cae1f011f4b68d237946cd69e3f7a3 100755
--- a/src/ui/window/JDialogSelectCPDiagrams.java
+++ b/src/ui/window/JDialogSelectCPDiagrams.java
@@ -47,17 +47,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcp.TMLCPRefAD;
+import ui.tmlcp.TMLCPRefSD;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
 import java.util.List;
-
-import myutil.*;
-
-import ui.*;
-import ui.tmlcp.*;
+import java.util.Vector;
 
 
 public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectRequirements.java b/src/ui/window/JDialogSelectRequirements.java
index df06f3c3a84be6dd2ffa17dbe29c4a9d7b62eec6..c7348c9c810c97863e50f8b1b3286fe4b2627671 100755
--- a/src/ui/window/JDialogSelectRequirements.java
+++ b/src/ui/window/JDialogSelectRequirements.java
@@ -46,14 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.req.Requirement;
 
-import ui.*;
-import ui.req.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogSelectRequirements extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectTMLComponent.java b/src/ui/window/JDialogSelectTMLComponent.java
index bce97693a5eea8dfd1bb901986c17a3d1d58783e..6796f7fd44477d35838a80d818b730e91e12aa56 100755
--- a/src/ui/window/JDialogSelectTMLComponent.java
+++ b/src/ui/window/JDialogSelectTMLComponent.java
@@ -46,15 +46,21 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcompd.TMLCCompositeComponent;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCRemoteCompositeComponent;
+
 import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 import java.util.List;
-
-import ui.*;
-import ui.tmlcompd.*;
+import java.util.Vector;
 
 
 public class JDialogSelectTMLComponent extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectTMLNodes.java b/src/ui/window/JDialogSelectTMLNodes.java
index 51b33da2e732979aa1adc14fb9075e2666b1e224..1360c2c94456e105e2c1e38f301f99c85ef88421 100755
--- a/src/ui/window/JDialogSelectTMLNodes.java
+++ b/src/ui/window/JDialogSelectTMLNodes.java
@@ -46,14 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmldd.TMLArchiNode;
 
-import ui.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogSelectTMLNodes extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSelectTMLTask.java b/src/ui/window/JDialogSelectTMLTask.java
index 2092c58e5fd9cd9596ccc800aab32c0595af4d4f..c1db0e681bdbd6a514945795abc592a586659e95 100755
--- a/src/ui/window/JDialogSelectTMLTask.java
+++ b/src/ui/window/JDialogSelectTMLTask.java
@@ -46,14 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcd.TMLTaskOperator;
 
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 
 public class JDialogSelectTMLTask extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSignalAssociation.java b/src/ui/window/JDialogSignalAssociation.java
index 44c1ca886d1504ee5e13732d3711a5d31c9466e8..4f24565f6adc0c1e0791ebe2c492ca9173159be6 100644
--- a/src/ui/window/JDialogSignalAssociation.java
+++ b/src/ui/window/JDialogSignalAssociation.java
@@ -46,15 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.TraceManager;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDPortConnector;
 
-import ui.*;
-import ui.avatarbd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.Vector;
 
 
 public class JDialogSignalAssociation extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSimulation.java b/src/ui/window/JDialogSimulation.java
index b8edd11e45487b3bc6a83f70cb51c1c17523f35e..6207d627dc77ad8e4e136d0a0fdc649fcfdd5e90 100755
--- a/src/ui/window/JDialogSimulation.java
+++ b/src/ui/window/JDialogSimulation.java
@@ -46,13 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogSimulation extends javax.swing.JDialog implements ActionListener, Runnable  {
     
diff --git a/src/ui/window/JDialogSynchro.java b/src/ui/window/JDialogSynchro.java
index 9dbcee1405ae94f2b06c8c69252a2bac1d2a27ed..2639a05e875a625afc72b08d2981a24ef64f4056 100755
--- a/src/ui/window/JDialogSynchro.java
+++ b/src/ui/window/JDialogSynchro.java
@@ -46,14 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.TClassSynchroInterface;
+import ui.TTwoAttributes;
+import ui.cd.TCDSynchroGateList;
 
-import ui.*;
-import ui.cd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogSynchro extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogSystemCGeneration.java b/src/ui/window/JDialogSystemCGeneration.java
index 05c700e2e2ab40af11dbc762d5b536ab02ad65d3..277c3f77b53398a8619554f77ddc13ac73aa08e4 100755
--- a/src/ui/window/JDialogSystemCGeneration.java
+++ b/src/ui/window/JDialogSystemCGeneration.java
@@ -47,46 +47,9 @@
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
 import launcher.LauncherException;
 import launcher.RshClient;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.MasterProcessInterface;
-import myutil.ScrolledJTextArea;
-import myutil.TraceManager;
+import myutil.*;
 import req.ebrdd.EBRDD;
 import tepe.TEPE;
 import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
@@ -97,6 +60,18 @@ import ui.JTextAreaWriter;
 import ui.MainGUI;
 import ui.avatarpd.AvatarPDPanel;
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
 public class JDialogSystemCGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface, ListSelectionListener  {
 
     protected MainGUI mgui;
diff --git a/src/ui/window/JDialogTMLADRandom.java b/src/ui/window/JDialogTMLADRandom.java
index c44ef2d3c88862beac6ade3467c4c3afde9ceb8f..ff6f4d3c53b6d807967de67538600b3e82115862 100755
--- a/src/ui/window/JDialogTMLADRandom.java
+++ b/src/ui/window/JDialogTMLADRandom.java
@@ -46,16 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmlad.*;
-
 
 public class JDialogTMLADRandom extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogTMLCPControllerInstance.java b/src/ui/window/JDialogTMLCPControllerInstance.java
index fc093e1365989e66767777eb42ccd378c3ed4af0..b9b17047ef2dfecf0037420de84068938dc97412 100755
--- a/src/ui/window/JDialogTMLCPControllerInstance.java
+++ b/src/ui/window/JDialogTMLCPControllerInstance.java
@@ -47,15 +47,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogTMLCPControllerInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLCPStorageInstance.java b/src/ui/window/JDialogTMLCPStorageInstance.java
index 3537de7603888b84d31a8f133d25ea322698addd..c1490cd6234dad792d142e66f6b8cb6504c16e14 100755
--- a/src/ui/window/JDialogTMLCPStorageInstance.java
+++ b/src/ui/window/JDialogTMLCPStorageInstance.java
@@ -47,15 +47,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogTMLCPStorageInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLCPTransferInstance.java b/src/ui/window/JDialogTMLCPTransferInstance.java
index f78a1aa5f7af3100640dfb6d32bfbb7e34d2d38f..96e6e22a52d96f13d39bcd7c13be02ffa422420f 100755
--- a/src/ui/window/JDialogTMLCPTransferInstance.java
+++ b/src/ui/window/JDialogTMLCPTransferInstance.java
@@ -47,15 +47,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public class JDialogTMLCPTransferInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLCompositePort.java b/src/ui/window/JDialogTMLCompositePort.java
index 59d033e35ae2a64d1078ac0b098aac7c1765aa0d..d21da8faea03c14518411100e36e2f0b4e8a3208 100755
--- a/src/ui/window/JDialogTMLCompositePort.java
+++ b/src/ui/window/JDialogTMLCompositePort.java
@@ -46,30 +46,16 @@
 
 package ui.window;
 
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Vector;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
 import ui.IconManager;
 import ui.TType;
 import ui.tmlcd.TMLDataFlowType;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
 public class JDialogTMLCompositePort extends JDialog implements ActionListener {
 	
     private JPanel panel1, panel2, panel3, panel4;
diff --git a/src/ui/window/JDialogTMLConnectorNode.java b/src/ui/window/JDialogTMLConnectorNode.java
index e59993885654c93a93ae088322ad21b00926c759..f311e10ba8273c81b6782ab414230709b2390584 100755
--- a/src/ui/window/JDialogTMLConnectorNode.java
+++ b/src/ui/window/JDialogTMLConnectorNode.java
@@ -46,15 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiConnectorNode;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.tmldd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogTMLConnectorNode extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogTMLRemoteCompositeComponent.java b/src/ui/window/JDialogTMLRemoteCompositeComponent.java
index 46b7a8b3ccf87fcfad8121ac994c5a8e2388d828..1480eec4665be6c2ab4960f485f5cedb18318205 100755
--- a/src/ui/window/JDialogTMLRemoteCompositeComponent.java
+++ b/src/ui/window/JDialogTMLRemoteCompositeComponent.java
@@ -46,15 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmlcompd.TMLCRemoteCompositeComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
-import ui.tmlcompd.*;
+//import javax.swing.event.*;
 
 
 public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog implements ActionListener  {
diff --git a/src/ui/window/JDialogTMLSDInstance.java b/src/ui/window/JDialogTMLSDInstance.java
index 7cdee4702582a9e137c9084f483e8bcaa9741843..aed4e6866956b66eeaa9c7fafd72e6d18582eb6e 100755
--- a/src/ui/window/JDialogTMLSDInstance.java
+++ b/src/ui/window/JDialogTMLSDInstance.java
@@ -47,15 +47,15 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.TAttribute;
 
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
 
 
 public abstract class JDialogTMLSDInstance extends javax.swing.JDialog implements ActionListener, ListSelectionListener  {
diff --git a/src/ui/window/JDialogTMLTaskArtifact.java b/src/ui/window/JDialogTMLTaskArtifact.java
index 6f7b257650168707279b5bdd054906a002004cc2..b9793ddc5e800dafea64883b6f36573ffed95fb1 100755
--- a/src/ui/window/JDialogTMLTaskArtifact.java
+++ b/src/ui/window/JDialogTMLTaskArtifact.java
@@ -46,17 +46,20 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
-import ui.tmldd.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
 import tmltranslator.modelcompiler.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
 
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
+//import javax.swing.event.*;
 
 public class JDialogTMLTaskArtifact extends javax.swing.JDialog implements ActionListener {
 
diff --git a/src/ui/window/JDialogTMatrixManagement.java b/src/ui/window/JDialogTMatrixManagement.java
index 32d3da8fdf3560db5bc69ed429bab26bf3510f61..ac22a06e24504ab4a2443139d08c019e8e695b18 100755
--- a/src/ui/window/JDialogTMatrixManagement.java
+++ b/src/ui/window/JDialogTMatrixManagement.java
@@ -46,16 +46,24 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.table.*;
-import java.util.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import myutil.TableSorter;
+import tmatrix.RequirementModeling;
+import tmatrix.Requirements;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
 
-import launcher.*;
-import myutil.*;
-import tmatrix.*;
-import ui.*;
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Vector;
 
 public class JDialogTMatrixManagement extends JFrame implements ActionListener, Runnable  {
     
diff --git a/src/ui/window/JDialogTOSClass.java b/src/ui/window/JDialogTOSClass.java
index a1f306beee83befcd4a61c4ccd2241d3e9604d56..656a4f4b360b8ebfae6f9a0b58682af4b903f4ef 100755
--- a/src/ui/window/JDialogTOSClass.java
+++ b/src/ui/window/JDialogTOSClass.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import ui.*;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.oscd.TOSClass;
 
-import ui.oscd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTOSClass extends javax.swing.JDialog implements ActionListener {
 
diff --git a/src/ui/window/JDialogTObjectName.java b/src/ui/window/JDialogTObjectName.java
index baede842eb8ad8def7f035e9cd9f87638ed7c47e..be8c846f2609ad6014989c615f74a3db75e3b199 100755
--- a/src/ui/window/JDialogTObjectName.java
+++ b/src/ui/window/JDialogTObjectName.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.cd.TCDTClass;
+import ui.cd.TCDTObject;
 
-import ui.*;
-import ui.cd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class JDialogTObjectName extends javax.swing.JDialog implements ActionListener {
         TCDTObject to;
diff --git a/src/ui/window/JDialogTPNValidation.java b/src/ui/window/JDialogTPNValidation.java
index eec86b855578226da850cf30f17c45f54b45b9c9..fb411a14b98ba92b729c84c8525a6181a421fc17 100755
--- a/src/ui/window/JDialogTPNValidation.java
+++ b/src/ui/window/JDialogTPNValidation.java
@@ -46,12 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import ui.IconManager;
+import ui.MainGUI;
+
 import javax.swing.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTPNValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
 	private static boolean verboseChecked, summaryChecked = false;
diff --git a/src/ui/window/JDialogTextProcess.java b/src/ui/window/JDialogTextProcess.java
index 1adbc9e60065a5301bef995b51888e1cb858d5c0..4965c035ada8223935c8585cc579fcc23e794277 100755
--- a/src/ui/window/JDialogTextProcess.java
+++ b/src/ui/window/JDialogTextProcess.java
@@ -46,13 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
  
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.Conversion;
+import myutil.FileUtils;
+import ui.IconManager;
+import ui.JTextAreaWriter;
 
 import javax.swing.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public class JDialogTextProcess extends javax.swing.JDialog implements ActionListener, Runnable  {
diff --git a/src/ui/window/JDialogTimeInterval.java b/src/ui/window/JDialogTimeInterval.java
index a5804b4cdbe8f7ebbc08aaa4301d37735a96d771..9a9c58f2383e91dee289c4dd469467ac909d2a29 100755
--- a/src/ui/window/JDialogTimeInterval.java
+++ b/src/ui/window/JDialogTimeInterval.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTimeInterval extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogTimeIntervalUnit.java b/src/ui/window/JDialogTimeIntervalUnit.java
index d56c5fffb3d8a3a6bc9234bf67d4a4f2a4560045..be0a32558856d949350d4f36d73bf62cffdcf962 100755
--- a/src/ui/window/JDialogTimeIntervalUnit.java
+++ b/src/ui/window/JDialogTimeIntervalUnit.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTimeIntervalUnit extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogTwoString.java b/src/ui/window/JDialogTwoString.java
index f15341562f1adafd9643cd4df51fd6e5a2df6603..ed9b7ed7da9830f73cccee1e67503d60275ca98a 100755
--- a/src/ui/window/JDialogTwoString.java
+++ b/src/ui/window/JDialogTwoString.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogTwoString extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogUPPAALGeneration.java b/src/ui/window/JDialogUPPAALGeneration.java
index 978d3328028f555512209acefaf2b3916a656e11..e306b3ccca83bcdc0fde4e81dab6fc9bca159bd7 100755
--- a/src/ui/window/JDialogUPPAALGeneration.java
+++ b/src/ui/window/JDialogUPPAALGeneration.java
@@ -46,13 +46,14 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
 import myutil.*;
 import ui.*;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 
 public class JDialogUPPAALGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface  {
 
diff --git a/src/ui/window/JDialogUPPAALValidation.java b/src/ui/window/JDialogUPPAALValidation.java
index 6e052f2546ce5a7c20db13b409f9d4cb228f15e8..a0ec2bf5e6fd111919744e3df27e294a89cd5ae4 100755
--- a/src/ui/window/JDialogUPPAALValidation.java
+++ b/src/ui/window/JDialogUPPAALValidation.java
@@ -46,18 +46,25 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
+import avatartranslator.touppaal.AVATAR2UPPAAL;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import myutil.TraceManager;
+import ui.*;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.*;
 
-import avatartranslator.*;
-import avatartranslator.touppaal.*;
-import uppaaldesc.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
-
 public class JDialogUPPAALValidation extends javax.swing.JDialog implements ActionListener, Runnable  {
     private static boolean deadlockAChecked/*, deadlockEChecked*/, generateTraceChecked, customChecked, stateAChecked, stateEChecked, stateLChecked, showDetailsChecked, translateChecked;
 
diff --git a/src/ui/window/JDialogUseCase.java b/src/ui/window/JDialogUseCase.java
index b92230ac4311d5b164e6ec5646579bf241daa7c0..f41db2225f288362bfefdc648e4848b45b743ac9 100755
--- a/src/ui/window/JDialogUseCase.java
+++ b/src/ui/window/JDialogUseCase.java
@@ -46,16 +46,16 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogUseCase extends javax.swing.JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JDialogVGMNNode.java b/src/ui/window/JDialogVGMNNode.java
index 8110728511795b8f428a78bd8bfa0914462dccec..362fb133596b1b73c6b7d2a24429b5a70790de84 100755
--- a/src/ui/window/JDialogVGMNNode.java
+++ b/src/ui/window/JDialogVGMNNode.java
@@ -46,16 +46,17 @@
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiVGMNNode;
+
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //import javax.swing.event.*;
 //import java.util.*;
 
-import ui.*;
-
-import ui.tmldd.*;
-
 
 public class JDialogVGMNNode extends javax.swing.JDialog implements ActionListener  {
 
diff --git a/src/ui/window/JDialogVersioningConnector.java b/src/ui/window/JDialogVersioningConnector.java
index b6a3584196d2eaa43c3f3418fa827161cf79ef84..256cdf7be0336b81eaea0a537fbd1feb89d05cc4 100755
--- a/src/ui/window/JDialogVersioningConnector.java
+++ b/src/ui/window/JDialogVersioningConnector.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
 
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class JDialogVersioningConnector extends JDialog implements ActionListener  {
     
diff --git a/src/ui/window/JFrameBasicText.java b/src/ui/window/JFrameBasicText.java
index 72a40d80afb13dd509b24137ad4ebfdf102d7776..f45c085f061b270dde6d61ba2c8e770a41b1b0c0 100755
--- a/src/ui/window/JFrameBasicText.java
+++ b/src/ui/window/JFrameBasicText.java
@@ -45,12 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.IconManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-//import myutil.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import ui.*;
+//import myutil.*;
 
 
 public	class JFrameBasicText extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameBird.java b/src/ui/window/JFrameBird.java
index b5468b988c7382e305ee734403d35be657b9b3b1..3370c79b170877c6cb4f20b441072f8a729f0807 100755
--- a/src/ui/window/JFrameBird.java
+++ b/src/ui/window/JFrameBird.java
@@ -45,11 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import ui.MainGUI;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 
 
 public	class JFrameBird extends JFrame implements WindowListener {
diff --git a/src/ui/window/JFrameCode.java b/src/ui/window/JFrameCode.java
index 2aa703965e8f8632c0acbe962e4f71db42662861..e9adba372a881fd05a0f2740d9c9d552579ece68 100755
--- a/src/ui/window/JFrameCode.java
+++ b/src/ui/window/JFrameCode.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
+import ui.IconManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public	class JFrameCode extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameDeadlock.java b/src/ui/window/JFrameDeadlock.java
index d11ba747275d6c7a6b24a200366d235a29fd4a12..ea0dfc70bcddaf8cdf2bc5a5b3687e5f6e122e61 100755
--- a/src/ui/window/JFrameDeadlock.java
+++ b/src/ui/window/JFrameDeadlock.java
@@ -46,17 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 //import java.io.*;
+
+import myutil.TableSorter;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.graph.AUTGraph;
+
 import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
+import javax.swing.table.AbstractTableModel;
 import java.awt.*;
-import java.awt.event.*;
-//import java.util.*;
-import ui.graph.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-
-import myutil.*;
-import ui.*;
+//import javax.swing.event.*;
+//import java.util.*;
 
 
 public	class JFrameDeadlock extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameMinimize.java b/src/ui/window/JFrameMinimize.java
index 41dbd9790800ec60fbe76e8138ef1f53a7e7ad95..dc0c539d05959505cf41704fc21a0b46487341dd 100755
--- a/src/ui/window/JFrameMinimize.java
+++ b/src/ui/window/JFrameMinimize.java
@@ -46,18 +46,21 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.ScrolledJTextArea;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.graph.AUTGraph;
+import ui.graph.RG;
 
-import launcher.*;
-import myutil.*;
-import translator.*;
-import ui.*;
-import ui.cd.*;
-import ui.graph.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 
 
 public class JFrameMinimize extends javax.swing.JFrame implements ActionListener, ListSelectionListener, Runnable  {
diff --git a/src/ui/window/JFrameNC.java b/src/ui/window/JFrameNC.java
index c32e6955eda980a3fce4469deb0d19d81ebef0c7..7bb12a76c3204657a9ccd27946590ed9e2021538 100755
--- a/src/ui/window/JFrameNC.java
+++ b/src/ui/window/JFrameNC.java
@@ -45,14 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import myutil.GraphicLib;
+import myutil.TableSorter;
+import nc.NCStructure;
+import ui.IconManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-
-import myutil.*;
-import ui.*;
-
-import nc.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 
 public	class JFrameNC extends JFrame implements ActionListener /*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
diff --git a/src/ui/window/JFramePowerManagementAnalysis.java b/src/ui/window/JFramePowerManagementAnalysis.java
index 35db3aeac82e07bc7b05d045c0cb11e9ecf5f817..1a14cc9f431cf1ecb1a806d318ea74192dbfe3fd 100755
--- a/src/ui/window/JFramePowerManagementAnalysis.java
+++ b/src/ui/window/JFramePowerManagementAnalysis.java
@@ -45,25 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
 import myutil.FileException;
 import myutil.GraphicLib;
 import myutil.ScrolledJTextArea;
@@ -74,6 +55,11 @@ import ui.StoppableGUIElement;
 import ui.graph.AUTGraph;
 import ui.graph.VCDGenerator;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 
 public	class JFramePowerManagementAnalysis extends JFrame implements ActionListener, StoppableGUIElement, Runnable {
 	private static String START_STRING = "Select options and then, click on 'start' to analyze power consumption and generate a VCD trace\n";
diff --git a/src/ui/window/JFrameRequirementTable.java b/src/ui/window/JFrameRequirementTable.java
index b2cb264cd6d409def68edacfb9a2459b90a444ee..1ec970b56c90792fe9abef2cb0e677a9da21f100 100755
--- a/src/ui/window/JFrameRequirementTable.java
+++ b/src/ui/window/JFrameRequirementTable.java
@@ -45,17 +45,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import javax.swing.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-
-
 import myutil.*;
 import ui.*;
-import ui.req.*;
-import ui.avatarrd.*;
+import ui.avatarrd.AvatarRDPanel;
+import ui.req.RequirementDiagramPanel;
+
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
 
 public	class JFrameRequirementTable extends JFrame implements ActionListener /*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
 	
diff --git a/src/ui/window/JFrameSimulationTrace.java b/src/ui/window/JFrameSimulationTrace.java
index d662cd4e4f7a5ddf93918310373b21c4be19d46d..08eb9bbb83425fe09e4d47072864c21ac256d7ea 100755
--- a/src/ui/window/JFrameSimulationTrace.java
+++ b/src/ui/window/JFrameSimulationTrace.java
@@ -45,14 +45,18 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.io.*;
+import translator.Gate;
+import translator.GroupOfGates;
+import translator.MasterGateManager;
+import ui.IconManager;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-
-import translator.*;
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.Vector;
 
 public	class JFrameSimulationTrace extends JFrame	implements ActionListener {
     private Vector trace;
diff --git a/src/ui/window/JFrameStatistics.java b/src/ui/window/JFrameStatistics.java
index 7f64959ffa31284ebb20788e4cef2639bfd127cd..8213ffe4d7860d3d597d46280bab141b84c73a5c 100755
--- a/src/ui/window/JFrameStatistics.java
+++ b/src/ui/window/JFrameStatistics.java
@@ -45,18 +45,23 @@
 
 package ui.window;
 
+import automata.Automata;
+import automata.State;
+import automata.Transition;
+import myutil.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.StoppableGUIElement;
+import ui.ThreadGUIElement;
+import ui.file.AUTFileFilter;
+import ui.graph.AUTGraph;
+
 import javax.swing.*;
-import javax.swing.table.*;
+import javax.swing.table.AbstractTableModel;
 import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.graph.*;
-import ui.file.*;
-import automata.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
 
 
 public  class JFrameStatistics extends JFrame implements ActionListener, StoppableGUIElement, SteppedAlgorithm, ExternalCall {
diff --git a/src/ui/window/JFrameText.java b/src/ui/window/JFrameText.java
index 45b2fe1eab51cebbb8f42c14e934e2c4f49e48c7..08fcfc0105fee34f0adad86eb90e5c384c83c8ef 100755
--- a/src/ui/window/JFrameText.java
+++ b/src/ui/window/JFrameText.java
@@ -45,14 +45,17 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.io.*;
+import myutil.FileUtils;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.RTLFileFilter;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import myutil.*;
-
-import ui.*;
-import ui.file.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FileOutputStream;
 
 
 public	class JFrameText extends JFrame	implements ActionListener {
diff --git a/src/ui/window/JSimulationPanel.java b/src/ui/window/JSimulationPanel.java
index 6df7c0222c527972965d03ee572bdeebe9859f53..3a04ba36258241f63347eaac6ad79eb2ee18fa5b 100755
--- a/src/ui/window/JSimulationPanel.java
+++ b/src/ui/window/JSimulationPanel.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import myutil.GraphicLib;
+import translator.Gate;
+import translator.GroupOfGates;
+import ui.ColorManager;
+import ui.ErrorGUI;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.awt.geom.Point2D;
-import java.util.*;
-
-import translator.*;
-import ui.*;
-import myutil.*;
+import java.util.Vector;
 
 public class JSimulationPanel extends JPanel implements JSimulationPanelInterface, MouseListener, MouseMotionListener {
     private JFrameSimulationTrace jfst;
diff --git a/src/ui/window/JSimulationPanelChrono.java b/src/ui/window/JSimulationPanelChrono.java
index 8678f4731d1dc52439ceb6c75cf3b8de6affc07a..54fb669b4d6339717037b5fcb065bef6a8504d50 100755
--- a/src/ui/window/JSimulationPanelChrono.java
+++ b/src/ui/window/JSimulationPanelChrono.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
+import myutil.GraphicLib;
+import translator.Gate;
+import translator.GroupOfGates;
+import ui.ColorManager;
+import ui.ErrorGUI;
+
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.awt.geom.Point2D;
-import java.util.*;
-
-import translator.*;
-import ui.*;
-import myutil.*;
+import java.util.Vector;
 
 public class JSimulationPanelChrono extends JPanel implements JSimulationPanelInterface, MouseListener, MouseMotionListener {
     private JFrameSimulationTrace jfst;
diff --git a/src/ui/window/LinksNCTableModel.java b/src/ui/window/LinksNCTableModel.java
index 4282ccac7e7c2422a2d9de88752d5d7a098fc006..7cae49730238026ace4d29132cd9ee46626fa656 100755
--- a/src/ui/window/LinksNCTableModel.java
+++ b/src/ui/window/LinksNCTableModel.java
@@ -46,11 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class LinksNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/PathsNCTableModel.java b/src/ui/window/PathsNCTableModel.java
index 27df5b46b2f082021397b5a568f0741591275bad..96cfcaf2dfcb5867eec3c6c24e21131ad4094b62 100755
--- a/src/ui/window/PathsNCTableModel.java
+++ b/src/ui/window/PathsNCTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCPath;
+import nc.NCStructure;
+import nc.NCSwitch;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class PathsNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/RequirementsTableModel.java b/src/ui/window/RequirementsTableModel.java
index b5c38520a8729018079b0e2fa99a32b6efba059a..1d97bae34bb86593af529e0fc968aad0daa7ffc0 100755
--- a/src/ui/window/RequirementsTableModel.java
+++ b/src/ui/window/RequirementsTableModel.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import java.awt.*;
-import javax.swing.table.*;
+import ui.TGComponent;
+import ui.avatarrd.AvatarRDRequirement;
+import ui.req.Requirement;
 
-import myutil.*;
-import ui.*;
-import ui.req.*;
-import ui.avatarrd.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.util.LinkedList;
 
 public class RequirementsTableModel extends AbstractTableModel {
 	private LinkedList<TGComponent> list;
diff --git a/src/ui/window/StatisticsItem.java b/src/ui/window/StatisticsItem.java
index 47fd8468136e48023ea327d299c42f44214052ad..dc1c9d94b6130a7fcb67cac1fe3dd8f5205a3780 100755
--- a/src/ui/window/StatisticsItem.java
+++ b/src/ui/window/StatisticsItem.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 import java.awt.*;
-import java.util.*;
+import java.util.Vector;
 
 public class StatisticsItem implements Comparable {
     private String name;
diff --git a/src/ui/window/StatisticsTableModel.java b/src/ui/window/StatisticsTableModel.java
index f2e209f63d36b3ef5cce7a3b7bcb4dd00b0e512b..61da418c7d5a5f828eae7b1fafa9af9cd5c25dd7 100755
--- a/src/ui/window/StatisticsTableModel.java
+++ b/src/ui/window/StatisticsTableModel.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import java.io.*;
-import javax.swing.table.*;
-
-import ui.graph.*;
-import myutil.*;
+import myutil.SteppedAlgorithm;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
+
+import javax.swing.table.AbstractTableModel;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.Collections;
+import java.util.Vector;
 
 public class StatisticsTableModel extends AbstractTableModel implements SteppedAlgorithm {
 	Vector statisticData;
diff --git a/src/ui/window/SwitchesNCTableModel.java b/src/ui/window/SwitchesNCTableModel.java
index 4c2f1c5a1dbdd894fb0ed935f157a4e2fe1ed44f..7c6167a4bff13dd86eeab798ac3d08578615cfb0 100755
--- a/src/ui/window/SwitchesNCTableModel.java
+++ b/src/ui/window/SwitchesNCTableModel.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
+import nc.NCSwitch;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class SwitchesNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/ui/window/TMatrixTableModel.java b/src/ui/window/TMatrixTableModel.java
index a6544121f37fb6c5b5b36b0914aceedabb06f518..6cf18b8348bade68982089f0252f4e8121023776 100755
--- a/src/ui/window/TMatrixTableModel.java
+++ b/src/ui/window/TMatrixTableModel.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
 package ui.window;
 
 
-import javax.swing.table.*;
+import tmatrix.RequirementModeling;
+import tmatrix.Requirements;
 
-import tmatrix.*;
+import javax.swing.table.AbstractTableModel;
 
 public class TMatrixTableModel extends AbstractTableModel {
     RequirementModeling rm;
diff --git a/src/ui/window/TrafficsNCTableModel.java b/src/ui/window/TrafficsNCTableModel.java
index deae4ec0f4975bfda8aeefe4d16f76d3f8b76fe5..eb916885f08b6caad9eb7b0ac455f5061d7d2900 100755
--- a/src/ui/window/TrafficsNCTableModel.java
+++ b/src/ui/window/TrafficsNCTableModel.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package ui.window;
 
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
+import nc.NCTraffic;
 
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
 
 public class TrafficsNCTableModel extends AbstractTableModel {
 	private NCStructure ncs;
diff --git a/src/uppaaldesc/UPPAALEventTemplate.java b/src/uppaaldesc/UPPAALEventTemplate.java
index c117bfa2d1c8b7e9d7653dba0aa3b85ae7bd3312..3352633a31caf0d6400a9bb5e7e7a7ffa9f4c070 100755
--- a/src/uppaaldesc/UPPAALEventTemplate.java
+++ b/src/uppaaldesc/UPPAALEventTemplate.java
@@ -45,9 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import tmltranslator.TMLEvent;
 
-import tmltranslator.*;
+import java.awt.*;
 
 
 public class UPPAALEventTemplate extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALEventTemplateWithLoss.java b/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
index 06529fc2dfd87ee92079717311874f0d5b295a00..ac43b0469323a149fe313ab9bb3d83573355f3a8 100644
--- a/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
+++ b/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
@@ -45,9 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import tmltranslator.TMLEvent;
 
-import tmltranslator.*;
+import java.awt.*;
 
 
 public class UPPAALEventTemplateWithLoss extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java b/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
index ee28107bc93e8b23994fa21ca4bf855c70276c06..2ce501165c4248c863134528d1c04bbebc8b6a32 100755
--- a/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
+++ b/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java b/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
index 876c5c370216b7614c4aacd7093a70dd2f304a5e..de19c5185e4095479eeebad45f90425dbce90bcc 100755
--- a/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java b/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
index 0ee867711f5ff04f10fe112a79b3bd29c6d01563..7fb333513384a70b695d2402731c18690eb675b1 100755
--- a/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
+++ b/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java b/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
index 6e078b807a91465882bb0083702c94de6ac471c1..d81de148f5d07a861bf2d00a9bf8d74cfbff55bd 100755
--- a/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALLocation.java b/src/uppaaldesc/UPPAALLocation.java
index 9ca174a574c471c45f5cedcbdeca80e96e332ff6..c8e87ceef5f4829e6863f78c252a235ec06ee1f9 100755
--- a/src/uppaaldesc/UPPAALLocation.java
+++ b/src/uppaaldesc/UPPAALLocation.java
@@ -45,8 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
-import myutil.*;
+import myutil.Conversion;
+
+import java.awt.*;
 
 
 public class UPPAALLocation {
diff --git a/src/uppaaldesc/UPPAALMemoryTemplate.java b/src/uppaaldesc/UPPAALMemoryTemplate.java
index a0a4b01e5dc0510d9ab9893e4bb9dd6997dc9fec..7194753589dea0b6d541d9f14a169f6b5987dab1 100755
--- a/src/uppaaldesc/UPPAALMemoryTemplate.java
+++ b/src/uppaaldesc/UPPAALMemoryTemplate.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALMemoryTemplateLoss.java b/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
index ffdae8051e1ba1dda25dac2f88f45b5ea39fa1c4..77668cc942877c29c22aecf270d06fa99b8f2674 100755
--- a/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
@@ -45,7 +45,7 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
+import java.awt.*;
 
 
 
diff --git a/src/uppaaldesc/UPPAALRequestTemplate.java b/src/uppaaldesc/UPPAALRequestTemplate.java
index 2c71b9d7e2cca3b5067795f2758021365041bc92..fb5554643d04e17bee93e2b0409e398551649144 100755
--- a/src/uppaaldesc/UPPAALRequestTemplate.java
+++ b/src/uppaaldesc/UPPAALRequestTemplate.java
@@ -45,8 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
-import tmltranslator.*;
+import tmltranslator.TMLRequest;
+
+import java.awt.*;
 
 
 public class UPPAALRequestTemplate extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java b/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
index e415db6355305a72f6c9ce7867f654dbae10c134..53cac0cd6a2cebd04c7bfe814a57ebf1ec4c5701 100755
--- a/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
+++ b/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
@@ -45,8 +45,9 @@
 
 package uppaaldesc;
 
-import java.awt.Point;
-import tmltranslator.*;
+import tmltranslator.TMLRequest;
+
+import java.awt.*;
 
 
 public class UPPAALRequestTemplateWithLoss extends  UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALSpec.java b/src/uppaaldesc/UPPAALSpec.java
index ac0a720a76a30bb97248a6e87e96a2dbe6f89a2b..22a371c7e659e33f268678efa61a5c6200cce996 100755
--- a/src/uppaaldesc/UPPAALSpec.java
+++ b/src/uppaaldesc/UPPAALSpec.java
@@ -45,9 +45,11 @@
 
 package uppaaldesc;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class UPPAALSpec {
diff --git a/src/uppaaldesc/UPPAALTemplate.java b/src/uppaaldesc/UPPAALTemplate.java
index 48338379ff72d8b380b6ff595c05b02b6fb29caf..c97ef71f37ba638701a3746e3df46f0da1a7781b 100755
--- a/src/uppaaldesc/UPPAALTemplate.java
+++ b/src/uppaaldesc/UPPAALTemplate.java
@@ -45,9 +45,10 @@
 
 package uppaaldesc;
 
-import java.util.*;
+import myutil.Conversion;
 
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
 
 
 public class UPPAALTemplate {
diff --git a/src/uppaaldesc/UPPAALTransition.java b/src/uppaaldesc/UPPAALTransition.java
index ffd2cc285426943ec358b28a439411502baacec4..c8d3022b853217c95aef555db9f3e42dc55a0ff2 100755
--- a/src/uppaaldesc/UPPAALTransition.java
+++ b/src/uppaaldesc/UPPAALTransition.java
@@ -45,11 +45,13 @@
 
 package uppaaldesc;
 
-import java.util.*;
-
-import java.awt.Point;
 import myutil.Conversion;
 
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 
 public class UPPAALTransition {
 	public UPPAALLocation destinationLoc, sourceLoc;
diff --git a/src/vcd/VCDContent.java b/src/vcd/VCDContent.java
index 6e701f56edac5add4233f42715a292b1f7b1405f..8d9da0cd96cf55d7e07ec4b123198553e79d6b0e 100755
--- a/src/vcd/VCDContent.java
+++ b/src/vcd/VCDContent.java
@@ -45,10 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package vcd;
 
-import java.util.*;
-import java.text.*;
+import ui.DefaultText;
 
-import ui.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
 
 public class VCDContent  {
     private String timeScale = "1 ns";
diff --git a/src/vcd/VCDTimeChange.java b/src/vcd/VCDTimeChange.java
index a4c02d19665bf3fb65c7f4ec0432e6c26b03aa75..9ccf77cc5a03a40a4c97a8eb6656f914fc6080fd 100755
--- a/src/vcd/VCDTimeChange.java
+++ b/src/vcd/VCDTimeChange.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
 
 package vcd;
 
-import java.util.*;
+import java.util.ArrayList;
 
 public class VCDTimeChange  {
     private String timeValue;
diff --git a/src/web/crawler/Client.java b/src/web/crawler/Client.java
index a31869a9b7bb0192f6553323faa1276337398c16..ed37af91a0b34bb6959ce8d0c89f8e59d48cb22c 100644
--- a/src/web/crawler/Client.java
+++ b/src/web/crawler/Client.java
@@ -47,19 +47,14 @@
 
 package web.crawler;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import java.io.*;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
 public class Client {
 
     /**
diff --git a/src/web/crawler/DataVisualisation.java b/src/web/crawler/DataVisualisation.java
index b93ffebe74e5b697064422ba113d0adc75ef71a2..f58a15bfdee2b3015e7683a34cdaeb1326be0147 100644
--- a/src/web/crawler/DataVisualisation.java
+++ b/src/web/crawler/DataVisualisation.java
@@ -52,14 +52,19 @@ import com.panayotis.gnuplot.plot.DataSetPlot;
 import com.panayotis.gnuplot.style.PlotStyle;
 import com.panayotis.gnuplot.style.Style;
 import com.panayotis.gnuplot.terminal.ImageTerminal;
-import java.awt.AWTException;
+import org.mcavallo.opencloud.Cloud;
+import org.mcavallo.opencloud.Tag;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.sql.Array;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -67,13 +72,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-import org.mcavallo.opencloud.Cloud;
-import org.mcavallo.opencloud.Tag;
-import javax.imageio.ImageIO;
+
 import static javax.imageio.ImageIO.write;
 import static javax.swing.WindowConstants.HIDE_ON_CLOSE;
 
diff --git a/src/web/crawler/DatabaseCreation.java b/src/web/crawler/DatabaseCreation.java
index 6b03d724816c0de96d41bc0f336d63549d8dbba3..62aa7852023722a07fd4d3ebc574c50efde30e1e 100644
--- a/src/web/crawler/DatabaseCreation.java
+++ b/src/web/crawler/DatabaseCreation.java
@@ -48,18 +48,14 @@
 
 package web.crawler;
 
-import myutil.*;
+import myutil.TraceManager;
+import org.apache.derby.drda.NetworkServerControl;
 
-import java.awt.AWTException;
-import java.awt.Robot;
-import java.io.*;
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
 import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import org.apache.derby.drda.NetworkServerControl;
+import java.sql.*;
 
 /**
  * All the function necessary for the creation of the database, creation of tables in the database and the storage of this databse
diff --git a/src/web/crawler/DatabaseQuery.java b/src/web/crawler/DatabaseQuery.java
index b38cdac79d38745809bf02bb218ea873f12c468f..a32ffee1885795333486d9e12a818df3ee79bf4e 100644
--- a/src/web/crawler/DatabaseQuery.java
+++ b/src/web/crawler/DatabaseQuery.java
@@ -48,7 +48,8 @@
 
 package web.crawler;
 
-import java.awt.AWTException;
+import javax.xml.transform.TransformerException;
+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -60,7 +61,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.xml.transform.TransformerException;
+
 import static web.crawler.FileManagement.StoreResultsInFile;
 
 
diff --git a/src/web/crawler/FileManagement.java b/src/web/crawler/FileManagement.java
index 3cbb07a9022fd5e3e6629479a61ce47a3c8a0a0a..e44b0256fa001de1d96b0c9352ee0460ec5e5e12 100644
--- a/src/web/crawler/FileManagement.java
+++ b/src/web/crawler/FileManagement.java
@@ -47,46 +47,28 @@
 
 package web.crawler;
 
-import myutil.*;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import myutil.TraceManager;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+import org.apache.commons.io.FileUtils;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.util.LinkedList;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.io.FileUtils;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.apache.commons.io.FileUtils;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
diff --git a/src/web/crawler/Message.java b/src/web/crawler/Message.java
index b061aa2a7eab3445bccf94eb2cb055488df900f2..166d5fbd17e78cd0f1db9964ae4b633f3255a1d1 100644
--- a/src/web/crawler/Message.java
+++ b/src/web/crawler/Message.java
@@ -1,14 +1,9 @@
 package web.crawler;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
-import java.io.Serializable;
-import javax.imageio.ImageIO;
 
 /**
  * @author Dan Huynh VO
diff --git a/src/web/crawler/MultiThreadServer.java b/src/web/crawler/MultiThreadServer.java
index 0b64d99e4b66c216059b1122029356abaaa6fa3c..37fa53eea373a8b4a70b7215d16239cc2e2a23d8 100644
--- a/src/web/crawler/MultiThreadServer.java
+++ b/src/web/crawler/MultiThreadServer.java
@@ -47,25 +47,15 @@
 
 package web.crawler;
 
-import java.awt.AWTException;
+import myutil.externalSearch.Message;
+import org.apache.commons.io.FileUtils;
+
+import javax.xml.transform.TransformerException;
+import java.awt.*;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Scanner;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.xml.transform.TransformerException;
-import org.apache.commons.io.FileUtils;
-import web.crawler.WebCrawler;
-import myutil.externalSearch.Message;
 
 
 public class MultiThreadServer {
diff --git a/src/web/crawler/ThreadSocket.java b/src/web/crawler/ThreadSocket.java
index aec3944e25a99549a15fa2892b2674bbe8e1fac7..dc192eb2cf902065deec259ac5276b3c2a5e77b9 100644
--- a/src/web/crawler/ThreadSocket.java
+++ b/src/web/crawler/ThreadSocket.java
@@ -47,17 +47,17 @@
 
 package web.crawler;
 
-import myutil.externalSearch.*;
+import myutil.externalSearch.Message;
 
-import java.awt.AWTException;
-import java.net.Socket;
-import java.io.*;
+import javax.net.ssl.SSLSocket;
+import javax.xml.transform.TransformerException;
+import java.awt.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.sql.SQLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.xml.transform.TransformerException;
-import myutil.externalSearch.Message;
-import javax.net.ssl.SSLSocket;
 
 
 
diff --git a/src/web/crawler/WebCrawler.java b/src/web/crawler/WebCrawler.java
index 4164c40d37a95844d14589cc829a3a2d27f74891..7a9a33421cc3569c4f617de4a3d2fe43b8b1e629 100644
--- a/src/web/crawler/WebCrawler.java
+++ b/src/web/crawler/WebCrawler.java
@@ -46,30 +46,27 @@
 
 package web.crawler;
 
-import myutil.*;
+import myutil.TraceManager;
 
-import java.awt.AWTException;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.sql.SQLException;
-import java.net.ServerSocket;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.FileTime;
+import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.concurrent.TimeUnit;
+
 import static web.crawler.FileManagement.ParsingXML;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSocket;
-import java.text.SimpleDateFormat;
-import java.util.Date;