Changeset 979

Timestamp:

12/14/15 13:38:48 (8 years ago)

Author:

davidb

Message:

Safer way to get colour information, that falls back to default values if the colorWheel for some reason no longer contains 2 colours

Location:

trunk/src/org/expeditee

Files:

• gui/Frame.java (modified) (1 diff)
• setting/ArraySetting.java (modified) (1 diff)

trunk/src/org/expeditee/gui/Frame.java

@@ -184 +184 @@
 
         private void resetDot() {
-                _dotTemplate.setColor(TemplateSettings.ColorWheel.get()[1]);
-                _dotTemplate.setFillColor(TemplateSettings.FillColorWheel.get()[0]);
+            _dotTemplate.setColor(TemplateSettings.ColorWheel.getSafe(1));
+            _dotTemplate.setFillColor(TemplateSettings.FillColorWheel.getSafe(0));
         }
 

trunk/src/org/expeditee/setting/ArraySetting.java

@@ -33 +33 @@
                 _value = value;
         }
-        
+
+        public T getSafe(int i) {
+                
+                if(i < _value.length){
+                        
+                        return _value[i];
+                }
+                else{
+                        return _default[i];
+                }               
+        }
+
         public T[] get() {
                 return _value;