summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/gui/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tabs')
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java8
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java14
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/collection/AggregationView.java6
3 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java b/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java
index 9a30d59..2af96ff 100644
--- a/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java
@@ -24,6 +24,7 @@ import javax.swing.SwingConstants;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.gui.EntityDetails;
+import com.c2kernel.gui.ImageLoader;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.tabs.outcome.OutcomeHandler;
import com.c2kernel.gui.tabs.outcome.form.OutcomePanel;
@@ -31,7 +32,6 @@ import com.c2kernel.gui.tree.NodeEntity;
import com.c2kernel.process.Gateway;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.Resource;
/**
* Generic item details tabbed pane.
*
@@ -53,7 +53,7 @@ public class EntityTabPane extends JPanel implements Runnable {
protected Box titleBox;
static {
try {
- mReloadIcon = Resource.findImage("reload.gif");
+ mReloadIcon = ImageLoader.findImage("reload.gif");
} catch (Exception e) {
Logger.warning("Couldn't load images: " + e);
}
@@ -96,7 +96,7 @@ public class EntityTabPane extends JPanel implements Runnable {
if (titleText == null)
titleText = tabName;
if (titleIcon == null)
- titleIcon = Resource.findImage("info.png");
+ titleIcon = ImageLoader.findImage("info.png");
JLabel title = new JLabel(titleText, titleIcon, SwingConstants.LEFT);
title.setFont(titleFont);
title.setForeground(headingColor);
@@ -113,7 +113,7 @@ public class EntityTabPane extends JPanel implements Runnable {
});
String defaultStartTab = MainFrame.getPref("DefaultStartTab", "Properties");
JToggleButton defaultStart =
- new JToggleButton(Resource.findImage("graph/start.png"));
+ new JToggleButton(ImageLoader.findImage("graph/start.png"));
defaultStart.setMargin(new Insets(0, 0, 0, 0));
defaultStart.setToolTipText(
Language.translate("Select this tab to be the default one opened when you double click an item"));
diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
index 5c3b1ed..40d07de 100644
--- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
@@ -14,9 +14,10 @@ import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator;
import com.c2kernel.graph.model.EdgeFactory;
-import com.c2kernel.graph.model.Selection;
import com.c2kernel.graph.model.VertexFactory;
+import com.c2kernel.gui.ImageLoader;
import com.c2kernel.gui.MainFrame;
+import com.c2kernel.gui.graph.controller.Selection;
import com.c2kernel.gui.graph.view.EditorPanel;
import com.c2kernel.gui.graph.view.VertexPropertyPanel;
import com.c2kernel.gui.lifecycle.instance.TransitionPanel;
@@ -34,17 +35,16 @@ import com.c2kernel.utils.CastorXMLUtility;
import com.c2kernel.utils.FileStringUtility;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.Resource;
public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<Workflow>
{
// Only for the purpose of loading and saving
protected Workflow mWorkflow = null;
boolean init = false;
TransitionPanel transPanel;
- protected JButton mLoadButton = new JButton(Resource.findImage("graph/load.png"));
- protected JButton mSaveButton = new JButton(Resource.findImage("graph/save.png"));
- protected JButton mLayoutButton = new JButton(Resource.findImage("graph/autolayout.png"));
- protected JButton mZoomOutButton = new JButton(Resource.findImage("graph/zoomout.png"));
+ protected JButton mLoadButton = new JButton(ImageLoader.findImage("graph/load.png"));
+ protected JButton mSaveButton = new JButton(ImageLoader.findImage("graph/save.png"));
+ protected JButton mLayoutButton = new JButton(ImageLoader.findImage("graph/autolayout.png"));
+ protected JButton mZoomOutButton = new JButton(ImageLoader.findImage("graph/zoomout.png"));
protected JButton[] mOtherToolBarButtons;
// Workflow factories
protected EdgeFactory mWfEdgeFactory;
@@ -237,7 +237,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W
(ItemProxy)sourceEntity.getEntity(),
"ReplaceDomainWorkflow",
new String[] { com.c2kernel.utils.CastorXMLUtility.marshall(cact)});
- cact.getChildrenGraphModel().setSelection(new Selection(null,null,0,0,0,0));
+ mEditorPanel.mGraphPanel.setSelection(new Selection(null,null,0,0,0,0));
}
catch (Exception e)
{
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/AggregationView.java b/src/main/java/com/c2kernel/gui/tabs/collection/AggregationView.java
index bd5e7d0..5c5d00c 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/AggregationView.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/AggregationView.java
@@ -2,6 +2,7 @@ package com.c2kernel.gui.tabs.collection;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import com.c2kernel.gui.ImageLoader;
import javax.swing.JButton;
import javax.swing.JSplitPane;
@@ -18,15 +19,14 @@ import com.c2kernel.gui.collection.SelectedMemberPanel;
import com.c2kernel.gui.graph.view.EditorPanel;
import com.c2kernel.gui.graph.view.GraphPanel;
import com.c2kernel.utils.Language;
-import com.c2kernel.utils.Resource;
/**
* @version $Revision: 1.5 $ $Date: 2006/09/15 15:02:24 $
* @author $Author: abranson $
*/
public class AggregationView extends CollectionView<AggregationMember>
{
- protected JButton mSaveButton = new JButton(Resource.findImage("graph/save.png"));
- protected JButton mHistoryButton = new JButton(Resource.findImage("graph/history.png"));
+ protected JButton mSaveButton = new JButton(ImageLoader.findImage("graph/save.png"));
+ protected JButton mHistoryButton = new JButton(ImageLoader.findImage("graph/history.png"));
protected JButton[] mOtherToolBarButtons = { mSaveButton, mHistoryButton };
// Graph editor panel
protected EditorPanel mEditorPanel;