More GUI refactoring

16 files changed, 23 insertions, 705 deletions

diff --git a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java b/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java
index cd4963f..7094644 100644
--- a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java
+++ b/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java
@@ -3,13 +3,11 @@ package com.c2kernel.collection.gui.model;
 import java.awt.Point;

 

 import com.c2kernel.collection.Aggregation;

-import com.c2kernel.collection.MembershipException;

 import com.c2kernel.graph.model.GraphModelManager;

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

 import com.c2kernel.graph.model.VertexFactory;

 import com.c2kernel.utils.CastorHashMap;

-import com.c2kernel.utils.Logger;

 

 

 public class AggregationVertexFactory implements VertexFactory

@@ -31,15 +29,10 @@ public class AggregationVertexFactory implements VertexFactory
         GraphModelManager           graphModelManager,

         Point                       location,

         TypeNameAndConstructionInfo typeNameAndConstructionInfo

-    )

+    ) throws Exception

     {

         if (typeNameAndConstructionInfo.mInfo.equals("AggregationMember")) {

-            try {

-                mAggregation.addMember(-1, new CastorHashMap(), "", new GraphPoint(location.x, location.y), 40, 40);

-            } catch (MembershipException ex) {

-                Logger.error(ex);

-                Logger.exceptionDialog(ex);

-            }

+            mAggregation.addMember(-1, new CastorHashMap(), "", new GraphPoint(location.x, location.y), 40, 40);

         }

     }

 }

