GUI: replace PushButton by JButton in various toolbars to have the same LAF everywhere

diff --git a/scilab/modules/commons/src/java/org/scilab/modules/commons/gui/ScilabLAF.java b/scilab/modules/commons/src/java/org/scilab/modules/commons/gui/ScilabLAF.java

new file mode 100644 (file)

index 0000000..c6127fc
--- /dev/null
+++ b/scilab/modules/commons/src/java/org/scilab/modules/commons/gui/ScilabLAF.java
@@ -0,0 +1,26 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - Scialb Enterprises - Calixte DENIZET
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ */
+
+package org.scilab.modules.commons.gui;
+
+import javax.swing.AbstractButton;
+
+public final class ScilabLAF {
+
+    public static void setDefaultProperties(AbstractButton button) {
+        if (button != null) {
+            button.setFocusable(false);
+            button.setContentAreaFilled(true);
+            button.setOpaque(false);
+        }
+    }
+}
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/DeleteAction.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/DeleteAction.java

index 132d1c2..60b6952 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/DeleteAction.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/DeleteAction.java
@@ -16,12 +16,13 @@ package org.scilab.modules.graph.actions;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.OneSelectionDependantAction;
 import org.scilab.modules.graph.utils.ScilabGraphMessages;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 
 /**
  * Delete manager
@@ -59,7 +60,7 @@ public final class DeleteAction extends OneSelectionDependantAction {
      * @param scilabGraph corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, DeleteAction.class);
     }
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/RedoAction.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/RedoAction.java

index c5f7e15..f85ce6d 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/RedoAction.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/RedoAction.java
@@ -19,12 +19,13 @@ import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.lang.ref.WeakReference;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.ActionConstraint;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.utils.ScilabGraphMessages;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 
 import com.mxgraph.util.mxEvent;
 import com.mxgraph.util.mxEventObject;
@@ -117,7 +118,7 @@ public class RedoAction extends DefaultAction {
      * @param scilabGraph corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton redoButton(ScilabGraph scilabGraph) {
+    public static JButton redoButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, RedoAction.class);
     }
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/UndoAction.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/UndoAction.java

index 904cee5..487c799 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/UndoAction.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/UndoAction.java
@@ -19,12 +19,13 @@ import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.lang.ref.WeakReference;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.ActionConstraint;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.utils.ScilabGraphMessages;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 
 import com.mxgraph.util.mxEvent;
 import com.mxgraph.util.mxEventObject;
@@ -116,7 +117,7 @@ public class UndoAction extends DefaultAction {
      * @param scilabGraph corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton undoButton(ScilabGraph scilabGraph) {
+    public static JButton undoButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, UndoAction.class);
     }
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomInAction.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomInAction.java

index 8fd0395..3d92baf 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomInAction.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomInAction.java
@@ -23,6 +23,7 @@ import java.awt.event.MouseWheelListener;
 
 import javax.swing.ActionMap;
 import javax.swing.InputMap;
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.commons.OS;
@@ -30,7 +31,6 @@ import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.utils.ScilabGraphMessages;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 
 /**
  * Zoom management
@@ -129,7 +129,7 @@ public class ZoomInAction extends DefaultAction {
      *            corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton zoominButton(ScilabGraph scilabGraph) {
+    public static JButton zoominButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, ZoomInAction.class);
     }
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java

index 8c87bff..6625874 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java
@@ -24,6 +24,7 @@ import java.awt.event.MouseWheelListener;
 
 import javax.swing.ActionMap;
 import javax.swing.InputMap;
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.commons.OS;
@@ -31,7 +32,6 @@ import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.utils.ScilabGraphMessages;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 
 /**
  * Zoom management
@@ -132,7 +132,7 @@ public class ZoomOutAction extends DefaultAction implements ActionListener {
      *            corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton zoomoutButton(ScilabGraph scilabGraph) {
+    public static JButton zoomoutButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, ZoomOutAction.class);
     }
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java

index a574278..db5c2ea 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java
@@ -21,20 +21,19 @@ import java.lang.ref.WeakReference;
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.gui.bridge.checkboxmenuitem.SwingScilabCheckBoxMenuItem;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.checkboxmenuitem.CheckBoxMenuItem;
 import org.scilab.modules.gui.checkboxmenuitem.ScilabCheckBoxMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 
 import com.mxgraph.swing.mxGraphComponent;
 
@@ -149,15 +148,14 @@ public abstract class DefaultAction extends CommonCallBack {
      *            the associated klass
      * @return the push button
      */
