Fixed bugs in frame and created some new ones....

Cube Control/cubeWorker.java

@@ -54,6 +54,7 @@ public class cubeWorker {
 
   cubeWorker() {
   animations.add(new Animation());
+  animations.get(0).setName("Animation 1");
   }
 
   cubeWorker(ArrayList<Animation> anims) {
@@ -93,7 +94,8 @@ public class cubeWorker {
           return -1;
     } else {
       int s = animations.size();
-      animations.add(s + 1, new Animation());
+      animations.add(s, new Animation());
+      animations.get(s).setName("Animation " + animations.size());
       return s;
     }
     }
@@ -156,7 +158,7 @@ public class cubeWorker {
     framesRemaining--;
     int s = animations.get(anim).size();
     animations.get(anim).add(s);
-	animations.get(anim).get(s).setName("Frame " + (2016 - framesRemaining));
+  animations.get(anim).get(s).setName("Frame " + (2016 - framesRemaining));
     return s;
     }
 
@@ -191,10 +193,10 @@ public class cubeWorker {
     if (dir == UP){
         // frame moved up
         if (frame > 0) {
-      		AFrame tmp = animations.get(anim).get(frame);
-      		animations.get(anim).set(animations.get(anim).get(frame - 1), frame);
-      		animations.get(anim).set(tmp, frame - 1);
-    	}
+          AFrame tmp = animations.get(anim).get(frame);
+          animations.get(anim).set(animations.get(anim).get(frame - 1), frame);
+          animations.get(anim).set(tmp, frame - 1);
+      }
     } else if (dir == DOWN){
       // frame moved down
     if (frame < (animations.get(anim).size() - 1)) {
@@ -212,20 +214,20 @@ public class cubeWorker {
     // Loads an animation file into this object
     public int loadState(String path) {
       changedState = false;
-		try {
-			animations = AnimationUtility.readFile(path);
-		} catch (Exception e) {
-			System.out.println(e.toString());
-			return -1;
-		}
-		int size = 0;
-		for (int i = 0; i < animations.size(); i++) {
-			size += animations.get(i).size();
-		}
-		framesRemaining = 2016 - size;
-		if (size > 2016) {
-			return -1;
-		}
+    try {
+      animations = AnimationUtility.readFile(path);
+    } catch (Exception e) {
+      System.out.println(e.toString());
+      return -1;
+    }
+    int size = 0;
+    for (int i = 0; i < animations.size(); i++) {
+      size += animations.get(i).size();
+    }
+    framesRemaining = 2016 - size;
+    if (size > 2016) {
+      return -1;
+    }
         return 0;
     }
 
@@ -276,13 +278,13 @@ class AnimationUtility {
 
   public static ArrayList<Animation> readFile(String path) throws Exception {
     Scanner sc = new Scanner(new File(path));
-	ArrayList<Animation> animations = new ArrayList<Animation>();
+  ArrayList<Animation> animations = new ArrayList<Animation>();
 
-	do {
-		animations.add(readAnimation(sc));
-	} while (sc.hasNextLine());
+  do {
+    animations.add(readAnimation(sc));
+  } while (sc.hasNextLine());
 
-	return animations;
+  return animations;
   }
 
   public static void writeFile(String path, ArrayList<Animation> animations) {
@@ -323,56 +325,56 @@ class AnimationUtility {
   }
 
   private static Animation readAnimation(Scanner sc) {
-	Animation anim = new Animation();
-	AFrame f = null;
-	int index = 0;
-	int size = sc.nextInt();
-	anim.setName(sc.nextLine());
-	while (size > 0) {
-		f = readFrame(sc, index);
-		anim.add(index);
-		anim.set(f, index);
-		index++;
-		size--;
-	}
-
-	return anim;
+  Animation anim = new Animation();
+  AFrame f = null;
+  int index = 0;
+  int size = sc.nextInt();
+  anim.setName(sc.nextLine());
+  while (size > 0) {
+    f = readFrame(sc, index);
+    anim.add(index);
+    anim.set(f, index);
+    index++;
+    size--;
+  }
+
+  return anim;
   }
 
   private static AFrame readFrame(Scanner sc, int index) {
-	AFrame frame = new AFrame();
-	frame.setName("Frame " + index);
-	byte[] d = {};
-	for (int i = 0; i < 8; i++) {
-		byte[] data = hexConvert(sc.nextLine());
-		d = concat(data, d);
-	}
-	frame.setData(d);
-	d = hexConvert(sc.nextLine());
-	frame.setTime(d[0]);
-	return frame;
+  AFrame frame = new AFrame();
+  frame.setName("Frame " + index);
+  byte[] d = {};
+  for (int i = 0; i < 8; i++) {
+    byte[] data = hexConvert(sc.nextLine());
+    d = concat(data, d);
+  }
+  frame.setData(d);
+  d = hexConvert(sc.nextLine());
+  frame.setTime(d[0]);
+  return frame;
   }
 
   private static byte[] concat(byte[] a, byte[] b) {
-	byte[] c = new byte[a.length + b.length];
-	System.arraycopy(a, 0, c, 0, a.length);
-	System.arraycopy(b, 0, c, a.length, b.length);
-	return c;
+  byte[] c = new byte[a.length + b.length];
+  System.arraycopy(a, 0, c, 0, a.length);
+  System.arraycopy(b, 0, c, a.length, b.length);
+  return c;
   }
 
   private static byte[] hexConvert(String hex) {
-	hex = hex.replaceAll("\\n", "");
-	int length = hex.length();
-	byte[] data = new byte[length / 2];
-	for (int i = 0; i < length; i += 2) {
-		data[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4) + Character.digit(hex.charAt(i + 1), 16));
-	}
-	return data;
+  hex = hex.replaceAll("\\n", "");
+  int length = hex.length();
+  byte[] data = new byte[length / 2];
+  for (int i = 0; i < length; i += 2) {
+    data[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4) + Character.digit(hex.charAt(i + 1), 16));
+  }
+  return data;
   }
 
   private static void writeAnimation(Animation anim, FileWriter f) throws IOException {
     f.write(anim.size() + "\n");
-	f.write(anim.getName() + "\n");
+  f.write(anim.getName() + "\n");
     for (int i = 0; i < anim.size(); i++) {
       writeFrame(anim.get(i), f);
     }

Cube Control/frame.java

@@ -98,11 +98,30 @@ public class frame extends JFrame implements ListSelectionListener {
 
   public void valueChanged(ListSelectionEvent evt) {
     if (!evt.getValueIsAdjusting()) {
-	   int anim = animList.getSelectedIndex();
-	   for (int i = 0; i < worker.numOfFrames(anim); i++) {
-		   frameListModel.add(i, worker.getFrameName(anim, i));
-		}
-		frameList.setModel(frameListModel);
+     DefaultListModel model = (DefaultListModel)((JList)evt.getSource()).getModel();
+     int anim = animList.getSelectedIndex();
+     int max;
+     if(evt.getSource() == animList){
+       max = worker.numOfAnimations();
+       System.out.println(max);
+
+     } else {
+       max = worker.numOfFrames(animList.getSelectedIndex());
+
+     }
+
+     if (anim == -1){
+        anim = 0;
+     }
+     model.clear();
+     for (int i = 0; i < max; i++) {
+       if(evt.getSource() == animList){
+          model.add(i, worker.getAnimationName(i));
+       } else {
+         model.add(i, worker.getFrameName(anim, i));
+       }
+    }
+    frameList.setModel(model);
     }
   }
 
@@ -460,21 +479,26 @@ public class frame extends JFrame implements ListSelectionListener {
   }
 
   public void frameAdd_ActionPerformed(ActionEvent evt) {
-         worker.addFrame(animList.getSelectedIndex());
-         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);
+         if(animList.getSelectedIndex() == -1){
+            errorMessage("Please select an animation!");
+         } else {
+           worker.addFrame(animList.getSelectedIndex());
+           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) {
          worker.removeFrame(animList.getSelectedIndex(), frameList.getSelectedIndex());
          frameRemaining.setText(Integer.toString(worker.framesRemaining()));
-		 frameListModel.removeElementAt(frameList.getSelectedIndex());
-		 frameList.setModel(frameListModel);
+     frameListModel.removeElementAt(frameList.getSelectedIndex());
+     frameList.setModel(frameListModel);
   }
 
   public void animUp_ActionPerformed(ActionEvent evt) {
@@ -503,20 +527,22 @@ public class frame extends JFrame implements ListSelectionListener {
     if(worker.addAnimation() == -1){
       errorMessage("Could not add animation!");
     } else {
-		int n = worker.numOfAnimations() - 1;
-		if (n < 0) {
-			n = 0;
-		}
-		animModel.add(n, worker.getAnimationName(n));
-		animList.setModel(animModel);
-	}
+    int n = worker.numOfAnimations() - 1;
+    if (n < 0) {
+      n = 0;
+    }
+    animModel.clear();
+    System.out.println(n);
+    animModel.addElement(worker.getAnimationName(n));
+    animList.setModel(animModel);
+    }
 
   }
 
   public void animRemove_ActionPerformed(ActionEvent evt) {
      worker.removeAnimation(animList.getSelectedIndex());
-	 animModel.removeElementAt(animList.getSelectedIndex());
-	 animList.setModel(animModel);
+   animModel.removeElementAt(animList.getSelectedIndex());
+   animList.setModel(animModel);
   }
 
   public void load_ActionPerformed(ActionEvent evt) {

Cube Control/makefile

@@ -1,7 +1,7 @@
 JAVAC = javac
 CC = gcc
-TARGET = unix
-#TARGET = win
+#TARGET = unix
+TARGET = win
 
 JAVAFILES = cubeWorker.java layerEditFrame.java frame.java
 
@@ -34,9 +34,10 @@ serialHelper:
 	$(CC) -o serialHelper serialHelper.c
 
 clean:
-	rm -f *.class
 ifeq ($(TARGET),win)
-	rm -f serialHelper.exe
+	del $(CLASSES)
+	del serialHelper.exe
 else
+	rm -f *.class
 	rm -f serialHelper
 endif