Merged changes from SVN

[simantics/platform.git] / bundles / org.simantics.utils.ui / src / org / simantics / utils / ui / color / ColorGradient.java

diff --git a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradient.java b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradient.java
index a08010f20076294e0917b15b0ba3822ad4c5bcf3..56195ce0c4cd5c643d89d513e25a59d761e76226 100644 (file)
--- a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradient.java
+++ b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/color/ColorGradient.java
@@ -38,9 +38,9 @@ public class ColorGradient {
 \r
     public static final int HSV = 1;\r
 \r
-    private ArrayList<ColorValue> values;\r
+    protected ArrayList<ColorValue> values;\r
 \r
-    private int type;\r
+    protected int type;\r
     \r
     public ColorGradient() {\r
         this.values = new ArrayList<ColorValue>();\r
@@ -59,7 +59,7 @@ public class ColorGradient {
     }\r
 \r
     public ColorGradient(ColorValue array[]) {\r
-        this.values = new ArrayList<ColorValue>();\r
+        this.values = new ArrayList<ColorValue>(array.length);\r
         for (ColorValue c : array) {\r
             values.add(c);\r
         }\r
@@ -295,7 +295,10 @@ public class ColorGradient {
     \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (!(obj instanceof ColorGradient)) return false;\r
+       if (obj == null)\r
+               return false;\r
+       if (obj.getClass() != getClass())\r
+               return false;\r
         ColorGradient cg = (ColorGradient) obj;\r
         if (cg.type != type) return false;\r
         if (values.size()!=cg.values.size()) return false;\r