ArrayList now LinkedList

CubeControl/Animation.java

@@ -21,7 +21,7 @@
  * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 
 /**
  * A collection of frames that represent an entire animation.
@@ -32,7 +32,9 @@ import java.util.ArrayList;
  */
 
 public class Animation {
-  ArrayList<AFrame> frames = new ArrayList<AFrame>();
+  public LinkedList<AFrame> frames = new LinkedList<AFrame>();
+  // Public so moveFrame can access it
+  
   private int lastFrameIndex = 0;
   private String name = "Animation";
 

CubeControl/AnimationUtility.java

@@ -25,7 +25,7 @@ import java.io.FileWriter;
 import java.io.File;
 import java.util.Scanner;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.LinkedList;
 
 /**
  * A helper class that loads animations from a file or saves them to one.
@@ -39,14 +39,14 @@ public class AnimationUtility {
   private static String lastError = null;
 
   /**
-   * Read a file, return ArrayList with all animations in the file.
+   * Read a file, return LinkedList with all animations in the file.
    * @param path Path of file
-   * @return Populated ArrayList
+   * @return Populated LinkedList
    * @throws Excpetion When something goes wrong with the Scanner...
    */
-  public static ArrayList<Animation> readFile(String path) throws Exception {
+  public static LinkedList<Animation> readFile(String path) throws Exception {
     Scanner sc = new Scanner(new File(path));
-  ArrayList<Animation> animations = new ArrayList<Animation>();
+  LinkedList<Animation> animations = new LinkedList<Animation>();
 
   do {
   Animation tmp = readAnimation(sc);
@@ -63,12 +63,12 @@ public class AnimationUtility {
   }
 
   /**
-   * Write a file with all Animations of an ArrayList
+   * Write a file with all Animations of an LinkedList
    * @param path Path to write to
-   * @param animations ArrayList with all animations to be saved
+   * @param animations LinkedList with all animations to be saved
    * @see AnimationUtility#getLastError() getLastError()
    */
-  public static void writeFile(String path, ArrayList<Animation> animations) {
+  public static void writeFile(String path, LinkedList<Animation> animations) {
     File f = new File(path);
     if (f.exists()) {
       try {
@@ -102,7 +102,7 @@ public class AnimationUtility {
   /**
    * Get the last error that occured while writing
    * @return Text of the exception that occured
-   * @see AnimationUtility#writeFile(String, ArrayList) writeFile()
+   * @see AnimationUtility#writeFile(String, LinkedList) writeFile()
    */
   public static String getLastError() {
     String tmp = lastError;

CubeControl/Frame.java

@@ -103,6 +103,14 @@ public class Frame extends JFrame implements ListSelectionListener {
   public void valueChanged(ListSelectionEvent evt) {
   if ((!evt.getValueIsAdjusting()) && ((evt.getSource() == animList) || (evt.getSource() == frameList))) {
     // If animList or framsList is the source, we act...
+	if ((evt.getSource() == animList) && (animList.getSelectedIndex() != -1)) {
+      // animList selection changed, update frameList
+      frameListModel.clear();
+      for (int i = 0; i < worker.numOfFrames(animList.getSelectedIndex()); i++) {
+        frameListModel.addElement(worker.getFrameName(animList.getSelectedIndex(), i));
+      }
+      frameList.setModel(frameListModel);
+    }
 
     // If both selections are valid, update Frame duration and set 3D data
     if ((animList.getSelectedIndex() != -1) && (frameList.getSelectedIndex() != -1)) {
@@ -112,15 +120,6 @@ public class Frame extends JFrame implements ListSelectionListener {
       // clear Frame duration
       frameLengthText.setText("");
     }
-
-    if ((evt.getSource() == animList) && (animList.getSelectedIndex() != -1)) {
-      // animList selection changed, update frameList
-      frameListModel.clear();
-      for (int i = 0; i < worker.numOfFrames(animList.getSelectedIndex()); i++) {
-        frameListModel.addElement(worker.getFrameName(animList.getSelectedIndex(), i));
-      }
-      frameList.setModel(frameListModel);
-    }
   }
   }
 

CubeControl/cubeWorker.java

@@ -25,7 +25,7 @@
  * This class handles one animation file. This file can contain
  * many animations, but has to be only 1Mbit in size (128*1024 Byte).
  */
-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.Collections;
 import java.util.StringTokenizer;
 
@@ -50,7 +50,7 @@ public class cubeWorker {
 // Fields
 // --------------------
 
-  private ArrayList<Animation> animations = new ArrayList<Animation>();
+  private LinkedList<Animation> animations = new LinkedList<Animation>();
   private int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
   private boolean changedState = false;
 
@@ -71,7 +71,7 @@ public class cubeWorker {
    * Creates a worker from the given animation list
    * @param anims List of animations
    */
-  cubeWorker(ArrayList<Animation> anims) {
+  cubeWorker(LinkedList<Animation> anims) {
     animations = anims;
   }