Cleaned up internal api

CubeControl/AFrame.java

@@ -32,50 +32,10 @@ import java.util.Arrays;
  * @version 1.0
  */
 
-public class AFrame implements Comparable<AFrame> {
+public class AFrame {
 	private short[] data = new short[64];
 	private short duration = 1;
 	private String name = "Frame";
-	private int order;
-	private static int orderIndex = 0;
-
-	/**
-	 * Compare this frame to another frame.
-	 * Compares the order in the frame list.
-	 * @return 0 if equal, -1 if this one comes first, 1 if last
-	 */
-	public int compareTo(AFrame compareFrame) {
-		if (getOrder() < compareFrame.getOrder()) {
-			return -1;
-		} else if (getOrder() == compareFrame.getOrder()) {
-			return 0;
-		} else {
-			return 1;
-		} 
-	}
-
-	/**
-	 * Get index of frame in list of frames.
-	 * @return index
-	 */
-	public int getOrder() {
-		return order;
-	}
-
-	/**
-	 * Set index of frame in list of frames.
-	 * @param newOrder new index
-	 */
-	public void setOrder(int newOrder) {
-		order = newOrder;
-	}
-
-	/**
-	 * Inserts frane at end of frame list.
-	 */
-	public AFrame() {
-		order = orderIndex++;
-	}
 
 	/**
 	 * Gets the Name of this Frame
@@ -83,7 +43,7 @@ public class AFrame implements Comparable<AFrame> {
 	 * @return Name of the Frame
 	 */
 	public String getName() {
-		return name + " (" + order + ")";
+		return name;
 	}
 
 	/**
@@ -125,7 +85,8 @@ public class AFrame implements Comparable<AFrame> {
 	}
 
 	/**
-	 * Gets the Duration of this Frame
+	 * Gets the Duration of this Frame.
+	 * 0 means (1/24) seconds.
 	 * 
 	 * @return Duration of frame.
 	 * @see AFrame#setTime(short) setTime()

CubeControl/Animation.java

@@ -33,99 +33,94 @@ import java.util.Collections;
  * @version 1.0
  */
 
-public class Animation implements Comparable<Animation> {
-	List<AFrame> frames = new ArrayList<AFrame>();
-	private int lastFrameIndex = 0;
+public class Animation {
+	AFrame frames[] = new AFrame[1];
 	private String name = "Animation";
-	private int order;
-	private static int orderIndex = 0;
 
 	/**
-	 * Compare this animation to another animation.
-	 * Compares the order in the animations list.
-	 * @return 0 if equal, -1 if this one comes first, 1 if last
+	 * Create an empty frame in this new animation.
 	 */
-	public int compareTo(Animation compareAnimation) {
-		if (getOrder() < compareAnimation.getOrder()) {
-			return -1;
-		} else if (getOrder() == compareAnimation.getOrder()) {
-			return 0;
-		} else {
-			return 1;
-		} 
+	public Animation() {
+		frames[0] = new AFrame();
 	}
 
 	/**
-	 * Get index of animation in list of animations.
-	 * @return index
+	 * Gets the specified frame in this animation
+	 * 
+	 * @param i Index of frame you want
+	 * @return The selected frame
 	 */
-	public int getOrder() {
-		return order;
+	public AFrame getFrame(int i) {
+		if (i >= frames.length) {
+			return null;
+		} else {
+			return frames[i];
+		}
 	}
 
 	/**
-	 * Set index of animation in list of animations.
-	 * @param newOrder new index
+	 * Move an frame up.
+	 * @param i the animation you want to move
 	 */
-	public void setOrder(int newOrder) {
-		order = newOrder;
+	public void moveFrameUp(int i) {
+		if (i > 0) {
+			AFrame tmp = frames[i];
+			frames[i] = frames[i - 1];
+			frames[i - 1] = tmp;
+		}
 	}
 
 	/**
-	 * Inserts animation at end of animation list.
+	 * Move an frame down.
+	 * @param i the animation you want to move
 	 */
-	public Animation() {
-		order = orderIndex++;
+	public void moveFrameDown(int i) {
+		if (i < (frames.length - 1)) {
+			AFrame tmp = frames[i];
+			frames[i] = frames[i + 1];
+			frames[i + 1] = tmp;
+		}
 	}
 
 	/**
-	 * Gets the name of this animation
+	 * Sets the selected Frame
 	 * 
-	 * @return name of this animation
+	 * @param f the frame you want to place in this animation
+	 * @param i Index of the frame you want to override
 	 */
-	public String getName() {
-		return name + " (" + order + ")";
+	public void setFrame(AFrame f, int i) {
+		if (i < frames.length) {
+			frames[i] = f;
+		} else {
+			addFrame(f);
+		}
 	}
 
 	/**
-	 * Sets the name of this animation
-	 * 
-	 * @param s
-	 *            new name
+	 * Add a new (empty) frame at the end
 	 */
-	public void setName(String s) {
-		name = s;
+	public void addFrame() {
+		extendArray();
+		frames[frames.length - 1] = new AFrame();
 	}
 
 	/**
-	 * Gets the specified frame in this animation
-	 * 
-	 * @param i Index of frame you want
-	 * @return The selected frame
+	 * Add a specified frame at the end
+	 *
+	 * @param f data for new frame
 	 */
-	public AFrame get(int i) {
-		try {
-			return frames.get(i);
-		} catch (IndexOutOfBoundsException e) {
-			System.out.println(e.toString());
-			return null;
-		}
+	public void addFrame(AFrame f) {
+		addFrame();
+		frames[frames.length - 1] = f;
 	}
 
 	/**
-	 * Sets the selected Frame
+	 * Return size of this animation, in number of frames.
 	 * 
-	 * @param f the frame you want to place in this animation
-	 * @param i Index of the frame you want to override
+	 * @return number of frames
 	 */
-	public void set(AFrame f, int i) {
-		if (lastFrameIndex <= i) {
-			try {
-				frames.set(i, f);
-			} catch (IndexOutOfBoundsException e) {
-				System.out.println(e.toString());
-			}
-		}
+	public int size() {
+		return frames.length;
 	}
 
 	/**
@@ -133,65 +128,60 @@ public class Animation implements Comparable<Animation> {
 	 * 
 	 * @param i Index of frame you want to remove
 	 */
-	public void remove(int i) {
-		try {
-			frames.remove(i);
-		} catch (IndexOutOfBoundsException e) {
-			System.out.println(e.toString());
-		}
+	public void removeFrame(int i) {
+		shiftOver(i);
+		shrinkArray();
 	}
 
 	/**
-	 * Add a new (empty) frame at the specified position
+	 * Gets the name of this animation
 	 * 
-	 * @param i Index you want to place the new frame in
-	 * @see Animation#size size()
+	 * @return name of this animation
 	 */
-	public void add(int i) {
-		try {
-			frames.add(i, new AFrame());
-			lastFrameIndex++;
-		} catch (IndexOutOfBoundsException e) {
-			System.out.println(e.toString());
-		}
+	public String getName() {
+		return name;
 	}
 
 	/**
-	 * Add a specified frame at the specified position
+	 * Sets the name of this animation
 	 * 
-	 * @param i Index for new frame
-	 * @param f data for new frame
+	 * @param s
+	 *            new name
 	 */
-	public void add(int i, AFrame f) {
-		try {
-			frames.add(i, f);
-			lastFrameIndex++;
-		} catch (IndexOutOfBoundsException e) {
-			System.out.println(e.toString());
+	public void setName(String s) {
+		name = s;
+	}
+
+	private void extendArray() {
+		AFrame newArray[] = new AFrame[frames.length + 1];
+		for (int i = 0; i < frames.length; i++) {
+			newArray[i] = frames[i];
 		}
+		frames = newArray;
 	}
 
-	// return true if damaged and fixed partially
-	private boolean checkFrameList() {
-		for (int i = 0; i < frames.size(); i++) {
-			if (frames.get(i).getOrder() != i) {
-				frames.get(i).setOrder(frames.size());
-				return true;
-			}
+	private void shrinkArray() {
+		AFrame newArray[] = new AFrame[frames.length - 1];
+		for (int i = 0; i < newArray.length; i++) {
+			newArray[i] = frames[i];
 		}
-		return false;
+		frames = newArray;
 	}
 
-	/**
-	 * Return size of this animation, in number of frames.
-	 * Also fixes the order of the frame list, if needed.
-	 * 
-	 * @return number of frames
-	 */
-	public int size() {
-		while(checkFrameList()) {
-			Collections.sort(frames);
+	/* private void shiftSpace(int newFree) {
+		AFrame temp = null;
+		for (int i = newFree; i < (frames.length - 1); i++) {
+			// Max i: vorletztes element
+			AFrame tmp = frames[i];
+			frames[i] = temp;
+			temp = frames[i + 1];
+			frames[i + 1] = tmp;
+		}
+	} */
+
+	private void shiftOver(int toForget) {
+		for (int i = (toForget + 1); i < frames.length; i++) {
+			frames[i - 1] = frames[i];
 		}
-		return frames.size();
 	}
 }

CubeControl/AnimationUtility.java

@@ -46,9 +46,9 @@ public class AnimationUtility {
 	 * @return Populated ArrayList
 	 * @throws Excpetion When something goes wrong with the Scanner...
 	 */
-	public static List<Animation> readFile(String path) throws Exception {
+	public static Animation[] readFile(String path) throws Exception {
 		Scanner sc = new Scanner(new File(path));
-		List<Animation> animations = new ArrayList<Animation>();
+		Animation[] animations = new Animation[0];
 		do {
 			Animation tmp = readAnimation(sc);
 			if (tmp == null) {
@@ -57,20 +57,29 @@ public class AnimationUtility {
 			if (sc.hasNextLine()) {
 				sc.nextLine();
 			}
-			animations.add(tmp);
+			extendArray(animations);
+			animations[animations.length - 1] = tmp;
 		} while (sc.hasNextLine());
 
 		return animations;
 	}
 
+	private static void extendArray(Animation[] animations) {
+		Animation newArray[] = new Animation[animations.length + 1];
+		for (int i = 0; i < animations.length; i++) {
+			newArray[i] = animations[i];
+		}
+		animations = newArray;
+	}
+
 	/**
 	 * Write a file with all Animations of an ArrayList
 	 * 
 	 * @param path Path to write to
-	 * @param animations ArrayList with all animations to be saved
+	 * @param animations Array with all animations to be saved
 	 * @see AnimationUtility#getLastError() getLastError()
 	 */
-	public static void writeFile(String path, List<Animation> animations) {
+	public static void writeFile(String path, Animation[] animations) {
 		File f = new File(path);
 		if (f.exists()) {
 			try {
@@ -83,9 +92,8 @@ public class AnimationUtility {
 		FileWriter output = null;
 		try {
 			output = new FileWriter(f);
-			for (int i = 0; i < animations.size(); i++) {
-				writeAnimation(animations.get(i), output,
-						(i == (animations.size() - 1)));
+			for (int i = 0; i < animations.length; i++) {
+				writeAnimation(animations[i], output, (i == (animations.length - 1)));
 			}
 		} catch (Exception e) {
 			lastError = e.toString();
@@ -106,7 +114,6 @@ public class AnimationUtility {
 	 * Get the last error that occured while writing
 	 * 
 	 * @return Text of the exception that occured
-	 * @see AnimationUtility#writeFile(String, List) writeFile()
 	 */
 	public static String getLastError() {
 		String tmp = lastError;
@@ -127,7 +134,7 @@ public class AnimationUtility {
 		anim.setName(sc.nextLine());
 		while (size > 0) {
 			f = readFrame(sc, index);
-			anim.add(index, f);
+			anim.setFrame(f, index);
 			index++;
 			size--;
 		}
@@ -187,7 +194,7 @@ public class AnimationUtility {
 		f.write(anim.size() + "\n");
 		f.write(anim.getName() + "\n");
 		for (int i = 0; i < anim.size(); i++) {
-			writeFrame(anim.get(i), f);
+			writeFrame(anim.getFrame(i), f);
 		}
 		if (!last) {
 			f.write("\n");

CubeControl/Frame.java

@@ -83,6 +83,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 
 	public cubeWorker worker = new cubeWorker(this);
 	private boolean fileSelected = false;
+	private Frame thisFrame;
 
 	// Ende Variablen
 
@@ -125,25 +126,22 @@ public class Frame extends JFrame implements ListSelectionListener {
 					&& (animList.getSelectedIndex() != -1)) {
 				// animList selection changed, update frameList
 				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));
+
+				// System.out.println("Selected Animation: " + animList.getSelectedIndex());
+				int max = worker.getAnimation(animList.getSelectedIndex()).size();
+
+				for (int i = 0; i < max; i++) {
+					frameListModel.addElement(worker.getAnimation(
+							animList.getSelectedIndex()).getFrame(i).getName());
 				}
 				frameList.setModel(frameListModel);
 			}
 
 			// If both selections are valid, update Frame duration and set 3D
 			// data
-			if ((animList.getSelectedIndex() != -1)
-					&& (frameList.getSelectedIndex() != -1)) {
-				ledView.setData(worker.getFrame(animList.getSelectedIndex(),
-						frameList.getSelectedIndex()));
-				frameLengthText.setText(Integer.toString(worker.getFrameTime(
-						animList.getSelectedIndex(),
-						frameList.getSelectedIndex())));
+			if ((animList.getSelectedIndex() != -1)	&& (frameList.getSelectedIndex() != -1)) {
+				ledView.setData(worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getData());
+				frameLengthText.setText(Integer.toString(worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime()));
 			} else {
 				// clear Frame duration
 				frameLengthText.setText("");
@@ -169,15 +167,16 @@ public class Frame extends JFrame implements ListSelectionListener {
 	public Frame(String title) {
 		// Frame-Initialisierung
 		super(title);
+		thisFrame = this;
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-		String[] sPorts = worker.getSerialPorts();
+		String[] sPorts = HelperUtility.getPorts();
 		for (int i = 0; i < sPorts.length; i++) {
 			jComboBox1.addItem(sPorts[i]);
 		}
 
-		for (int i = 0; i < worker.numOfAnimations(); i++) {
-			animModel.addElement(worker.getAnimationName(i));
+		for (int i = 0; i < worker.size(); i++) {
+			animModel.addElement(worker.getAnimation(i).getName());
 		}
 
 		addWindowListener(new WindowAdapter() {
@@ -216,7 +215,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editA);
 		editA.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editA_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 0, worker, thisFrame);
+				}
 			}
 		});
 
@@ -226,7 +231,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editB);
 		editB.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editB_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 1, worker, thisFrame);
+				}
 			}
 		});
 
@@ -236,7 +247,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editC);
 		editC.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editC_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 2, worker, thisFrame);
+				}
 			}
 		});
 
@@ -246,7 +263,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editD);
 		editD.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editD_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 3, worker, thisFrame);
+				}
 			}
 		});
 
@@ -256,7 +279,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editE);
 		editE.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editE_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 4, worker, thisFrame);
+				}
 			}
 		});
 
@@ -266,7 +295,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editF);
 		editF.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editF_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 5, worker, thisFrame);
+				}
 			}
 		});
 
@@ -276,7 +311,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editG);
 		editG.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editG_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 6, worker, thisFrame);
+				}
 			}
 		});
 
