From 048df693f05557b2ccebc238cd8c2cfdc18129b3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Nov 2013 11:56:48 +0100 Subject: [PATCH] Remove some java warnings (redundant declarations) Change-Id: I7291954d59bde629ec8164ec9855390091673076 --- .../modules/graphic_objects/legend/Legend.java | 6 +++--- .../modules/gui/bridge/tab/SwingScilabTab.java | 4 ++-- .../scilab/modules/gui/datatip/DatatipCreate.java | 4 ++-- .../java/org/scilab/modules/gui/editor/Editor.java | 2 +- .../java/org/scilab/modules/gui/ged/Inspector.java | 2 +- .../modules/gui/plotbrowser/PlotBrowser.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java b/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java index 804af8b..ed2bb20 100644 --- a/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java +++ b/scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java @@ -201,7 +201,7 @@ public class Legend extends ClippableTextObject { ArrayList validLinks = new ArrayList(0); for (int i = 0; i < links.size(); i++) { - GraphicObject object = (GraphicObject) GraphicController.getController().getObjectFromId(links.get(i)); + GraphicObject object = GraphicController.getController().getObjectFromId(links.get(i)); if (object != null) { validLinks.add(links.get(i)); @@ -218,7 +218,7 @@ public class Legend extends ClippableTextObject { int numValidLinks = 0; for (int i = 0; i < links.size(); i++) { - GraphicObject object = (GraphicObject) GraphicController.getController().getObjectFromId(links.get(i)); + GraphicObject object = GraphicController.getController().getObjectFromId(links.get(i)); if (object != null) { numValidLinks++; @@ -282,7 +282,7 @@ public class Legend extends ClippableTextObject { /* Text strings are stored in reverse order relative to links. */ for (int i = 0; i < links.size(); i++) { - GraphicObject object = (GraphicObject) GraphicController.getController().getObjectFromId(links.get(links.size() - i - 1)); + GraphicObject object = GraphicController.getController().getObjectFromId(links.get(links.size() - i - 1)); if (object != null) { validStrings.add(text[i].getText()); diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java index 324d4bf..f7befa0 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java @@ -1461,8 +1461,8 @@ public class SwingScilabTab extends View implements SwingViewObject, SimpleTab, SwingScilabWindow figure = SwingScilabWindow.allScilabWindows.get(parentWindowId); Size oldFigureSize = figure.getDims(); figure.setDims(new Size(size[0], size[1])); - int deltaFigureX = size[0] - (int) oldFigureSize.getWidth(); - int deltaFigureY = size[1] - (int) oldFigureSize.getHeight(); + int deltaFigureX = size[0] - oldFigureSize.getWidth(); + int deltaFigureY = size[1] - oldFigureSize.getHeight(); if ( oldFigureSize.getWidth() != 0 && oldFigureSize.getHeight() != 0 && ((oldFigureSize.getWidth() != size[0]) || (oldFigureSize.getHeight() != size[1])) && ((Boolean) GraphicController.getController().getProperty(getId(), __GO_AUTORESIZE__)) diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipCreate.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipCreate.java index 2d05be5..7e60320 100755 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipCreate.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/datatip/DatatipCreate.java @@ -144,8 +144,8 @@ public class DatatipCreate { int yInt = (int) pixelCoordinates[1]; int[] coordInteger = new int[2]; - coordInteger[0] = (int) xInt; - coordInteger[1] = (int) yInt; + coordInteger[0] = xInt; + coordInteger[1] = yInt; return coordInteger; } diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/Editor.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/Editor.java index 385032d..9b538c1 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/Editor.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/Editor.java @@ -142,7 +142,7 @@ public class Editor { redo.setEnabled(editorHistory.isRedoEnabled()); menu.show(event.getComponent(), event.getX(), event.getY()); - dialogComponent = (Component)event.getComponent(); + dialogComponent = event.getComponent(); } else { dataEditor.onRightClick(event); } diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/ged/Inspector.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/ged/Inspector.java index 1174366..21771c9 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/ged/Inspector.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/ged/Inspector.java @@ -94,7 +94,7 @@ public class Inspector { } } else { SwingScilabWindow window = (SwingScilabWindow) SwingUtilities.getAncestorOfClass - (SwingScilabWindow.class, (SwingInspector) inspectorTab); + (SwingScilabWindow.class, inspectorTab); window.setVisible(true); window.toFront(); new SwapObject(objectID); diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/PlotBrowser.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/PlotBrowser.java index 1021531..20c2b63 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/PlotBrowser.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/plotbrowser/PlotBrowser.java @@ -93,7 +93,7 @@ public class PlotBrowser { } } else { SwingScilabWindow window = (SwingScilabWindow) SwingUtilities.getAncestorOfClass - (SwingScilabWindow.class, (SwingPlotBrowser) plotBrowserTab); + (SwingScilabWindow.class, plotBrowserTab); window.setVisible(true); window.toFront(); new SwapFigure(objectID); -- 1.7.9.5