Fixed makefile, renamed cryptical variables, set the default close operation

Cube Control/Frame.java

@@ -72,8 +72,8 @@ public class Frame extends JFrame implements ListSelectionListener {
   private JButton download = new JButton();
   private JLabel jLabel4 = new JLabel();
   private JTextField frameRemaining = new JTextField();
-  private JLabel frmLngthLbl = new JLabel();
-  private JTextField frmLngthTxt = new JTextField();
+  private JLabel frameLengthLabel = new JLabel();
+  private JTextField frameLengthText = new JTextField();
   private JButton frameDuration = new JButton();
   // Ende Attribute
 
@@ -107,10 +107,10 @@ public class Frame extends JFrame implements ListSelectionListener {
     // 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()));
-      frmLngthTxt.setText(Integer.toString(worker.getFrameTime(animList.getSelectedIndex(), frameList.getSelectedIndex())));
+      frameLengthText.setText(Integer.toString(worker.getFrameTime(animList.getSelectedIndex(), frameList.getSelectedIndex())));
     } else {
       // clear Frame duration
-      frmLngthTxt.setText("");
+      frameLengthText.setText("");
     }
 
     if ((evt.getSource() == animList) && (animList.getSelectedIndex() != -1)) {
@@ -142,6 +142,7 @@ public class Frame extends JFrame implements ListSelectionListener {
   public Frame(String title) {
     // Frame-Initialisierung
     super(title);
+    this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
     String[] sPorts = worker.getSerialPorts();
     for(int i = 0; i < sPorts.length; i++){
@@ -328,15 +329,15 @@ public class Frame extends JFrame implements ListSelectionListener {
       }
     });
 
-    frmLngthLbl.setBounds(536, 160, 113, 24);
-    frmLngthLbl.setText("Time (1/24 sec)");
-    frmLngthLbl.setFont(new Font("Dialog", Font.PLAIN, 13));
-    cp.add(frmLngthLbl);
+    frameLengthLabel.setBounds(536, 160, 113, 24);
+    frameLengthLabel.setText("Time (1/24 sec)");
+    frameLengthLabel.setFont(new Font("Dialog", Font.PLAIN, 13));
+    cp.add(frameLengthLabel);
 
-    frmLngthTxt.setBounds(536, 184, 50, 24);
-    frmLngthTxt.setText("");
-    frmLngthTxt.setFont(new Font("Dialog", Font.PLAIN, 13));
-    cp.add(frmLngthTxt);
+    frameLengthText.setBounds(536, 184, 50, 24);
+    frameLengthText.setText("");
+    frameLengthText.setFont(new Font("Dialog", Font.PLAIN, 13));
+    cp.add(frameLengthText);
 
   frameDuration.setBounds(590, 184, 50, 24);
   frameDuration.setText("OK");
@@ -344,12 +345,12 @@ public class Frame extends JFrame implements ListSelectionListener {
   cp.add(frameDuration);
   frameDuration.addActionListener(new ActionListener() {
     public void actionPerformed(ActionEvent evt) {
-      if (frmLngthTxt.getText().equals("0")) {
+      if (frameLengthText.getText().equals("0")) {
         errorMessage("0 is not a valid value!");
-        frmLngthTxt.setText("1");
-      } else if (Integer.parseInt(frmLngthTxt.getText()) > 256) {
+        frameLengthText.setText("1");
+      } else if (Integer.parseInt(frameLengthText.getText()) > 256) {
         errorMessage("Value too high. Max: 256");
-        frmLngthTxt.setText("256");
+        frameLengthText.setText("256");
         return;
       } else {
         if (animList.getSelectedIndex() == -1) {
@@ -360,7 +361,7 @@ public class Frame extends JFrame implements ListSelectionListener {
           errorMessage("Please select a Frame!");
           return;
         }
-        worker.setFrameTime((byte)(Integer.parseInt(frmLngthTxt.getText()) - 1), animList.getSelectedIndex(), frameList.getSelectedIndex());
+        worker.setFrameTime((byte)(Integer.parseInt(frameLengthText.getText()) - 1), animList.getSelectedIndex(), frameList.getSelectedIndex());
       }
     }
   });
@@ -742,13 +743,13 @@ public class Frame extends JFrame implements ListSelectionListener {
          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...");
-			 }
+       if (worker.probeCubeConnected((String)jComboBox1.getSelectedItem())) {
+         if (worker.uploadState((String)jComboBox1.getSelectedItem()) != 0) {
+           errorMessage("Could not upload data!");
+         }
+       } else {
+         errorMessage("Cube does not respond...");
+       }
          }
   }
 
@@ -800,26 +801,26 @@ public class Frame extends JFrame implements ListSelectionListener {
         System.out.println("All LEDs off now...");
       }
 
-	  if (s.equals("e") || s.equals("exec")) {
-  	  		System.out.println(HelperUtility.runHelper(new String[0]));
-	  }
+    if (s.equals("e") || s.equals("exec")) {
+          System.out.println(HelperUtility.runHelper(new String[0]));
+    }
 
-	  if (s.startsWith("e ") || s.startsWith("exec ")) {
-			int pos = 0;
-			while (s.charAt(pos) != ' ') {
-				pos++;
-			}
-			String[] arr = new String[1];
-			arr[0] = s.substring(pos + 1);
-			System.out.println(HelperUtility.runHelper(arr));
-	  }
+    if (s.startsWith("e ") || s.startsWith("exec ")) {
+      int pos = 0;
+      while (s.charAt(pos) != ' ') {
+        pos++;
+      }
+      String[] arr = new String[1];
+      arr[0] = s.substring(pos + 1);
+      System.out.println(HelperUtility.runHelper(arr));
+    }
 
       if (s.equals("h") || (s.equals("help"))) {
         System.out.println("Commands:");
         System.out.println("\t'on'     / '1'\t:\tToggle all LEDs on");
         System.out.println("\t'off'    / '0'\t:\tToggle all LEDs off");
         System.out.println("\t'print'  / 'p'\t:\tPrint 3D Translation Matrix Data");
-		System.out.println("\t'exec'   / 'e'\t:\tExecute helper with given args");
+    System.out.println("\t'exec'   / 'e'\t:\tExecute helper with given args");
         System.out.println("\t'help'   / 'h'\t:\tShow this message");
         System.out.println("\t'quit'   / 'q'\t:\tExit Cube Control");
       }

Cube Control/doc/AFrame.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:22 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:14 CET 2011 -->
 <TITLE>
 AFrame
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/Animation.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:14 CET 2011 -->
 <TITLE>
 Animation
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/AnimationUtility.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:14 CET 2011 -->
 <TITLE>
 AnimationUtility
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/HelperUtility.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 HelperUtility
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/Led3D.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 Led3D
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/allclasses-frame.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/allclasses-noframe.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/constant-values.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/cubeWorker.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:14 CET 2011 -->
 <TITLE>
 cubeWorker
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/deprecated-list.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/frame.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:23 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:14 CET 2011 -->
 <TITLE>
 Frame
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/help-doc.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 API Help
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/index-all.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 Index
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 

Cube Control/doc/index.html

@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Tue Dec 06 20:47:24 CET 2011-->
+<!-- Generated by javadoc on Wed Dec 07 17:50:15 CET 2011-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>

Cube Control/doc/layerEditFrame.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 layerEditFrame
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/overview-tree.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/package-frame.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 &lt;Unnamed&gt;
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/package-summary.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/package-tree.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
  Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

Cube Control/doc/serialized-form.html

@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 20:47:24 CET 2011 -->
+<!-- Generated by javadoc (build 1.6.0_29) on Wed Dec 07 17:50:15 CET 2011 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
-<META NAME="date" CONTENT="2011-12-06">
+<META NAME="date" CONTENT="2011-12-07">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
@@ -442,18 +442,18 @@ javax.swing.JTextField <B>frameRemaining</B></PRE>
 </DL>
 <HR>
 <H3>
-frmLngthLbl</H3>
+frameLengthLabel</H3>
 <PRE>
-javax.swing.JLabel <B>frmLngthLbl</B></PRE>
+javax.swing.JLabel <B>frameLengthLabel</B></PRE>
 <DL>
 <DL>
 </DL>
 </DL>
 <HR>
 <H3>
-frmLngthTxt</H3>
+frameLengthText</H3>
 <PRE>
-javax.swing.JTextField <B>frmLngthTxt</B></PRE>
+javax.swing.JTextField <B>frameLengthText</B></PRE>
 <DL>
 <DL>
 </DL>

Cube Control/makefile

@@ -3,8 +3,8 @@ JAVADOC = javadoc
 DOCDIR = doc
 CC = gcc
 #TARGET = unix
-TARGET= cygwin
-#TARGET = win
+#TARGET= cygwin
+TARGET = win
 
 # Java files to be compiled
 # Needs to be a complete list so they work as target
@@ -12,10 +12,10 @@ JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java
 
 ifeq ($(TARGET),unix)
 INJAR = *.class *.png serialHelper
-RM = del
+RM = rm
 else
 INJAR = *.class *.png serialHelper.exe
-RM = rm
+RM = del
 endif
 
 # Spit out jar file, documentation, delete intermediate files