@@ -286,7 +327,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(editH);
 		editH.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				editH_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 7, worker, thisFrame);
+				}
 			}
 		});
 
@@ -300,7 +347,14 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(frameUp);
 		frameUp.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				frameUp_ActionPerformed(evt);
+				int i = frameList.getSelectedIndex();
+				if ((i > 0) && (frameListModel.getSize() >= 2)) {
+					Object tmp = frameListModel.get(i);
+					frameListModel.set(i, frameListModel.get(i - 1));
+					frameListModel.set(i - 1, tmp);
+					frameList.setSelectedIndex(i - 1);
+					worker.getAnimation(animList.getSelectedIndex()).moveFrameUp(frameList.getSelectedIndex());
+				}
 			}
 		});
 
@@ -310,7 +364,16 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(frameAdd);
 		frameAdd.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				frameAdd_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation!");
+				} else {
+					int n = worker.getAnimation(animList.getSelectedIndex()).size();
+					worker.getAnimation(animList.getSelectedIndex()).addFrame();
+			// Not reaching past this comment if frame list empty
+					frameRemaining.setText(Integer.toString(worker.memoryRemaining()));
+					frameListModel.add(n, worker.getAnimation(animList.getSelectedIndex()).getFrame(n).getName());
+					frameList.setModel(frameListModel);
+				}
 			}
 		});
 