diff --git a/src/main/java/com/c2kernel/graph/model/GraphModel.java b/src/main/java/com/c2kernel/graph/model/GraphModel.java
index 47f368d..6f5ced5 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModel.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphModel.java
@@ -56,22 +56,22 @@ public class GraphModel implements Serializable{
 

     /* Notification Events */

 

-    private ClearedEvent mClearedEvent = new ClearedEvent();

-    private EdgeRemovedEvent mEdgeRemovedEvent = new EdgeRemovedEvent();

-    private EdgesChangedEvent mEdgesChangedEvent = new EdgesChangedEvent();

-    private ForcedNotifyEvent mForcedNotifyEvent = new ForcedNotifyEvent();

-    private NewEdgeEndPointChangedEvent mNewEdgeEndPointChangedEvent = new NewEdgeEndPointChangedEvent();

-    private SelectionChangedEvent mSelectionChangedEvent = new SelectionChangedEvent();

-    private StartVertexIdChangedEvent mStartVertexIdChangedEvent = new StartVertexIdChangedEvent();

-    private VertexAddedEvent mVertexAddedEvent = new VertexAddedEvent();

-    private VertexCreatedEvent mVertexCreatedEvent = new VertexCreatedEvent();

-    private VertexMovedEvent mVertexMovedEvent = new VertexMovedEvent();

-    private SelectionMovedEvent mSelectionMovedEvent = new SelectionMovedEvent();

-    private VertexRemovedEvent mVertexRemovedEvent = new VertexRemovedEvent();

-    private VerticesChangedEvent mVerticesChangedEvent = new VerticesChangedEvent();

-    private ElasticBandSetEvent mElasticBandSetEvent = new ElasticBandSetEvent();

-    private ElasticBandResizedEvent mElasticBandResizedEvent = new ElasticBandResizedEvent();

-    private GraphModelResizedEvent mGraphModelResizedEvent = new GraphModelResizedEvent();

+    private final ClearedEvent mClearedEvent = new ClearedEvent();

+    private final EdgeRemovedEvent mEdgeRemovedEvent = new EdgeRemovedEvent();

+    private final EdgesChangedEvent mEdgesChangedEvent = new EdgesChangedEvent();

+    private final ForcedNotifyEvent mForcedNotifyEvent = new ForcedNotifyEvent();

+    private final NewEdgeEndPointChangedEvent mNewEdgeEndPointChangedEvent = new NewEdgeEndPointChangedEvent();

+    private final SelectionChangedEvent mSelectionChangedEvent = new SelectionChangedEvent();

+    private final StartVertexIdChangedEvent mStartVertexIdChangedEvent = new StartVertexIdChangedEvent();

+    private final VertexAddedEvent mVertexAddedEvent = new VertexAddedEvent();

+    private final VertexCreatedEvent mVertexCreatedEvent = new VertexCreatedEvent();

+    private final VertexMovedEvent mVertexMovedEvent = new VertexMovedEvent();

+    private final SelectionMovedEvent mSelectionMovedEvent = new SelectionMovedEvent();

+    private final VertexRemovedEvent mVertexRemovedEvent = new VertexRemovedEvent();

+    private final VerticesChangedEvent mVerticesChangedEvent = new VerticesChangedEvent();

+    private final ElasticBandSetEvent mElasticBandSetEvent = new ElasticBandSetEvent();

+    private final ElasticBandResizedEvent mElasticBandResizedEvent = new ElasticBandResizedEvent();

+    private final GraphModelResizedEvent mGraphModelResizedEvent = new GraphModelResizedEvent();

 

     // Calling this constructor does not create a vertex outline creator

     // which is required by the method addVertexAndCreateId()

@@ -604,7 +604,7 @@ public class GraphModel implements Serializable{
         mExternalVertexFactory = factory;

     }

 

-    public void createVertex(Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo) {

+    public void createVertex(Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo) throws Exception {

         if (mExternalVertexFactory != null) {

             mExternalVertexFactory.create(mManager, location, typeNameAndConstructionInfo);

             setChanged();

diff --git a/src/main/java/com/c2kernel/graph/model/VertexFactory.java b/src/main/java/com/c2kernel/graph/model/VertexFactory.java
index 550367e..02681bd 100644
--- a/src/main/java/com/c2kernel/graph/model/VertexFactory.java
+++ b/src/main/java/com/c2kernel/graph/model/VertexFactory.java
@@ -10,7 +10,7 @@ public interface VertexFactory
         GraphModelManager           graphModelManager,

         Point                       location,

         TypeNameAndConstructionInfo typeNameAndConstructionInfo

-    );

+    ) throws Exception;

 

     public void setCreationContext(Object newContext);

 }

diff --git a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java b/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java
index 86b6f88..df97086 100644
--- a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java
+++ b/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java
@@ -7,7 +7,6 @@ import com.c2kernel.graph.model.GraphModel;
 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.GraphableVertex;

 import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator;

 import com.c2kernel.lifecycle.instance.CompositeActivity;

 import com.c2kernel.lifecycle.instance.Next;

 import com.c2kernel.lifecycle.instance.WfVertex;

diff --git a/src/main/java/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java b/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java
index 63d3b2f..a63a0a8 100644
--- a/src/main/java/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java
+++ b/src/main/java/com/c2kernel/lifecycle/WfVertexDefOutlineCreator.java
@@ -1,9 +1,8 @@
-package com.c2kernel.lifecycle.gui.model;

+package com.c2kernel.lifecycle;

 

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.graph.model.VertexOutlineCreator;

-import com.c2kernel.lifecycle.ActivitySlotDef;

 

 public class WfVertexDefOutlineCreator implements VertexOutlineCreator

 {

diff --git a/src/main/java/com/c2kernel/lifecycle/chooser/ActivityChooser.java b/src/main/java/com/c2kernel/lifecycle/chooser/ActivityChooser.java
deleted file mode 100644
index d5f62a0..0000000
--- a/src/main/java/com/c2kernel/lifecycle/chooser/ActivityChooser.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*

- * Created on 1 sept. 2003

- *

- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments

- */

-package com.c2kernel.lifecycle.chooser;

-

-import java.awt.Container;

-import java.awt.Cursor;

-import java.awt.Dimension;

-import java.awt.Image;

-import java.awt.Toolkit;

-import java.awt.event.ActionEvent;

-import java.awt.event.ActionListener;

-import java.util.HashMap;

-

-import javax.swing.BorderFactory;

-import javax.swing.Box;

-import javax.swing.BoxLayout;

-import javax.swing.JButton;

-import javax.swing.JFrame;

-import javax.swing.JLabel;

-import javax.swing.JPanel;

-

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.Logger;

-import com.c2kernel.utils.Resource;

-

-/**

- * @author Developpement

- *

- * To change the template for this generated type comment go to

- * Window>Preferences>Java>Code Generation>Code and Comments

- */

-public class ActivityChooser extends JFrame

-{

-    private LDAPFileChooser mLDAPFileChooserActivity = null;

-

-    private JButton mButtonOK = null;

-

-    private JButton mButtonCancel = null;

-

-    private JPanel mJPanelVertical = null;

-

-    private JPanel mJPanelHorizontal = null;

-

-    private String mMessage = "Choose or modify";

-

-    private WorkflowDialogue mParent = null;

-

-    private JLabel label = null;

-

-    HashMap<?, ?> mhashmap = null;

-

-    public ActivityChooser(String message, String title, Image img, WorkflowDialogue parent, HashMap<?, ?> hashmap)

-    {

-        super(title);

-        mMessage = message;

-        img = Resource.findImage("graph/newvertex_large.png").getImage();

-        setIconImage(img);

-        mParent = parent;

-        mhashmap = hashmap;

-        initialize();

-    }

-

-    private JButton getJButtonOK()

-    {

-        if (mButtonOK == null)

-            mButtonOK = new JButton(Language.translate("OK"));

-        return mButtonOK;

-    }

-

-    private JButton getJButtonCancel()

-    {

-        if (mButtonCancel == null)

-            mButtonCancel = new JButton(Language.translate("Cancel"));

-        return mButtonCancel;

-    }

-

-    private LDAPFileChooser getLDAPFileChooserActivity()

-    {

-        if (mLDAPFileChooserActivity == null)

-        {

-            try

-            {

-                mLDAPFileChooserActivity = new LDAPFileChooser(LDAPFileChooser.ACTIVITY_CHOOSER);

-                mLDAPFileChooserActivity.setName("LDAPFileChooserRouting");

-                mLDAPFileChooserActivity.setEditable(false);

-                //mLDAPFileChooserActivity.setBounds(125, 13, 400, 19);

-            } catch (Exception mExc)

-            {

-                Logger.error(mExc);

-            }

-        }

-        return mLDAPFileChooserActivity;

-    }

-

-    private void initialize()

-    {

-        getJButtonOK().addActionListener(new ActionListener()

-        {

-            @Override

-			public void actionPerformed(ActionEvent e)

-            {

-                Logger.debug(5, "mLDAPFileChooserActivity.getEntryName()" + mLDAPFileChooserActivity.getEntryName());

-                setCursor(new Cursor(Cursor.WAIT_CURSOR));

-                mParent.loadThisWorkflow(mLDAPFileChooserActivity.getEntryName(), mhashmap);

-                setCursor(new Cursor(Cursor.DEFAULT_CURSOR));

-                close();

-            }

-        });

-        getJButtonCancel().addActionListener(new ActionListener()

-        {

-            @Override

-			public void actionPerformed(ActionEvent e)

-            {

-                close();

-            }

-        });

-        //getContentPane().add(getJPanelVertical());

-        Container contentPane = getContentPane();

-        contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));

-        contentPane.add(getJPanelVertical());

-        contentPane.add(getJPanelHorizontal());

-        contentPane.add(Box.createGlue());

-        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();

-        setLocation((d.width - getWidth()) / 2, (d.height - getHeight()) / 2);

-        setResizable(true);

-        pack();

-        setSize(new Dimension(getWidth(), getJButtonCancel().getHeight() + getLDAPFileChooserActivity().getHeight() + label.getHeight() + 100));

-        setVisible(true);

-        setVisible(true);

-    }

-

-    private void close()

-    {

-        mParent = null;

-        this.setEnabled(false);

-        this.setVisible(false);

-    }

-

-    private JPanel getJPanelVertical()

-    {

-        if (mJPanelVertical == null)

-        {

-            try

-            {

-                Logger.debug(8, "Panel button");

-                mJPanelVertical = new JPanel();

-                mJPanelVertical.setName("JPanelV");

-                mJPanelVertical.setLayout(new BoxLayout(mJPanelVertical, BoxLayout.Y_AXIS));

-                label = new JLabel(mMessage);

-                JPanel labelP = new JPanel();

-                labelP.setLayout(new BoxLayout(labelP, BoxLayout.X_AXIS));

-                labelP.add(label);

-                labelP.add(Box.createGlue());

-                mJPanelVertical.add(labelP);

-                mJPanelVertical.add(Box.createRigidArea(new Dimension(0, 5)));

-                mJPanelVertical.add(getLDAPFileChooserActivity(), getLDAPFileChooserActivity().getName());

-                //mJPanelVertical.add(Box.createRigidArea(new Dimension(0,

-                // 10)));

-                mJPanelVertical.add(Box.createGlue());

-                mJPanelVertical.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));

-                mJPanelVertical.setVisible(true);

-            } catch (java.lang.Throwable mExc)

-            {

-                //handleException(mExc);

-            }

-        }

