Source now pretty

CubeControl/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="libSerial/" kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

CubeControl/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CubeControl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

CubeControl/AFrame.java

@@ -20,11 +20,12 @@
  * You should have received a copy of the GNU General Public License
  * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 import java.util.Arrays;
 
 /**
- * The representation of a single frame. Contains the data of all 512 LEDs in a given time.
+ * The representation of a single frame. Contains the data of all 512 LEDs in a
+ * given time.
+ * 
  * @author Thomas Buck
  * @author Max Nuding
  * @author Felix Bäder
@@ -32,65 +33,72 @@ import java.util.Arrays;
  */
 
 public class AFrame {
-  private short[] data = new short[64];
-  private short duration = 1;
-  private String name = "Frame";
+	private short[] data = new short[64];
+	private short duration = 1;
+	private String name = "Frame";
 
-  /**
-   * Gets the Name of this Frame
-   * @return Name of the Frame
-   */
-  public String getName() {
-    return name;
-  }
+	/**
+	 * Gets the Name of this Frame
+	 * 
+	 * @return Name of the Frame
+	 */
+	public String getName() {
+		return name;
+	}
 
-  /**
-   * Sets the Name of this Frame
-   * @param s New Name
-   */
-  public void setName(String s) {
-    name = s;
-  }
+	/**
+	 * Sets the Name of this Frame
+	 * 
+	 * @param s New Name
+	 */
+	public void setName(String s) {
+		name = s;
+	}
 
-  /**
-   * Sets the Data of this Frame
-   * @param d 64 bytes that contain data (8 bit per byte, so 8 LEDs)
-   */
-  public void setData(short[] d) {
-    data = d;
-  }
+	/**
+	 * Sets the Data of this Frame
+	 * 
+	 * @param d 64 bytes that contain data (8 bit per byte, so 8 LEDs)
+	 */
+	public void setData(short[] d) {
+		data = d;
+	}
 
-  /**
-   * Gets tha Data of this Frame
-   * @return 64 bytes that contain data (8 bits / LEDs per byte)
-   */
-  public short[] getData() {
-    return data;
-  }
+	/**
+	 * Gets tha Data of this Frame
+	 * 
+	 * @return 64 bytes that contain data (8 bits / LEDs per byte)
+	 */
+	public short[] getData() {
+		return data;
+	}
 
-  /**
-   * Sets the Duration of this Frame
-   * @param t Duration of frame in (( t * (1/24) ) + (1/24)) seconds
-   */
-  public void setTime(short t) {
-    duration = t;
-  }
+	/**
+	 * Sets the Duration of this Frame
+	 * 
+	 * @param t Duration of frame in (( t * (1/24) ) + (1/24)) seconds
+	 */
+	public void setTime(short t) {
+		duration = t;
+	}
 
-  /**
-   * Gets the Duration of this Frame
-   * @return Duration of frame.
-   * @see AFrame#setTime(short) setTime()
-   */
-  public short getTime() {
-    return duration;
-  }
+	/**
+	 * Gets the Duration of this Frame
+	 * 
+	 * @return Duration of frame.
+	 * @see AFrame#setTime(short) setTime()
+	 */
+	public short getTime() {
+		return duration;
+	}
 
-  /**
-   * Gets the Data of the Layer you want
-   * @param i Number of Layer you want
-   * @return 8 byte array with data of selected layer
-   */
-  public short[] getLayer(int i) {
-    return Arrays.copyOfRange(data, (i * 8), (i * 8) + 8);
-  }
+	/**
+	 * Gets the Data of the Layer you want
+	 * 
+	 * @param i Number of Layer you want
+	 * @return 8 byte array with data of selected layer
+	 */
+	public short[] getLayer(int i) {
+		return Arrays.copyOfRange(data, (i * 8), (i * 8) + 8);
+	}
 }

CubeControl/Animation.java

@@ -20,12 +20,12 @@
  * You should have received a copy of the GNU General Public License
  * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * A collection of frames that represent an entire animation.
+ * 
  * @author Thomas Buck
  * @author Max Nuding
  * @author Felix Bäder
@@ -33,100 +33,109 @@ import java.util.List;
  */
 
 public class Animation {
-  List<AFrame> frames = new ArrayList<AFrame>();
-  private int lastFrameIndex = 0;
-  private String name = "Animation";
+	List<AFrame> frames = new ArrayList<AFrame>();
+	private int lastFrameIndex = 0;
+	private String name = "Animation";
 
-  /**
-   * Gets the name of this animation
-   * @return name of this animation
-   */
-  public String getName() {
-    return name;
-  }
+	/**
+	 * Gets the name of this animation
+	 * 
+	 * @return name of this animation
+	 */
+	public String getName() {
+		return name;
+	}
 
-  /**
-   * Sets the name of this animation
-   * @param s new name
-   */
-  public void setName(String s) {
-    name = s;
-  }
+	/**
+	 * Sets the name of this animation
+	 * 
+	 * @param s
+	 *            new name
+	 */
+	public void setName(String s) {
+		name = s;
+	}
 
-  /**
-   * Gets the specified frame in this animation
-   * @param i Index of frame you want
-   * @return The selected frame
-   */
-  public AFrame get(int i) {
-    try {
-      return frames.get(i);
-    } catch (IndexOutOfBoundsException e) {
-      System.out.println(e.toString());
-      return null;
-    }
-  }
+	/**
+	 * Gets the specified frame in this animation
+	 * 
+	 * @param i Index of frame you want
+	 * @return The selected frame
+	 */
+	public AFrame get(int i) {
+		try {
+			return frames.get(i);
+		} catch (IndexOutOfBoundsException e) {
+			System.out.println(e.toString());
+			return null;
+		}
+	}
 
-  /**
-   * Sets the selected Frame
-   * @param f the frame you want to place in this animation
-   * @param i Index of the frame you want to override
-   */
-  public void set(AFrame f, int i) {
-    if (lastFrameIndex <= i) {
-      try {
-        frames.set(i, f);
-      } catch (IndexOutOfBoundsException e) {
-        System.out.println(e.toString());
-      }
-    }
-  }
+	/**
+	 * Sets the selected Frame
+	 * 
+	 * @param f the frame you want to place in this animation
+	 * @param i Index of the frame you want to override
+	 */
+	public void set(AFrame f, int i) {
+		if (lastFrameIndex <= i) {
+			try {
+				frames.set(i, f);
+			} catch (IndexOutOfBoundsException e) {
+				System.out.println(e.toString());
+			}
+		}
+	}
 
-  /**
-   * Removes a frame. Subsequent frames shift to the left.
-   * @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());
-    }
-  }
+	/**
+	 * Removes a frame. Subsequent frames shift to the left.
+	 * 
+	 * @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());
+		}
+	}
 
-  /**
-   * Add a new (empty) frame at the specified position
-   * @param i Index you want to place the new frame in
-   * @see Animation#size size()
-   */
-  public void add(int i) {
-    try {
-      frames.add(i, new AFrame());
-      lastFrameIndex++;
-    } catch (IndexOutOfBoundsException e)  {
-      System.out.println(e.toString());
-    }
-  }
+	/**
+	 * Add a new (empty) frame at the specified position
+	 * 
+	 * @param i Index you want to place the new frame in
+	 * @see Animation#size size()
+	 */
+	public void add(int i) {
+		try {
+			frames.add(i, new AFrame());
+			lastFrameIndex++;
+		} catch (IndexOutOfBoundsException e) {
+			System.out.println(e.toString());
+		}
+	}
 
-  /**
-   * Add a specified frame at the specified position
-   * @param i Index for new frame
-   * @param f data for new frame
-   */
-  public void add(int i, AFrame f) {
-    try {
-      frames.add(i, f);
-      lastFrameIndex++;
-    } catch (IndexOutOfBoundsException e)  {
-      System.out.println(e.toString());
-    }
-  }
+	/**
+	 * Add a specified frame at the specified position
+	 * 
+	 * @param i Index for new frame
+	 * @param f data for new frame
+	 */
+	public void add(int i, AFrame f) {
+		try {
+			frames.add(i, f);
+			lastFrameIndex++;
+		} catch (IndexOutOfBoundsException e) {
+			System.out.println(e.toString());
+		}
+	}
 
-  /**
-   * Return size of this animation, in number of frames
-   * @return number of frames
-   */
-  public int size() {
-    return frames.size();
-  }
+	/**
+	 * Return size of this animation, in number of frames
+	 * 
+	 * @return number of frames
+	 */
+	public int size() {
+		return frames.size();
+	}
 }