@@ -320,7 +383,16 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(frameRemove);
 		frameRemove.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				frameRemove_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Select a Frame.");
+				} else {
+					worker.getAnimation(animList.getSelectedIndex()).removeFrame(frameList.getSelectedIndex());
+					frameRemaining.setText(Integer.toString(worker.memoryRemaining()));
+					frameListModel.removeElementAt(frameList.getSelectedIndex());
+					frameList.setModel(frameListModel);
+				}
 			}
 		});
 
@@ -340,11 +412,8 @@ public class Frame extends JFrame implements ListSelectionListener {
 					errorMessage("Select a Frame!");
 					return;
 				}
-				worker.setFrameName(
-						askString("Rename",
-								"Rename " + frameList.getSelectedValue() + "?"),
-						a, f);
-				frameListModel.set(f, worker.getFrameName(a, f));
+				worker.getAnimation(a).getFrame(f).setName(askString("Rename", "Rename " + frameList.getSelectedValue() + "?"));
+				frameListModel.set(f, worker.getAnimation(a).getFrame(f).getName());
 				frameList.setModel(frameListModel);
 			}
 		});
@@ -355,7 +424,14 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(frameDown);
 		frameDown.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				frameDown_ActionPerformed(evt);
+				int i = frameList.getSelectedIndex();
+				if ((i >= 0) && (frameListModel.getSize() >= 2) && (i < (frameListModel.getSize() - 1))) {
+					Object tmp = frameListModel.get(i);
+					frameListModel.set(i, frameListModel.get(i + 1));
+					frameListModel.set(i + 1, tmp);
+					frameList.setSelectedIndex(i + 1);
+					worker.getAnimation(animList.getSelectedIndex()).moveFrameDown(frameList.getSelectedIndex());
+				}
 			}
 		});
 
@@ -375,7 +451,14 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(fullScreenButton);
 		fullScreenButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				enterFullscreen(evt);
+				ledView.enterFullscreen();
+				setLocation(0,0);
+				setSize(700, 700);
+				int w = Toolkit.getDefaultToolkit().getScreenSize().width;
+				int h = Toolkit.getDefaultToolkit().getScreenSize().height;
+				setSize(w - 5, h - 30);
+				playAnimationFullscreen.setVisible(true);
+				cubeCanvas.setBounds(0, 0, w - 5, h - 80);
 			}
 		});
 
@@ -384,18 +467,40 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(exitButton);
 		exitButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				exitFullscreen();
+				playAnimationFullscreen.setVisible(false);
+				setLocation(0,0);
+				setSize(661, 440);
+				ledView.leaveFullscreen();
+				cubeCanvas.setBounds(8,8, 250,250);
+				Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+				int x = (d.width - getSize().width) / 2;
+				int y = (d.height - getSize().height) / 2;
+				setLocation(x, y);
 			}
 		});
 
-
 		playAnimation.setText("Play");
 		playAnimation.setBounds(344, 390, 147, 25);
 		playAnimation.setFont(new Font("Dialog", Font.PLAIN, 13));
 		cp.add(playAnimation);
 		playAnimation.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt){
-				playAnimation(evt);		
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					for(int i = 0; i < frameList.getModel().getSize(); i++){
+						frameList.setSelectedIndex(i);
+						short time1 = worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime();
+						long time = (long) (((time1+1) * 1/24) * 1000);
+						try {
+							Thread.sleep(time);
+						} catch(Exception e) {
+							System.out.println(e);
+						}
+					}	
+				}
 			}
 		});
 
@@ -406,11 +511,25 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(playAnimationFullscreen);
 		playAnimationFullscreen.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt){
-				playAnimation(evt);		
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Please select an animation.");
+				} else if (frameList.getSelectedIndex() == -1) {
+					errorMessage("Please select a Frame.");
+				} else {
+					for(int i = 0; i < frameList.getModel().getSize(); i++){
+						frameList.setSelectedIndex(i);
+						short time1 = worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime();
+						long time = (long) (((time1+1) * 1/24) * 1000);
+						try {
+							Thread.sleep(time);
+						} catch(Exception e) {
+							System.out.println(e);
+						}
+					}	
+				}
 			}
 		});
 
-
 		frameDuration.setBounds(590, 184, 60, 24);
 		frameDuration.setText("OK");
 		frameDuration.setFont(new Font("Dialog", Font.PLAIN, 13));
@@ -433,10 +552,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 						errorMessage("Please select a Frame!");
 						return;
 					}
-					worker.setFrameTime(
-							(byte) (Integer.parseInt(frameLengthText.getText()) - 1),
-							animList.getSelectedIndex(),
-							frameList.getSelectedIndex());
+					worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).setTime((byte)(Integer.parseInt(frameLengthText.getText()) - 1));
 				}
 			}
 		});