-        return mJPanelVertical;

-    }

-

-    private JPanel getJPanelHorizontal()

-    {

-        if (mJPanelHorizontal == null)

-        {

-            try

-            {

-                Logger.debug(8, "Panel button");

-                mJPanelHorizontal = new JPanel();

-                mJPanelHorizontal.setName("JPanelH");

-                mJPanelHorizontal.setLayout(new BoxLayout(mJPanelHorizontal, BoxLayout.X_AXIS));

-                mJPanelHorizontal.add(getJButtonOK(), getJButtonOK().getName());

-                mJPanelHorizontal.add(Box.createRigidArea(new Dimension(10, 0)));

-                mJPanelHorizontal.add(getJButtonCancel(), getJButtonCancel().getName());

-                mJPanelHorizontal.setVisible(true);

-            } catch (java.lang.Throwable mExc)

-            {

-                //handleException(mExc);

-            }

-        }

-        return mJPanelHorizontal;

-    }

-}
\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java b/src/main/java/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
deleted file mode 100644
index d21f6d5..0000000
--- a/src/main/java/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.c2kernel.lifecycle.chooser;

-/**

- * @version $Revision: 1.2 $ $Date: 2005/12/01 14:23:15 $

- * @author  $Author: abranson $

- */

-

-import java.awt.Dimension;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Enumeration;

