Some java cleaning. 36/3636/2
Bruno JOFRET [Thu, 24 Mar 2011 22:09:51 +0000 (23:09 +0100)]
Change-Id: I371f35deb219d0f18bec827d4796067cb3b833ea

34 files changed:
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/highlevel/ScilabInterpreterManagement.java
scilab/modules/commons/src/java/org/scilab/modules/commons/gui/ScilabCaret.java
scilab/modules/console/src/java/org/scilab/modules/console/CompletionAction.java
scilab/modules/console/src/java/org/scilab/modules/console/SciCompletionWindow.java
scilab/modules/console/src/java/org/scilab/modules/console/SciDropTargetListener.java
scilab/modules/console/src/java/org/scilab/modules/console/SciInputCommandView.java
scilab/modules/console/src/java/org/scilab/modules/console/SciOutputView.java
scilab/modules/console/src/java/org/scilab/modules/console/utils/ScilabSpecialTextUtilities.java
scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphConstants.java
scilab/modules/graph/src/java/org/scilab/modules/graph/view/ScilabGraphView.java
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ConvertSVG.java
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSRenderer.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/OSXAdapter.java
scilab/modules/gui/src/java/org/scilab/modules/gui/graphicWindow/ScilabRendererProperties.java
scilab/modules/gui/src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ConfigManager.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/HelpSearchField.java
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabList.java
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabMList.java
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabString.java
scilab/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/TeXObjectGL.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/JOGLMarkDrawingStrategy.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/graphicEvents/InteractiveZoomEvent.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java