@@ -452,7 +568,14 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(animUp);
 		animUp.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				animUp_ActionPerformed(evt);
+				int i = animList.getSelectedIndex();
+				if ((i > 0) && (animModel.getSize() >= 2)) {
+					Object tmp = animModel.get(i);
+					animModel.set(i, animModel.get(i - 1));
+					animModel.set(i - 1, tmp);
+					animList.setSelectedIndex(i - 1);
+					worker.moveAnimationUp(animList.getSelectedIndex());
+				}
 			}
 		});
 
@@ -462,7 +585,14 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(animDown);
 		animDown.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				animDown_ActionPerformed(evt);
+				int i = animList.getSelectedIndex();
+				if ((i >= 0) && (animModel.getSize() >= 2) && (i < (animModel.getSize() - 1))) {
+					Object tmp = animModel.get(i);
+					animModel.set(i, animModel.get(i + 1));
+					animModel.set(i + 1, tmp);
+					animList.setSelectedIndex(i + 1);
+					worker.moveAnimationDown(animList.getSelectedIndex());
+				}
 			}
 		});
 
@@ -477,11 +607,8 @@ public class Frame extends JFrame implements ListSelectionListener {
 					errorMessage("Select an animation!");
 					return;
 				}
-				worker.setAnimationName(
-						askString("Rename",
-								"Rename " + animList.getSelectedValue() + "?"),
-						a);
-				animModel.set(a, worker.getAnimationName(a));
+				worker.getAnimation(a).setName(askString("Rename", "Rename " + animList.getSelectedValue() + "?"));
+				animModel.set(a, worker.getAnimation(a).getName());
 				animList.setModel(animModel);
 			}
 		});
@@ -492,7 +619,15 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(animAdd);
 		animAdd.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				animAdd_ActionPerformed(evt);
+				if (worker.addAnimation() == -1) {
+					errorMessage("Could not add animation!");
+				} else {
+					animModel.clear();
+					for (int i = 0; i < worker.size(); i++) {
+						animModel.add(i, worker.getAnimation(i).getName());
+					}
+					animList.setModel(animModel);
+				}
 			}
 		});
 
@@ -502,7 +637,13 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(animRemove);
 		animRemove.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				animRemove_ActionPerformed(evt);
+				if (animList.getSelectedIndex() == -1) {
+					errorMessage("Select an animation.");
+				} else {
+					worker.removeAnimation(animList.getSelectedIndex());
+					animModel.removeElementAt(animList.getSelectedIndex());
+					animList.setModel(animModel);
+				}
 			}
 		});
 
@@ -517,7 +658,24 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(load);
 		load.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				load_ActionPerformed(evt);
+				JFileChooser fc = new JFileChooser();
+				int ret = fc.showOpenDialog(thisFrame);
+				if (ret == JFileChooser.APPROVE_OPTION) {
+					File file = fc.getSelectedFile();
+					if (fileSelected == false) {
+						fileSelected = true;
+					}
+					animPath.setText(file.getPath());
+					worker.loadState(animPath.getText());
+					animModel.clear();
+					for (int i = 0; i < worker.size(); i++) {
+						animModel.addElement(worker.getAnimation(i).getName());
+					}
+					animList.setModel(animModel);
+
+					frameListModel.clear();
+					frameList.setModel(frameListModel);
+				}
 			}
 		});
 
@@ -527,7 +685,18 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(save);
 		save.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				save_ActionPerformed(evt);
+				if (fileSelected == false) {
+					JFileChooser fc = new JFileChooser();
+					int ret = fc.showSaveDialog(thisFrame);
+					if (ret == JFileChooser.APPROVE_OPTION) {
+						File file = fc.getSelectedFile();
+						fileSelected = true;
+						animPath.setText(file.getPath());
+						worker.saveState(animPath.getText());
+					}
+				} else {
+					worker.saveState(animPath.getText());
+				}
 			}
 		});
 
@@ -537,7 +706,21 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(saveAs);
 		saveAs.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				saveAs_ActionPerformed(evt);
+				JFileChooser fc;
+				if (fileSelected == true) {
+					fc = new JFileChooser(new File(animPath.getText()).getParentFile());
+				} else {
+					fc = new JFileChooser();
+				}
+				int ret = fc.showSaveDialog(thisFrame);
+				if (ret == JFileChooser.APPROVE_OPTION) {
+					File file = fc.getSelectedFile();
+					if (fileSelected == false) {
+						fileSelected = true;
+					}
+					animPath.setText(file.getPath());
+					worker.saveState(animPath.getText());
+				}
 			}
 		});
 
@@ -550,7 +733,17 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(upload);
 		upload.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				upload_ActionPerformed(evt);
+				if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
+					// errorMessage("No serial port selected...");
+				} else {
+					if (worker.cubeProbeConnected((String) jComboBox1.getSelectedItem())) {
+						if (worker.cubeSendState((String) jComboBox1.getSelectedItem()) != 0) {
+							// errorMessage("Could not upload data!");
+						}
+					} else {
+						// errorMessage("Cube does not respond...");
+					}
+				}
 			}
 		});
 
@@ -560,7 +753,17 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(download);
 		download.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
-				download_ActionPerformed(evt);
+				if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
+					// errorMessage("No serial port selected...");
+				} else {
+					if (worker.cubeProbeConnected((String) jComboBox1.getSelectedItem())) {
+						if (worker.cubeGetState((String) jComboBox1.getSelectedItem()) != 0) {
+							// errorMessage("Could not download data!");
+						}
+					} else {
+						// errorMessage("Cube does not respond...");
+					}
+				}
 			}
 		});
 
@@ -570,7 +773,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 		cp.add(jLabel4);
 		frameRemaining.setBounds(536, 232, 113, 24);
 		frameRemaining.setEditable(false);
-		frameRemaining.setText(String.valueOf(worker.framesRemaining()));
+		frameRemaining.setText(String.valueOf(worker.memoryRemaining()));
 		frameRemaining.setFont(new Font("Dialog", Font.PLAIN, 13));
 		cp.add(frameRemaining);
 		animList.setFont(new Font("Dialog", Font.PLAIN, 13));
@@ -582,348 +785,6 @@ public class Frame extends JFrame implements ListSelectionListener {
 		setVisible(true);
 	}
 