-

-import javax.swing.JComboBox;

-

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.Logger;

-

-public class LDAPEntryChooser extends JComboBox

-{

-

-    DomainPath mDomainPath = null;

-    ArrayList<String> allItems = new ArrayList<String>();

-

-    public LDAPEntryChooser(DomainPath domPath, boolean editable)

-    {

-        super();

-        setEditable(editable);

-        mDomainPath = domPath;

-        initialise();

-     }

-

-    private void initialise()

-    {

-        try

-        {

-            Enumeration<?> children = Gateway.getLDAPLookup().searchAliases(mDomainPath);

-            while (children.hasMoreElements())

-            {

-                DomainPath domPath = (DomainPath)children.nextElement();

-                allItems.add(domPath.getName());

-            }

-        }

-        catch (Exception ex)

-        {

-            Logger.exceptionDialog(ex);

-        }

-

-        Collections.sort(allItems);

-        addItem("");

-        for (String element : allItems) {

-			addItem(element);

-		}

-

-    }

-

-    public void reload()

-    {

-        removeAllItems();

-        initialise();

-    }

-

-    @Override

-	public synchronized Dimension getSize()

-    {

-        if ("1".equals(Gateway.getProperty("ResizeCombo")))

-            return new Dimension(super.getSize().width<400?400:super.getSize().width,super.getSize().height);

-        return super.getSize();

-    }

-

-}

diff --git a/src/main/java/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java b/src/main/java/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java
deleted file mode 100644
index 9843d61..0000000
--- a/src/main/java/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.c2kernel.lifecycle.chooser;

