Fixed #11

Author: amybytes

src/io/github/rowak/nanoleafdesktop/Main.java

@@ -80,7 +80,7 @@
 
 public class Main extends JFrame
 {
-	public static final Version VERSION = new Version("v0.8.2", true);
+	public static final Version VERSION = new Version("v0.8.2", false);
 	public static final String VERSION_HOST =
 			"https://api.github.com/repos/rowak/nanoleaf-desktop/releases";
 	public static final String GIT_REPO = "https://github.com/rowak/nanoleaf-desktop";
@@ -345,6 +345,20 @@ public void run()
 						sce.printStackTrace();
 					}
 
+					BasicEffects.initializeBasicEffects();
+					try
+					{
+						List<Effect> effects = BasicEffects.getBasicEffects(devices).get(0);
+						for (Effect ef : effects)
+						{
+							basicEffectsPanel.addEffect(ef.getName());
+						}
+					}
+					catch (StatusCodeException sce)
+					{
+						sce.printStackTrace();
+					}
+					
 					if (regEffectsPanel.getModel().size() > 0)
 					{
 						regEffectsPanel.setViewportView(regEffectsPanel.getList());
@@ -722,20 +736,7 @@ private void initPanelCanvas()
 
 	private void initEffectsPanels()
 	{
-		BasicEffects.initializeBasicEffects();
 		basicEffectsPanel = new EffectsPanel("Basic Effects", this, devices, canvas);
-		try
-		{
-			List<Effect> effects = BasicEffects.getBasicEffects(devices).get(0);
-			for (Effect ef : effects)
-			{
-				basicEffectsPanel.addEffect(ef.getName());
-			}
-		}
-		catch (StatusCodeException sce)
-		{
-			sce.printStackTrace();
-		}
 		getContentPane().add(basicEffectsPanel, "cell 0 1,grow");
 
 		regEffectsPanel = new EffectsPanel("Color Effects", this, devices, canvas);

src/io/github/rowak/nanoleafdesktop/models/BasicEffect.java

@@ -0,0 +1,44 @@
+package io.github.rowak.nanoleafdesktop.models;
+
+public class BasicEffect
+{
+	private String name;
+	private int hue, sat;
+	
+	public BasicEffect(String name, int hue, int sat)
+	{
+		this.name = name;
+		this.hue = hue;
+		this.sat = sat;
+	}
+	
+	public String getName()
+	{
+		return name;
+	}
+	
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+	
+	public int getHue()
+	{
+		return hue;
+	}
+	
+	public void setHue(int hue)
+	{
+		this.hue = hue;
+	}
+	
+	public int getSaturation()
+	{
+		return sat;
+	}
+	
+	public void setSaturation(int sat)
+	{
+		this.sat = sat;
+	}
+}

src/io/github/rowak/nanoleafdesktop/tools/BasicEffects.java

@@ -14,6 +14,7 @@
 import io.github.rowak.StatusCodeException.UnauthorizedException;
 import io.github.rowak.effectbuilder.StaticEffectBuilder;
 import io.github.rowak.nanoleafdesktop.Main;
+import io.github.rowak.nanoleafdesktop.models.BasicEffect;
 
 public class BasicEffects
 {
@@ -150,6 +151,26 @@ public static List<List<Effect>> getBasicEffects(Aurora[] devices)
 		return basicEffects;
 	}
 
+	public static List<BasicEffect> getBasicEffects()
+	{
+		List<BasicEffect> basicEffects = new ArrayList<BasicEffect>();
+		PropertyManager manager = new PropertyManager(Main.PROPERTIES_FILEPATH);
+		String strEffects = manager.getProperty("basicEffects");
+		if (strEffects != null)
+		{
+			JSONArray arr = new JSONArray(strEffects);
+			for (int i = 0; i < arr.length(); i++)
+			{
+				JSONObject obj = arr.getJSONObject(i);
+				String name = obj.getString("name");
+				int hue = obj.getInt("hue");
+				int sat = obj.getInt("sat");
+				basicEffects.add(new BasicEffect(name, hue, sat));
+			}
+		}
+		return basicEffects;
+	}
+	
 	private static Effect getEffect(String name, int hue, int sat, Aurora device)
 			throws UnauthorizedException, StatusCodeException
 	{

src/io/github/rowak/nanoleafdesktop/ui/panel/EffectsPanel.java

@@ -17,6 +17,7 @@
 import io.github.rowak.Effect;
 import io.github.rowak.StatusCodeException;
 import io.github.rowak.nanoleafdesktop.Main;
+import io.github.rowak.nanoleafdesktop.models.BasicEffect;
 import io.github.rowak.nanoleafdesktop.tools.BasicEffects;
 import io.github.rowak.nanoleafdesktop.tools.UIConstants;
 import io.github.rowak.nanoleafdesktop.ui.dialog.LoadingSpinner;
@@ -149,23 +150,20 @@ private void setBasicEffectForDevices(String effectName)
 	{
 		try
 		{
-			List<List<Effect>> basicEffects = BasicEffects.getBasicEffects(devices);
-			int efIndex = -1;
-			for (int i = 0; i < basicEffects.get(0).size(); i++)
+			List<BasicEffect> basicEffects = BasicEffects.getBasicEffects();
+			for (BasicEffect ef : basicEffects)
 			{
-				if (basicEffects.get(0).get(i).getName().equals(effectName))
+				if (ef.getName().equals(effectName))
 				{
-					efIndex = i;
-				}
-			}
-			if (efIndex != -1)
-			{
-				for (int i = 0; i < devices.length; i++)
-				{
-					devices[i].effects().displayEffect(basicEffects.get(i).get(efIndex));
+					for (int i = 0; i < devices.length; i++)
+					{
+						devices[i].state().setHue(ef.getHue());
+						devices[i].state().setSaturation(ef.getSaturation());
+					}
+					canvas.checkAuroraState();
+					parent.loadStateComponents();
+					break;
 				}
-				canvas.checkAuroraState();
-				parent.loadStateComponents();
 			}
 		}
 		catch (StatusCodeException sce)