Coverity fixes: #1350904 #1350976 #1350977

Change-Id: I5a005ba681c9afbd70bd6e7fc114dcf85b3c3de9

diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/LegendHandler.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/LegendHandler.java
index e33d9ed..94ecce6 100644 (file)
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/LegendHandler.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/editor/LegendHandler.java
@@ -63,7 +63,7 @@ public class LegendHandler {
      */
 
     public static void setLegend(Integer legend, Integer axes, Integer polyline, String text) {
-        if (text == null || text == "" || polyline == null || axes == null || legend == null) {
+       if (text == null || text.equals("") || polyline == null || axes == null || legend == null) {
             return;
         }
 
@@ -131,7 +131,7 @@ public class LegendHandler {
             Integer[] linksOld = (Integer[])GraphicController.getController().getProperty(legend, GraphicObjectProperties.__GO_LINKS__);
             int remove = -1;
             for (int i = 0; i < linksOld.length; i++) {
-                if (polyline != linksOld[i]) {
+                if (!(polyline.equals(linksOld[i]))) {
                     links.add(linksOld[i]);
                 } else {
                     remove = i;
@@ -177,7 +177,7 @@ public class LegendHandler {
                 String[] textOld = (String[])GraphicController.getController().getProperty(legend, GraphicObjectProperties.__GO_TEXT_STRINGS__);
                 Integer[] linksOld = (Integer[])GraphicController.getController().getProperty(legend, GraphicObjectProperties.__GO_LINKS__);
                 for (int i = 0; i < linksOld.length; i++) {
-                    if (linksOld[i] == polyline) {
+                    if (linksOld[i].equals(polyline)) {
                         return textOld[linksOld.length - i - 1];
                     }
                 }