-import java.awt.Dimension;

-import java.awt.event.ItemListener;

-import java.util.HashMap;

-

-import javax.swing.BoxLayout;

-import javax.swing.JPanel;

-

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.utils.Logger;

-

-//import fr.agilium.gui.tabs.wfPropertiesViewer.JPanelTabbedProperties;

-/**

- * @version $Revision: 1.2 $ $Date: 2005/06/27 15:16:12 $

- * @author  $Author: abranson $

- */

-

-public class LDAPFileChooser extends JPanel

-{

-    public static String SCRIPT_CHOOSER = "Script";

-    public static String SCHEMA_CHOOSER = "Schema";

-    public static String ACTIVITY_CHOOSER = "Activity";

-    private String chooserMode = null;

-    private HashMap<?, ?> mHashList = null;

-    public LDAPEntryChooser mLec;

-    private boolean mEditable = false;

-    DomainPath domainPath;

-    String itemQuery = null;

-    boolean showversion = true;

-

-    public LDAPFileChooser(String choose)

-    {

-        super();

-        chooserMode = choose;

-        initialise();

-    }

-

-    private void initialise()

-    {

-        if (chooserMode.equals(SCHEMA_CHOOSER))

-        {

-            itemQuery = ClusterStorage.VIEWPOINT + "/Schema/all";

-            domainPath = new DomainPath("/desc/OutcomeDesc/");

-        }

-        else if (chooserMode.equals(SCRIPT_CHOOSER))

-        {

-            itemQuery = ClusterStorage.VIEWPOINT + "/Script/all";

-            domainPath = new DomainPath("/desc/Script/");

-        }

-        else if (chooserMode.equals(ACTIVITY_CHOOSER))

-        {

-            domainPath = new DomainPath("/desc/ActivityDesc/");

-            showversion = false;

-        }

-        else

-            return;

-        mLec = new LDAPEntryChooser(domainPath, mEditable);

-

-        mLec.setPreferredSize(new Dimension(220, 19));

-        mLec.setMaximumSize(new Dimension(3000, 22));

-        mLec.setMinimumSize(new Dimension(50, 19));

-        //mLec.getRenderer().getListCellRendererComponent();

-

-        BoxLayout blyt = new BoxLayout(this, BoxLayout.X_AXIS);

-        setLayout(blyt);

-        add(mLec);

-        mLec.setVisible(true);

-        this.validate();

-        this.setVisible(true);

-

-    }

-

-    public String getEntryName()

-    {

-        return (String) mLec.getSelectedItem();

-    }

-

-    public void addItemListener(ItemListener il)

-    {

-        mLec.addItemListener(il);

-    }

-    public void setSelectedItem(String name, String version)

-    {

-        Logger.debug(5,"setSelectedItem " + name + " " + version);

-        if (name == null||name.equals("-1")) name="";

-        mLec.setSelectedItem(name);

-    }

-

-    public void reload()

-    {

-        mLec.reload();

-    }

-

-    public void removeAllItems()

-    {

-        mLec.removeAllItems();

-    }

-

-    /**

-     * @param b

-     */

-    public void setEditable(boolean b)

-    {

-        mEditable = b;

-        mLec.setEditable(b);

-    }

-

-    @Override

-	public void updateUI()

-	{

-		if (mLec!=null) mLec.updateUI();

-		super.updateUI();

-	}

-

-    @Override

-	public void setEnabled(boolean enabled)

-    {

-        mLec.setEnabled(enabled);

-    }

-}

diff --git a/src/main/java/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java b/src/main/java/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java
deleted file mode 100644
index 2ddd489..0000000
--- a/src/main/java/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*

- * Created on 2 sept. 2003

- *

- * To change the template for this generated file go to

- * Window>Preferences>Java>Code Generation>Code and Comments

- */

-package com.c2kernel.lifecycle.chooser;

-

-import java.util.HashMap;

-

-/**

- * @author Developpement

- *

- * To change the template for this generated type comment go to

- * Window>Preferences>Java>Code Generation>Code and Comments

- */