-    protected static PushButton createButton(ScilabGraph graph, final Class <? extends DefaultAction > klass) {
+    protected static JButton createButton(ScilabGraph graph, final Class <? extends DefaultAction > klass) {
         DefaultAction action = GraphActionManager.getInstance(graph, klass);
-        PushButton item = ScilabPushButton.createPushButton();
+        JButton item = new JButton();
 
-        SwingScilabPushButton swingItem = (SwingScilabPushButton) item.getAsSimplePushButton();
-        swingItem.setAction(action);
+        item.setAction(action);
 
         // Hide the text on buttons
-        swingItem.setHideActionText(true);
+        item.setHideActionText(true);
 
         return item;
     }
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java

index 63c0da6..b5d4018 100644 (file)
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java
@@ -28,6 +28,7 @@ import javax.swing.JToggleButton;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.xml.ScilabDocumentBuilderFactory;
 import org.scilab.modules.graphic_objects.graphicObject.CallBack;
 import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
@@ -217,9 +218,7 @@ public final class ToolBarBuilder {
                             pushButton = new JButton();
                         }
 
-                        pushButton.setFocusable(false);
-                        pushButton.setContentAreaFilled(true);
-                        pushButton.setOpaque(false);
+                        ScilabLAF.setDefaultProperties(pushButton);
 
                         for (int i = 0; i < buttonAttributes.getLength(); i++) {
                             if (buttonAttributes.item(i).getNodeName().equals(ICON)) {
diff --git a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java

index 5dde7f0..6658765 100644 (file)
--- a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java
+++ b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java
@@ -39,6 +39,7 @@ import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
 import org.scilab.modules.gui.bridge.tab.SwingScilabDockablePanel;
+import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
@@ -475,16 +476,17 @@ public final class CommandHistory extends SwingScilabDockablePanel implements Si
      */
     private static ToolBar createToolBar() {
         ToolBar toolBar = ScilabToolBar.createToolBar();
+        SwingScilabToolBar stb = (SwingScilabToolBar) toolBar.getAsSimpleToolBar();
 
-        toolBar.add(CopyAction.createPushButton());
-        toolBar.add(CutAction.createPushButton());
-        toolBar.add(DeleteAction.createPushButton());
+        stb.add(CopyAction.createPushButton());
+        stb.add(CutAction.createPushButton());
+        stb.add(DeleteAction.createPushButton());
 
-        toolBar.addSeparator();
-        toolBar.add(PrefsAction.createPushButton());
-        toolBar.addSeparator();
+        stb.addSeparator();
+        stb.add(PrefsAction.createPushButton());
+        stb.addSeparator();
 
-        toolBar.add(HelpAction.createPushButton());
+        stb.add(HelpAction.createPushButton());
 
         return toolBar;
     }
diff --git a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CloseAction.java b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CloseAction.java

index 7ad4e17..891d4e5 100644 (file)
--- a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CloseAction.java
+++ b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CloseAction.java
@@ -14,13 +14,15 @@ package org.scilab.modules.history_browser.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.gui.utils.ClosingOperationsManager;
 import org.scilab.modules.history_browser.CommandHistory;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
@@ -72,11 +74,13 @@ public final class CloseAction extends CommonCallBack {
      * Create the associated button
      * @return the button
      */
-    public static PushButton createPushButton() {
-        PushButton pushButton = ScilabPushButton.createPushButton();
-        pushButton.setIcon(ICON);
+    public static JButton createPushButton() {
+        JButton pushButton = new JButton();
+        ScilabLAF.setDefaultProperties(pushButton);
+        pushButton.setIcon(new ImageIcon(ICON));
         pushButton.setToolTipText(LABEL);
-        pushButton.setCallback(getCallBack());
+        pushButton.addActionListener(getCallBack());
+
         return pushButton;
     }
 
diff --git a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java

index 3ad9fb7..0a39dc2 100644 (file)
--- a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java
+++ b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java
@@ -17,15 +17,15 @@ import java.awt.datatransfer.StringSelection;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.history_browser.CommandHistory;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 
@@ -76,11 +76,13 @@ public final class CopyAction extends CommonCallBack {
      * Create the associated button
      * @return the button
      */
-    public static PushButton createPushButton() {
-        PushButton pushButton = ScilabPushButton.createPushButton();
-        pushButton.setIcon(ICON);
+    public static JButton createPushButton() {
+        JButton pushButton = new JButton();
+        ScilabLAF.setDefaultProperties(pushButton);
+        pushButton.setIcon(new ImageIcon(ICON));
         pushButton.setToolTipText(LABEL);
-        pushButton.setCallback(getCallBack());
+        pushButton.addActionListener(getCallBack());
+
         return pushButton;
     }
 
diff --git a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java

index 4899d5d..151c4e0 100644 (file)
--- a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java
+++ b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java
@@ -15,15 +15,15 @@ package org.scilab.modules.history_browser.actions;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.history_browser.CommandHistory;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 
@@ -74,11 +74,13 @@ public final class CutAction extends CommonCallBack {
      * Create the associated button
      * @return the button
      */
-    public static PushButton createPushButton() {
-        PushButton pushButton = ScilabPushButton.createPushButton();
-        pushButton.setIcon(ICON);
+    public static JButton createPushButton() {
+        JButton pushButton = new JButton();
+        ScilabLAF.setDefaultProperties(pushButton);
+        pushButton.setIcon(new ImageIcon(ICON));
         pushButton.setToolTipText(LABEL);
-        pushButton.setCallback(getCallBack());
+        pushButton.addActionListener(getCallBack());
+
         return pushButton;
     }
 
diff --git a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java

index 853793c..83c0674 100644 (file)
--- a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java
+++ b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java
@@ -15,18 +15,18 @@ package org.scilab.modules.history_browser.actions;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.history_browser.CommandHistory;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 import org.scilab.modules.history_manager.HistoryManagement;
@@ -78,11 +78,13 @@ public final class DeleteAction extends CommonCallBack {
      * Create the associated button
      * @return the button
      */
-    public static PushButton createPushButton() {
-        PushButton pushButton = ScilabPushButton.createPushButton();
-        pushButton.setIcon(ICON);
+    public static JButton createPushButton() {
+        JButton pushButton = new JButton();
+        ScilabLAF.setDefaultProperties(pushButton);
+        pushButton.setIcon(new ImageIcon(ICON));
         pushButton.setToolTipText(LABEL);
-        pushButton.setCallback(getCallBack());
+        pushButton.addActionListener(getCallBack());
+
         return pushButton;
     }
 
diff --git a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java

index 3575674..0ee302a 100644 (file)
--- a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java
+++ b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java
@@ -15,15 +15,15 @@ package org.scilab.modules.history_browser.actions;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.CallScilabBridge;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 
 /**
@@ -62,11 +62,12 @@ public final class HelpAction extends CommonCallBack {
      * Create the associated button
      * @return the button
      */
-    public static PushButton createPushButton() {
-        PushButton pushButton = ScilabPushButton.createPushButton();
-        pushButton.setIcon(ICON);
+    public static JButton createPushButton() {
+        JButton pushButton = new JButton();
+        ScilabLAF.setDefaultProperties(pushButton);
+        pushButton.setIcon(new ImageIcon(ICON));
         pushButton.setToolTipText(LABEL);
-        pushButton.setCallback(getCallBack());
+        pushButton.addActionListener(getCallBack());
         return pushButton;
     }
 
diff --git a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/PrefsAction.java b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/PrefsAction.java

index 3164c32..650b1ca 100644 (file)
--- a/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/PrefsAction.java
+++ b/scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/PrefsAction.java
@@ -15,15 +15,15 @@ package org.scilab.modules.history_browser.actions;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.commons.ScilabGeneralPrefs;
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 
 /**
@@ -62,11 +62,13 @@ public final class PrefsAction extends CommonCallBack {
      * Create the associated button
      * @return the button
      */
-    public static PushButton createPushButton() {
-        PushButton pushButton = ScilabPushButton.createPushButton();
-        pushButton.setIcon(ICON);
+    public static JButton createPushButton() {
+        JButton pushButton = new JButton();
+        ScilabLAF.setDefaultProperties(pushButton);
+        pushButton.setIcon(new ImageIcon(ICON));
         pushButton.setToolTipText(LABEL);
-        pushButton.setCallback(getCallBack());
+        pushButton.addActionListener(getCallBack());
+
         return pushButton;
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java

index 1991975..9bb482b 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
@@ -43,6 +43,7 @@ import java.util.UUID;
 import java.util.logging.Logger;
 
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -79,7 +80,6 @@ import org.scilab.modules.gui.messagebox.ScilabModalDialog;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.AnswerOption;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.ButtonType;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.tab.SimpleTab;
 import org.scilab.modules.gui.tabfactory.ScilabTabFactory;
 import org.scilab.modules.gui.textbox.TextBox;
@@ -171,8 +171,8 @@ public class SciNotes extends SwingScilabDockablePanel {
     private int numberOfUntitled;
     private EditorKit editorKit;
 
-    private PushButton undoButton;
-    private PushButton redoButton;
+    private JButton undoButton;
+    private JButton redoButton;
 
     private boolean protectOpenFileList;
     private boolean restored;
@@ -1655,7 +1655,7 @@ public class SciNotes extends SwingScilabDockablePanel {
      * @param button
      *            the UndoButton used in this editor
      */
-    public void setUndoButton(PushButton button) {
+    public void setUndoButton(JButton button) {
         undoButton = button;
         enableUndoButton(false);
     }
@@ -1684,7 +1684,7 @@ public class SciNotes extends SwingScilabDockablePanel {
      * @param button
      *            the RedoButton used in this editor
      */
-    public void setRedoButton(PushButton button) {
+    public void setRedoButton(JButton button) {
         redoButton = button;
         enableRedoButton(false);
     }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesGUI.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesGUI.java

index 1de184a..86ca9b0 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesGUI.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesGUI.java
@@ -19,16 +19,19 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.JButton;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.xml.ScilabDocumentBuilderFactory;
 import org.scilab.modules.gui.bridge.checkboxmenuitem.SwingScilabCheckBoxMenuItem;
 import org.scilab.modules.gui.bridge.menu.SwingScilabMenu;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
+import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.gui.checkboxmenuitem.CheckBoxMenuItem;
 import org.scilab.modules.gui.menu.Menu;
@@ -36,7 +39,6 @@ import org.scilab.modules.gui.menu.ScilabMenu;
 import org.scilab.modules.gui.menubar.MenuBar;
 import org.scilab.modules.gui.menubar.ScilabMenuBar;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.textbox.ScilabTextBox;
 import org.scilab.modules.gui.textbox.TextBox;
 import org.scilab.modules.gui.toolbar.ScilabToolBar;
@@ -198,8 +200,8 @@ public final class SciNotesGUI {
             Node node = buttons.item(i);
             if (BUTTON.equals(node.getNodeName())) {
                 Element elem = (Element) node;
-                PushButton pb = (PushButton) getButton(elem.getAttribute(ACTION), elem.getAttribute(TOOLTIP), elem.getAttribute(ICON), editor);
-                toolBar.add(pb);
+                JButton button = getButton(elem.getAttribute(ACTION), elem.getAttribute(TOOLTIP), elem.getAttribute(ICON), editor);
+                ((SwingScilabToolBar) toolBar.getAsSimpleToolBar()).add(button);
             } else if (SEPARATOR.equals(node.getNodeName())) {
                 toolBar.addSeparator();
             }
@@ -351,7 +353,7 @@ public final class SciNotesGUI {
      * @param editor the editor
      * @return the button
      */
-    private static Object getButton(String action, String tooltip, String icon, SciNotes editor) {
+    private static JButton getButton(String action, String tooltip, String icon, SciNotes editor) {
         ClassLoader loader = ClassLoader.getSystemClassLoader();
         String className = "";
         String actionClass = SciNotes.getActionName().get(action);
@@ -363,7 +365,10 @@ public final class SciNotesGUI {
             }
             Class clazz = loader.loadClass(className);
             Method method = clazz.getMethod("createButton", new Class[] {String.class, String.class, SciNotes.class});
-            return method.invoke(null, new Object[] {Messages.gettext(tooltip), icon, editor});
+            JButton button = (JButton) method.invoke(null, new Object[] {Messages.gettext(tooltip), icon, editor});
+            ScilabLAF.setDefaultProperties(button);
+
+            return button;
         } catch (ClassNotFoundException e) {
             System.err.println("No action: " + className);
         } catch (NoSuchMethodException e) {
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CodeNavigatorAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CodeNavigatorAction.java

index 5d453fb..6fb9cc8 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CodeNavigatorAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CodeNavigatorAction.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.ScilabDocument;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.tabfactory.CodeNavigatorTab;
@@ -62,7 +62,7 @@ public final class CodeNavigatorAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new CodeNavigatorAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLAction.java

index 79cc2f0..9ab9e92 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLAction.java
@@ -21,13 +21,13 @@ import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.im.InputContext;
 import java.io.IOException;
 
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 import javax.swing.TransferHandler;
 
 import org.scilab.modules.jvm.LoadClassPath;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.ScilabEditorPane;
 import org.scilab.modules.scinotes.utils.HTMLCodeConverter;
@@ -82,7 +82,7 @@ public class CopyAsHTMLAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new CopyAsHTMLAction(tooltip, editor));
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLWithLineNumberAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLWithLineNumberAction.java

index 7fce883..9468de7 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLWithLineNumberAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLWithLineNumberAction.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 
 /**
@@ -54,7 +54,7 @@ public class CopyAsHTMLWithLineNumberAction extends CopyAsHTMLAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new CopyAsHTMLWithLineNumberAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CutAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CutAction.java

index c98e7b4..6be4246 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CutAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CutAction.java
@@ -15,10 +15,10 @@ package org.scilab.modules.scinotes.actions;
 
 import java.awt.Toolkit;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.ScilabDocument;
 import org.scilab.modules.scinotes.ScilabEditorPane;
@@ -79,7 +79,7 @@ public final class CutAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new CutAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/DefaultAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/DefaultAction.java

index 9bf7335..e16ad8d 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/DefaultAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/DefaultAction.java
@@ -16,17 +16,15 @@ package org.scilab.modules.scinotes.actions;
 import java.awt.event.ActionListener;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.utils.SciNotesMessages;
 
@@ -75,14 +73,14 @@ public class DefaultAction extends CommonCallBack {
      * @param listener action listener
      * @return the button
      */
-    protected static PushButton createButton(String title, String icon, ActionListener listener) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(listener);
+    protected static JButton createButton(String title, String icon, ActionListener listener) {
+        JButton button = new JButton();
+        button.addActionListener(listener);
         button.setToolTipText(title);
         if (icon == null) {
             button.setText(title);
         } else {
-            ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(new ImageIcon(FindIconHelper.findIcon(icon)));
+            button.setIcon(new ImageIcon(FindIconHelper.findIcon(icon)));
         }
         return button;
     }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/ExecuteFileIntoScilabAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/ExecuteFileIntoScilabAction.java

index 62a65c4..9109b32 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/ExecuteFileIntoScilabAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/ExecuteFileIntoScilabAction.java
@@ -14,11 +14,11 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.console.ScilabConsole;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.AnswerOption;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.ButtonType;
@@ -99,7 +99,7 @@ public class ExecuteFileIntoScilabAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new ExecuteFileIntoScilabAction(tooltip, editor));
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindAction.java

index 748a32e..4a87762 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindAction.java
@@ -64,14 +64,12 @@ import javax.swing.text.Highlighter;
 import org.scilab.modules.commons.gui.FindIconHelper;
 import org.scilab.modules.gui.bridge.textbox.SwingScilabTextBox;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.ScilabDocument;
 import org.scilab.modules.scinotes.SearchManager;
 import org.scilab.modules.scinotes.utils.ConfigSciNotesManager;
 import org.scilab.modules.scinotes.utils.SciNotesMessages;
 
-
 /**
  * FindAction
  * @author Sylvestre KOUMAR
@@ -246,7 +244,7 @@ public final class FindAction extends DefaultAction implements WindowFocusListen
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new FindAction(tooltip, editor));
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/GeneralSettingsAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/GeneralSettingsAction.java

index aaedd72..97f966f 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/GeneralSettingsAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/GeneralSettingsAction.java
@@ -12,11 +12,11 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.commons.ScilabGeneralPrefs;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 
 /**
@@ -60,7 +60,7 @@ public class GeneralSettingsAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new GeneralSettingsAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/HelpAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/HelpAction.java

index d2cc8c9..0e3edff 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/HelpAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/HelpAction.java
@@ -12,11 +12,11 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 
 /**
@@ -65,7 +65,7 @@ public final class HelpAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new HelpAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/IncrementalSearchAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/IncrementalSearchAction.java

index 50b1b49..f6200bc 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/IncrementalSearchAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/IncrementalSearchAction.java
@@ -40,7 +40,6 @@ import javax.swing.KeyStroke;
 import org.scilab.modules.commons.ScilabConstants;
 import org.scilab.modules.commons.gui.FindIconHelper;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.ScilabDocument;
 import org.scilab.modules.scinotes.ScilabEditorPane;
@@ -104,7 +103,7 @@ public final class IncrementalSearchAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new IncrementalSearchAction(tooltip, editor));
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/NewAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/NewAction.java

index aa4d616..372ef11 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/NewAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/NewAction.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.utils.ConfigSciNotesManager;
 
@@ -64,7 +64,7 @@ public final class NewAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new NewAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenAction.java

index a385d14..c9d7af7 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenAction.java
@@ -15,13 +15,13 @@ package org.scilab.modules.scinotes.actions;
 
 import java.io.File;
 
+import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
 import org.scilab.modules.gui.filechooser.Juigetfile;
 import org.scilab.modules.gui.filechooser.ScilabFileChooser;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.utils.ConfigManager;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.utils.ConfigSciNotesManager;
@@ -110,7 +110,7 @@ public class OpenAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new OpenAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenFileInAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenFileInAction.java

index e002c8c..da8425c 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenFileInAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenFileInAction.java
@@ -16,6 +16,7 @@ import java.io.File;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
@@ -24,7 +25,6 @@ import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
 import org.scilab.modules.gui.bridge.menu.SwingScilabMenu;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.utils.ConfigSciNotesManager;
 
@@ -86,7 +86,7 @@ public final class OpenFileInAction extends OpenAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         StringTokenizer token = new StringTokenizer(tooltip, ";\uff1b");
         String tt = token.nextToken();
         String path = token.nextToken();
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PasteAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PasteAction.java

index 37dfbe4..61c6ce8 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PasteAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PasteAction.java
@@ -19,10 +19,10 @@ import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.IOException;
 import java.io.StringReader;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.SciNotesCaret;
 import org.scilab.modules.scinotes.ScilabDocument;
@@ -85,7 +85,7 @@ public class PasteAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new PasteAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintAction.java

index 8d4a399..59a42fb 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintAction.java
@@ -12,11 +12,11 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.jvm.LoadClassPath;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.ScilabEditorPane;
 import org.scilab.modules.scinotes.utils.CodeExporter;
@@ -71,7 +71,7 @@ public class PrintAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new PrintAction(tooltip, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintPreviewAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintPreviewAction.java

index b338488..f509ae5 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintPreviewAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintPreviewAction.java
@@ -12,11 +12,11 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.jvm.LoadClassPath;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.ScilabEditorPane;
 import org.scilab.modules.scinotes.utils.CodeExporter;
@@ -75,8 +75,7 @@ public final class PrintPreviewAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new PrintPreviewAction(tooltip, editor));
     }
-
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RedoAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RedoAction.java

index 4e25137..98d3ce6 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RedoAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RedoAction.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 
 /**
@@ -60,8 +60,8 @@ public class RedoAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
-        PushButton button = createButton(tooltip, icon, new RedoAction(tooltip, editor));
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
+        JButton button = createButton(tooltip, icon, new RedoAction(tooltip, editor));
         editor.setRedoButton(button);
         return button;
     }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RegisterFavoriteDirsAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RegisterFavoriteDirsAction.java

index 4888da6..ddeff55 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RegisterFavoriteDirsAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RegisterFavoriteDirsAction.java
@@ -27,7 +27,6 @@ import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
 import org.scilab.modules.gui.bridge.menu.SwingScilabMenu;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.utils.ConfigSciNotesManager;
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAction.java

index a0a56a6..856e645 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAction.java
@@ -12,12 +12,12 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.utils.SciNotesMessages;
 
@@ -60,7 +60,7 @@ public final class SaveAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new SaveAction(tooltip, editor));
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteAllFilesAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteAllFilesAction.java

index 6e396c0..5f2220d 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteAllFilesAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteAllFilesAction.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.ScilabDocument;
 import org.scilab.modules.scinotes.ScilabEditorPane;
 import org.scilab.modules.scinotes.SciNotes;
@@ -65,7 +65,7 @@ public class SaveAndExecuteAllFilesAction extends SaveAndExecuteFileAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new SaveAndExecuteAllFilesAction(tooltip, editor));
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteFileAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteFileAction.java

index 244a6da..d27d71f 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteFileAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteFileAction.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 
 /**
@@ -43,7 +43,7 @@ public class SaveAndExecuteFileAction extends ExecuteFileIntoScilabAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new SaveAndExecuteFileAction(tooltip, editor));
     }
 
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAsAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAsAction.java

index 80b6944..6d2cf77 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAsAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAsAction.java
@@ -12,12 +12,12 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 import org.scilab.modules.scinotes.utils.SciNotesMessages;
 
@@ -83,7 +83,7 @@ public class SaveAsAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
         return createButton(tooltip, icon, new SaveAsAction(tooltip, null, editor));
     }
 }
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/UndoAction.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/UndoAction.java

index 7d4e3a5..9ed6d97 100644 (file)
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/UndoAction.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/UndoAction.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.scinotes.actions;
 
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.scinotes.SciNotes;
 
 /**
@@ -60,8 +60,8 @@ public final class UndoAction extends DefaultAction {
      * @param editor SciNotes
      * @return PushButton
      */
-    public static PushButton createButton(String tooltip, String icon, SciNotes editor) {
-        PushButton button = createButton(tooltip, icon, new UndoAction(tooltip, editor));
+    public static JButton createButton(String tooltip, String icon, SciNotes editor) {
+        JButton button = createButton(tooltip, icon, new UndoAction(tooltip, editor));
         editor.setUndoButton(button);
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java

index 195ed40..846e546 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java
@@ -17,20 +17,19 @@ import java.awt.event.ActionEvent;
 
 import javax.swing.Action;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.graphic_objects.graphicObject.CallBack;
 import org.scilab.modules.gui.bridge.checkboxmenuitem.SwingScilabCheckBoxMenuItem;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.checkboxmenuitem.CheckBoxMenuItem;
 import org.scilab.modules.gui.checkboxmenuitem.ScilabCheckBoxMenuItem;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 
 /**
  * Default action for a BrowseVar
@@ -138,19 +137,16 @@ public abstract class DefaultAction extends CommonCallBack {
      *            the associated callback
      * @return the push button
      */
-    protected static PushButton createButton(CommonCallBack callback) {
-        PushButton item = ScilabPushButton.createPushButton();
-
-        SwingScilabPushButton swingItem = (SwingScilabPushButton) item
-                                          .getAsSimplePushButton();
-        swingItem.setAction(callback);
+    protected static JButton createButton(CommonCallBack callback) {
+        JButton button = new JButton();
+        button.setAction(callback);
 
         // Not compatible with java 1.5
         // Hide the name text
-        // swingItem.setHideActionText(true);
-        swingItem.setText("");
+        // button.setHideActionText(true);
+        button.setText("");
 
-        return item;
+        return button;
     }
 
     /**
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/HelpAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/HelpAction.java

index f907d2f..8e44dcd 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/HelpAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/HelpAction.java
@@ -13,17 +13,16 @@
 package org.scilab.modules.ui_data.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 
 /**
  * Launch Scilab help class
@@ -59,11 +58,12 @@ public final class HelpAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new HelpAction(title));
+    public static JButton createButton(String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new HelpAction(title));
         button.setToolTipText(title);
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(icon);
+        button.setIcon(icon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/ScilabVarFilteringButtonAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/ScilabVarFilteringButtonAction.java

index 19125e2..7973078 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/ScilabVarFilteringButtonAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/ScilabVarFilteringButtonAction.java
@@ -13,12 +13,11 @@
 package org.scilab.modules.ui_data.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
 import org.scilab.modules.ui_data.variablebrowser.ScilabVariableBrowser;
 
@@ -50,12 +49,13 @@ public class ScilabVarFilteringButtonAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new ScilabVarFilteringButtonAction(title));
+    public static JButton createButton(String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new ScilabVarFilteringButtonAction(title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("edit-clear"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserComponent.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserComponent.java

index 51d046e..e8bb55c 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserComponent.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserComponent.java
@@ -15,13 +15,12 @@ package org.scilab.modules.ui_data.filebrowser;
 import java.awt.BorderLayout;
 import java.awt.Color;
 
+import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 
-import org.scilab.modules.gui.pushbutton.PushButton;
-
 /**
  * A JPanel containing the different elements composing the File Browser
  * @author Calixte DENIZET
@@ -75,14 +74,14 @@ public class ScilabFileBrowserComponent extends JPanel {
     /**
      * @return the next button in the history
      */
-    public PushButton getNextButton() {
+    public JButton getNextButton() {
         return stt.getNextButton();
     }
 
     /**
      * @return the previous button in the history
      */
-    public PushButton getPreviousButton() {
+    public JButton getPreviousButton() {
         return stt.getPreviousButton();
     }
 }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserHistory.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserHistory.java

index ce7681d..302d269 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserHistory.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserHistory.java
@@ -20,16 +20,16 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.SwingUtilities;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
 import org.scilab.modules.commons.gui.FindIconHelper;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
 
 /**
@@ -45,8 +45,8 @@ public class ScilabFileBrowserHistory {
     private final SwingScilabTreeTable stt;
     private final List<String> history = new ArrayList<String>();
     private int position = -1;
-    private final PushButton previous;
-    private final PushButton next;
+    private final JButton previous;
+    private final JButton next;
     private final JPopupMenu popup;
     private Timer timer;
 
@@ -59,12 +59,12 @@ public class ScilabFileBrowserHistory {
         this.popup = new JPopupMenu();
         this.popup.setBorderPainted(true);
 
-        previous = ScilabPushButton.createPushButton();
-        previous.setIcon(PREVIOUSICON);
+        previous = new JButton();
+        previous.setIcon(new ImageIcon(PREVIOUSICON));
+        ScilabLAF.setDefaultProperties(previous);
 
-        final SwingScilabPushButton swingPrevious = (SwingScilabPushButton) previous.getAsSimplePushButton();
-        swingPrevious.setToolTipText(UiDataMessages.PREVIOUSDIR);
-        swingPrevious.addMouseListener(new MouseAdapter() {
+        previous.setToolTipText(UiDataMessages.PREVIOUSDIR);
+        previous.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
                 if (timer == null) {
@@ -90,7 +90,7 @@ public class ScilabFileBrowserHistory {
 
             @Override
             public void mouseClicked(MouseEvent e) {
-                if (SwingUtilities.isRightMouseButton(e) && previous.isEnabled() && (!popup.isVisible() || popup.getInvoker() != swingPrevious)) {
+                if (SwingUtilities.isRightMouseButton(e) && previous.isEnabled() && (!popup.isVisible() || popup.getInvoker() != previous)) {
                     showPopup(true);
                 } else if (SwingUtilities.isLeftMouseButton(e) && !popup.isVisible() && previous.isEnabled()) {
                     ScilabFileBrowserHistory.this.stt.setBaseDir(history.get(position - 1), false);
@@ -100,12 +100,12 @@ public class ScilabFileBrowserHistory {
             }
         });
 
-        next = ScilabPushButton.createPushButton();
-        next.setIcon(NEXTICON);
+        next = new JButton();
+        next.setIcon(new ImageIcon(NEXTICON));
+        ScilabLAF.setDefaultProperties(next);
 
-        final SwingScilabPushButton swingNext = (SwingScilabPushButton) next.getAsSimplePushButton();
-        swingNext.setToolTipText(UiDataMessages.NEXTDIR);
-        swingNext.addMouseListener(new MouseAdapter() {
+        next.setToolTipText(UiDataMessages.NEXTDIR);
+        next.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
                 if (timer == null) {
@@ -131,7 +131,7 @@ public class ScilabFileBrowserHistory {
 
             @Override
             public void mouseClicked(MouseEvent e) {
-                if (SwingUtilities.isRightMouseButton(e) && next.isEnabled() && (!popup.isVisible() || popup.getInvoker() != swingNext)) {
+                if (SwingUtilities.isRightMouseButton(e) && next.isEnabled() && (!popup.isVisible() || popup.getInvoker() != next)) {
                     showPopup(false);
                 } else if (SwingUtilities.isLeftMouseButton(e) && !popup.isVisible() && next.isEnabled()) {
                     ScilabFileBrowserHistory.this.stt.setBaseDir(history.get(position + 1), false);
@@ -181,11 +181,11 @@ public class ScilabFileBrowserHistory {
         }
         popup.pack();
 
-        SwingScilabPushButton button;
+        JButton button;
         if (prev) {
-            button = (SwingScilabPushButton) previous.getAsSimplePushButton();
+            button = previous;
         } else {
-            button = (SwingScilabPushButton) next.getAsSimplePushButton();
+            button = next;
         }
 
         popup.show(button, 0, button.getBounds(null).height);
@@ -210,14 +210,14 @@ public class ScilabFileBrowserHistory {
     /**
      * @return the previous button
      */
-    public PushButton getPreviousButton() {
+    public JButton getPreviousButton() {
         return previous;
     }
 
     /**
      * @return the next button
      */
-    public PushButton getNextButton() {
+    public JButton getNextButton() {
         return next;
     }
 
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabFileBrowser.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabFileBrowser.java

index ccc8f10..bbc9f70 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabFileBrowser.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabFileBrowser.java
@@ -13,6 +13,7 @@
 package org.scilab.modules.ui_data.filebrowser;
 
 import org.scilab.modules.gui.bridge.tab.SwingScilabDockablePanel;
+import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
@@ -51,13 +52,14 @@ public final class SwingScilabFileBrowser extends SwingScilabDockablePanel {
         filebrowser = new ScilabFileBrowserComponent();
 
         ToolBar toolBar = ScilabToolBar.createToolBar();
-        toolBar.add(filebrowser.getPreviousButton());
-        toolBar.add(filebrowser.getNextButton());
-        toolBar.addSeparator();
-        toolBar.add(GoToHomeAction.createButton());
-        toolBar.add(GoToSCIAction.createButton());
-        toolBar.addSeparator();
-        toolBar.add(HelpAction.createButton(UiDataMessages.HELP));
+        SwingScilabToolBar stb = (SwingScilabToolBar) toolBar.getAsSimpleToolBar();
+        stb.add(filebrowser.getPreviousButton());
+        stb.add(filebrowser.getNextButton());
+        stb.addSeparator();
+        stb.add(GoToHomeAction.createButton());
+        stb.add(GoToSCIAction.createButton());
+        stb.addSeparator();
+        stb.add(HelpAction.createButton(UiDataMessages.HELP));
 
         addToolBar(toolBar);
         setContentPane(filebrowser);
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabTreeTable.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabTreeTable.java

index a7e232e..2592b1e 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabTreeTable.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabTreeTable.java
@@ -32,6 +32,7 @@ import java.util.regex.Pattern;
 import javax.swing.ActionMap;
 import javax.swing.ImageIcon;
 import javax.swing.InputMap;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -47,7 +48,6 @@ import javax.swing.tree.TreePath;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.ui_data.filebrowser.actions.ChangeCWDAction;
 import org.scilab.modules.ui_data.filebrowser.actions.EditFileWithDefaultAppAction;
 import org.scilab.modules.ui_data.filebrowser.actions.ExecuteFileInConsoleAction;
@@ -217,14 +217,14 @@ public class SwingScilabTreeTable extends JTable {
     /**
      * @return the Next button used in history
      */
-    public PushButton getNextButton() {
+    public JButton getNextButton() {
         return history.getNextButton();
     }
 
     /**
      * @return the Previous button used in history
      */
-    public PushButton getPreviousButton() {
+    public JButton getPreviousButton() {
         return history.getPreviousButton();
     }
 
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/ChangeCWDAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/ChangeCWDAction.java

index 80705d9..69b64f2 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/ChangeCWDAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/ChangeCWDAction.java
@@ -17,11 +17,9 @@ import java.io.File;
 import javax.swing.JButton;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.FileBrowser;
 import org.scilab.modules.ui_data.filebrowser.FileUtils;
 import org.scilab.modules.ui_data.filebrowser.SwingScilabTreeTable;
@@ -56,8 +54,8 @@ public class ChangeCWDAction extends CommonCallBack {
      * @return the button used to set the cwd in using a JFileChooser
      */
     public JButton createButton() {
-        PushButton button = ScilabPushButton.createPushButton();
-        button.setCallback(new CommonCallBack(null) {
+        JButton button = new JButton();
+        button.addActionListener(new CommonCallBack(null) {
             public void callBack() {
                 SwingScilabFileChooser filechooser = new SwingScilabFileChooser();
                 filechooser.setCurrentDirectory(new File(table.getComboBox().getBaseDir()));
@@ -71,17 +69,18 @@ public class ChangeCWDAction extends CommonCallBack {
                 }
             }
         });
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(FileUtils.getClosedDirIcon());
+        button.setIcon(FileUtils.getClosedDirIcon());
+        ScilabLAF.setDefaultProperties(button);
 
-        return (SwingScilabPushButton) button.getAsSimplePushButton();
+        return button;
     }
 
     /**
      * @return the button used to jump to the parent directory
      */
     public JButton createParentDirButton() {
-        PushButton button = ScilabPushButton.createPushButton();
-        button.setCallback(new CommonCallBack(null) {
+        JButton button = new JButton();
+        button.addActionListener(new CommonCallBack(null) {
             public void callBack() {
                 File f = new File(table.getComboBox().getBaseDir());
                 if (f.exists()) {
@@ -92,9 +91,9 @@ public class ChangeCWDAction extends CommonCallBack {
                 }
             }
         });
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(FileUtils.getUpDirIcon());
+        button.setIcon(FileUtils.getUpDirIcon());
 
-        return (SwingScilabPushButton) button.getAsSimplePushButton();
+        return button;
     }
 
     /**
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToHomeAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToHomeAction.java

index 9c83d2b..844ace0 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToHomeAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToHomeAction.java
@@ -14,12 +14,12 @@ package org.scilab.modules.ui_data.filebrowser.actions;
 
 import java.io.File;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.action_binding.InterpreterManagement;
 import org.scilab.modules.commons.ScilabConstants;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.FileBrowser;
 import org.scilab.modules.ui_data.filebrowser.FileUtils;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
@@ -52,11 +52,12 @@ public class GoToHomeAction extends CommonCallBack {
     /**
      * @return the corresponding button
      */
-    public static PushButton createButton() {
-        PushButton button = ScilabPushButton.createPushButton();
-        button.setCallback(new GoToHomeAction());
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setToolTipText(UiDataMessages.USERHOME);
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(FileUtils.getClosedUserHomeIcon());
+    public static JButton createButton() {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new GoToHomeAction());
+        button.setToolTipText(UiDataMessages.USERHOME);
+        button.setIcon(FileUtils.getClosedUserHomeIcon());
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToSCIAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToSCIAction.java

index f6d0456..bb78d4e 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToSCIAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToSCIAction.java
@@ -14,11 +14,11 @@ package org.scilab.modules.ui_data.filebrowser.actions;
 
 import java.io.File;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.action_binding.InterpreterManagement;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.FileBrowser;
 import org.scilab.modules.ui_data.filebrowser.FileUtils;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
@@ -51,11 +51,12 @@ public class GoToSCIAction extends CommonCallBack {
     /**
      * @return the corresponding button
      */
-    public static PushButton createButton() {
-        PushButton button = ScilabPushButton.createPushButton();
-        button.setCallback(new GoToSCIAction());
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setToolTipText(UiDataMessages.SCIFOLDER);
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(FileUtils.getSCIIcon());
+    public static JButton createButton() {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new GoToSCIAction());
+        button.setToolTipText(UiDataMessages.SCIFOLDER);
+        button.setIcon(FileUtils.getSCIIcon());
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java

index c513f3b..2617b04 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
@@ -19,17 +19,16 @@ import java.awt.Color;
 import java.awt.MouseInfo;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-
-import javax.swing.SwingUtilities;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
+import javax.swing.JButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.RowFilter;
+import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
@@ -38,6 +37,7 @@ import javax.swing.table.TableRowSorter;
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.bridge.tab.SwingScilabDockablePanel;
+import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
 import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
 import org.scilab.modules.gui.contextmenu.ContextMenu;
 import org.scilab.modules.gui.contextmenu.ScilabContextMenu;
@@ -48,7 +48,6 @@ import org.scilab.modules.gui.menubar.MenuBar;
 import org.scilab.modules.gui.menubar.ScilabMenuBar;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.textbox.TextBox;
 import org.scilab.modules.gui.toolbar.ScilabToolBar;
 import org.scilab.modules.gui.toolbar.ToolBar;
@@ -124,7 +123,7 @@ public final class SwingScilabVariableBrowser extends SwingScilabDockablePanel i
     private CheckBoxMenuItem filterIntrinsicFunctionCheckBox;
     private CheckBoxMenuItem filterMatlabSparseCheckBox;
     private CheckBoxMenuItem filterImplicitPolynomialCheckBox;
-    private PushButton filteringButton;
+    private JButton filteringButton;
 
     private boolean isSetData = false;
 
@@ -143,12 +142,13 @@ public final class SwingScilabVariableBrowser extends SwingScilabDockablePanel i
         addMenuBar(menuBar);
 
         ToolBar toolBar = ScilabToolBar.createToolBar();
-        toolBar.add(RefreshAction.createButton(UiDataMessages.REFRESH));
-        toolBar.addSeparator();
-        toolBar.add(ModifyAction.createButton(this, UiDataMessages.MODIFY));
-        toolBar.add(DeleteAction.createButton(this, UiDataMessages.DELETE));
-        toolBar.addSeparator();
-        toolBar.add(HelpAction.createButton(UiDataMessages.HELP));
+        SwingScilabToolBar stb = (SwingScilabToolBar) toolBar.getAsSimpleToolBar();
+        stb.add(RefreshAction.createButton(UiDataMessages.REFRESH));
+        stb.addSeparator();
+        stb.add(ModifyAction.createButton(this, UiDataMessages.MODIFY));
+        stb.add(DeleteAction.createButton(this, UiDataMessages.DELETE));
+        stb.addSeparator();
+        stb.add(HelpAction.createButton(UiDataMessages.HELP));
         filteringButton = ScilabVarFilteringButtonAction.createButton("Show/hide Scilab variable");
         //        toolBar.add(filteringButton);
         addToolBar(toolBar);
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/DeleteAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/DeleteAction.java

index 9590c22..ace119b 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/DeleteAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/DeleteAction.java
@@ -16,16 +16,15 @@ package org.scilab.modules.ui_data.variablebrowser.actions;
 import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.BrowseVar;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
 import org.scilab.modules.ui_data.variablebrowser.SwingScilabVariableBrowser;
@@ -60,11 +59,12 @@ public final class DeleteAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableBrowser variableBrowser, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new DeleteAction(variableBrowser));
+    public static JButton createButton(SwingScilabVariableBrowser variableBrowser, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new DeleteAction(variableBrowser));
         button.setToolTipText(title);
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(icon);
+        button.setIcon(icon);
 
         return button;
     }
@@ -82,7 +82,6 @@ public final class DeleteAction extends CommonCallBack {
         return menuItem;
     }
 
-
     /**
      * Action!
      * @see org.scilab.modules.gui.events.callback.CallBack#callBack()
@@ -97,7 +96,6 @@ public final class DeleteAction extends CommonCallBack {
     }
 
     private String getSelectedVariable() {
-
         int clickedRow = variableBrowser.getTable().getSelectedRow();
         // Does nothing if no variable selected
         if (clickedRow != -1) {
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/ModifyAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/ModifyAction.java

index 0d3ed94..12188f1 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/ModifyAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/ModifyAction.java
@@ -14,15 +14,14 @@
 package org.scilab.modules.ui_data.variablebrowser.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.BrowseVar;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
 import org.scilab.modules.ui_data.variablebrowser.SwingScilabVariableBrowser;
@@ -57,11 +56,12 @@ public final class ModifyAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableBrowser variableBrowser, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new ModifyAction(variableBrowser));
+    public static JButton createButton(SwingScilabVariableBrowser variableBrowser, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new ModifyAction(variableBrowser));
         button.setToolTipText(title);
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(icon);
+        button.setIcon(icon);
 
         return button;
     }
@@ -79,7 +79,6 @@ public final class ModifyAction extends CommonCallBack {
         return menuItem;
     }
 
-
     /**
      * Action!
      * @see org.scilab.modules.gui.events.callback.CallBack#callBack()
@@ -87,11 +86,9 @@ public final class ModifyAction extends CommonCallBack {
     @Override
     public void callBack() {
         variableBrowser.startEditVar(getSelectedVariableVisibility(), getSelectedVariable());
-
     }
 
     private String getSelectedVariable() {
-
         int clickedRow = variableBrowser.getTable().getSelectedRow();
         // Does nothing if no variable selected
         if (clickedRow != -1) {
@@ -101,7 +98,6 @@ public final class ModifyAction extends CommonCallBack {
     }
 
     private String getSelectedVariableVisibility() {
-
         int clickedRow = variableBrowser.getTable().getSelectedRow();
         // Does nothing if no variable selected
         if (clickedRow != -1) {
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java

index 0f7c5d7..d7722fe 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java
@@ -16,17 +16,16 @@ import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 
 /**
  * RefreshAction class
@@ -67,11 +66,12 @@ public final class RefreshAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new RefreshAction(title));
+    public static JButton createButton(String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new RefreshAction(title));
         button.setToolTipText(title);
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(icon);
+        button.setIcon(icon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java

index 7ecc3f9..34d360b 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java
@@ -15,6 +15,7 @@ package org.scilab.modules.ui_data.variableeditor;
 
 import java.awt.Component;
 
+import javax.swing.JButton;
 import javax.swing.JMenu;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
@@ -26,12 +27,12 @@ import javax.swing.event.TableModelEvent;
 import javax.swing.table.TableModel;
 
 import org.scilab.modules.gui.bridge.tab.SwingScilabDockablePanel;
+import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
 import org.scilab.modules.gui.menubar.MenuBar;
 import org.scilab.modules.gui.menubar.ScilabMenuBar;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.tab.SimpleTab;
 import org.scilab.modules.gui.textbox.TextBox;
 import org.scilab.modules.gui.toolbar.ScilabToolBar;
@@ -84,9 +85,9 @@ public class SwingScilabVariableEditor extends SwingScilabDockablePanel implemen
     private static final long serialVersionUID = 1L;
 
     private final ScilabTabbedPane tabPane;
-    private final PushButton refreshButton;
-    private final PushButton undoButton;
-    private final PushButton redoButton;
+    private final JButton refreshButton;
+    private final JButton undoButton;
+    private final JButton redoButton;
 
     /**
      * Create a JTable with data Model.
@@ -194,26 +195,28 @@ public class SwingScilabVariableEditor extends SwingScilabDockablePanel implemen
      */
     public ToolBar createToolBar() {
         ToolBar toolBar = ScilabToolBar.createToolBar();
-        toolBar.add(refreshButton);
-        toolBar.addSeparator();
-        toolBar.add(CreateVariableFromSelectionAction.createButton(this, UiDataMessages.CREATE));
-        toolBar.add(CreateNewVariableAction.createButton(this, UiDataMessages.CREATENEWVAR));
-        toolBar.addSeparator();
-        toolBar.add(CutAction.createButton(this, UiDataMessages.CUT));
-        toolBar.add(CopyAction.createButton(this, UiDataMessages.COPY));
-        toolBar.add(PasteAction.createButton(this, UiDataMessages.PASTE));
-        toolBar.addSeparator();
-        toolBar.add(undoButton);
-        toolBar.add(redoButton);
-        toolBar.addSeparator();
-        toolBar.add(SizeColumnsToFitAction.createButton(this, UiDataMessages.FIT));
-        toolBar.addSeparator();
-        toolBar.add(SetPrecisionShortAction.createButton(this, UiDataMessages.SHORT));
-        toolBar.add(SetPrecisionShorteAction.createButton(this, UiDataMessages.SHORTE));
-        toolBar.add(SetPrecisionLongAction.createButton(this, UiDataMessages.LONG));
-        toolBar.add(SetPrecisionLongeAction.createButton(this, UiDataMessages.LONGE));
-        toolBar.addSeparator();
-        toolBar.add(PlotAction.createButton(this, UiDataMessages.PLOTSELECTION));
+        SwingScilabToolBar stb = (SwingScilabToolBar) toolBar.getAsSimpleToolBar();
+
+        stb.add(refreshButton);
+        stb.addSeparator();
+        stb.add(CreateVariableFromSelectionAction.createButton(this, UiDataMessages.CREATE));
+        stb.add(CreateNewVariableAction.createButton(this, UiDataMessages.CREATENEWVAR));
+        stb.addSeparator();
+        stb.add(CutAction.createButton(this, UiDataMessages.CUT));
+        stb.add(CopyAction.createButton(this, UiDataMessages.COPY));
+        stb.add(PasteAction.createButton(this, UiDataMessages.PASTE));
+        stb.addSeparator();
+        stb.add(undoButton);
+        stb.add(redoButton);
+        stb.addSeparator();
+        stb.add(SizeColumnsToFitAction.createButton(this, UiDataMessages.FIT));
+        stb.addSeparator();
+        stb.add(SetPrecisionShortAction.createButton(this, UiDataMessages.SHORT));
+        stb.add(SetPrecisionShorteAction.createButton(this, UiDataMessages.SHORTE));
+        stb.add(SetPrecisionLongAction.createButton(this, UiDataMessages.LONG));
+        stb.add(SetPrecisionLongeAction.createButton(this, UiDataMessages.LONGE));
+        stb.addSeparator();
+        stb.add(PlotAction.createButton(this, UiDataMessages.PLOTSELECTION));
 
         return toolBar;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java

index b1ef81b..cbf285e 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java
@@ -13,16 +13,15 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 
 /**
@@ -59,12 +58,13 @@ public final class CopyAction extends CopySelectionAction {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new CopyAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new CopyAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("edit-copy"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateNewVariableAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateNewVariableAction.java

index f9b492f..132b7aa 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateNewVariableAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateNewVariableAction.java
@@ -32,14 +32,12 @@ import javax.swing.JTextField;
 import javax.swing.SpinnerNumberModel;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.UI_data;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
@@ -248,12 +246,13 @@ public final class CreateNewVariableAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new CreateNewVariableAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new CreateNewVariableAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("variable-new"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateVariableFromSelectionAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateVariableFromSelectionAction.java

index 01e9202..4b6a469 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateVariableFromSelectionAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateVariableFromSelectionAction.java
@@ -32,14 +32,12 @@ import javax.swing.JTable;
 import javax.swing.JTextField;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.UI_data;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.utils.UiDataMessages;
@@ -186,12 +184,13 @@ public final class CreateVariableFromSelectionAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new CreateVariableFromSelectionAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new CreateVariableFromSelectionAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("variable-from-selection"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java

index 940eae6..63eaa04 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java
@@ -17,17 +17,16 @@ import java.awt.datatransfer.StringSelection;
 import java.util.Vector;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 
@@ -126,12 +125,13 @@ public final class CutAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new CutAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new CutAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("edit-cut"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertColumnAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertColumnAction.java

index d8f926b..addb699 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertColumnAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertColumnAction.java
@@ -13,14 +13,13 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.TableVariableEditor;
 
@@ -64,12 +63,13 @@ public final class InsertColumnAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(JTable table, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new InsertColumnAction(table, title));
+    public static JButton createButton(JTable table, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new InsertColumnAction(table, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("short"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertRowAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertRowAction.java

index 0c1d0c5..8c82bcb 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertRowAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertRowAction.java
@@ -13,14 +13,13 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.TableVariableEditor;
 
@@ -60,12 +59,13 @@ public final class InsertRowAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(JTable table, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new InsertRowAction(table, title));
+    public static JButton createButton(JTable table, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new InsertRowAction(table, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("short"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java

index 346d8ad..f14c3de 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java
@@ -23,17 +23,16 @@ import java.util.StringTokenizer;
 import java.util.Vector;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 
@@ -139,12 +138,13 @@ public final class PasteAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new PasteAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new PasteAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("edit-paste"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PlotAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PlotAction.java

index 49be06c..839c124 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PlotAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PlotAction.java
@@ -19,19 +19,18 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
 
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.bridge.tab.SwingScilabDockablePanel;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.types.ScilabTypeEnumDescription;
 import org.scilab.modules.ui_data.BrowseVar;
 import org.scilab.modules.ui_data.EditVar;
@@ -39,7 +38,6 @@ import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variablebrowser.SwingScilabVariableBrowser;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 
-
 /**
  * RefreshAction class
  * @author Calixte DENIZET
@@ -234,17 +232,17 @@ public final class PlotAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabDockablePanel editor, String title) {
-        final PushButton button = ScilabPushButton.createPushButton();
+    public static JButton createButton(SwingScilabDockablePanel editor, String title) {
+        final JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("plot"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         final JPopupMenu popup = new JPopupMenu() {
             @Override
             public void show(Component c, int x, int y) {
-                SwingScilabPushButton but = (SwingScilabPushButton) button.getAsSimplePushButton();
-                super.show(but, 0, but.getBounds(null).height);
+                super.show(button, 0, button.getBounds(null).height);
             }
         };
         popup.setBorderPainted(true);
@@ -263,7 +261,7 @@ public final class PlotAction extends CommonCallBack {
 
         popup.pack();
 
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new CommonCallBack(null) {
+        button.addActionListener(new CommonCallBack(null) {
             @Override
             public void callBack() {
                 if (!popup.isVisible()) {
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java

index 704ccf5..79dd555 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java
@@ -13,17 +13,16 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 
@@ -73,12 +72,13 @@ public final class RedoAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new RedoAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new RedoAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("edit-redo"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java

index 7018e9b..597b108 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java
@@ -13,12 +13,11 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 
@@ -55,12 +54,13 @@ public final class RefreshAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new RefreshAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new RefreshAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("view-refresh"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveColumnAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveColumnAction.java

index c9acc21..acb9177 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveColumnAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveColumnAction.java
@@ -13,14 +13,13 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.TableVariableEditor;
 
@@ -63,12 +62,13 @@ public final class RemoveColumnAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(JTable table, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new RemoveColumnAction(table, title));
+    public static JButton createButton(JTable table, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new RemoveColumnAction(table, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("short"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveRowAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveRowAction.java

index e24ef7b..8a3902b 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveRowAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveRowAction.java
@@ -13,14 +13,13 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.TableVariableEditor;
 
@@ -63,12 +62,13 @@ public final class RemoveRowAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(JTable table, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new RemoveRowAction(table, title));
+    public static JButton createButton(JTable table, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new RemoveRowAction(table, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("short"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongAction.java

index 77a1f9a..d58a066 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongAction.java
@@ -13,15 +13,14 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 import org.scilab.modules.ui_data.variableeditor.renderers.ScilabComplexRenderer;
 
@@ -73,12 +72,13 @@ public final class SetPrecisionLongAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new SetPrecisionLongAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new SetPrecisionLongAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("long"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongeAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongeAction.java

index 917e216..36aa68f 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongeAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongeAction.java
@@ -13,10 +13,12 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
@@ -73,12 +75,13 @@ public final class SetPrecisionLongeAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new SetPrecisionLongeAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new SetPrecisionLongeAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("longe"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShortAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShortAction.java

index b030f84..4705ef3 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShortAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShortAction.java
@@ -13,15 +13,14 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 import org.scilab.modules.ui_data.variableeditor.renderers.ScilabComplexRenderer;
 
@@ -71,12 +70,13 @@ public final class SetPrecisionShortAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new SetPrecisionShortAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new SetPrecisionShortAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("short"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShorteAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShorteAction.java

index 1063210..d917040 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShorteAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShorteAction.java
@@ -13,15 +13,14 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 import org.scilab.modules.ui_data.variableeditor.renderers.ScilabComplexRenderer;
 
@@ -73,12 +72,13 @@ public final class SetPrecisionShorteAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new SetPrecisionShorteAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new SetPrecisionShorteAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("shorte"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SizeColumnsToFitAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SizeColumnsToFitAction.java

index 8e04ac1..ac98806 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SizeColumnsToFitAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SizeColumnsToFitAction.java
@@ -13,17 +13,16 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 import org.scilab.modules.ui_data.variableeditor.TableVariableEditor;
 
@@ -73,12 +72,13 @@ public final class SizeColumnsToFitAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new SizeColumnsToFitAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new SizeColumnsToFitAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("SizeColumnsToFit"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java

index e1f96b7..69541f3 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java
@@ -13,17 +13,16 @@
 package org.scilab.modules.ui_data.variableeditor.actions;
 
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JTable;
 
 import org.scilab.modules.commons.gui.FindIconHelper;
+import org.scilab.modules.commons.gui.ScilabLAF;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.events.callback.CommonCallBack;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
-import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.ui_data.datatable.SwingEditvarTableModel;
 import org.scilab.modules.ui_data.variableeditor.SwingScilabVariableEditor;
 
@@ -73,12 +72,13 @@ public final class UndoAction extends CommonCallBack {
      * @param title tooltip for the button
      * @return the button
      */
-    public static PushButton createButton(SwingScilabVariableEditor editor, String title) {
-        PushButton button = ScilabPushButton.createPushButton();
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).addActionListener(new UndoAction(editor, title));
+    public static JButton createButton(SwingScilabVariableEditor editor, String title) {
+        JButton button = new JButton();
+        ScilabLAF.setDefaultProperties(button);
+        button.addActionListener(new UndoAction(editor, title));
         button.setToolTipText(title);
         ImageIcon imageIcon = new ImageIcon(FindIconHelper.findIcon("edit-undo"));
-        ((SwingScilabPushButton) button.getAsSimplePushButton()).setIcon(imageIcon);
+        button.setIcon(imageIcon);
 
         return button;
     }
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java

index c4d4245..a464bc0 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
@@ -22,6 +22,7 @@ import java.util.ListIterator;
 import java.util.UUID;
 import java.util.logging.Logger;
 
+import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 
 import org.scilab.modules.graph.actions.CopyAction;
@@ -38,6 +39,7 @@ import org.scilab.modules.graph.event.ArrowKeyListener;
 import org.scilab.modules.gui.bridge.menu.SwingScilabMenu;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
 import org.scilab.modules.gui.bridge.tab.SwingScilabDockablePanel;
+import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.gui.checkboxmenuitem.CheckBoxMenuItem;
 import org.scilab.modules.gui.menu.Menu;
@@ -46,7 +48,6 @@ import org.scilab.modules.gui.menubar.MenuBar;
 import org.scilab.modules.gui.menubar.ScilabMenuBar;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.tab.SimpleTab;
 import org.scilab.modules.gui.tabfactory.ScilabTabFactory;
 import org.scilab.modules.gui.textbox.ScilabTextBox;
@@ -141,21 +142,21 @@ public class XcosTab extends SwingScilabDockablePanel implements SimpleTab {
 
     private JCheckBoxMenuItem viewport;
 
-    private PushButton openAction;
-    private PushButton saveAction;
-    private PushButton saveAsAction;
-    private PushButton printAction;
-    private PushButton newDiagramAction;
-    private PushButton deleteAction;
-    private PushButton undoAction;
-    private PushButton redoAction;
-    private PushButton fitDiagramToViewAction;
-    private PushButton startAction;
-    private PushButton stopAction;
-    private PushButton zoomInAction;
-    private PushButton zoomOutAction;
-    private PushButton xcosDemonstrationAction;
-    private PushButton xcosDocumentationAction;
+    private JButton openAction;
+    private JButton saveAction;
+    private JButton saveAsAction;
+    private JButton printAction;
+    private JButton newDiagramAction;
+    private JButton deleteAction;
+    private JButton undoAction;
+    private JButton redoAction;
+    private JButton fitDiagramToViewAction;
+    private JButton startAction;
+    private JButton stopAction;
+    private JButton zoomInAction;
+    private JButton zoomOutAction;
+    private JButton xcosDemonstrationAction;
+    private JButton xcosDocumentationAction;
 
     private static class ClosingOperation implements org.scilab.modules.gui.utils.ClosingOperationsManager.ClosingOperation {
         private final WeakReference<XcosDiagram> graph;
@@ -591,68 +592,69 @@ public class XcosTab extends SwingScilabDockablePanel implements SimpleTab {
      */
     private ToolBar createToolBar(final XcosDiagram diagram) {
         final ToolBar toolBar = ScilabToolBar.createToolBar();
+        SwingScilabToolBar stb = (SwingScilabToolBar) toolBar.getAsSimpleToolBar();
 
         newDiagramAction = NewDiagramAction.createButton(diagram);
-        toolBar.add(newDiagramAction);
+        stb.add(newDiagramAction);
 
         openAction = OpenAction.createButton(diagram);
-        toolBar.add(openAction);
+        stb.add(openAction);
 
-        toolBar.add(OpenInSciAction.createButton(diagram));
+        stb.add(OpenInSciAction.createButton(diagram));
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         saveAction = SaveAction.createButton(diagram);
-        toolBar.add(saveAction);
+        stb.add(saveAction);
         saveAsAction = SaveAsAction.createButton(diagram);
-        toolBar.add(saveAsAction);
+        stb.add(saveAsAction);
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         printAction = PrintAction.createButton(diagram);
-        toolBar.add(printAction);
+        stb.add(printAction);
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         deleteAction = DeleteAction.createButton(diagram);
-        toolBar.add(deleteAction);
+        stb.add(deleteAction);
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         // UNDO / REDO
         undoAction = UndoAction.undoButton(diagram);
         redoAction = RedoAction.redoButton(diagram);
-        toolBar.add(undoAction);
-        toolBar.add(redoAction);
+        stb.add(undoAction);
+        stb.add(redoAction);
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         fitDiagramToViewAction = FitDiagramToViewAction.createButton(diagram);
-        toolBar.add(fitDiagramToViewAction);
+        stb.add(fitDiagramToViewAction);
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         // START / STOP
         startAction = StartAction.createButton(diagram);
         stopAction = StopAction.createButton(diagram);
 
-        toolBar.add(startAction);
-        toolBar.add(stopAction);
+        stb.add(startAction);
+        stb.add(stopAction);
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         // ZOOMIN / ZOOMOUT
         zoomInAction = ZoomInAction.zoominButton(diagram);
-        toolBar.add(zoomInAction);
+        stb.add(zoomInAction);
         zoomOutAction = ZoomOutAction.zoomoutButton(diagram);
-        toolBar.add(zoomOutAction);
+        stb.add(zoomOutAction);
 
-        toolBar.addSeparator();
+        stb.addSeparator();
 
         xcosDemonstrationAction = XcosDemonstrationsAction.createButton(diagram);
-        toolBar.add(xcosDemonstrationAction);
+        stb.add(xcosDemonstrationAction);
         xcosDocumentationAction = XcosDocumentationAction.createButton(diagram);
-        toolBar.add(xcosDocumentationAction);
+        stb.add(xcosDocumentationAction);
 
         return toolBar;
     }
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java

index 695a067..02d0e8e 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java
@@ -16,11 +16,12 @@ package org.scilab.modules.xcos.actions;
 
 import java.awt.event.ActionEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.io.scicos.ScilabDirectHandler;
 import org.scilab.modules.xcos.utils.XcosMessages;
@@ -55,7 +56,7 @@ public final class DumpAction extends DefaultAction {
      *            graph
      * @return push button
      */
-    public static PushButton dumpButton(ScilabGraph scilabGraph) {
+    public static JButton dumpButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, DumpAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java

index ea46ff7..e391b3c 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java
@@ -17,11 +17,12 @@ import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.OneBlockDependantAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
@@ -67,7 +68,7 @@ public final class FitDiagramToViewAction extends OneBlockDependantAction {
      *            associated diagram
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, FitDiagramToViewAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java

index 5ecfdae..b581bca 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java
@@ -18,11 +18,12 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.logging.Logger;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.io.scicos.ScilabDirectHandler;
 import org.scilab.modules.xcos.utils.XcosMessages;
@@ -58,7 +59,7 @@ public final class InitModelicaAction extends SimulationNotRunningAction {
      *            corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, InitModelicaAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java

index 95a00ca..9e45139 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java
@@ -17,10 +17,11 @@ import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
@@ -66,7 +67,7 @@ public final class NewDiagramAction extends DefaultAction {
      *            associated Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, NewDiagramAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java

index 8abd029..e3b9f66 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java
@@ -19,6 +19,7 @@ import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.IOException;
 
+import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
@@ -27,7 +28,6 @@ import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
 import org.scilab.modules.gui.filechooser.ScilabFileChooser;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.configuration.ConfigurationManager;
 import org.scilab.modules.xcos.io.XcosFileType;
@@ -75,7 +75,7 @@ public final class OpenAction extends DefaultAction {
      *            associated Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, OpenAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenInSciAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenInSciAction.java

index c08d776..f116858 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenInSciAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenInSciAction.java
@@ -16,12 +16,13 @@ import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.commons.CommonFileUtils;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
 /**
@@ -66,7 +67,7 @@ public final class OpenInSciAction extends DefaultAction {
      *            associated Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, OpenInSciAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java

index 902dfba..004d21f 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java
@@ -21,10 +21,11 @@ import java.awt.print.Paper;
 import java.awt.print.PrinterException;
 import java.awt.print.PrinterJob;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
 import com.mxgraph.swing.mxGraphComponent;
@@ -74,7 +75,7 @@ public final class PrintAction extends DefaultAction {
      *            associated diagram
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, PrintAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java

index bf8e31e..97165e4 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java
@@ -17,10 +17,11 @@ import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
@@ -66,7 +67,7 @@ public final class SaveAction extends DefaultAction {
      *            associated Xcos diagram
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, SaveAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java

index 127b4ad..3a35b75 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java
@@ -16,6 +16,7 @@ import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
@@ -24,7 +25,6 @@ import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
 import org.scilab.modules.gui.filechooser.ScilabFileChooser;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.io.XcosFileType;
@@ -74,7 +74,7 @@ public final class SaveAsAction extends DefaultAction {
      *            associated Xcos diagram
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, SaveAsAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java

index 4f6f650..a27669c 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java
@@ -22,13 +22,14 @@ import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.util.logging.Logger;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.GraphActionManager;
 import org.scilab.modules.graph.actions.base.OneBlockDependantAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.io.scicos.ScilabDirectHandler;
 import org.scilab.modules.xcos.utils.XcosMessages;
@@ -61,7 +62,7 @@ public final class StartAction extends OneBlockDependantAction {
      *            graph
      * @return push button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, StartAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java

index ceeff95..3adb23f 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java
@@ -16,13 +16,14 @@ package org.scilab.modules.xcos.actions;
 
 import java.awt.event.ActionEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.actions.base.GraphActionManager;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
@@ -54,7 +55,7 @@ public final class StopAction extends DefaultAction {
      *            graph
      * @return push button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, StopAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java

index 854fbab..f83d9dd 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java
@@ -15,12 +15,13 @@ package org.scilab.modules.xcos.actions;
 
 import java.awt.event.ActionEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
@@ -55,7 +56,7 @@ public final class XcosDemonstrationsAction extends DefaultAction {
      *            corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, XcosDemonstrationsAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java

index 6930e38..375b487 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java
@@ -16,12 +16,13 @@ package org.scilab.modules.xcos.actions;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.bridge.CallScilabBridge;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosMessages;
 
@@ -56,7 +57,7 @@ public final class XcosDocumentationAction extends DefaultAction {
      *            corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, XcosDocumentationAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java

index 739f78f..c05600a 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java
@@ -17,13 +17,14 @@ import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabComponent;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosDialogs;
@@ -60,7 +61,7 @@ public final class BlockDocumentationAction extends VertexSelectionDependantActi
      *            corresponding Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(ScilabGraph scilabGraph) {
+    public static JButton createButton(ScilabGraph scilabGraph) {
         return createButton(scilabGraph, BlockDocumentationAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java

index 9fce466..c633f2c 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java
@@ -17,12 +17,13 @@ import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
 
+import javax.swing.JButton;
+
 import org.scilab.modules.commons.CommonFileUtils;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.actions.OpenAction;
 import org.scilab.modules.xcos.palette.PaletteManager;
 import org.scilab.modules.xcos.palette.model.Category;
@@ -76,7 +77,7 @@ public final class LoadAsPalAction extends DefaultAction {
      *            associated Scilab Graph
      * @return the button
      */
-    public static PushButton createButton(final ScilabGraph scilabGraph) {
+    public static JButton createButton(final ScilabGraph scilabGraph) {
         return createButton(scilabGraph, LoadAsPalAction.class);
     }
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java

index 2d60414..e79f3b0 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java
@@ -23,6 +23,7 @@ import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
 import org.scilab.modules.gui.bridge.tab.SwingScilabDockablePanel;
+import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
@@ -163,7 +164,8 @@ public class PaletteManagerView extends SwingScilabDockablePanel implements Simp
 
         /* Create the toolbar */
         final ToolBar toolbar = ScilabToolBar.createToolBar();
-        toolbar.add(LoadAsPalAction.createButton(null));
+        SwingScilabToolBar stb = (SwingScilabToolBar) toolbar.getAsSimpleToolBar();
+        stb.add(LoadAsPalAction.createButton(null));
 
         setToolBar(toolbar);
scilab/modules/commons/src/java/org/scilab/modules/commons/gui/ScilabLAF.java	[new file with mode: 0644]	patch \| blob
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/DeleteAction.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/RedoAction.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/UndoAction.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomInAction.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java		patch \| blob \| history
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java		patch \| blob \| history
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java		patch \| blob \| history
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CloseAction.java		patch \| blob \| history
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java		patch \| blob \| history
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java		patch \| blob \| history
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java		patch \| blob \| history
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java		patch \| blob \| history
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/PrefsAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesGUI.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CodeNavigatorAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CopyAsHTMLWithLineNumberAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/CutAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/DefaultAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/ExecuteFileIntoScilabAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/GeneralSettingsAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/HelpAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/IncrementalSearchAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/NewAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenFileInAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PasteAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/PrintPreviewAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RedoAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/RegisterFavoriteDirsAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteAllFilesAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAndExecuteFileAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SaveAsAction.java		patch \| blob \| history
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/UndoAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/HelpAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/ScilabVarFilteringButtonAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserComponent.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserHistory.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabFileBrowser.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabTreeTable.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/ChangeCWDAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToHomeAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/GoToSCIAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/DeleteAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/ModifyAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateNewVariableAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateVariableFromSelectionAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertColumnAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertRowAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PlotAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveColumnAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveRowAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongeAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShortAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShorteAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SizeColumnsToFitAction.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenInSciAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java		patch \| blob \| history