Merge branch 'modules'2.3

3 files changed, 10 insertions, 10 deletions

diff --git a/source/com/c2kernel/gui/tabs/EntityTabPane.java b/source/com/c2kernel/gui/tabs/EntityTabPane.java
index 5a374dd..0a8a0cd 100644
--- a/source/com/c2kernel/gui/tabs/EntityTabPane.java
+++ b/source/com/c2kernel/gui/tabs/EntityTabPane.java
@@ -43,7 +43,7 @@ public class EntityTabPane extends JPanel implements Runnable {
 	protected NodeEntity sourceEntity;

     protected String titleText = null;

     protected ImageIcon titleIcon = null;

-    private String tabName;

+    private final String tabName;

     protected GridBagLayout gridbag = new GridBagLayout();

     protected GridBagConstraints c = null;

     public static Font titleFont = null;

@@ -53,7 +53,7 @@ public class EntityTabPane extends JPanel implements Runnable {
     protected Box titleBox;

     static {

         try {

-            mReloadIcon = Resource.getImageResource("reload.gif");

+            mReloadIcon = Resource.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.getImageResource("info.png");

+            titleIcon = Resource.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.getImageResource("graph/start.png"));

+            new JToggleButton(Resource.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/source/com/c2kernel/gui/tabs/WorkflowPane.java b/source/com/c2kernel/gui/tabs/WorkflowPane.java
index 6bccd08..e4acd8d 100644
--- a/source/com/c2kernel/gui/tabs/WorkflowPane.java
+++ b/source/com/c2kernel/gui/tabs/WorkflowPane.java
@@ -41,10 +41,10 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W
 	protected Workflow mWorkflow = null;

 	boolean init = false;

 	TransitionPanel transPanel;

-	protected JButton mLoadButton = new JButton(Resource.getImageResource("graph/load.png"));

-	protected JButton mSaveButton = new JButton(Resource.getImageResource("graph/save.png"));

-	protected JButton mLayoutButton = new JButton(Resource.getImageResource("graph/autolayout.png"));

-	protected JButton mZoomOutButton = new JButton(Resource.getImageResource("graph/zoomout.png"));

+	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[] mOtherToolBarButtons;

 	// Workflow factories

 	protected EdgeFactory mWfEdgeFactory;

diff --git a/source/com/c2kernel/gui/tabs/collection/AggregationView.java b/source/com/c2kernel/gui/tabs/collection/AggregationView.java
index 35cdb11..b6578bb 100644
--- a/source/com/c2kernel/gui/tabs/collection/AggregationView.java
+++ b/source/com/c2kernel/gui/tabs/collection/AggregationView.java
@@ -25,8 +25,8 @@ import com.c2kernel.utils.Resource;
  */

 public class AggregationView extends CollectionView<AggregationMember>

 {

-	protected JButton mSaveButton = new JButton(Resource.getImageResource("graph/save.png"));

-	protected JButton mHistoryButton = new JButton(Resource.getImageResource("graph/history.png"));

+	protected JButton mSaveButton = new JButton(Resource.findImage("graph/save.png"));

+	protected JButton mHistoryButton = new JButton(Resource.findImage("graph/history.png"));

 	protected JButton[] mOtherToolBarButtons = { mSaveButton, mHistoryButton };

 	// Graph editor panel

 	protected EditorPanel mEditorPanel;