Huge changes in the layereditor, now (almost) works...

Cube Control/cubeWorker.java

@@ -32,6 +32,7 @@ import java.util.Scanner;
 import java.io.FileWriter;
 import java.io.File;
 import java.io.IOException;
+import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
 
 public class cubeWorker {
 
@@ -55,6 +56,9 @@ public class cubeWorker {
   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--;
   }
 
   cubeWorker(ArrayList<Animation> anims) {
@@ -158,7 +162,7 @@ public class cubeWorker {
     framesRemaining--;
     int s = animations.get(anim).size();
     animations.get(anim).add(s);
-  animations.get(anim).get(s).setName("Frame " + (2016 - framesRemaining));
+  animations.get(anim).get(s).setName("Frame " + animations.get(anim).size());
     return s;
     }
 
@@ -217,7 +221,8 @@ public class cubeWorker {
     try {
       animations = AnimationUtility.readFile(path);
     } catch (Exception e) {
-      System.out.println(e.toString());
+	  System.out.println("Did not load!");
+      e.printStackTrace(System.out);
       return -1;
     }
     int size = 0;
@@ -281,7 +286,14 @@ class AnimationUtility {
   ArrayList<Animation> animations = new ArrayList<Animation>();
 
   do {
-    animations.add(readAnimation(sc));
+	Animation tmp = readAnimation(sc);
+	if (tmp == null) {
+		return animations;
+	}
+	if (sc.hasNextLine()) {
+		sc.nextLine();
+	}
+    animations.add(tmp);
   } while (sc.hasNextLine());
 
   return animations;
@@ -301,7 +313,7 @@ class AnimationUtility {
     try {
       output = new FileWriter(f);
       for (int i = 0; i < animations.size(); i++) {
-        writeAnimation(animations.get(i), output);
+        writeAnimation(animations.get(i), output, (i == (animations.size() - 1)));
       }
     } catch (Exception e) {
       lastError = e.toString();
@@ -328,22 +340,25 @@ class AnimationUtility {
   Animation anim = new Animation();
   AFrame f = null;
   int index = 0;
-  int size = sc.nextInt();
+  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);
-    anim.set(f, index);
+    anim.add(index, f);
     index++;
     size--;
   }
-
   return anim;
   }
 
   private static AFrame readFrame(Scanner sc, int index) {
   AFrame frame = new AFrame();
-  frame.setName("Frame " + index);
+  frame.setName(sc.nextLine());
   byte[] d = {};
   for (int i = 0; i < 8; i++) {
     byte[] data = hexConvert(sc.nextLine());
@@ -364,25 +379,24 @@ class AnimationUtility {
 
   private static byte[] hexConvert(String hex) {
   hex = hex.replaceAll("\\n", "");
-  int length = hex.length();
-  byte[] data = new byte[length / 2];
-  for (int i = 0; i < length; i += 2) {
-    data[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4) + Character.digit(hex.charAt(i + 1), 16));
-  }
-  return data;
+  HexBinaryAdapter a = new HexBinaryAdapter();
+  return a.unmarshal(hex);
   }
 
-  private static void writeAnimation(Animation anim, FileWriter f) throws IOException {
+  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);
     }
-    f.write("\n");
+    if (!last) {
+		f.write("\n");
+	}
   }
 
   private static void writeFrame(AFrame fr, FileWriter f) throws IOException {
-    for (int i = 0; i < 8; i++) {
+    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");
@@ -483,6 +497,15 @@ class Animation {
     }
   }
 
+  void add(int i, AFrame f) {
+    try {
+      frames.add(i, f);
+      lastFrameIndex++;
+    } catch (IndexOutOfBoundsException e)  {
+      System.out.println(e.toString());
+    }
+  }
+
   int size() {
     return frames.size();
   }

Cube Control/frame.java

@@ -57,6 +57,7 @@ public class frame extends JFrame implements ListSelectionListener {
   private JButton frameDown = new JButton();
   private JButton frameAdd = new JButton();
   private JButton frameRemove = new JButton();
+  private JButton frameRename = new JButton();
   private JButton frame = new JButton();
   private JList animList = new JList();
   private DefaultListModel animModel = new DefaultListModel();
@@ -65,6 +66,7 @@ public class frame extends JFrame implements ListSelectionListener {
   private JButton animDown = new JButton();
   private JButton animAdd = new JButton();
   private JButton animRemove = new JButton();
+  private JButton animRename = new JButton();
   private JTextField animPath = new JTextField();
   private JButton load = new JButton();
   private JButton save = new JButton();
@@ -86,47 +88,64 @@ public class frame extends JFrame implements ListSelectionListener {
     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) {
-       worker.saveState(animPath.getText());
        return 1;
     } else {
        return 0;
     }
   }
 
+  private String askString(String title, String text) {
+    return JOptionPane.showInputDialog(null, text, title, JOptionPane.QUESTION_MESSAGE);
+  }
+
   private void errorMessage(String s) {
   String[] Optionen = {"OK"};
   JOptionPane.showOptionDialog(this, s, "Error!", JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE, null, Optionen, Optionen[0]);
   }
 
   public void valueChanged(ListSelectionEvent evt) {
-    if ((!evt.getValueIsAdjusting()) && (evt.getSource() != animList) && (evt.getSource() != frameList)) {
-     DefaultListModel model = (DefaultListModel)((JList)evt.getSource()).getModel();
+    if ((!evt.getValueIsAdjusting()) && ((evt.getSource() == animList) || (evt.getSource() == frameList))) {
      int anim = animList.getSelectedIndex();
      int max;
-     if(evt.getSource() == animList){
+   if (anim == -1){
+        anim = 0;
+     }
+     if(evt.getSource() == frameList){
        max = worker.numOfAnimations();
-       System.out.println(max);
-
+     animModel.clear();
      } else {
-       max = worker.numOfFrames(animList.getSelectedIndex());
-
+       max = worker.numOfFrames(anim);
+     frameListModel.clear();
      }
 
-     if (anim == -1){
-        anim = 0;
-     }
-     model.clear();
-     for (int i = 0; i < max; i++) {
+   // if value changed in anim, rebuild frame, else other way round
+   for (int i = 0; i < max; i++) {
        if(evt.getSource() == animList){
-          model.add(i, worker.getAnimationName(i));
+      frameListModel.addElement(worker.getFrameName(anim, i));
+      frameList.setModel(frameListModel);
        } else {
-         model.add(i, worker.getFrameName(anim, i));
+      animModel.addElement(worker.getAnimationName(i));
+      animList.setModel(animModel);
        }
-    }
-    frameList.setModel(model);
+   }
     }
   }
 
+  private void save() {
+    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 frame(String title) {
     // Frame-Initialisierung
     super(title);
@@ -143,7 +162,11 @@ public class frame extends JFrame implements ListSelectionListener {
     addWindowListener(new WindowAdapter() {
       public void windowClosing(WindowEvent evt) {
              if (worker.changedStateSinceSave()) {
-                  saveExitDialog();
+                  if (saveExitDialog() == 1) {
+            save();
+          } else {
+            return;
+          }
              }
              System.exit(0);
       }
@@ -276,6 +299,7 @@ public class frame extends JFrame implements ListSelectionListener {
     });
 
     frameDown.setBounds(544, 122, 107, 28);
+
     frameDown.setText("Move down");
     frameDown.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameDown);
@@ -286,6 +310,28 @@ public class frame extends JFrame implements ListSelectionListener {
     });
 
     frameAdd.setBounds(544, 46, 107, 28);
+  frameRename.setText("Rename");
+  frameRename.setFont(new Font("Dialog", Font.PLAIN, 13));
+  cp.add(frameRename);
+  frameRename.addActionListener(new ActionListener() {
+    public void actionPerformed(ActionEvent evt) {
+      int a = animList.getSelectedIndex();
+      if (a < 0) {
+        errorMessage("Select an animation!");
+        return;
+      }
+      int f = frameList.getSelectedIndex();
+      if (f < 0) {
+        errorMessage("Select a frame!");
+        return;
+      }
+      worker.setFrameName(askString("Rename", "Rename " + frameList.getSelectedValue() + "?"), a, f);
+      frameListModel.set(f, worker.getFrameName(a, f));
+      frameList.setModel(frameListModel);
+    }
+  });
+
+
     frameAdd.setText("Add");
     frameAdd.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameAdd);
@@ -295,7 +341,11 @@ public class frame extends JFrame implements ListSelectionListener {
       }
     });
 
+
     frameRemove.setBounds(544, 84, 107, 28);
+
+    frameRemove.setBounds(544, 84, 107, 33);
+
     frameRemove.setText("Remove");
     frameRemove.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameRemove);
@@ -319,6 +369,7 @@ public class frame extends JFrame implements ListSelectionListener {
     animList.setModel(animModel);
     //jList2Model.addElement("");
     cp.add(animScrollPane);
+
     animUp.setBounds(224, 264, 99, 25);
     animUp.setText("Move up");
     animUp.setFont(new Font("Dialog", Font.PLAIN, 13));
@@ -329,7 +380,7 @@ public class frame extends JFrame implements ListSelectionListener {
       }
     });
 
-    animDown.setBounds(224, 360, 99, 25);
+    animDown.setBounds(224, 342, 99, 25);
     animDown.setText("Move down");
     animDown.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animDown);
@@ -339,7 +390,24 @@ public class frame extends JFrame implements ListSelectionListener {
       }
     });
 
-    animAdd.setBounds(224, 296, 99, 25);
+  animRename.setBounds(224, 368, 99, 25);
+  animRename.setText("Rename");
+  animRename.setFont(new Font("Dialog", Font.PLAIN, 13));
+  cp.add(animRename);
+  animRename.addActionListener(new ActionListener() {
+    public void actionPerformed(ActionEvent evt) {
+      int a = animList.getSelectedIndex();
+      if (a < 0) {
+        errorMessage("Select an animation!");
+        return;
+      }
+      worker.setAnimationName(askString("Rename", "Rename " + animList.getSelectedValue() + "?"), a);
+      animModel.set(a, worker.getAnimationName(a));
+      animList.setModel(animModel);
+    }
+  });
+
+    animAdd.setBounds(224, 290, 99, 25);
     animAdd.setText("Add");
     animAdd.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animAdd);
@@ -349,7 +417,7 @@ public class frame extends JFrame implements ListSelectionListener {
       }
     });
 