-public interface WorkflowDialogue

-{

-	public void loadThisWorkflow(String name, HashMap<?, ?> hashMap);

-}

diff --git a/src/main/java/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java b/src/main/java/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java
deleted file mode 100644
index 6e6727a..0000000
--- a/src/main/java/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.c2kernel.lifecycle.gui.model;

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.EdgeFactory;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.lifecycle.NextDef;

-import com.c2kernel.lifecycle.WfVertexDef;

-public class WfEdgeDefFactory implements EdgeFactory

-{

-	@Override

-	public void create(

-		GraphModelManager graphModelManager,

-		Vertex origin,

-		Vertex terminus,

-		TypeNameAndConstructionInfo typeNameAndConstructionInfo)

-	{

-		if (validCreation(graphModelManager, origin, terminus))

-				{

-					NextDef nextDef = new NextDef((WfVertexDef) origin, (WfVertexDef) terminus);

-					graphModelManager.getModel().addEdgeAndCreateId(nextDef, origin, terminus);

-				}

-	}

-	private static boolean validCreation(GraphModelManager graphModelManager, Vertex origin, Vertex terminus)

-	{

-		DirectedEdge[] connectingEdgesAToB = graphModelManager.getModel().getConnectingEdges(origin.getID(), terminus.getID());

-		DirectedEdge[] connectingEdgesBToA = graphModelManager.getModel().getConnectingEdges(terminus.getID(), origin.getID());

-		return (origin != terminus) && (connectingEdgesAToB.length == 0) && (connectingEdgesBToA.length == 0);

-	}

-}

diff --git a/src/main/java/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java b/src/main/java/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
deleted file mode 100644
index 132fdcf..0000000
--- a/src/main/java/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.c2kernel.lifecycle.gui.model;

-import java.awt.Point;

-import java.io.Serializable;

-import java.util.HashMap;

-

-import javax.swing.JOptionPane;

-

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.VertexFactory;

-import com.c2kernel.lifecycle.ActivityDef;

-import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.lifecycle.chooser.ActivityChooser;

-import com.c2kernel.lifecycle.chooser.WorkflowDialogue;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

-import com.c2kernel.utils.Logger;

-import com.c2kernel.utils.Resource;

-public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue

-{

-	protected CompositeActivityDef mCompositeActivityDef = null;

-	@Override

-	public void create(GraphModelManager graphModelManager, Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo)

-	{

-		String vertexTypeId = null;

-		if (mCompositeActivityDef != null && typeNameAndConstructionInfo.mInfo instanceof String)

-		{

-			vertexTypeId = (String) typeNameAndConstructionInfo.mInfo;

-			if (vertexTypeId.equals("Atomic") || vertexTypeId.equals("Composite"))

-			{

-				// ask for a name

-				HashMap<String, Serializable> mhm = new HashMap<String, Serializable>();

-				mhm.put("P1", vertexTypeId);

-				mhm.put("P2", location);

-				//************************************************

-				ActivityChooser a =

-					new ActivityChooser(

-						Language.translate("Please enter a Type for the new activityDef"),

-						Language.translate("New " + vertexTypeId + " Activity"),

-						Resource.findImage("graph/newvertex_large.png").getImage(),

-						this,

-						mhm);

-				a.setVisible(true);

-			}

-			else

-				mCompositeActivityDef.newChild("", vertexTypeId, location);

-		}

-	}

-	@Override

-	public void loadThisWorkflow(String newName, HashMap<?, ?> hashMap)

-	{

-		String vertexTypeId = (String) hashMap.get("P1");

-		Point location = (Point) hashMap.get("P2");

-		if (newName == null || newName.equals(""))

-			return;

-		Logger.debug(5, newName);

-		ActivityDef act = (ActivityDef) mCompositeActivityDef.search(mCompositeActivityDef.getID() + "/" + newName);

-		if (act != null)

-		{

-			String unicName = newName;

-			while (unicName == null

-				|| unicName == ""

-				|| mCompositeActivityDef.search(mCompositeActivityDef.getID() + "/" + unicName) != null)

-				unicName =

-					(String) JOptionPane.showInputDialog(

-						null,

-						Language.translate("Please type a Name"),

-						Language.translate("New " + vertexTypeId + " Activity"),

-						JOptionPane.QUESTION_MESSAGE,

-						Resource.findImage("graph/newvertex_large.png"),

-						null,

-						null);

-			act = (ActivityDef) mCompositeActivityDef.search(mCompositeActivityDef.getID() + "/" + newName);

-			mCompositeActivityDef.addExistingActivityDef(unicName, act, new GraphPoint(location.x, location.y));

-		}

-		else

-		{

-			try

-			{

-				act = LocalObjectLoader.getActDef(newName, "last");

-			}

-			catch (Exception ex)

-			{

-				Logger.exceptionDialog(ex);

-				return;

-			}

-			mCompositeActivityDef.newChild(newName, vertexTypeId, location);

-		}

-	}

-	@Override

-	public void setCreationContext(Object newContext)

-	{

-		if (newContext != null && newContext instanceof CompositeActivityDef)

-			mCompositeActivityDef = (CompositeActivityDef) newContext;

-	}

-}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
index c080a37..74f71ba 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
@@ -12,7 +12,6 @@ import com.c2kernel.entity.agent.Job;
 import com.c2kernel.graph.model.GraphModel;

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.GraphableVertex;

