Fixed movement

CubeControl/AFrame.java

@@ -36,6 +36,14 @@ public class AFrame {
 	private short[] data = new short[64];
 	private short duration = 1;
 	private String name = "Frame";
+	private static int lastIndex = 1;
+
+	/**
+	 * Give it a nice name.
+	 */
+	public AFrame() {
+		name = "Frame " + lastIndex++;
+	}
 
 	/**
 	 * Gets the Name of this Frame

CubeControl/Animation.java

@@ -36,12 +36,14 @@ import java.util.Collections;
 public class Animation {
 	AFrame frames[] = new AFrame[1];
 	private String name = "Animation";
+	private static int lastIndex = 1;
 
 	/**
 	 * Create an empty frame in this new animation.
 	 */
 	public Animation() {
 		frames[0] = new AFrame();
+		name = "Animation " + lastIndex++;
 	}
 
 	/**

CubeControl/Frame.java

@@ -430,7 +430,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 					frameListModel.set(i, frameListModel.get(i + 1));
 					frameListModel.set(i + 1, tmp);
 					frameList.setSelectedIndex(i + 1);
-					worker.getAnimation(animList.getSelectedIndex()).moveFrameDown(frameList.getSelectedIndex());
+					worker.getAnimation(animList.getSelectedIndex()).moveFrameDown(i);
 				}
 			}
 		});
@@ -886,6 +886,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 					String[] sPorts = HelperUtility.getPorts();
 					f.jComboBox1.removeAllItems();
 					for (int i = 0; i < sPorts.length; i++) {
+						System.out.println("Port " + i + ": " + sPorts[i]);
 						f.jComboBox1.addItem(sPorts[i]);
 					}
 				}

CubeControl/HelperUtility.java

@@ -77,7 +77,7 @@ public class HelperUtility {
 			inChannel.close();
 			outChannel.close();
 			System.load(fileOut.toString());
-			System.out.println("Loaded Serial Library from " + fileOut.toString());
+			System.out.println("Loaded Serial Library!");
 		} catch (Exception e) {
 			System.out.println("Failed to load Serial Library:");
 			e.printStackTrace();
@@ -113,18 +113,19 @@ public class HelperUtility {
 	 *         others
 	 */
 	public static String[] getPorts() {
-		String[] ports = { "No serial ports!" };
 		String portLines = getPortsOS();
 		if (portLines == null) {
+			String[] ports = { "Select serial port..." };
+			return ports;
+		} else {
+			StringTokenizer sT = new StringTokenizer(portLines, "\n");
+			int size = sT.countTokens();
+			String[] ports = new String[size];
+			for (int i = 0; i < size; i++) {
+				ports[i] = sT.nextToken();
+			}
 			return ports;
 		}
-		StringTokenizer sT = new StringTokenizer(portLines, "\n");
-		int size = sT.countTokens();
-		ports = new String[size];
-		for (int i = 0; i < size; i++) {
-			ports[i] = sT.nextToken();
-		}
-		return ports;
 	}
 
 	/**
@@ -137,7 +138,7 @@ public class HelperUtility {
 		try {
 			if (os.indexOf("windows") > -1) {
 				return getThePorts("COM");
-			} else if (os.indexOf("max") > -1) {
+			} else if (os.indexOf("mac") > -1) {
 				return getThePorts("tty.");
 			} else {
 				return getThePorts("tty");
@@ -146,7 +147,6 @@ public class HelperUtility {
 			// Unsatisfied linker error:
 			// Serial.dll was probably not found
 			System.out.println("Exception: " + e.toString());
-		} finally {
 			return null;
 		}
 	}

CubeControl/cubeWorker.java

@@ -53,7 +53,6 @@ public class cubeWorker {
 	 */
 	public cubeWorker(Frame parent) {
 		animations[0] = new Animation();
-		animations[0].setName("Animation 1");
 		parentFrame = parent;
 	}
 

CubeControl/libSerial/serialHelper.c

@@ -57,7 +57,7 @@ JNIEXPORT jstring JNICALL Java_HelperUtility_getThePorts(JNIEnv *env, jclass cla
 
 	string = (char *)malloc((length + 1) * sizeof(char));
 	if (string == NULL) {
-		// printf("JNI: Not enough memory!\n");
+		printf("JNI: Not enough memory!\n");
 		return (*env)->NewStringUTF(env, NULL);
 	}
 
@@ -73,6 +73,8 @@ JNIEXPORT jstring JNICALL Java_HelperUtility_getThePorts(JNIEnv *env, jclass cla
 	}
 	string[lengthabs] = '\0';
 
+	// printf("JNI: %s\n", string);
+
 	jstring ret = (*env)->NewStringUTF(env, string);
 	return ret;
 }