-    animRemove.setBounds(224, 328, 99, 25);
+    animRemove.setBounds(224, 316, 99, 25);
     animRemove.setText("Remove");
     animRemove.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animRemove);
@@ -418,12 +486,12 @@ public class frame extends JFrame implements ListSelectionListener {
     });
 
     jLabel4.setBounds(536, 208, 112, 20);
-    jLabel4.setText("Frames remaining:");
+    jLabel4.setText("Remaining:");
     jLabel4.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(jLabel4);
     frameRemaining.setBounds(536, 232, 113, 24);
     frameRemaining.setEditable(false);
-    frameRemaining.setText("2048");
+    frameRemaining.setText(String.valueOf(worker.framesRemaining()));
     frameRemaining.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameRemaining);
     animList.setFont(new Font("Dialog", Font.PLAIN, 13));
@@ -542,13 +610,12 @@ public class frame extends JFrame implements ListSelectionListener {
       errorMessage("Could not add animation!");
     } else {
     int n = worker.numOfAnimations() - 1;
-    if (n < 0) {
+    // would have 0 anims after successfully adding one...
+  /*if (n < 0) {
       n = 0;
-    }
+    }*/
     animModel.clear();
-    System.out.println(n);
-    //animModel.addElement(worker.getAnimationName(n));
-    for (int i = 0; i < n; i++) {
+    for (int i = 0; i < (n + 1); i++) {
         animModel.add(i, worker.getAnimationName(i));
     }
     animList.setModel(animModel);
@@ -572,6 +639,14 @@ public class frame extends JFrame implements ListSelectionListener {
     }
     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);
   }
   }
 