-import com.c2kernel.lifecycle.instance.gui.model.WfVertexOutlineCreator;

 import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;

 import com.c2kernel.lifecycle.instance.stateMachine.States;

 import com.c2kernel.lifecycle.instance.stateMachine.Transitions;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java b/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java
index e8cb303..3ae1730 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java
@@ -1,11 +1,10 @@
-package com.c2kernel.lifecycle.instance.gui.model;

+package com.c2kernel.lifecycle.instance;

 

 import java.io.Serializable;

 

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.graph.model.VertexOutlineCreator;

-import com.c2kernel.lifecycle.instance.Activity;

 

 public class WfVertexOutlineCreator implements VertexOutlineCreator,Serializable

 {

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java b/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java
deleted file mode 100644
index e96ef37..0000000
--- a/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.c2kernel.lifecycle.instance.gui.model;

-

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.graph.model.EdgeFactory;

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.lifecycle.instance.WfVertex;

-

-public class WfEdgeFactory implements EdgeFactory

-{

-    @Override

-	public void create

-    (

-        GraphModelManager           graphModelManager,

-        Vertex                      origin,

-        Vertex                      terminus,

-        TypeNameAndConstructionInfo typeNameAndConstructionInfo

-    )

-    {

-		if ( validCreation( graphModelManager, origin, terminus ) )

-			((WfVertex)origin).addNext((WfVertex)terminus);

-

-    }

-

-    private static boolean validCreation( GraphModelManager graphModelManager, Vertex origin, Vertex terminus )

-    {

-        DirectedEdge[] connectingEdgesAToB = graphModelManager.getModel().getConnectingEdges( origin.getID()  , terminus.getID() );

-        DirectedEdge[] connectingEdgesBToA = graphModelManager.getModel().getConnectingEdges( terminus.getID(), origin.getID() );

-

-

-        return ( origin != terminus ) && ( connectingEdgesAToB.length == 0 ) && ( connectingEdgesBToA.length == 0 );

-    }

-}

-

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java b/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
deleted file mode 100644
index 39e7ee9..0000000
--- a/src/main/java/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.c2kernel.lifecycle.instance.gui.model;

-import java.awt.Point;

-import java.io.Serializable;

-import java.util.HashMap;

-

-import javax.swing.JOptionPane;

-

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.VertexFactory;

-import com.c2kernel.lifecycle.ActivityDef;

-import com.c2kernel.lifecycle.chooser.ActivityChooser;

-import com.c2kernel.lifecycle.chooser.WorkflowDialogue;

-import com.c2kernel.lifecycle.instance.Activity;

-import com.c2kernel.lifecycle.instance.CompositeActivity;

-import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

-import com.c2kernel.utils.Resource;

-public class WfVertexFactory implements VertexFactory, WorkflowDialogue

-{

-	protected CompositeActivity mRootAct = null;

-	@Override

-	public void create(GraphModelManager graphModelManager, Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo)

-	{

-		String vertexTypeId = null;

-		if (mRootAct != null && typeNameAndConstructionInfo.mInfo instanceof String)

-		{

-			vertexTypeId = (String) typeNameAndConstructionInfo.mInfo;

-			if (vertexTypeId.equals("Atomic") || vertexTypeId.equals("Composite"))

-			{

-				HashMap<String, Serializable> mhm = new HashMap<String, Serializable>();

-				mhm.put("P1", vertexTypeId);

-				mhm.put("P2", location);

-				//************************************************

-				ActivityChooser a =

-					new ActivityChooser(

-						Language.translate("Please enter a Type for the new activity"),

-						Language.translate("New " + vertexTypeId + " Activity"),

-						Resource.findImage("graph/newvertex_large.png").getImage(),

-						this,

-						mhm);

-				a.setVisible(true);

-			}

-			else

-				mRootAct.newChild(vertexTypeId, location);

-		}

-	}

-	@Override

-	public void setCreationContext(Object newContext)

-	{

-		if (newContext != null && newContext instanceof CompositeActivity)

-			mRootAct = (CompositeActivity) newContext;

-	}

-	@Override

-	public void loadThisWorkflow(String newName, HashMap<?, ?> hashMap)

-	{

-		String vertexTypeId = (String) hashMap.get("P1");

-		Point location = (Point) hashMap.get("P2");

-		if (newName == null)

-			return;

-

-

-		String unicName = newName;

-		while (mRootAct.search(mRootAct.getPath() + "/" + unicName) != null)

-		{

-			unicName =

-				(String) JOptionPane.showInputDialog(

-					null,

-					Language.translate("Activity name not unique. Please give another."),

-					Language.translate("New " + vertexTypeId + " Activity"),

-					JOptionPane.QUESTION_MESSAGE,

-					Resource.findImage("graph/newvertex_large.png"),

-					null,

-					null);

-			if (newName.equals(""))

-				return;

-		}

-		Activity act = null;

-		try

-		{

-			ActivityDef actD = LocalObjectLoader.getActDef(newName, "last");

-			act = (Activity)actD.instantiate(unicName);

-		}

-		catch (Exception e)

-		{

-		}

-		if (act == null)

-			mRootAct.newChild(unicName, vertexTypeId, location);

-		else

-			mRootAct.newExistingChild(act, unicName, location);

-	}

-}

diff --git a/src/main/java/com/c2kernel/utils/Logger.java b/src/main/java/com/c2kernel/utils/Logger.java
index 45edbee..e5d5013 100644
--- a/src/main/java/com/c2kernel/utils/Logger.java
+++ b/src/main/java/com/c2kernel/utils/Logger.java
@@ -6,9 +6,6 @@ import java.sql.Timestamp;
 import java.util.HashMap;

 import java.util.Iterator;

 

-import javax.swing.JOptionPane;

-

-import org.omg.CORBA.UserException;

 import org.tanukisoftware.wrapper.WrapperManager;

 

 import com.c2kernel.process.AbstractMain;

@@ -116,16 +113,7 @@ public class Logger
 		else

 			System.exit(1);

 	}

-	static public void exceptionDialog(Exception ex)

-	{

-		String className = ex.getClass().getName();

-		className = className.substring(className.lastIndexOf('.') + 1);

-		String error = ex.getMessage();

-		if (ex instanceof UserException)

-			error = error.substring(error.indexOf(' ') + 1);

-		JOptionPane.showMessageDialog(null, error, className, JOptionPane.ERROR_MESSAGE);

-	}

-    /**

+	/**

      * @param console

      */

     public static void addLogStream(PrintStream console, int logLevel) {