-	// Anfang Methoden
-
-	// Anfang Ereignisprozeduren
-	
-	public void playAnimation(ActionEvent evt){
-			if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			for(int i = 0; i < frameList.getModel().getSize(); i++){
-				frameList.setSelectedIndex(i);
-				short time1 = worker.getFrameTime(animList.getSelectedIndex(), frameList.getSelectedIndex());
-				long time = (long) (((time1+1) * 1/24) * 1000);
-				try{
-					Thread.sleep(time);
-				}catch(Exception e){
-					System.out.println(e);
-				}
-			}	
-		}
-	
-	}
-	
-	public void enterFullscreen(ActionEvent evt) {
-		ledView.enterFullscreen();
-		//FullscreenWindow fw = new FullscreenWindow(worker, cubeCanvas, ledView, this);
-		setLocation(0,0);
-		setSize(700, 700);
-		int w = Toolkit.getDefaultToolkit().getScreenSize().width;
-		int h = Toolkit.getDefaultToolkit().getScreenSize().height;
-		System.out.println(w);
-		System.out.println(h);
-		setSize(w-5, h-30);
-
-		playAnimationFullscreen.setVisible(true);
-		//setSize(Toolkit.getDefaultToolkit().getScreenSize().width, Toolkit.getDefaultToolkit().getScreenSize().height);
-		//Y U NO WORK????
-		cubeCanvas.setBounds(0,0,Toolkit.getDefaultToolkit().getScreenSize().width-5, Toolkit.getDefaultToolkit().getScreenSize().height-80);
-	
-	}
-	public void exitFullscreen(){
-	//661, 440
-		playAnimationFullscreen.setVisible(false);
-		setLocation(0,0);
-		setSize(661, 440);
-		ledView.leaveFullscreen();
-		cubeCanvas.setBounds(8,8, 250,250);
-		Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-		int x = (d.width - getSize().width) / 2;
-		int y = (d.height - getSize().height) / 2;
-		setLocation(x, y);
-	}
-	
-	public void editA_ActionPerformed(ActionEvent evt) {
-
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					0, worker, this);
-
-		}
-	}
-
-	public void editB_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					1, worker, this);
-		}
-	}
-
-	public void editC_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					2, worker, this);
-		}
-	}
-
-	public void editD_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					3, worker, this);
-		}
-	}
-
-	public void editE_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					4, worker, this);
-		}
-	}
-
-	public void editF_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					5, worker, this);
-		}
-	}
-
-	public void editG_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					6, worker, this);
-		}
-	}
-
-	public void editH_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Please select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Please select a Frame.");
-		} else {
-			@SuppressWarnings("unused")
-			layerEditFrame layerFrame1 = new layerEditFrame(
-					animList.getSelectedIndex(), frameList.getSelectedIndex(),
-					7, worker, this);
-		}
-	}
-
-	public void frameUp_ActionPerformed(ActionEvent evt) {
-		int i = frameList.getSelectedIndex();
-		if ((i > 0) && (frameListModel.getSize() >= 2)) {
-			Object tmp = frameListModel.get(i);
-			frameListModel.set(i, frameListModel.get(i - 1));
-			frameListModel.set(i - 1, tmp);
-			frameList.setSelectedIndex(i - 1);
-			worker.moveFrame(worker.UP, animList.getSelectedIndex(),
-					frameList.getSelectedIndex());
-		}
-	}
-
-	public void frameDown_ActionPerformed(ActionEvent evt) {
-		int i = frameList.getSelectedIndex();
-		if ((i >= 0) && (frameListModel.getSize() >= 2)
-				&& (i < (frameListModel.getSize() - 1))) {
-			Object tmp = frameListModel.get(i);
-			frameListModel.set(i, frameListModel.get(i + 1));
-			frameListModel.set(i + 1, tmp);
-			frameList.setSelectedIndex(i + 1);
-			worker.moveFrame(worker.DOWN, animList.getSelectedIndex(),
-					frameList.getSelectedIndex());
-		}
-	}
-
-	public void frameAdd_ActionPerformed(ActionEvent evt) {
-		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()));
-			frameListModel.add(n,
-					worker.getFrameName(animList.getSelectedIndex(), n));
-			frameList.setModel(frameListModel);
-		}
-	}
-
-	public void frameRemove_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Select an animation.");
-		} else if (frameList.getSelectedIndex() == -1) {
-			errorMessage("Select a Frame.");
-		} else {
-			worker.removeFrame(animList.getSelectedIndex(),
-					frameList.getSelectedIndex());
-			frameRemaining.setText(Integer.toString(worker.framesRemaining()));
-			frameListModel.removeElementAt(frameList.getSelectedIndex());
-			frameList.setModel(frameListModel);
-		}
-	}
-
-	public void animUp_ActionPerformed(ActionEvent evt) {
-		int i = animList.getSelectedIndex();
-		if ((i > 0) && (animModel.getSize() >= 2)) {
-			Object tmp = animModel.get(i);
-			animModel.set(i, animModel.get(i - 1));
-			animModel.set(i - 1, tmp);
-			animList.setSelectedIndex(i - 1);
-			worker.moveAnimation(worker.UP, animList.getSelectedIndex());
-		}
-	}
-
-	public void animDown_ActionPerformed(ActionEvent evt) {
-		int i = animList.getSelectedIndex();
-		if ((i >= 0) && (animModel.getSize() >= 2)
-				&& (i < (animModel.getSize() - 1))) {
-			Object tmp = animModel.get(i);
-			animModel.set(i, animModel.get(i + 1));
-			animModel.set(i + 1, tmp);
-			animList.setSelectedIndex(i + 1);
-			worker.moveAnimation(worker.DOWN, animList.getSelectedIndex());
-		}
-	}
-
-	public void animAdd_ActionPerformed(ActionEvent evt) {
-		if (worker.addAnimation() == -1) {
-			errorMessage("Could not add animation!");
-		} else {
-			animModel.clear();
-			for (int i = 0; i < worker.numOfAnimations(); i++) {
-				animModel.add(i, worker.getAnimationName(i));
-			}
-			animList.setModel(animModel);
-		}
-
-	}
-
-	public void animRemove_ActionPerformed(ActionEvent evt) {
-		if (animList.getSelectedIndex() == -1) {
-			errorMessage("Select an animation.");
-		} else {
-			worker.removeAnimation(animList.getSelectedIndex());
-			animModel.removeElementAt(animList.getSelectedIndex());
-			animList.setModel(animModel);
-		}
-	}
-
-	public void load_ActionPerformed(ActionEvent evt) {
-		JFileChooser fc = new JFileChooser();
-		int ret = fc.showOpenDialog(this);
-		if (ret == JFileChooser.APPROVE_OPTION) {
-			File file = fc.getSelectedFile();
-			if (fileSelected == false) {
-				fileSelected = true;
-			}
-			animPath.setText(file.getPath());
-			worker.loadState(animPath.getText());
-			animModel.clear();
-			for (int i = 0; i < worker.numOfAnimations(); i++) {
-				animModel.addElement(worker.getAnimationName(i));
-			}
-			animList.setModel(animModel);
-
-			frameListModel.clear();
-			frameList.setModel(frameListModel);
-		}
-	}
-
-	public void save_ActionPerformed(ActionEvent evt) {
-		if (fileSelected == false) {
-			JFileChooser fc = new JFileChooser();
-			int ret = fc.showSaveDialog(this);
-			if (ret == JFileChooser.APPROVE_OPTION) {
-				File file = fc.getSelectedFile();
-				fileSelected = true;
-				animPath.setText(file.getPath());
-				worker.saveState(animPath.getText());
-			}
-		} else {
-			worker.saveState(animPath.getText());
-		}
-	}
-
-	public void saveAs_ActionPerformed(ActionEvent evt) {
-		JFileChooser fc;
-		if (fileSelected == true) {
-			fc = new JFileChooser(new File(animPath.getText()).getParentFile());
-		} else {
-			fc = new JFileChooser();
-		}
-		int ret = fc.showSaveDialog(this);
-		if (ret == JFileChooser.APPROVE_OPTION) {
-			File file = fc.getSelectedFile();
-			if (fileSelected == false) {
-				fileSelected = true;
-			}
-			animPath.setText(file.getPath());
-			worker.saveState(animPath.getText());
-		}
-	}
-
-	// We get detailed error messages from the SerialHelper...
-	public void upload_ActionPerformed(ActionEvent evt) {
-		if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
-			// errorMessage("No serial port selected...");
-		} else {
-			if (worker.probeCubeConnected((String) jComboBox1.getSelectedItem())) {
-				if (worker.uploadState((String) jComboBox1.getSelectedItem()) != 0) {
-					// errorMessage("Could not upload data!");
-				}
-			} else {
-				// errorMessage("Cube does not respond...");
-			}
-		}
-	}
-
-	public void download_ActionPerformed(ActionEvent evt) {
-		if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
-			// errorMessage("No serial port selected...");
-		} else {
-			if (worker.probeCubeConnected((String) jComboBox1.getSelectedItem())) {
-				if (worker.downloadState((String) jComboBox1.getSelectedItem()) != 0) {
-					// errorMessage("Could not download data!");
-				}
-			} else {
-				// errorMessage("Cube does not respond...");
-			}
-		}
-	}
-
 	public Led3D get3D() {
 		return ledView;
 	}