index f288c6c..eb5e436 100644 (file)
@@ -51,6 +51,9 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
         * Throw when there is a problem to communicate with the scilab interpreter.
         */
        public static class InterpreterException extends Exception {
+               
+               private static final long serialVersionUID = -7222406936060866827L;
+
                /**
                 * Default constructor
                 * 
index 3d87edd..c966b9c 100644 (file)
@@ -16,13 +16,12 @@ import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
 
-import javax.swing.text.BadLocationException;
-import javax.swing.text.JTextComponent;
 import javax.swing.UIManager;
+import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultCaret;
+import javax.swing.text.JTextComponent;
 
 /**
  * This class handles the tabulation
index 0a9a3f5..a670428 100644 (file)
@@ -15,15 +15,14 @@ package org.scilab.modules.console;
 
 import java.awt.Point;
 import java.awt.event.ActionEvent;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
+
+import org.scilab.modules.completion.Completion;
 
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 import com.artenum.rosetta.interfaces.core.CompletionItem;
 
-import org.scilab.modules.completion.Completion;
-import org.scilab.modules.localization.Messages;
-
 /**
  * Class used when Scilab user asks for completion on the current edited line
  * @author Vincent COUVERT
index b9074c9..bdf5e61 100644 (file)
 package org.scilab.modules.console;
 
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.Point;
 import java.util.List;
 
-import javax.swing.text.JTextComponent;
 import javax.swing.JScrollPane;
+import javax.swing.text.JTextComponent;
 
 import com.artenum.rosetta.interfaces.core.CompletionItem;
 
@@ -97,8 +96,6 @@ public class SciCompletionWindow extends AbstractSciCompletionWindow {
                                 int yCarPos = ((SciInputCommandView) sciConsole.getConfiguration().getInputCommandView()).getCaretLocation().y;
                                 int newHeight =  yCarPos +  window.getHeight();
 
-                                Dimension newDim = new Dimension(newWidth, newHeight);
-
                                 SciInputCommandView sicv = (SciInputCommandView) getTextComponent();
                                 sicv.setPreferredWidth(newWidth);
                                 sicv.setPreferredHeight(newHeight);
index 78c9b7e..be4366f 100644 (file)
@@ -67,8 +67,8 @@ public class SciDropTargetListener implements DropTargetListener {
                        try {
 
                                if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
-                               java.util.List data = (java.util.List) transferable.getTransferData(DataFlavor.javaFileListFlavor);
-                               // Send file names to Scilab
+                                       List<File> data = (List<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor);
+                                       // Send file names to Scilab
 
                                        String[] fileNames = new String[data.size()];
                                        for (int i = 0; i < data.size(); i++) {
index 66fa09a..4fa7d6b 100644 (file)
@@ -19,9 +19,9 @@ import java.awt.EventQueue;
 import java.awt.FontMetrics;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.event.KeyEvent;
 import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DropTarget;
+import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -36,16 +36,15 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.BadLocationException;
 
+import org.scilab.modules.commons.gui.ScilabCaret;
+import org.scilab.modules.console.utils.ScilabLaTeXViewer;
+
 import com.artenum.rosetta.interfaces.ui.InputCommandView;
 import com.artenum.rosetta.interfaces.ui.OutputView;
 import com.artenum.rosetta.interfaces.ui.PromptView;
 import com.artenum.rosetta.ui.ConsoleTextPane;
 import com.artenum.rosetta.util.StringConstants;
 
-import org.scilab.modules.commons.gui.ScilabCaret;
-import org.scilab.modules.console.utils.ScilabLaTeXViewer;
-import org.scilab.modules.history_manager.HistoryManagement;
-
 /**
  * Scilab UI that contains the line edited by the user
  * @author Vincent COUVERT
@@ -61,7 +60,6 @@ public class SciInputCommandView extends ConsoleTextPane implements InputCommand
 
     // A clearest pattern: ['"] \$ [^\\\$'"]* (( [\\].? | ['"]{2} ) [^\\\$'"]* )+
     private static final Pattern latexPattern = Pattern.compile("[\'\"]\\$[^\\\\\\$\'\"]*(?:(?:[\\\\].?|[\'\"]{2})[^\\\\\\$\'\"]*)*");
-    private static final int INSET = 3;
 
     private static BlockingQueue<String> queue = new LinkedBlockingQueue<String>();
     private static BlockingQueue<Boolean> displayQueue = new LinkedBlockingQueue<Boolean>();
index fc4017e..a58cb0d 100644 (file)
@@ -12,7 +12,6 @@
 
 package org.scilab.modules.console;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
@@ -21,8 +20,6 @@ import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DropTarget;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.io.Writer;
@@ -31,15 +28,12 @@ import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
 import javax.swing.BorderFactory;
+import javax.swing.JEditorPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JEditorPane;
 import javax.swing.JTextPane;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultCaret;
-import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PlainDocument;
 import javax.swing.text.StyleContext;
@@ -86,7 +80,6 @@ public class SciOutputView extends JEditorPane implements OutputView {
     private int insertPosition;
 
     private int maxNumberOfLines;
-    private int numberOfLines;
 
     /**
      * Constructor
@@ -115,7 +108,9 @@ public class SciOutputView extends JEditorPane implements OutputView {
          */
         final class FixedCaret extends ScilabCaret {
 
-            /**
+                       private static final long serialVersionUID = 8230195712653828841L;
+
+                       /**
              * Constructor
              */
             private FixedCaret() {
index 41ce959..43a2c8e 100644 (file)
 
 package org.scilab.modules.console.utils;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -24,25 +24,19 @@ import java.lang.reflect.Method;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.scilab.modules.jvm.LoadClassPath;
-
-import org.scilab.forge.jlatexmath.TeXConstants;
-import org.scilab.forge.jlatexmath.TeXFormula;
-import org.scilab.forge.jlatexmath.TeXIcon;
-import org.scilab.forge.jlatexmath.ParseException;
-
 import net.sourceforge.jeuclid.MathMLParserSupport;
-import net.sourceforge.jeuclid.MutableLayoutContext;
-import net.sourceforge.jeuclid.layout.JEuclidView;
 import net.sourceforge.jeuclid.context.LayoutContextImpl;
 import net.sourceforge.jeuclid.context.Parameter;
+import net.sourceforge.jeuclid.layout.JEuclidView;
 
-import org.w3c.dom.Node;
+import org.scilab.forge.jlatexmath.ParseException;
+import org.scilab.forge.jlatexmath.TeXConstants;
+import org.scilab.forge.jlatexmath.TeXFormula;
+import org.scilab.modules.jvm.LoadClassPath;
 import org.w3c.dom.Document;
+import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
 /**
index ee1fc4d..37cae4a 100644 (file)
@@ -34,10 +34,6 @@ import com.mxgraph.view.mxGraphView;
  * Implement specific method to render a graph
  */
 public class ScilabGraphView extends mxGraphView {
-       /**
-        * Empty area real size between bounding-box and paint area. 
-        */
-       private static final double LABEL_BORDER = 8.0;
 
        /**
         * Default constructor
index 98402d7..d300105 100644 (file)
  
 package org.scilab.modules.graphic_export;
 
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 
-import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.fop.svg.PDFTranscoder;
-import org.apache.fop.render.ps.PSTranscoder;
+import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.fop.render.ps.EPSTranscoder;
+import org.apache.fop.render.ps.PSTranscoder;
 import org.apache.fop.svg.AbstractFOPTranscoder;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.fop.svg.PDFTranscoder;
 
 /**
  * Static class to convert a SVG file into a vectorial file using FOP and Batik
index 006e8b7..bca66fb 100644 (file)
@@ -190,7 +190,7 @@ public abstract class ExportRenderer implements GLEventListener {
                        /* Transform the array to vector to have access to search methods*/
 
                        ArrayList<String> extensionsAllowedV = new ArrayList<String>(Arrays.asList(extensionsAllowed));
-                       ArrayList<Integer> fileTypeAllowedV = new ArrayList(Arrays.asList(fileTypeAllowed));
+                       ArrayList<Integer> fileTypeAllowedV = new ArrayList<Integer>(Arrays.asList(fileTypeAllowed));
 
                        if (extensionsAllowedV.contains(suffix) && fileTypeAllowedV.contains(this.fileType)){
                                this.fileName = this.fileName.substring(0, pos); /* Physically removed the extension */
index d34f5cc..a9a509f 100644 (file)
@@ -18,12 +18,6 @@ import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.ContainerEvent;
-import java.awt.event.ContainerListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.beans.PropertyChangeEvent;
@@ -31,12 +25,10 @@ import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.util.StringTokenizer;
 
-import javax.swing.JPanel;
 import javax.swing.JEditorPane;
+import javax.swing.JPanel;
 import javax.swing.JTextPane;
 import javax.swing.SwingUtilities;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.StyleContext;
@@ -49,15 +41,14 @@ import org.scilab.modules.console.SciHistoryManager;
 import org.scilab.modules.console.SciOutputView;
 import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
 import org.scilab.modules.gui.bridge.menuitem.SwingScilabMenuItem;
-import org.scilab.modules.gui.console.ScilabConsole;
 import org.scilab.modules.gui.console.SimpleConsole;
 import org.scilab.modules.gui.events.callback.ScilabCallBack;
-import org.scilab.modules.gui.helpbrowser.ScilabHelpBrowser;
 import org.scilab.modules.gui.utils.ConfigManager;
 import org.scilab.modules.gui.utils.Position;
 import org.scilab.modules.gui.utils.Size;
 import org.scilab.modules.history_manager.HistoryManagement;
 import org.scilab.modules.localization.Messages;
+
 import com.artenum.rosetta.interfaces.ui.InputCommandView;
 import com.artenum.rosetta.util.StringConstants;
 
index 2d241ac..31e2abc 100644 (file)
@@ -31,8 +31,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 
 import javax.help.DefaultHelpHistoryModel;
-import javax.help.JHelpContentViewer;
 import javax.help.HelpSet;
+import javax.help.JHelpContentViewer;
 import javax.help.plaf.basic.BasicContentViewerUI;
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
@@ -45,14 +45,11 @@ import javax.swing.event.HyperlinkEvent;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultEditorKit;
 import javax.swing.text.Document;
-import javax.swing.text.EditorKit;
 import javax.swing.text.Element;
 import javax.swing.text.MutableAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
-import javax.swing.text.html.HTML;
 import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLEditorKit;
 
 import org.scilab.modules.commons.ScilabConstants;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
index 6c044b7..5cb2efd 100644 (file)
@@ -61,9 +61,12 @@ Copyright © 2003-2007 Apple, Inc., All Rights Reserved
 
 package org.scilab.modules.gui.bridge.window;
 
-import java.lang.reflect.*;
-import java.util.HashMap;
 import java.awt.Image;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
 import javax.swing.ImageIcon;
 
 
index 6f19a82..6a54ad2 100644 (file)
@@ -17,7 +17,6 @@ package org.scilab.modules.gui.graphicWindow;
 
 import javax.media.opengl.GL;
 
-import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
 import org.scilab.modules.gui.canvas.Canvas;
 import org.scilab.modules.gui.canvas.ScilabCanvas;
 import org.scilab.modules.gui.tab.Tab;
index 83d75f5..1f65cfa 100644 (file)
@@ -16,21 +16,19 @@ import java.awt.Component;
 import java.awt.Container;
 import java.awt.KeyEventDispatcher;
 import java.awt.KeyboardFocusManager;
-import java.awt.event.KeyEvent;
 import java.awt.Toolkit;
-import java.io.File;
+import java.awt.event.KeyEvent;
 
 import javax.swing.SwingUtilities;
 
 import org.scilab.modules.commons.ScilabConstants;
-import org.scilab.modules.localization.Messages;
 import org.scilab.modules.gui.bridge.ScilabBridge;
-import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
+import org.scilab.modules.gui.bridge.helpbrowser.SwingScilabHelpBrowser;
 import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
+import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.gui.console.ScilabConsole;
 import org.scilab.modules.gui.dockable.ScilabDockable;
 import org.scilab.modules.gui.events.callback.ScilabCallBack;
-import org.scilab.modules.gui.bridge.helpbrowser.SwingScilabHelpBrowser;
 import org.scilab.modules.gui.menubar.MenuBar;
 import org.scilab.modules.gui.tab.ScilabTab;
 import org.scilab.modules.gui.tab.Tab;
@@ -42,6 +40,7 @@ import org.scilab.modules.gui.utils.Position;
 import org.scilab.modules.gui.utils.Size;
 import org.scilab.modules.gui.window.ScilabWindow;
 import org.scilab.modules.gui.window.Window;
+import org.scilab.modules.localization.Messages;
 
 /**
  * Class for Scilab Help Browser in GUIs
index 5693d98..517fb16 100644 (file)
@@ -21,9 +21,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.scilab.modules.commons.ScilabCommons;
-import org.scilab.modules.commons.xml.ScilabTransformerFactory;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -31,11 +28,12 @@ import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.scilab.modules.commons.ScilabCommons;
+import org.scilab.modules.commons.xml.ScilabTransformerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
index f6eca3d..405df4c 100644 (file)
@@ -14,7 +14,6 @@ package org.scilab.modules.gui.utils;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.KeyboardFocusManager;
@@ -41,7 +40,6 @@ import javax.swing.text.DefaultHighlighter;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 
-import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
 import org.scilab.modules.commons.ScilabConstants;
 
 /**
index b5c13c3..f15a653 100644 (file)
@@ -14,7 +14,6 @@ package org.scilab.modules.hdf5.read;
 
 import java.util.ArrayList;
 
-import ncsa.hdf.hdf5lib.H5;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.types.ScilabList;
index 333f30b..685b899 100644 (file)
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.types.ScilabMList;
-import org.scilab.modules.types.ScilabTList;
 
 public class H5ReadScilabMList extends H5ReadScilabCommonList {
 
index 7d64eee..f0e91ec 100644 (file)
@@ -15,7 +15,6 @@ package org.scilab.modules.hdf5.read;
 import ncsa.hdf.hdf5lib.H5;
 import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
-import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
 
 import org.scilab.modules.types.ScilabString;
 
index cf1b22a..a62bdaf 100644 (file)
 /*--------------------------------------------------------------------------*/
 package org.scilab.modules.jvm;
 /*--------------------------------------------------------------------------*/ 
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.URI;
 import java.util.Iterator;
 import java.util.Vector;
 /*--------------------------------------------------------------------------*/
index 5cd322b..0a64aa7 100644 (file)
 
 package org.scilab.modules.renderer.textDrawing;
 
-import java.awt.Graphics2D;
-import java.awt.Graphics;
-import java.awt.Component;
 import java.awt.Canvas;
 import java.awt.Color;
-import java.awt.Insets;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
-import java.awt.geom.AffineTransform;
-
 import java.nio.ByteBuffer;
 
-import org.scilab.modules.renderer.utils.textRendering.SpecialTextException;
-
+import org.scilab.forge.jlatexmath.ParseException;
 import org.scilab.forge.jlatexmath.TeXConstants;
 import org.scilab.forge.jlatexmath.TeXFormula;
 import org.scilab.forge.jlatexmath.TeXIcon;
-import org.scilab.forge.jlatexmath.ParseException;
+import org.scilab.modules.renderer.utils.textRendering.SpecialTextException;
 
 /**
  * LaTeX object
index e56e0a8..937b7a7 100644 (file)
@@ -12,9 +12,8 @@
 
 package org.scilab.modules.renderer.utils.graphicEvents;
 
-import org.scilab.modules.localization.Messages;
-import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL;
 import org.scilab.modules.renderer.FigureScilabCall;
+import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL;
 
 /**
  *  A graphic event designed to use zoom with an area selection 
index 963e5b1..3727c53 100644 (file)
@@ -27,6 +27,8 @@ import java.util.Arrays;
  */
 public class ScilabBoolean implements ScilabType {
 
+       private static final long serialVersionUID = 6511497080095473901L;
+
        /* the boolean data */
        private boolean[][] data;
 
index 1819fc7..1013eae 100644 (file)
@@ -36,6 +36,7 @@ import java.util.Arrays;
  */
 public class ScilabDouble implements ScilabType {
 
+       private static final long serialVersionUID = 879624048944109684L;
        private double[][] realPart;
        private double[][] imaginaryPart;
 
index 921ada8..d51897a 100644 (file)
@@ -26,6 +26,8 @@ import java.util.Arrays;
  */
 public class ScilabInteger implements ScilabType {
 
+       private static final long serialVersionUID = 1759633801332932450L;
+
        private long[][] longData = null;
        private short[][] shortData = null;
        private int[][] intData = null;
index 8a7f673..3ebb0ce 100644 (file)
@@ -28,6 +28,8 @@ import java.util.Collection;
  */
 public class ScilabList extends ArrayList<ScilabType> implements ScilabType {
        
+       private static final long serialVersionUID = 6884293176289980909L;
+
        /**
         * Construct an empty Scilab list.
         */
index 516f823..64aed39 100644 (file)
@@ -28,6 +28,8 @@ import java.util.Collection;
  */
 public class ScilabMList extends ArrayList<ScilabType> implements ScilabType {
    
+       private static final long serialVersionUID = 3224510024213901841L;
+
        /**
         * Construct an empty mlist.
         * 
index 93c1334..273351f 100644 (file)
@@ -26,6 +26,8 @@ import java.util.Arrays;
  */
 public class ScilabString implements ScilabType {
 
+       private static final long serialVersionUID = 359802519980180085L;
+
        private String[][] data;
 
        /**
index ec1a450..60d767a 100644 (file)
@@ -28,6 +28,8 @@ import java.util.Collection;
  */
 public class ScilabTList extends ArrayList<ScilabType> implements ScilabType {
 
+       private static final long serialVersionUID = 8080160982092586620L;
+
        /**
         * Construct an empty tlist.
         *