CubeControl/AnimationUtility.java

@@ -20,7 +20,6 @@
  * You should have received a copy of the GNU General Public License
  * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 import java.io.FileWriter;
 import java.io.File;
 import java.util.Scanner;
@@ -30,6 +29,7 @@ import java.util.List;
 
 /**
  * A helper class that loads animations from a file or saves them to one.
+ * 
  * @author Thomas Buck
  * @author Max Nuding
  * @author Felix Bäder
@@ -37,178 +37,179 @@ import java.util.List;
  */
 
 public class AnimationUtility {
-  private static String lastError = null;
-
-  /**
-   * Read a file, return ArrayList with all animations in the file.
-   * @param path Path of file
-   * @return Populated ArrayList
-   * @throws Excpetion When something goes wrong with the Scanner...
-   */
-  public static List<Animation> readFile(String path) throws Exception {
-    Scanner sc = new Scanner(new File(path));
-  List<Animation> animations = new ArrayList<Animation>();
-  do {
-  Animation tmp = readAnimation(sc);
-  if (tmp == null) {
-    return animations;
-  }
-  if (sc.hasNextLine()) {
-    sc.nextLine();
-  }
-    animations.add(tmp);
-  } while (sc.hasNextLine());
-
-  return animations;
-  }
-
-  /**
-   * Write a file with all Animations of an ArrayList
-   * @param path Path to write to
-   * @param animations ArrayList with all animations to be saved
-   * @see AnimationUtility#getLastError() getLastError()
-   */
-  public static void writeFile(String path, List<Animation> animations) {
-    File f = new File(path);
-    if (f.exists()) {
-      try {
-        f.delete();
-      } catch (Exception e) {
-        lastError = e.toString();
-        return;
-      }
-    }
-    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)));
-      }
-    } catch (Exception e) {
-      lastError = e.toString();
-      return;
-    } finally {
-      if (output != null) {
-        try {
-          output.close();
-        } catch (Exception e) {
-          lastError = e.toString();
-        }
-      }
-    }
-
-  }
-
-  /**
-   * Get the last error that occured while writing
-   * @return Text of the exception that occured
-   * @see AnimationUtility#writeFile(String, ArrayList) writeFile()
-   */
-  public static String getLastError() {
-    String tmp = lastError;
-    lastError = null;
-    return tmp;
-  }
-
-  private static Animation readAnimation(Scanner sc) {
-  Animation anim = new Animation();
-  AFrame f = null;
-  int index = 0;
-  String tmpSize = sc.nextLine().replaceAll("\\n", "");
-  if (tmpSize.equals("")) {
-    return null;
-  }
-  Integer tmpSizeAgain = new Integer(tmpSize);
-  int size = tmpSizeAgain.intValue();
-  anim.setName(sc.nextLine());
-  while (size > 0) {
-    f = readFrame(sc, index);
-    anim.add(index, f);
-    index++;
-    size--;
-  }
-  return anim;
-  }
-
-  private static AFrame readFrame(Scanner sc, int index) {
-    AFrame frame = new AFrame();
-    frame.setName(sc.nextLine());
-    short[] d = {};
-    for (int i = 0; i < 8; i++) {
-      short[] data = hexConvert(sc.nextLine());
-      d = concat(d, data);
-    }
-  
-    frame.setData(d);
-    d = hexConvert(sc.nextLine());
-    frame.setTime(d[0]);
-    return frame;
-  }
-  
-  /*private static short[] invert(short[] a){
-    short[] tmp = new short[a.length];
-    int j = 0;
-    for(int i = a.length-1; i >= 0; i--){
-      tmp[j] = a[i];
-      j++;
-    }
-    return tmp;
-  }*/
-
-  private static short[] concat(short[] a, short[] b) {
-  short[] c = new short[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 short[] hexConvert(String hex) {
-    hex = hex.replaceAll("\\n", "");
-
-      short[] tmp = new short[hex.length()/2];
-      for (int i = 0; i < hex.length(); i=i+2){
-        char[] tmpString = new char[2];
-        tmpString[0] = hex.charAt(i);
-        tmpString[1] = hex.charAt(i+1);
-        String tmpS = String.copyValueOf(tmpString);
-        if(i == 0){
-          tmp[0] = Short.parseShort(tmpS, 16);
-        } else {
-          tmp[i/2] = Short.parseShort(tmpS, 16);
-        }
-
-      }
-      return tmp;
-
-
-  }
-
-  private static void writeAnimation(Animation anim, FileWriter f, boolean last) throws IOException {
-    f.write(anim.size() + "\n");
-  f.write(anim.getName() + "\n");
-    for (int i = 0; i < anim.size(); i++) {
-      writeFrame(anim.get(i), f);
-    }
-    if (!last) {
-    f.write("\n");
-  }
-  }
-
-  private static void writeFrame(AFrame fr, FileWriter f) throws IOException {
-    f.write(fr.getName() + "\n");
-  for (int i = 0; i < 8; i++) {
-      writeLayer(fr.getLayer(i), f);
-    }
-    f.write(Integer.toString( (fr.getTime() & 0xff) + 0x100, 16).substring(1) + "\n");
-  }
-
-  private static void writeLayer(short[] l, FileWriter f) throws IOException {
-    String hex = "";
-    for (int i = 0; i < l.length; i++) {
-      hex += Integer.toString( (l[i] & 0xff) + 0x100, 16).substring(1);
-    }
-    hex += "\n";
-
-    f.write(hex);
-  }
+	private static String lastError = null;
+
+	/**
+	 * Read a file, return ArrayList with all animations in the file.
+	 * 
+	 * @param path Path of file
+	 * @return Populated ArrayList
+	 * @throws Excpetion When something goes wrong with the Scanner...
+	 */
+	public static List<Animation> readFile(String path) throws Exception {
+		Scanner sc = new Scanner(new File(path));
+		List<Animation> animations = new ArrayList<Animation>();
+		do {
+			Animation tmp = readAnimation(sc);
+			if (tmp == null) {
+				return animations;
+			}
+			if (sc.hasNextLine()) {
+				sc.nextLine();
+			}
+			animations.add(tmp);
+		} while (sc.hasNextLine());
+
+		return animations;
+	}
+
+	/**
+	 * Write a file with all Animations of an ArrayList
+	 * 
+	 * @param path Path to write to
+	 * @param animations ArrayList with all animations to be saved
+	 * @see AnimationUtility#getLastError() getLastError()
+	 */
+	public static void writeFile(String path, List<Animation> animations) {
+		File f = new File(path);
+		if (f.exists()) {
+			try {
+				f.delete();
+			} catch (Exception e) {
+				lastError = e.toString();
+				return;
+			}
+		}
+		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)));
+			}
+		} catch (Exception e) {
+			lastError = e.toString();
+			return;
+		} finally {
+			if (output != null) {
+				try {
+					output.close();
+				} catch (Exception e) {
+					lastError = e.toString();
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Get the last error that occured while writing
+	 * 
+	 * @return Text of the exception that occured
+	 * @see AnimationUtility#writeFile(String, ArrayList) writeFile()
+	 */
+	public static String getLastError() {
+		String tmp = lastError;
+		lastError = null;
+		return tmp;
+	}
+
+	private static Animation readAnimation(Scanner sc) {
+		Animation anim = new Animation();
+		AFrame f = null;
+		int index = 0;
+		String tmpSize = sc.nextLine().replaceAll("\\n", "");
+		if (tmpSize.equals("")) {
+			return null;
+		}
+		Integer tmpSizeAgain = new Integer(tmpSize);
+		int size = tmpSizeAgain.intValue();
+		anim.setName(sc.nextLine());
+		while (size > 0) {
+			f = readFrame(sc, index);
+			anim.add(index, f);
+			index++;
+			size--;
+		}
+		return anim;
+	}
+
+	private static AFrame readFrame(Scanner sc, int index) {
+		AFrame frame = new AFrame();
+		frame.setName(sc.nextLine());
+		short[] d = {};
+		for (int i = 0; i < 8; i++) {
+			short[] data = hexConvert(sc.nextLine());
+			d = concat(d, data);
+		}
+
+		frame.setData(d);
+		d = hexConvert(sc.nextLine());
+		frame.setTime(d[0]);
+		return frame;
+	}
+
+	/*
+	 * private static short[] invert(short[] a){ short[] tmp = new
+	 * short[a.length]; int j = 0; for(int i = a.length-1; i >= 0; i--){ tmp[j]
+	 * = a[i]; j++; } return tmp; }
+	 */
+
+	private static short[] concat(short[] a, short[] b) {
+		short[] c = new short[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 short[] hexConvert(String hex) {
+		hex = hex.replaceAll("\\n", "");
+
+		short[] tmp = new short[hex.length() / 2];
+		for (int i = 0; i < hex.length(); i = i + 2) {
+			char[] tmpString = new char[2];
+			tmpString[0] = hex.charAt(i);
+			tmpString[1] = hex.charAt(i + 1);
+			String tmpS = String.copyValueOf(tmpString);
+			if (i == 0) {
+				tmp[0] = Short.parseShort(tmpS, 16);
+			} else {
+				tmp[i / 2] = Short.parseShort(tmpS, 16);
+			}
+
+		}
+		return tmp;
+
+	}
+
+	private static void writeAnimation(Animation anim, FileWriter f,
+			boolean last) throws IOException {
+		f.write(anim.size() + "\n");
+		f.write(anim.getName() + "\n");
+		for (int i = 0; i < anim.size(); i++) {
+			writeFrame(anim.get(i), f);
+		}
+		if (!last) {
+			f.write("\n");
+		}
+	}
+
+	private static void writeFrame(AFrame fr, FileWriter f) throws IOException {
+		f.write(fr.getName() + "\n");
+		for (int i = 0; i < 8; i++) {
+			writeLayer(fr.getLayer(i), f);
+		}
+		f.write(Integer.toString((fr.getTime() & 0xff) + 0x100, 16)
+				.substring(1) + "\n");
+	}
+
+	private static void writeLayer(short[] l, FileWriter f) throws IOException {
+		String hex = "";
+		for (int i = 0; i < l.length; i++) {
+			hex += Integer.toString((l[i] & 0xff) + 0x100, 16).substring(1);
+		}
+		hex += "\n";
+
+		f.write(hex);
+	}
 }

CubeControl/HelperUtility.java

@@ -28,7 +28,6 @@
  * @author Felix Bäder
  * @version 1.0
  */
-
 import java.io.*;
 import java.nio.channels.*;
 import java.nio.*;
@@ -65,7 +64,8 @@ public class HelperUtility {
 			// have to use a stream
 			InputStream in = HelperUtility.class.getResourceAsStream(name);
 			// System.out.println("Input Stream: " + in);
-			File fileOut = new File(System.getProperty("java.io.tmpdir") + "/" + path + name);
+			File fileOut = new File(System.getProperty("java.io.tmpdir") + "/"
+					+ path + name);
 			OutputStream out = new FileOutputStream(fileOut);
 			ReadableByteChannel inChannel = Channels.newChannel(in);
 			WritableByteChannel outChannel = Channels.newChannel(out);
@@ -80,7 +80,8 @@ public class HelperUtility {
 	}
 
 	// http://thomaswabner.wordpress.com/2007/10/09/fast-stream-copy-using-javanio-channels/
-	public static void fastChannelCopy(ReadableByteChannel src, WritableByteChannel dest) throws IOException {
+	public static void fastChannelCopy(ReadableByteChannel src,
+			WritableByteChannel dest) throws IOException {
 		ByteBuffer buffer = ByteBuffer.allocateDirect(16 * 1024);
 		while (src.read(buffer) != -1) {
 			// prepare the buffer to be drained
@@ -101,6 +102,7 @@ public class HelperUtility {
 
 	/**
 	 * Get all the existing serial port names
+	 * 
 	 * @return List of port names. \n between entries
 	 */
 	public static String getPorts() {
@@ -121,8 +123,10 @@ public class HelperUtility {
 
 	/**
 	 * Open Connection to a port
+	 * 
 	 * @return TRUE if successful
-	 * @param name Port to open
+	 * @param name
+	 *            Port to open
 	 */
 	public static native boolean openPort(String name);
 
@@ -133,15 +137,20 @@ public class HelperUtility {
 
 	/**
 	 * Read data from Cube
-	 * @param length Amount of data to read
+	 * 
+	 * @param length
+	 *            Amount of data to read
 	 * @return Data read
 	 */
 	public static native short[] readData(int length);
 
 	/**
 	 * Write data to Cube
-	 * @param data Data to write
-	 * @param length Length of data
+	 * 
+	 * @param data
+	 *            Data to write
+	 * @param length
+	 *            Length of data
 	 */
 	public static native void writeData(short[] data, int length);
 }

CubeControl/Led3D.java

@@ -1,37 +1,36 @@
 /*
-* Led3D.java
-*
-*
-* Copyright 2011 Thomas Buck <xythobuz@me.com>
-* Copyright 2011 Max Nuding <max.nuding@gmail.com>
-* Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
-*
-* This file is part of LED-Cube.
-*
-* LED-Cube is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* LED-Cube is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with LED-Cube. If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ * Led3D.java
+ *
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube. If not, see <http://www.gnu.org/licenses/>.
+ */
 import com.sun.j3d.utils.universe.*;
 import com.sun.j3d.utils.geometry.*;
 import javax.media.j3d.*;
 import javax.vecmath.*;
 import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.Color;
 import com.sun.j3d.utils.image.TextureLoader;
 
 /**
  * This class is responsible for displaying the 3D View of our Cube.
+ * 
  * @author Thomas Buck
  * @author Max Nuding
  * @author Felix Bäder
@@ -43,97 +42,108 @@ public class Led3D {
 	private SimpleUniverse universe = null;
 	private BranchGroup group = null;
 	private Transform3D trans3D = null;
-	private BranchGroup inBetween = null;
 	private TransformGroup transGroup = null;
 
 	private Sphere[][][] leds = new Sphere[8][8][8];
-	private static ColoringAttributes redColor = new ColoringAttributes(new Color3f(1.0f, 0.0f, 0.0f), ColoringAttributes.FASTEST);
-	private static ColoringAttributes whiteColor = new ColoringAttributes(new Color3f(0.2f, 0.2f, 0.2f), ColoringAttributes.FASTEST);
-	private static Material whiteMat = new Material(new Color3f(0.2f, 0.2f, 0.2f), new Color3f(0.0f, 0.0f, 0.0f), new Color3f(0.2f, 0.2f, 0.2f), new Color3f(0.2f, 0.2f, 0.2f), 64.0f);
-	private static Material redMat = new Material(new Color3f(1.0f, 0.0f, 0.0f), new Color3f(1.0f, 0.0f, 0.0f), new Color3f(1.0f, 0.0f, 0.0f), new Color3f(1.0f, 0.0f, 0.0f), 64.0f);
-
-  /**
-   * @param canv The Canvas3D we render our cube in
-   */
-  public Led3D(Canvas3D canv) {
-
-    canvas = canv;
-    group = new BranchGroup();
-    // Position viewer, so we are looking at object
-    trans3D = new Transform3D();
-	Matrix4d mat = new Matrix4d();
-	mat.setRow(0, 0.744, 0.0237, -0.66756, -0.34);
-	mat.setRow(1, 0.136, -0.9837, 0.117, 3.24);
-	mat.setRow(2, -0.6536, -0.1785, -0.735, -8.32);
-	mat.setRow(3, 0.0, 0.0, 0.0, 1.0);
-	trans3D.set(mat);
-
-	transGroup = new TransformGroup(trans3D);
-	transGroup.setCapability(TransformGroup.ALLOW_TRANSFORM_READ);
-	transGroup.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
-    ViewingPlatform viewingPlatform = new ViewingPlatform();
-    Viewer viewer = new Viewer(canvas);
-    universe = new SimpleUniverse(viewingPlatform, viewer);
-
-    BoundingBox boundBox = new BoundingBox(new Point3d(-5.0, -5.0, -5.0), new Point3d(13.0, 13.0, 13.0));
-    // roration with left mouse button
-    MouseRotate behaviour = new MouseRotate(transGroup);
-	behaviour.setSchedulingBounds(boundBox);
-    transGroup.addChild(behaviour);
-
-    // zoom with middle mouse button
-    MouseZoom beh2 = new MouseZoom(transGroup);
-	beh2.setSchedulingBounds(boundBox);
-	transGroup.addChild(beh2);
-
-    // move with right mouse button
-    MouseTranslate beh3 = new MouseTranslate(transGroup);
-    beh3.setSchedulingBounds(boundBox);
-	transGroup.addChild(beh3);
-
-	group.addChild(createBackground());
-
-    // Add all our led sphares to the universe
-    for (int x = 0; x < 8; x++) {
-      for (int y = 0; y < 8; y++) {
-        for (int z = 0; z < 8; z++) {
-          Appearance a = new Appearance();
-          a.setMaterial(whiteMat);
-		  a.setColoringAttributes(whiteColor);
-		  
-		  leds[x][y][z] = new Sphere(0.08f, Sphere.ENABLE_APPEARANCE_MODIFY, a);
-
-          TransformGroup tg = new TransformGroup();
-          Transform3D transform = new Transform3D();
-          Vector3f vector = new Vector3f(x, y, z);
-          transform.setTranslation(vector);
-          tg.setTransform(transform);
-          tg.addChild(leds[x][y][z]);
-          transGroup.addChild(tg);
-
-		  drawLedFeetVertical((double)x, y + 0.5, (double)z, 0.9f, 0.01f);
-		  if (x < 7)
-			  drawLedFeetHorizontal(x + 0.5, (double)y, (double)z, 0.9f, 0.01f, 0);
-        }
-      }
-	  // 8 times, use x as y
-	  drawLedFeetHorizontal(0.5, (double)x, 3.5, 7.0f, 0.02f, 90);
-	  drawLedFeetHorizontal(6.5, (double)x, 3.5, 7.0f, 0.02f, 90);
-	  drawLedFeetHorizontal(3.5, (double)x, 3.5, 7.0f, 0.02f, 90);
-    }
-
-    // Add an ambient light
-    Color3f light2Color = new Color3f(1.0f, 1.0f, 1.0f);
-    AmbientLight light2 = new AmbientLight(light2Color);
-    BoundingSphere bounds = new BoundingSphere(new Point3d(0.0, 0.0, 0.0), 100.0);
-    light2.setInfluencingBounds(bounds);
-    light2.setEnable(true);
-    transGroup.addChild(light2);
-	group.addChild(transGroup);
-	universe.addBranchGraph(group); // Add group to universe
-  }
-
-	private void drawLedFeetVertical(double x, double y, double z, float length, float rad) {
+	private static ColoringAttributes redColor = new ColoringAttributes(
+			new Color3f(1.0f, 0.0f, 0.0f), ColoringAttributes.FASTEST);
+	private static ColoringAttributes whiteColor = new ColoringAttributes(
+			new Color3f(0.2f, 0.2f, 0.2f), ColoringAttributes.FASTEST);
+	private static Material whiteMat = new Material(new Color3f(0.2f, 0.2f,
+			0.2f), new Color3f(0.0f, 0.0f, 0.0f),
+			new Color3f(0.2f, 0.2f, 0.2f), new Color3f(0.2f, 0.2f, 0.2f), 64.0f);
+	private static Material redMat = new Material(
+			new Color3f(1.0f, 0.0f, 0.0f), new Color3f(1.0f, 0.0f, 0.0f),
+			new Color3f(1.0f, 0.0f, 0.0f), new Color3f(1.0f, 0.0f, 0.0f), 64.0f);
+
+	/**
+	 * @param canv The Canvas3D we render our cube in
+	 */
+	public Led3D(Canvas3D canv) {
+
+		canvas = canv;
+		group = new BranchGroup();
+		// Position viewer, so we are looking at object
+		trans3D = new Transform3D();
+		Matrix4d mat = new Matrix4d();
+		mat.setRow(0, 0.744, 0.0237, -0.66756, -0.34);
+		mat.setRow(1, 0.136, -0.9837, 0.117, 3.24);
+		mat.setRow(2, -0.6536, -0.1785, -0.735, -8.32);
+		mat.setRow(3, 0.0, 0.0, 0.0, 1.0);
+		trans3D.set(mat);
+
+		transGroup = new TransformGroup(trans3D);
+		transGroup.setCapability(TransformGroup.ALLOW_TRANSFORM_READ);
+		transGroup.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
+		ViewingPlatform viewingPlatform = new ViewingPlatform();
+		Viewer viewer = new Viewer(canvas);
+		universe = new SimpleUniverse(viewingPlatform, viewer);
+
+		BoundingBox boundBox = new BoundingBox(new Point3d(-5.0, -5.0, -5.0),
+				new Point3d(13.0, 13.0, 13.0));
+		// roration with left mouse button
+		MouseRotate behaviour = new MouseRotate(transGroup);
+		behaviour.setSchedulingBounds(boundBox);
+		transGroup.addChild(behaviour);
+
+		// zoom with middle mouse button
+		MouseZoom beh2 = new MouseZoom(transGroup);
+		beh2.setSchedulingBounds(boundBox);
+		transGroup.addChild(beh2);
+
+		// move with right mouse button
+		MouseTranslate beh3 = new MouseTranslate(transGroup);
+		beh3.setSchedulingBounds(boundBox);
+		transGroup.addChild(beh3);
+
+		group.addChild(createBackground());
+
+		// Add all our led sphares to the universe
+		for (int x = 0; x < 8; x++) {
+			for (int y = 0; y < 8; y++) {
+				for (int z = 0; z < 8; z++) {
+					Appearance a = new Appearance();
+					a.setMaterial(whiteMat);
+					a.setColoringAttributes(whiteColor);
+
+					leds[x][y][z] = new Sphere(0.08f,
+							Sphere.ENABLE_APPEARANCE_MODIFY, a);
+
+					TransformGroup tg = new TransformGroup();
+					Transform3D transform = new Transform3D();
+					Vector3f vector = new Vector3f(x, y, z);
+					transform.setTranslation(vector);
+					tg.setTransform(transform);
+					tg.addChild(leds[x][y][z]);
+					transGroup.addChild(tg);
+
+					drawLedFeetVertical((double) x, y + 0.5, (double) z, 0.9f,
+							0.01f);
+					if (x < 7)
+						drawLedFeetHorizontal(x + 0.5, (double) y, (double) z,
+								0.9f, 0.01f, 0);
+				}
+			}
+			// 8 times, use x as y
+			drawLedFeetHorizontal(0.5, (double) x, 3.5, 7.0f, 0.02f, 90);
+			drawLedFeetHorizontal(6.5, (double) x, 3.5, 7.0f, 0.02f, 90);
+			drawLedFeetHorizontal(3.5, (double) x, 3.5, 7.0f, 0.02f, 90);
+		}
+
+		// Add an ambient light
+		Color3f light2Color = new Color3f(1.0f, 1.0f, 1.0f);
+		AmbientLight light2 = new AmbientLight(light2Color);
+		BoundingSphere bounds = new BoundingSphere(new Point3d(0.0, 0.0, 0.0),
+				100.0);
+		light2.setInfluencingBounds(bounds);
+		light2.setEnable(true);
+		transGroup.addChild(light2);
+		group.addChild(transGroup);
+		universe.addBranchGraph(group); // Add group to universe
+	}
+
+	private void drawLedFeetVertical(double x, double y, double z,
+			float length, float rad) {
 		// draw Feet going down
 		Appearance feetApp = new Appearance();
 		feetApp.setMaterial(whiteMat);
@@ -150,7 +160,8 @@ public class Led3D {
 		transGroup.addChild(tg);
 	}
 
-	private void drawLedFeetHorizontal(double x, double y, double z, float length, float rad, int deg) {
+	private void drawLedFeetHorizontal(double x, double y, double z,
+			float length, float rad, int deg) {
 		// draw Feet going down
 		Appearance feetApp = new Appearance();
 		feetApp.setMaterial(whiteMat);
@@ -184,9 +195,10 @@ public class Led3D {
 	}
 
 	/**
-	 * Prints the translation matrix that is changed by moving/rotating the 3D Cube with your mouse.
+	 * Prints the translation matrix that is changed by moving/rotating the 3D
+	 * Cube with your mouse.
 	 */
-  	public void printTranslationData() {
+	public void printTranslationData() {
 		Matrix4d mat = new Matrix4d();
 		Transform3D t = new Transform3D();
 		transGroup.getTransform(t);
@@ -197,6 +209,7 @@ public class Led3D {
 
 	/**
 	 * Sets the data that is displayed by the LEDs
+	 * 
 	 * @param data 64 byte array with the data (8 bits/LEDs per byte)
 	 */
 	public void setData(short[] data) {
@@ -221,9 +234,11 @@ public class Led3D {
 
 	// create nice background
 	private Background createBackground() {
-		ImageComponent2D image = new TextureLoader(getClass().getResource("bg.png"), null).getImage();
+		ImageComponent2D image = new TextureLoader(getClass().getResource(
+				"bg.png"), null).getImage();
 		Background bg = new Background(image);
-		bg.setApplicationBounds(new BoundingSphere(new Point3d(0.0, 0.0, 0.0), 100.0));
+		bg.setApplicationBounds(new BoundingSphere(new Point3d(0.0, 0.0, 0.0),
+				100.0));
 		return bg;
 	}
 }

CubeControl/cubeWorker.java

@@ -27,11 +27,13 @@
  */
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Collections;
 import java.util.StringTokenizer;
 
 /**
- * This class holds all Data of the Application. Additionally it performs the transmission of animation data to/from the cube and saves/loads animations in/from a file.
+ * This class holds all Data of the Application. Additionally it performs the
+ * transmission of animation data to/from the cube and saves/loads animations
+ * in/from a file.
+ * 
  * @author Thomas Buck
  * @author Felix Bäder
  * @author Max Nuding
@@ -40,343 +42,368 @@ import java.util.StringTokenizer;
 
 public class cubeWorker {
 
-// --------------------
-// Definitions
-// --------------------
-
-  final int UP = 0;
-  final int DOWN = 1;
-
-// --------------------
-// Fields
-// --------------------
-
-  private List<Animation> animations = new ArrayList<Animation>();
-  private int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
-  private boolean changedState = false;
-
-// --------------------
-
-  /**
-   * Creates a worker with one animation, containing an empty frame.
-   */
-  cubeWorker() {
-  animations.add(new Animation());
-  animations.get(0).setName("Animation 1");
-  animations.get(0).add(0);
-  animations.get(0).get(0).setName("Frame 1");
-  framesRemaining--;
-  }
-  
-  /**
-   * Creates a worker from the given animation list
-   * @param anims List of animations
-   */
-  cubeWorker(List<Animation> anims) {
-    animations = anims;
-  }
-
-// --------------------
-// Misc. Methods
-// --------------------
+	// --------------------
+	// Definitions
+	// --------------------
+
+	final int UP = 0;
+	final int DOWN = 1;
+
+	// --------------------
+	// Fields
+	// --------------------
+
+	private List<Animation> animations = new ArrayList<Animation>();
+	private int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
+	private boolean changedState = false;
+
+	// --------------------
+
+	/**
+	 * Creates a worker with one animation, containing an empty frame.
+	 */
+	cubeWorker() {
+		animations.add(new Animation());
+		animations.get(0).setName("Animation 1");
+		animations.get(0).add(0);
+		animations.get(0).get(0).setName("Frame 1");
+		framesRemaining--;
+	}
+
+	/**
+	 * Creates a worker from the given animation list
+	 * 
+	 * @param anims List of animations
+	 */
+	cubeWorker(List<Animation> anims) {
+		animations = anims;
+	}
+
+	// --------------------
+	// Misc. Methods
+	// --------------------
 
 	/**
 	 * Get the number of animations in this worker.
+	 * 
 	 * @return number of animations
 	 */
-    public int numOfAnimations() {
-           return animations.size();
-    }
+	public int numOfAnimations() {
+		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 numOfFrames(int selectedAnimation) {
+		return animations.get(selectedAnimation).size();
+	}
 
-    /**
+	/**
 	 * Get the number of frames you can add until the Cubes memory is full.
+	 * 
 	 * @return number of frames remaining
 	 */
-    public int framesRemaining() {
-           return framesRemaining;
-    }
-
+	public int framesRemaining() {
+		return framesRemaining;
+	}
 
-// --------------------
-// Animation Specific
-// --------------------
+	// --------------------
+	// Animation Specific
+	// --------------------
 
 	/**
 	 * Add an animation.
+	 * 
 	 * @return Index of new animation, or -1 if not enough space remaining.
 	 */
-    public int addAnimation() {
-    	changedState = true;
-    	if (framesRemaining <= 0) {
-          return -1;
-    	} else {
-    	  int s = animations.size();
-    	  animations.add(s, new Animation());
-    	  animations.get(s).setName("Animation " + animations.size());
-    	  return s;
-    	}
-    }
+	public int addAnimation() {
+		changedState = true;
+		if (framesRemaining <= 0) {
+			return -1;
+		} else {
+			int s = animations.size();
+			animations.add(s, new Animation());
+			animations.get(s).setName("Animation " + animations.size());
+			return s;
+		}
+	}
 
 	/**
 	 * Remove an animation.
+	 * 
 	 * @param selectedAnimation the animation you want to delete
 	 */
-    public void removeAnimation(int selectedAnimation) {
-    changedState = true;
-    animations.remove(selectedAnimation);
-    }
+	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
 	 */
-  public String getAnimationName(int selectedAnimation) {
-      return animations.get(selectedAnimation).getName();
-    }
+	public String getAnimationName(int selectedAnimation) {
+		return animations.get(selectedAnimation).getName();
+	}
 
 	/**
-	 * Set the name of an animation
-	 * @param s New name
+	 * 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) {
-      changedState = true;
-    animations.get(selectedAnimation).setName(s);
-    }
+	public void setAnimationName(String s, int selectedAnimation) {
+		changedState = true;
+		animations.get(selectedAnimation).setName(s);
+	}
 
 	/**
 	 * Move an animation UP or DOWN.
+	 * 
 	 * @param dir Direction. Use UP and DOWN defined in cubeWorker
 	 * @param selectedAnimation 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);
-  }
-    }
-  }
-
-// --------------------
-// Frame Specific
-// --------------------
+	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);
+			}
+		}
+	}
+
+	// --------------------
+	// Frame Specific
+	// --------------------
 
 	/**
 	 * Get the name of a frame.
+	 * 
 	 * @param anim Animation the frame is in
 	 * @param frame Index of the frame
 	 */
-  public String getFrameName(int anim, int frame) {
-      return animations.get(anim).get(frame).getName();
-    }
+	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);
-    }
+	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;
-    }
-    framesRemaining--;
-    int s = animations.get(anim).size();
-    animations.get(anim).add(s);
-  animations.get(anim).get(s).setName("Frame " + animations.get(anim).size());
-    return s;
-    }
-
-    /**
+	public int addFrame(int anim) {
+		changedState = true;
+		if (framesRemaining <= 0) {
+			return -1;
+		}
+		framesRemaining--;
+		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);
-    }
+	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
+	 * 
+	 * @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();
-  }
+	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();
-  }
-
-  /**
-   * 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) {
-    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);
-    }
-    }
-  }
-
-// --------------------
-// File Specific
-// --------------------
+	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();
+	}
+
+	/**
+	 * 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) {
+		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);
+			}
+		}
+	}
+
+	// --------------------
+	// File Specific
+	// --------------------
 
 	/**
 	 * Loads an animation file into this worker.
+	 * 
 	 * @param path Path of file to load
 	 * @return 0 on success, -1 on error.
 	 */
-    public int loadState(String path) {
-      changedState = false;
-    try {
-      animations = AnimationUtility.readFile(path);
-    } catch (Exception e) {
-    System.out.println("Did not load!");
-      e.printStackTrace(System.out);
-      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;
-    }
+	public int loadState(String path) {
+		changedState = false;
+		try {
+			animations = AnimationUtility.readFile(path);
+		} catch (Exception e) {
+			System.out.println("Did not load!");
+			e.printStackTrace(System.out);
+			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;
+	}
 
 	/**
 	 * Save the state of this object into a file.
+	 * 
 	 * @param path Path to save file in
 	 * @return 0 on success, -1 on error
 	 */
-    public int saveState(String path) {
-           changedState = false;
-       AnimationUtility.writeFile(path, animations);
-       if (AnimationUtility.getLastError() != null) {
-         System.out.println(AnimationUtility.getLastError());
-         return -1;
-      }
-           return 0;
-    }
+	public int saveState(String path) {
+		changedState = false;
+		AnimationUtility.writeFile(path, animations);
+		if (AnimationUtility.getLastError() != null) {
+			System.out.println(AnimationUtility.getLastError());
+			return -1;
+		}
+		return 0;
+	}
 
 	/**
 	 * Check if something changed after loading/saving.
+	 * 
 	 * @return TRUE if something changed, FALSE otherwise
 	 */
-    public boolean changedStateSinceSave() {
-           return changedState;
-    }
+	public boolean changedStateSinceSave() {
+		return changedState;
+	}
 
-// --------------------
-// Serial Port Specific
-// --------------------
+	// --------------------
+	// 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 uploadState(String port) {
 
-           return -1;
-    }
+		return -1;
+	}
 
 	/**
 	 * 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
+	 * 
+	 * @param port Name of serial port to use  @return 0 on success, -1 on error
 	 */
-    public int downloadState(String port) {
+	public int downloadState(String port) {
 
-           return -1;
-    }
+		return -1;
+	}
 
 	/**
 	 * Try to speak with the cube.
+	 * 
 	 * @return TRUE if cube responds
 	 * @param port Name of serial port
 	 */
@@ -386,10 +413,12 @@ 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
+	 * 
+	 * @return Array of port names. First entry is "Select serial port..." if no
+	 *         others
 	 */
-    public String[] getSerialPorts() {
-		String[] ports = {"Select serial port..."};
+	public String[] getSerialPorts() {
+		String[] ports = { "Select serial port..." };
 		String portLines = HelperUtility.getPorts();
 		if (portLines == null) {
 			return ports;
@@ -401,8 +430,8 @@ public class cubeWorker {
 			ports[i] = sT.nextToken();
 		}
 		return ports;
-    }
+	}
 
-// --------------------
+	// --------------------
 
 }

CubeControl/layerEditFrame.java

@@ -1,27 +1,26 @@
 /*
-* layerEditFrame.java
-*
-*
-* Copyright 2011 Thomas Buck <xythobuz@me.com>
-* Copyright 2011 Max Nuding <max.nuding@gmail.com>
-* Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
-*
-* This file is part of LED-Cube.
-*
-* LED-Cube is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* LED-Cube is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with LED-Cube. If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ * layerEditFrame.java
+ *
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube. If not, see <http://www.gnu.org/licenses/>.
+ */
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
@@ -29,6 +28,7 @@ import javax.swing.event.*;
 
 /**
  * Shows a windows that allows the user to toggle the state of 64 LEDs.
+ * 
  * @author Max Nuding
  * @author Thomas Buck
  * @author Felix Bäder
@@ -36,201 +36,204 @@ import javax.swing.event.*;
  */
 
 public class layerEditFrame extends JFrame {
-  // Anfang Attribute
-
-  private JPanel panelLED1 = new JPanel(null, true);
-  JButton[][] ledPanels = new JButton[8][8];
-  ImageIcon on = new ImageIcon(getClass().getResource("LEDon.png"));
-  ImageIcon off = new ImageIcon(getClass().getResource("LEDoff.png"));
-  byte[][] ledStatus = new byte[8][8];
-  boolean changedStateSinceSave = false;
-  short[] frame;
-  int li;
-  boolean finish = false;
-  cubeWorker worker = null;
-  int animI;
-  int frameI;
-  Frame LedFrame;
-
-  // Ende Attribute
-  /**
-   * Create a new layer editor.
-   * @param animIndex Current animation
-   * @param frameIndex Current frame
-   * @param layerIndex Layer to edit
-   * @param work the cubeWorker containing the data
-   * @param LEDframe Used to call valueChanged, to trigger 3D View update
-   */
-  public layerEditFrame(int animIndex, int frameIndex, int layerIndex, cubeWorker work, Frame LEDframe) {
-    // Frame-Initialisierung
-    super("Layer Edit");
-    worker = work;
-    LedFrame = LEDframe;
-    animI = animIndex;
-    frameI = frameIndex;
-    //frame =  byteToShortArray(worker.getFrame(animIndex, frameIndex));
-    frame = worker.getFrame(animIndex, frameIndex);
-    li = layerIndex;
-    setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-    int frameWidth = 180;
-    int frameHeight = 230;
-    setSize(frameWidth, frameHeight);
-    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-    int x = (d.width - getSize().width) / 2;
-    int y = (d.height - getSize().height) / 2;
-    setLocation(x, y);
-    setResizable(false);
-    Container cp = getContentPane();
-    cp.setLayout(null);
-
-    for(int i = 0; i < 8; i++){
-      for(int j = 0; j < 8; j++){
-         final int finalI = i;
-         final int finalJ = j;
-         ledPanels[i][j] = new JButton(on);
-         ledPanels[i][j].setBounds((i*20)+5, (j*20)+5, 15, 15);
-         ledPanels[i][j].addActionListener(new ActionListener() {
-           public void actionPerformed(ActionEvent evt) {
-             btnClicked(finalI, finalJ);
-           }
-         });
-         ledPanels[i][j].setVisible(true);
-         cp.add(ledPanels[i][j]);
-      }
-    }
-    loadData();
-    JButton saveBtn = new JButton("Save");
-    JButton cancelBtn = new JButton("Cancel");
-
-    saveBtn.setBounds(5, 170, 70, 25);
-    saveBtn.setFont(new Font("Dialog", Font.PLAIN, 13));
-    cp.add(saveBtn);
-    cancelBtn.setBounds(80, 170, 80, 25);
-    cancelBtn.setFont(new Font("Dialog", Font.PLAIN, 13));
-    cp.add(cancelBtn);
-    setVisible(true);
-
-
-
-    saveBtn.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent evt) {
-        save();
-      }
-    });
-
-    cancelBtn.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent evt) {
-        cancel();
-      }
-    });
-
-
-    addWindowListener(new WindowAdapter() {
-      public void windowClosing(WindowEvent evt) {
-             if(changedStateSinceSave){
-                saveExitDialog();
-             }
-             dispose();
-      }
-    });
-  }
-    // Anfang Komponenten
-
-    // Ende Komponenten
-  private void loadData(){
-
-    for(int i = 0; i < 8; i++){
-      int div = frame[(8*(li+1)+i)-8];
-      int[] rest = new int[8];
-      int ctr = 0;
-      while(div != 0){
-        rest[ctr] = div%2;
-        div = div/2;
-        ctr++;
-      }
-
-      for(int j = 0; j < 8; j++){
-        if(rest[j] == 0){
-         ledPanels[j][i].setIcon(off);
-        } else {
-         ledPanels[j][i].setIcon(on);
-        }
-        ledStatus[j][i] = (byte) rest[j];
-      }
-
-    }
-
-  }
+	// Anfang Attribute
+
+	private static final long serialVersionUID = 13374223L;
+	JButton[][] ledPanels = new JButton[8][8];
+	ImageIcon on = new ImageIcon(getClass().getResource("LEDon.png"));
+	ImageIcon off = new ImageIcon(getClass().getResource("LEDoff.png"));
+	byte[][] ledStatus = new byte[8][8];
+	boolean changedStateSinceSave = false;
+	short[] frame;
+	int li;
+	boolean finish = false;
+	cubeWorker worker = null;
+	int animI;
+	int frameI;
+	Frame LedFrame;
+
+	// Ende Attribute
+	/**
+	 * Create a new layer editor.
+	 * 
+	 * @param animIndex Current animation
+	 * @param frameIndex Current frame
+	 * @param layerIndex Layer to edit
+	 * @param work the cubeWorker containing the data
+	 * @param LEDframe Used to call valueChanged, to trigger 3D View update
+	 */
+	public layerEditFrame(int animIndex, int frameIndex, int layerIndex,
+			cubeWorker work, Frame LEDframe) {
+		// Frame-Initialisierung
+		super("Layer Edit");
+		worker = work;
+		LedFrame = LEDframe;
+		animI = animIndex;
+		frameI = frameIndex;
+		// frame = byteToShortArray(worker.getFrame(animIndex, frameIndex));
+		frame = worker.getFrame(animIndex, frameIndex);
+		li = layerIndex;
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+		int frameWidth = 180;
+		int frameHeight = 230;
+		setSize(frameWidth, frameHeight);
+		Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+		int x = (d.width - getSize().width) / 2;
+		int y = (d.height - getSize().height) / 2;
+		setLocation(x, y);
+		setResizable(false);
+		Container cp = getContentPane();
+		cp.setLayout(null);
+
+		for (int i = 0; i < 8; i++) {
+			for (int j = 0; j < 8; j++) {
+				final int finalI = i;
+				final int finalJ = j;
+				ledPanels[i][j] = new JButton(on);
+				ledPanels[i][j].setBounds((i * 20) + 5, (j * 20) + 5, 15, 15);
+				ledPanels[i][j].addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent evt) {
+						btnClicked(finalI, finalJ);
+					}
+				});
+				ledPanels[i][j].setVisible(true);
+				cp.add(ledPanels[i][j]);
+			}
+		}
+		loadData();
+		JButton saveBtn = new JButton("Save");
+		JButton cancelBtn = new JButton("Cancel");
+
+		saveBtn.setBounds(5, 170, 70, 25);
+		saveBtn.setFont(new Font("Dialog", Font.PLAIN, 13));
+		cp.add(saveBtn);
+		cancelBtn.setBounds(80, 170, 80, 25);
+		cancelBtn.setFont(new Font("Dialog", Font.PLAIN, 13));
+		cp.add(cancelBtn);
+		setVisible(true);
+
+		saveBtn.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				save();
+			}
+		});
+
+		cancelBtn.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				cancel();
+			}
+		});
+
+		addWindowListener(new WindowAdapter() {
+			public void windowClosing(WindowEvent evt) {
+				if (changedStateSinceSave) {
+					saveExitDialog();
+				}
+				dispose();
+			}
+		});
+	}
+
+	// Anfang Komponenten
+
+	// Ende Komponenten
+	private void loadData() {
+
+		for (int i = 0; i < 8; i++) {
+			int div = frame[(8 * (li + 1) + i) - 8];
+			int[] rest = new int[8];
+			int ctr = 0;
+			while (div != 0) {
+				rest[ctr] = div % 2;
+				div = div / 2;
+				ctr++;
+			}
+
+			for (int j = 0; j < 8; j++) {
+				if (rest[j] == 0) {
+					ledPanels[j][i].setIcon(off);
+				} else {
+					ledPanels[j][i].setIcon(on);
+				}
+				ledStatus[j][i] = (byte) rest[j];
+			}
+
+		}
+
+	}
 
 	/**
 	 * Get the edited data back. NOTE: The worker is updated automagically!
+	 * 
 	 * @return Now changed 64 byte array.
 	 */
-   public short[] getFinalFrame(){
-      if (finish == false) {
-        return null;
-      }
-      return frame;
-   }
+	public short[] getFinalFrame() {
+		if (finish == false) {
+			return null;
+		}
+		return frame;
+	}
 
 	/**
 	 * Gets called when the user clicks on a Toggle Button.
+	 * 
 	 * @param i X-Coordinate of Button
 	 * @param j Y-Coordinate of Button
 	 */
-  public void btnClicked(int i, int j){
-    changedStateSinceSave = true;
-    if (ledPanels[i][j].getIcon() == on){
-      ledPanels[i][j].setIcon(off);
-       ledStatus[i][j] = 0;
-    } else {
-      ledPanels[i][j].setIcon(on);
-       ledStatus[i][j] = 1;
-    }
-
-  }
+	public void btnClicked(int i, int j) {
+		changedStateSinceSave = true;
+		if (ledPanels[i][j].getIcon() == on) {
+			ledPanels[i][j].setIcon(off);
+			ledStatus[i][j] = 0;
+		} else {
+			ledPanels[i][j].setIcon(on);
+			ledStatus[i][j] = 1;
+		}
+
+	}
 
 	/**
 	 * Action of Cancel Button. Removes this window...
 	 */
-  public void cancel(){
-    dispose();
-  }
+	public void cancel() {
+		dispose();
+	}
 
 	/**
-	 * Gets called when clicking the save button. Puts data back into Worker and fires ListSelectionEvent in Worker, so that the 3D View is updated.
+	 * Gets called when clicking the save button. Puts data back into Worker and
+	 * fires ListSelectionEvent in Worker, so that the 3D View is updated.
 	 */
-  public void save(){
-    int ctr = 0;
-    short[] tmpFrame = frame;
-    changedStateSinceSave = false;
-    short reihe = 0;
-    for(int j = 0; j < 8; j++){
-      for(int i = 0; i < 8; i++){
-        reihe += ((short) Math.pow(2, i)) * ledStatus[i][j];
-        ctr++;
-      }
-      tmpFrame[(8*(li+1)+j)-8] = reihe;
-      reihe = 0;
-    }
-      frame = tmpFrame;
-      worker.setFrame(frame, animI, frameI);
-      ListSelectionEvent layerChanged = new ListSelectionEvent(LedFrame.frameList, LedFrame.frameList.getSelectedIndex(), LedFrame.frameList.getSelectedIndex(), false);
-      LedFrame.valueChanged(layerChanged);
-      dispose();
-  }
-
-
-
-  private int saveExitDialog() {
-    String[] Optionen = {"Yes", "No"};
-    int Auswahl = JOptionPane.showOptionDialog(this, "Do you want to save your changes?", "Save?", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, Optionen, Optionen[0]);
-    if (Auswahl == JOptionPane.YES_OPTION) {
-       save();
-       return 1;
-    } else {
-       return 0;
-    }
-  }
+	public void save() {
+		short[] tmpFrame = frame;
+		changedStateSinceSave = false;
+		short reihe = 0;
+		for (int j = 0; j < 8; j++) {
+			for (int i = 0; i < 8; i++) {
+				reihe += ((short) Math.pow(2, i)) * ledStatus[i][j];
+			}
+			tmpFrame[(8 * (li + 1) + j) - 8] = reihe;
+			reihe = 0;
+		}
+		frame = tmpFrame;
+		worker.setFrame(frame, animI, frameI);
+		ListSelectionEvent layerChanged = new ListSelectionEvent(
+				LedFrame.frameList, LedFrame.frameList.getSelectedIndex(),
+				LedFrame.frameList.getSelectedIndex(), false);
+		LedFrame.valueChanged(layerChanged);
+		dispose();
+	}
+
+	private int saveExitDialog() {
+		String[] Optionen = { "Yes", "No" };
+		int Auswahl = JOptionPane.showOptionDialog(this,
+				"Do you want to save your changes?", "Save?",
+				JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null,
+				Optionen, Optionen[0]);
+		if (Auswahl == JOptionPane.YES_OPTION) {
+			save();
+			return 1;
+		} else {
+			return 0;
+		}
+	}
 }
-

CubeControl/libSerial/.project

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>libSerial</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>make</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>

CubeControl/libSerial/makefile

@@ -0,0 +1,50 @@
+CC = gcc
+# Path to jni.h
+ifdef SystemRoot
+HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
+RM = del
+PLATFORM = Win
+else
+HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
+RM = rm -f
+PLATFORM = Mac
+endif
+
+# --------------------------------------
+
+all: libSerial
+
+doc: doc/index.html
+
+serialInterface.h: HelperUtility.class
+	javah -o serialInterface.h HelperUtility
+
+HelperUtility.class: ../HelperUtility.java
+	javac ../HelperUtility.java
+	cp ../HelperUtility.class HelperUtility.class
+
+# SystemRoot is only defined in Windows
+ifdef SystemRoot
+libSerial: Serial.dll
+else
+libSerial: libSerial.jnilib
+endif
+
+libSerial.jnilib: serialHelper.c unixSerial.c serialInterface.h
+	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o
+	$(CC) -dynamiclib -o libSerial.jnilib serialHelper.o
+
+Serial.dll: serialHelper.c winSerial.c serialInterface.h
+	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o -D winHelper
+	$(CC) -shared -o Serial.dll serialHelper.o
+
+# Delete intermediate files
+clean:
+	$(RM) *.class
+	$(RM) *.h
+	$(RM) *.o
+ifdef SystemRoot
+	$(RM) *.dll
+else
+	$(RM) *.jnilib
+endif

CubeControl/serialHelper.c → CubeControl/libSerial/serialHelper.c

@@ -26,9 +26,9 @@
 #include "serialInterface.h"
 
 #ifdef winHelper
-#include "helper/winSerial.c"
+#include "winSerial.c"
 #else
-#include "helper/unixSerial.c"
+#include "unixSerial.c"
 #endif
 
 JNIEXPORT jstring JNICALL Java_HelperUtility_getThePorts(JNIEnv *env, jclass class, jstring s) {

CubeControl/makefile

@@ -1,15 +1,16 @@
 # Name of your C-Compiler
 CC = gcc
+INJAR = *.class LEDoff.png LEDon.png splash.png bg.png
 # Path to jni.h
 ifdef SystemRoot
 HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
 RM = del
-INJAR = *.class *.png Serial.dll
+INJAR += Serial.dll
 PLATFORM = Win
 else
 HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
 RM = rm -f
-INJAR = *.class *.png libSerial.jnilib
+INJAR += libSerial.jnilib
 PLATFORM = Mac
 endif
 
@@ -19,7 +20,7 @@ JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java
 
 # --------------------------------------
 
-all: libSerial CubeControl.jar clean
+all: CubeControl.jar clean
 
 doc: doc/index.html
 
@@ -32,28 +33,29 @@ serialInterface.h: HelperUtility.class
 HelperUtility.class: $(JAVAFILES)
 	javac $(JAVAFILES)
 
-libSerial.jnilib: serialHelper.c helper/unixSerial.c serialInterface.h
-	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o
-	$(CC) -dynamiclib -o libSerial.jnilib serialHelper.o
-
-Serial.dll: serialHelper.c helper/winSerial.c serialInterface.h
-	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o -D winHelper
-	$(CC) -shared -o Serial.dll serialHelper.o
-
 doc/index.html: $(JAVAFILES)
 	javadoc -d doc $(JAVAFILES)
 
-# SystemRoot is only defined in Windows
 ifdef SystemRoot
 libSerial: Serial.dll
 else
 libSerial: libSerial.jnilib
 endif
 
+Serial.dll: libSerial/serialHelper.c libSerial/winSerial.c
+	make -C libSerial
+	mv libSerial/Serial.dll Serial.dll
+	make -C libSerial clean
+
+libSerial.jnilib: libSerial/serialHelper.c libSerial/unixSerial.c
+	make -C libSerial
+	mv libSerial/libSerial.jnilib libSerial.jnilib
+	make -C libSerial clean
+
 # Delete intermediate files
 clean:
 	$(RM) *.class
-	$(RM) *.h
+	$(RM) *.
 	$(RM) *.o
 ifdef SystemRoot
 	$(RM) *.dll