Worked at movement...

CubeControl/AFrame.java

@@ -83,7 +83,7 @@ public class AFrame implements Comparable<AFrame> {
 	 * @return Name of the Frame
 	 */
 	public String getName() {
-		return name;
+		return name + " (" + order + ")";
 	}
 
 	/**

CubeControl/Animation.java

@@ -84,7 +84,7 @@ public class Animation implements Comparable<Animation> {
 	 * @return name of this animation
 	 */
 	public String getName() {
-		return name;
+		return name + " (" + order + ")";
 	}
 
 	/**
@@ -171,10 +171,6 @@ public class Animation implements Comparable<Animation> {
 		}
 	}
 
-	private void sortFrameList() {
-		Collections.sort(frames);
-	}
-
 	// return true if damaged and fixed partially
 	private boolean checkFrameList() {
 		for (int i = 0; i < frames.size(); i++) {
@@ -194,7 +190,7 @@ public class Animation implements Comparable<Animation> {
 	 */
 	public int size() {
 		while(checkFrameList()) {
-			sortFrameList();
+			Collections.sort(frames);
 		}
 		return frames.size();
 	}

CubeControl/Frame.java

@@ -127,6 +127,8 @@ public class Frame extends JFrame implements ListSelectionListener {
 				frameListModel.clear();
 				for (int i = 0; i < worker.numOfFrames(animList
 						.getSelectedIndex()); i++) {
+				// Offending statement:
+				// worker.numOfFrames(animList.getSelectedIndex())
 					frameListModel.addElement(worker.getFrameName(
 							animList.getSelectedIndex(), i));
 				}
@@ -769,17 +771,14 @@ public class Frame extends JFrame implements ListSelectionListener {
 		if (animList.getSelectedIndex() == -1) {
 			errorMessage("Please select an animation!");
 		} else {
+			int n = worker.numOfFrames(animList.getSelectedIndex());
 			worker.addFrame(animList.getSelectedIndex());
+			// Not reaching past this comment if frame list empty
 			frameRemaining.setText(Integer.toString(worker.framesRemaining()));
-			int n = worker.numOfFrames(animList.getSelectedIndex()) - 1;
-			if (n < 0) {
-				n = 0;
-			}
 			frameListModel.add(n,
 					worker.getFrameName(animList.getSelectedIndex(), n));
 			frameList.setModel(frameListModel);
 		}
-
 	}
 
 	public void frameRemove_ActionPerformed(ActionEvent evt) {
@@ -1015,6 +1014,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 					}
 				}
 
+				if (s.equals("a") || s.equals("anims")) {
+					for (int i = 0; i < f.worker.numOfAnimations(); i++) {
+						Animation anim = f.worker.getAnimationList().get(i);
+						System.out.println("\tAnimation " + anim.getOrder() + ": " + anim.getName());
+					}
+				}
+
 				if (s.equals("s") || s.equals("scan")) {
 					String[] sPorts = f.worker.getSerialPorts();
 					f.jComboBox1.removeAllItems();

CubeControl/cubeWorker.java

@@ -99,15 +99,46 @@ public class cubeWorker {
 	// Misc. Methods
 	// --------------------
 
-	private void sortAnimationList() {
-		Collections.sort(animations);
+	// Returns a number that is below the size of the animations list and not used as order
+	// If a order is higher or equal to the size of the list, it tries to assign a hole found to this
+	// Returns -1 if there is no hole
+	private int holeInAnimationList() {
+		int s = animations.size();
+		byte[] result = new byte[s];
+		int hole = -1;
+		int fix = -1;
+		for (int i = 0; i < s; i++) {
+			result[i] = 0;
+		}
+		for (int i = 0; i < s; i++) {
+			int order = animations.get(i).getOrder();
+			if (order >= s) {
+				// Houston, we have a problem...
+				fix = i;
+			}
+			result[order] = 1;
+		}
+		for (int i = 0; i < s; i++) {
+			if (result[i] == 0) {
+				hole = i;
+				break;
+			}
+		}
+		if ((hole != -1) && (fix != 1)) {
+			animations.get(fix).setOrder(hole);
+			return holeInAnimationList();
+		}
+		return hole;
 	}
 
-	// return true if damaged and fixed partially
+	// return true if damaged and to be sorted
 	private boolean checkAnimationList() {
 		for (int i = 0; i < animations.size(); i++) {
 			if (animations.get(i).getOrder() != i) {
-				animations.get(i).setOrder(animations.size());
+				int h = holeInAnimationList();
+				if (h != -1) {
+					animations.get(i).setOrder(h);
+				}
 				return true;
 			}
 		}
@@ -122,7 +153,7 @@ public class cubeWorker {
 	 */
 	public int numOfAnimations() {
 		while(checkAnimationList()) {
-			sortAnimationList();
+			Collections.sort(animations);
 		}
 		return animations.size();
 	}
@@ -151,7 +182,7 @@ public class cubeWorker {
 	// --------------------
 
 	/**
-	 * Add an animation.
+	 * Add an animation. It has an initial empty frame
 	 * 
 	 * @return Index of new animation, or -1 if not enough space remaining.
 	 */
@@ -163,6 +194,8 @@ public class cubeWorker {
 			int s = animations.size();
 			animations.add(s, new Animation());
 			animations.get(s).setName("Animation " + animations.size());
+			animations.get(s).add(0, new AFrame());
+			animations.get(s).get(0).setName("Frame 1");
 			return s;
 		}
 	}

CubeControl/makefile

@@ -31,7 +31,7 @@ serialInterface.h: HelperUtility.class
 	javah -o serialInterface.h HelperUtility
 
 HelperUtility.class: $(JAVAFILES)
-	javac $(JAVAFILES)
+	javac -g $(JAVAFILES)
 
 doc/index.html: $(JAVAFILES)
 	javadoc -d doc $(JAVAFILES)