@@ -1003,26 +864,26 @@ public class Frame extends JFrame implements ListSelectionListener {
 
 				if (s.startsWith("frames ")) {
 					int anim = Integer.parseInt(s.substring(7));
-					if (anim >= f.worker.numOfAnimations()) {
-						System.out.println("Animation does not exist! Max: " + (f.worker.numOfAnimations() - 1));
+					if (anim >= f.worker.size()) {
+						System.out.println("Animation does not exist! Max: " + (f.worker.size() - 1));
 					} else {
-						System.out.println("Animation: " + f.worker.getAnimationName(anim));
-						for (int i = 0; i < f.worker.numOfFrames(anim); i++) {
-							AFrame frame = f.worker.getAnimationList().get(anim).get(i);
-							System.out.println("\tFrame " + frame.getOrder() + " (" + frame.getTime() + "): " + frame.getName());
+						System.out.println("Animation: " + f.worker.getAnimation(anim).getName());
+						for (int i = 0; i < f.worker.getAnimation(anim).size(); i++) {
+							AFrame frame = f.worker.getAnimation(anim).getFrame(i);
+							System.out.println("\tFrame (" + frame.getTime() + "): " + frame.getName());
 						}
 					}
 				}
 
 				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());
+					for (int i = 0; i < f.worker.size(); i++) {
+						Animation anim = f.worker.getAnimation(i);
+						System.out.println("\tAnimation: " + anim.getName());
 					}
 				}
 
 				if (s.equals("s") || s.equals("scan")) {
-					String[] sPorts = f.worker.getSerialPorts();
+					String[] sPorts = HelperUtility.getPorts();
 					f.jComboBox1.removeAllItems();
 					for (int i = 0; i < sPorts.length; i++) {
 						f.jComboBox1.addItem(sPorts[i]);

CubeControl/HelperUtility.java

@@ -31,6 +31,7 @@
 import java.io.*;
 import java.nio.channels.*;
 import java.nio.*;
+import java.util.StringTokenizer;
 
 public class HelperUtility {
 
@@ -106,11 +107,32 @@ public class HelperUtility {
 	}
 
 	/**
+	 * Get the names of all available serial ports.
+	 * 
+	 * @return Array of port names. First entry is "No serial ports!" if no
+	 *         others
+	 */
+	public static String[] getPorts() {
+		String[] ports = { "No serial ports!" };
+		String portLines = getPortsOS();
+		if (portLines == null) {
+			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;
+	}
+
+	/**
 	 * Get all the existing serial port names
 	 * 
 	 * @return List of port names. \n between entries
 	 */
-	public static String getPorts() {
+	private static String getPortsOS() {
 		String os = System.getProperty("os.name").toLowerCase();
 		try {
 			if (os.indexOf("windows") > -1) {

CubeControl/SerialHelper.java

@@ -78,7 +78,7 @@ public class SerialHelper {
 	 * @return A cubeWorker populated with the new data or null.
 	 */
 	public cubeWorker getAnimationsFromCube() {
-		List<Animation> animations = new ArrayList<Animation>();
+		Animation[] animations;
 		int animationCount, frameCount;
 		short[] data, tmp = new short[1];
 
@@ -108,6 +108,8 @@ public class SerialHelper {
 			return null;
 		}
 
+		animations = new Animation[animationCount];
+
 		// Get animations
 		for (int a = 0; a < animationCount; a++) {
 			Animation currentAnim = new Animation();
@@ -159,11 +161,11 @@ public class SerialHelper {
 				}
 
 				// Add frame to animation
-				currentAnim.add(f, currentFrame);
+				currentAnim.setFrame(currentFrame, f);
 			}
 
 			// Add animation to animations list
-			animations.add(a, currentAnim);
+			animations[a] = currentAnim;
 		}
 
 		return new cubeWorker(animations, frame);
@@ -190,7 +192,7 @@ public class SerialHelper {
 		}
 
 		// Send animation count
-		tmp[0] = (short)worker.numOfAnimations();
+		tmp[0] = (short)worker.size();
 		if (!writeData(tmp)) {
 			printErrorMessage("Timeout numOfAnimations");
 			return -1;
@@ -202,9 +204,9 @@ public class SerialHelper {
 		}
 
 		// Send animations
-		for (int a = 0; a < worker.numOfAnimations(); a++) {
+		for (int a = 0; a < worker.size(); a++) {
 			// Send frame count
-			tmp[0] = (short)worker.numOfFrames(a);
+			tmp[0] = (short)worker.getAnimation(a).size();
 			if (!writeData(tmp)) {
 				printErrorMessage("Timeout numOfFrames");
 				return -1;
@@ -216,9 +218,9 @@ public class SerialHelper {
 			}
 
 			// Send frames
-			for (int f = 0; f < worker.numOfFrames(a); f++) {
+			for (int f = 0; f < worker.getAnimation(a).size(); f++) {
 				// Frame duration
-				tmp[0] = worker.getFrameTime(a, f);
+				tmp[0] = worker.getAnimation(a).getFrame(f).getTime();
 				if (!writeData(tmp)) {
 					printErrorMessage("Timeout Frame duration");
 					return -1;
@@ -230,7 +232,7 @@ public class SerialHelper {
 				}
 
 				// Frame data
-				if (!writeData(worker.getFrame(a, f))) {
+				if (!writeData(worker.getAnimation(a).getFrame(f).getData())) {
 					printErrorMessage("Timeout Frame");
 					return -1;
 				}

CubeControl/cubeWorker.java

@@ -43,41 +43,21 @@ import java.util.Collections;
 
 public class cubeWorker {
 
-	// --------------------
-	// Definitions
-	// --------------------
-
-	final int UP = 0;
-	final int DOWN = 1;
-
-	// --------------------
-	// Fields
-	// --------------------
-
-	private List<Animation> animations = new ArrayList<Animation>();
 	private final int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
 	private boolean changedState = false;
 	private Frame parentFrame;
-
-	// --------------------
+	private Animation[] animations = new Animation[1];
 
 	/**
 	 * Creates a worker with one animation, containing an empty frame.
 	 */
 	public cubeWorker(Frame parent) {
-		animations.add(new Animation());
-		animations.get(0).setName("Animation 1");
-		animations.get(0).add(0);
-		animations.get(0).get(0).setName("Frame 1");
+		animations[0] = new Animation();
+		animations[0].setName("Animation 1");
 		parentFrame = parent;
 	}
 
-	/**
-	 * Creates a worker from the given animation list
-	 * 
-	 * @param anims List of animations
-	 */
-	public cubeWorker(List<Animation> anims, Frame parent) {
+	public cubeWorker(Animation[] anims, Frame parent) {
 		animations = anims;
 		parentFrame = parent;
 	}
@@ -88,84 +68,24 @@ public class cubeWorker {
 	 * @return number of frames.
 	 */
 	public int completeNumOfFrames() {
-		int count = 0;
-		for (int i = 0; i < numOfAnimations(); i++) {
-			count += numOfFrames(i);
+		int c = 0;
+		for (int i = 0; i < size(); i++) {
+			c += getAnimation(i).size();
 		}
-		return count;
+		return c;
 	}
 
 	// --------------------
 	// Misc. Methods
 	// --------------------
 
-	// 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 to be sorted
-	private boolean checkAnimationList() {
-		for (int i = 0; i < animations.size(); i++) {
-			if (animations.get(i).getOrder() != i) {
-				int h = holeInAnimationList();
-				if (h != -1) {
-					animations.get(i).setOrder(h);
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
 	/**
 	 * Get the number of animations in this worker.
-	 * Also fixes the order of the animation list, if needed.
 	 * 
 	 * @return number of animations
 	 */
-	public int numOfAnimations() {
-		while(checkAnimationList()) {
-			Collections.sort(animations);
-		}
-		return animations.size();
-	}
-
-	/**
-	 * Get the number of frames in an animation.
-	 * 
-	 * @param selectedAnimation the animation you want to check
-	 * @return number of frames in this animation
-	 */
-	public int numOfFrames(int selectedAnimation) {
-		return animations.get(selectedAnimation).size();
+	public int size() {
+		return animations.length;
 	}
 
 	/**
@@ -173,14 +93,10 @@ public class cubeWorker {
 	 * 
 	 * @return number of frames remaining
 	 */
-	public int framesRemaining() {
+	public int memoryRemaining() {
 		return framesRemaining - completeNumOfFrames();
 	}
 
-	// --------------------
-	// Animation Specific
-	// --------------------
-
 	/**
 	 * Add an animation. It has an initial empty frame
 	 * 
@@ -188,210 +104,65 @@ public class cubeWorker {
 	 */
 	public int addAnimation() {
 		changedState = true;
-		if (framesRemaining() <= 0) {
+		if (memoryRemaining() <= 0) {
 			return -1;
 		} else {
-			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;
+			extendArray();
+			animations[animations.length - 1] = new Animation();
+			return animations.length - 1;
 		}
 	}
 
 	/**
 	 * Remove an animation.
 	 * 
-	 * @param selectedAnimation the animation you want to delete
-	 */
-	public void removeAnimation(int selectedAnimation) {
-		changedState = true;
-		animations.remove(selectedAnimation);
-	}
-
-	/**
-	 * Get the name of an animation
-	 * 
-	 * @return The name
-	 * @param selectedAnimation The animation you want to get the name from
+	 * @param i the animation you want to delete
 	 */
-	public String getAnimationName(int selectedAnimation) {
-		return animations.get(selectedAnimation).getName();
-	}
-
-	/**
-	 * Set the name of an animation  @param s New name
-	 * 
-	 * @param selectedAnimation Index of the animation you want to change
-	 */
-	public void setAnimationName(String s, int selectedAnimation) {
+	public void removeAnimation(int i) {
 		changedState = true;
-		animations.get(selectedAnimation).setName(s);
+		shiftOver(i);
+		shrinkArray();
 	}
 
 	/**
-	 * Move an animation UP or DOWN.
-	 * 
-	 * @param dir Direction. Use UP and DOWN defined in cubeWorker
-	 * @param selectedAnimation Animation you want to move
+	 * Move an animation up.
+	 * @param i the animation you want to move
 	 */
-	public void moveAnimation(int dir, int selectedAnimation) {
-		changedState = true;
-		if (dir == UP) {
-			// animation moved up
-			if (selectedAnimation > 0) {
-				Animation tmp = animations.get(selectedAnimation);
-				animations.set(selectedAnimation,
-						animations.get(selectedAnimation - 1));
-				animations.set(selectedAnimation - 1, tmp);
-			}
-		} else if (dir == DOWN) {
-			// animation moved down
-			if (selectedAnimation < (animations.size() - 1)) {
-				Animation tmp = animations.get(selectedAnimation);
-				animations.set(selectedAnimation,
-						animations.get(selectedAnimation + 1));
-				animations.set(selectedAnimation + 1, tmp);
-			}
+	public void moveAnimationUp(int i) {
+		if (i > 0) {
+			Animation tmp = animations[i];
+			animations[i] = animations[i - 1];
+			animations[i - 1] = tmp;
 		}
 	}
 
-	// --------------------
-	// Frame Specific
-	// --------------------
-
 	/**
-	 * Get the name of a frame.
-	 * 
-	 * @param anim Animation the frame is in
-	 * @param frame Index of the frame
+	 * Move an animation down.
+	 * @param i the animation you want to move
 	 */
-	public String getFrameName(int anim, int frame) {
-		return animations.get(anim).get(frame).getName();
-	}
-
-	/**
-	 * Set the name of a frame.
-	 * 
-	 * @param s New name
-	 * @param anim Animation Index
-	 * @param frame Frame Index
-	 */
-	public void setFrameName(String s, int anim, int frame) {
-		changedState = true;
-		animations.get(anim).get(frame).setName(s);
-	}
-
-	/**
-	 * Add a Frame to an animation.
-	 * 
-	 * @return Index of new Frame or -1 if not enough space
-	 * @param anim Animation Index
-	 */
-	public int addFrame(int anim) {
-		changedState = true;
-		if (framesRemaining() <= 0) {
-			return -1;
+	public void moveAnimationDown(int i) {
+		if (i < (animations.length - 1)) {
+			Animation tmp = animations[i];
+			animations[i] = animations[i + 1];
+			animations[i + 1] = tmp;
 		}
-		int s = animations.get(anim).size();
-		animations.get(anim).add(s);
-		animations.get(anim).get(s)
-				.setName("Frame " + animations.get(anim).size());
-		return s;
-	}
-
-	/**
-	 * Remove a frame.
-	 * 
-	 * @param anim Animation Index
-	 * @param frame Frame you want to remove
-	 */
-	public void removeFrame(int anim, int frame) {
-		changedState = true;
-		animations.get(anim).remove(frame);
-	}
-
-	/**
-	 * Get the data of a frame.
-	 * 
-	 * @param anim Animation Index  @param frame Frame Index
-	 * @return 64 byte array with data (8 bits per byte => 512 bits)
-	 */
-	public short[] getFrame(int anim, int frame) {
-		return animations.get(anim).get(frame).getData();
 	}
 
-	/**
-	 * Set the data of a frame
-	 * 
-	 * @param data 64 byte array with data
-	 * @param anim Animation Index
-	 * @param frame Frame Index
-	 * @see cubeWorker#getFrame(int, int) getFrame()
-	 */
-	public void setFrame(short[] data, int anim, int frame) {
-		changedState = true;
-		animations.get(anim).get(frame).setData(data);
-	}
-
-	/**
-	 * Get frame duration.
-	 * 
-	 * @param anim Animation Index
-	 * @param frame Frame Index
-	 * @return Duration. 0 means 1/24th of a second.
-	 */
-	public short getFrameTime(int anim, int frame) {
-		return animations.get(anim).get(frame).getTime();
+	public Animation getAnimation(int i) {
+		if (i < animations.length) {
+			return animations[i];
+		} else {
+			return null;
+		}
 	}
 
-	/**
-	 * Set the frames duration.
-	 * 
-	 * @param time New duration
-	 * @param anim Animation Index
-	 * @param frame Frame Index
-	 * @see cubeWorker#getFrameTime(int, int) getFrameTime()
-	 */
-	public void setFrameTime(short time, int anim, int frame) {
+	public void setAnimation(Animation a, int i) {
 		changedState = true;
-		animations.get(anim).get(frame).setTime(time);
-	}
-
-	/**
-	 * Move a frame.
-	 * 
-	 * @param dir Direction to move. Use UP and DOWN from cubeWorker
-	 * @param anim Animation Index
-	 * @param frame Frame Index
-	 * @see cubeWorker#moveAnimation(int, int) moveAnimation()
-	 */
-	public void moveFrame(int dir, int anim, int frame) {
-		changedState = true;
-		if (dir == UP) {
-			// frame moved up
-			if (frame > 0) {
-				AFrame tmp = animations.get(anim).frames.get(frame);
-				animations.get(anim).frames.set(frame,
-						animations.get(anim).frames.get(frame - 1));
-				animations.get(anim).frames.set(frame - 1, tmp);
-			}
-		} else if (dir == DOWN) {
-			// frame moved down
-			if (frame < (animations.get(anim).size() - 1)) {
-				AFrame tmp = animations.get(anim).frames.get(frame);
-				animations.get(anim).frames.set(frame,
-						animations.get(anim).frames.get(frame + 1));
-				animations.get(anim).frames.set(frame + 1, tmp);
-			}
+		if (i < animations.length) {
+			animations[i] = a;
 		}
 	}
 
-	// --------------------
-	// File Specific
-	// --------------------
-
 	/**
 	 * Loads an animation file into this worker.
 	 * 
@@ -408,8 +179,8 @@ public class cubeWorker {
 			return -1;
 		}
 		int size = 0;
-		for (int i = 0; i < animations.size(); i++) {
-			size += animations.get(i).size();
+		for (int i = 0; i < animations.length; i++) {
+			size += animations[i].size();
 		}
 		if (size > framesRemaining) {
 			return -1;
@@ -442,17 +213,13 @@ public class cubeWorker {
 		return changedState;
 	}
 
-	// --------------------
-	// Serial Port Specific
-	// --------------------
-
 	/**
 	 * Send all animations to the cube.
 	 * 
 	 * @param port Name of serial port to use
 	 * @return 0 on success, -1 on error
 	 */
-	public int uploadState(String port) {
+	public int cubeSendState(String port) {
 		try {
 			SerialHelper sh = new SerialHelper(port, parentFrame);
 			int ret = sh.sendAnimationsToCube(this);
@@ -464,12 +231,20 @@ public class cubeWorker {
 	}
 
 	/**
+	 * Get the array of animations in this worker.
+	 * @return animation array
+	 */
+	public Animation[] getAnimationArray() {
+		return animations;
+	}
+
+	/**
 	 * Get all animations from the cube, place it in this object
 	 * 
 	 * @param port Name of serial port to use
 	 * @return 0 on success, -1 on error
 	 */
-	public int downloadState(String port) {
+	public int cubeGetState(String port) {
 		try {
 			SerialHelper sh = new SerialHelper(port, parentFrame);
 			cubeWorker ret = sh.getAnimationsFromCube();
@@ -478,7 +253,7 @@ public class cubeWorker {
 				return -1;
 			} else {
 				changedState = true;
-				animations = ret.getAnimationList();
+				animations = ret.getAnimationArray();
 				return 0;
 			}
 		} catch (Exception e) {
@@ -487,20 +262,12 @@ public class cubeWorker {
 	}
 
 	/**
-	 * Get the list used internally to store all the animations.
-	 * @return The list.
-	 */
-	public List<Animation> getAnimationList() {
-		return animations;
-	}
-
-	/**
 	 * Try to speak with the cube.
 	 * 
 	 * @return TRUE if cube responds
 	 * @param port Name of serial port
 	 */
-	public boolean probeCubeConnected(String port) {
+	public boolean cubeProbeConnected(String port) {
 		try {
 			SerialHelper sh = new SerialHelper(port, parentFrame);
 			boolean response = sh.probeForCube();
@@ -511,27 +278,25 @@ public class cubeWorker {
 		}
 	}
 
-	/**
-	 * Get the names of all available serial ports.
-	 * 
-	 * @return Array of port names. First entry is "Select serial port..." if no
-	 *         others
-	 */
-	public String[] getSerialPorts() {
-		String[] ports = { "Select serial port..." };
-		String portLines = HelperUtility.getPorts();
-		if (portLines == null) {
-			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();
+	private void extendArray() {
+		Animation newArray[] = new Animation[animations.length + 1];
+		for (int i = 0; i < animations.length; i++) {
+			newArray[i] = animations[i];
 		}
-		return ports;
+		animations = newArray;
 	}
 
-	// --------------------
+	private void shrinkArray() {
+		Animation newArray[] = new Animation[animations.length - 1];
+		for (int i = 0; i < newArray.length; i++) {
+			newArray[i] = animations[i];
+		}
+		animations = newArray;
+	}
 
+	private void shiftOver(int toForget) {
+		for (int i = (toForget + 1); i < animations.length; i++) {
+			animations[i - 1] = animations[i];
+		}
+	}
 }

CubeControl/layerEditFrame.java

@@ -71,7 +71,7 @@ public class layerEditFrame extends JFrame {
 		animI = animIndex;
 		frameI = frameIndex;
 		// frame = byteToShortArray(worker.getFrame(animIndex, frameIndex));
-		frame = worker.getFrame(animIndex, frameIndex);
+		frame = worker.getAnimation(animIndex).getFrame(frameIndex).getData();
 		li = layerIndex;
 		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		int frameWidth = 180;
@@ -215,7 +215,7 @@ public class layerEditFrame extends JFrame {
 			reihe = 0;
 		}
 		frame = tmpFrame;
-		worker.setFrame(frame, animI, frameI);
+		worker.getAnimation(animI).getFrame(frameI).setData(frame);
 		ListSelectionEvent layerChanged = new ListSelectionEvent(
 				LedFrame.frameList, LedFrame.frameList.getSelectedIndex(),
 				LedFrame.frameList.getSelectedIndex(), false);