Refactor clor_group and ColorUtil

Author: monkstone

library/color_group/color_group.rb

@@ -1,18 +1,21 @@
 java_import Java::Monkstone::ColorUtil
 
+# class for manipulating color
 class ColorGroup
-  attr_reader :web_colors, :pcolors
+  attr_reader :pcolors
   def initialize(web)
-    @web_colors = web
     @pcolors = ColorUtil.web_array(web)
   end
 
-  def shuffle
-    @pcolors = ColorUtil.web_array(web_colors.shuffle)
+  def self.from_p5cols(p5cols)
+    return ColorGroup.new(p5cols)
   end
 
   def shuffle!
-    web_colors.shuffle!
-    @pcolors = ColorUtil.web_array(web_colors)
+    @pcolors = ColorUtil.shuffle(pcolors)
+  end
+
+  def ruby_string
+    ColorUtil.rubyString(pcolors)
   end
 end

src/monkstone/ColorUtil.java

@@ -1,8 +1,8 @@
 /**
  * This utility allows JRubyArt users to use the processing.org color method
- * in their sketches. Includes a method to efficiently convert an array of web
- * strings to an array of color int, and another to convert an array of p5 color
- * (int) to a string that can be used in ruby code (to generate web color array).
+ * in their sketches. Includes a method to efficiently convert an cols of web
+ * strings to an cols of color int, and another to convert an cols of p5 color
+ * (int) to a string that can be used in ruby code (to generate web color cols).
  * Copyright (c) 2015-18 Martin Prout.
  * This utility is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -13,6 +13,12 @@
  */
 package monkstone;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 /**
  *
  * @author Martin Prout
@@ -46,7 +52,7 @@ static public int colorString(String hexstring) {
     /**
      *
      * @param web Array of web (hex) String
-     * @return array of p5 color (int)
+     * @return cols of p5 color (int)
      */
     static public int[] webArray(String[] web) {
         int[] result = new int[web.length];
@@ -60,20 +66,39 @@ static public int[] webArray(String[] web) {
      * Return a ruby string of the form "%w(a b c)" where a, b, c are raw web
      * strings. This string can be used in ruby code.
      *
-     * @param p5colors array of p5 colors (int)
+     * @param p5colors cols of p5 colors (int)
      * @return String for use in ruby
      */
     static public String rubyString(int[] p5colors) {
-        StringBuilder sb = new StringBuilder("%w(");
+        StringBuilder sb = new StringBuilder("%w[");
         for (int p5color : p5colors) {
             sb.append(String.format("#%06X", (0xFFFFFF & p5color)));
             sb.append(' ');
         }
         sb.deleteCharAt(sb.length() - 1);
-        sb.append(")\n");
+        sb.append("]\n");
         return sb.toString();
     }
 
+    static public String[] p5ToWeb(int[] p5colors) {
+        List<String> list = new ArrayList<>();
+        for (int p5color : p5colors) {
+            list.add(String.format("#%06X", (0xFFFFFF & p5color)));
+        }
+        return list.toArray(new String[0]);
+    }
+
+    static public int[] shuffle(int[] cols) {
+        Random rgen = new Random();  // Random number generator
+        for (int i = 0; i < cols.length; i++) {
+            int randomPosition = rgen.nextInt(cols.length);
+            int temp = cols[i];
+            cols[i] = cols[randomPosition];
+            cols[randomPosition] = temp;
+        }
+        return cols;
+    }
+
     /**
      *
      * @param hex double

test/helper_methods_test.rb

@@ -29,7 +29,7 @@ def test_hex_color
 
   def test_p52ruby
     p5array = [16777215, 16711680, 255]
-    ruby_string = "%w(#FFFFFF #FF0000 #0000FF)\n"
+    ruby_string = "%w[#FFFFFF #FF0000 #0000FF]\n"
     result = p52ruby(p5array)
     assert_equal(result, ruby_string)
   end