From 3069ddf81b3cce2303cc1528e5de4708a798841f Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 26 Jun 2012 20:57:49 +0200 Subject: More GUI refactoring --- src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java | 2 +- src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java | 4 ++-- src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java | 4 ++-- src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java | 6 +++--- src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java | 8 ++++---- .../com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java | 3 ++- .../java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java | 4 ++-- .../com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs') diff --git a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java index 408a32c..340ec63 100644 --- a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java +++ b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java @@ -101,7 +101,7 @@ public void actionPerformed(ActionEvent e) { try { MainFrame.userAgent.execute(entity, action+"DomainPath", params); } catch (Exception e) { - Logger.exceptionDialog(e); + MainFrame.exceptionDialog(e); return false; } return true; diff --git a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java index 4a78581..e5d1dcc 100644 --- a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java @@ -141,7 +141,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver try { ((ItemProxy)sourceEntity.getEntity()).setProperty(MainFrame.userAgent, e.getActionCommand(), newVal); } catch (Exception ex) { - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } } @@ -187,7 +187,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver try { MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), predefStep, params); } catch (Exception ex) { - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java index 52c9cb3..6f15bfc 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java @@ -344,7 +344,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action } catch (Exception ex) { Logger.error(ex); - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } @@ -376,7 +376,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), "AddC2KObject", predefParams); } catch (Exception e) { Logger.error(e); - Logger.exceptionDialog(e); + MainFrame.exceptionDialog(e); } } diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java index 1ae4d43..5c3b1ed 100644 --- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java @@ -21,13 +21,13 @@ import com.c2kernel.gui.graph.view.EditorPanel; import com.c2kernel.gui.graph.view.VertexPropertyPanel; import com.c2kernel.gui.lifecycle.instance.TransitionPanel; import com.c2kernel.gui.lifecycle.instance.WfDirectedEdgeRenderer; +import com.c2kernel.gui.lifecycle.instance.WfEdgeFactory; import com.c2kernel.gui.lifecycle.instance.WfGraphPanel; +import com.c2kernel.gui.lifecycle.instance.WfVertexFactory; import com.c2kernel.gui.lifecycle.instance.WfVertexRenderer; import com.c2kernel.lifecycle.instance.CompositeActivity; +import com.c2kernel.lifecycle.instance.WfVertexOutlineCreator; import com.c2kernel.lifecycle.instance.Workflow; -import com.c2kernel.lifecycle.instance.gui.model.WfEdgeFactory; -import com.c2kernel.lifecycle.instance.gui.model.WfVertexFactory; -import com.c2kernel.lifecycle.instance.gui.model.WfVertexOutlineCreator; import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.process.Gateway; import com.c2kernel.utils.CastorXMLUtility; diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java index 707f311..34118a3 100644 --- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java +++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java @@ -209,7 +209,7 @@ public class ActivityViewer extends JPanel implements Runnable { } } catch (Exception ex) { Logger.error(ex); - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } }); @@ -230,7 +230,7 @@ public class ActivityViewer extends JPanel implements Runnable { } } catch (Exception ex) { Logger.error(ex); - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } }); @@ -260,7 +260,7 @@ public class ActivityViewer extends JPanel implements Runnable { executingJob = thisJob; new Thread(this).start(); } catch (OutcomeException ex) { - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } @@ -278,7 +278,7 @@ public class ActivityViewer extends JPanel implements Runnable { } catch (Exception e) { Logger.error(e); status.setText(Language.translate("Error during execution")); - Logger.exceptionDialog(e); + MainFrame.exceptionDialog(e); } enableAllButtons(true); } diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java b/src/main/java/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java index 3c5da27..13112ac 100644 --- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java +++ b/src/main/java/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java @@ -6,6 +6,7 @@ import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import com.c2kernel.gui.MainFrame; import java.util.StringTokenizer; import javax.swing.JComponent; @@ -133,7 +134,7 @@ public class MultiLinePasteAdapter implements ActionListener { } } } catch (Exception ex) { - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java index 2c4ce05..3be29f5 100644 --- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java +++ b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java @@ -1,6 +1,7 @@ package com.c2kernel.gui.tabs.outcome.form.field; import java.awt.Component; +import com.c2kernel.gui.MainFrame; import java.util.Enumeration; import java.util.StringTokenizer; @@ -16,7 +17,6 @@ import org.exolab.castor.xml.schema.SimpleType; import com.c2kernel.gui.tabs.outcome.form.StructuralException; import com.c2kernel.scripting.Script; -import com.c2kernel.utils.Logger; /******************************************************************************* * @@ -117,7 +117,7 @@ public class ComboField extends StringEditField { lovscript.setInputParamValue("LOV", vals); lovscript.execute(); } catch (Exception ex) { - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java index 716a073..8eb9368 100644 --- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java +++ b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java @@ -16,7 +16,7 @@ import javax.swing.JLabel; import org.apache.xerces.impl.dv.util.Base64; -import com.c2kernel.utils.Logger; +import com.c2kernel.gui.MainFrame; public class ImageEditField extends StringEditField { @@ -70,7 +70,7 @@ public class ImageEditField extends StringEditField { imageLabel.setIcon(newImage); encodedImage = Base64.encode(bArray); } catch (Exception ex) { - Logger.exceptionDialog(ex); + MainFrame.exceptionDialog(ex); } } } -- cgit v1.2.3