Cube Control/makefile

@@ -1,14 +1,14 @@
 JAVAC = javac
 CC = gcc
-#TARGET = unix
-TARGET = win
+TARGET = unix
+#TARGET = win
 
 JAVAFILES = cubeWorker.java layerEditFrame.java frame.java
 
 ifeq ($(TARGET),win)
-CLASSES = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class AFrame.class Animation.class AnimationUtility.class LEDoff.png LEDon.png
+CLASSES = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class frame$$23.class frame$$24.class AFrame.class Animation.class AnimationUtility.class LEDoff.png LEDon.png
 else
-CLASSES = 'cubeWorker.class' 'layerEditFrame.class' 'layerEditFrame$$1.class' 'layerEditFrame$$2.class' 'layerEditFrame$$3.class' 'layerEditFrame$$4.class' 'frame.class' 'frame$$1.class' 'frame$$2.class' 'frame$$3.class' 'frame$$4.class' 'frame$$5.class' 'frame$$6.class' 'frame$$7.class' 'frame$$8.class' 'frame$$9.class' 'frame$$10.class' 'frame$$11.class' 'frame$$12.class' 'frame$$13.class' 'frame$$14.class' 'frame$$15.class' 'frame$$16.class' 'frame$$17.class' 'frame$$18.class' 'frame$$19.class' 'frame$$20.class' 'frame$$21.class' 'frame$$22.class' 'AFrame.class' 'Animation.class' 'AnimationUtility.class' 'LEDoff.png' 'LEDon.png'
+CLASSES = 'cubeWorker.class' 'layerEditFrame.class' 'layerEditFrame$$1.class' 'layerEditFrame$$2.class' 'layerEditFrame$$3.class' 'layerEditFrame$$4.class' 'frame.class' 'frame$$1.class' 'frame$$2.class' 'frame$$3.class' 'frame$$4.class' 'frame$$5.class' 'frame$$6.class' 'frame$$7.class' 'frame$$8.class' 'frame$$9.class' 'frame$$10.class' 'frame$$11.class' 'frame$$12.class' 'frame$$13.class' 'frame$$14.class' 'frame$$15.class' 'frame$$16.class' 'frame$$17.class' 'frame$$18.class' 'frame$$19.class' 'frame$$20.class' 'frame$$21.class' 'frame$$22.class' 'frame$$23.class' 'frame$$24.class' 'AFrame.class' 'Animation.class' 'AnimationUtility.class' 'LEDoff.png' 'LEDon.png'
 endif
 
 all: build clean