Added Frame functionality

Cube Control/cubeWorker.java

@@ -1,5 +1,5 @@
 /*
- * cube.c
+ * cubeWorker.java
  *
  * Copyright 2011 Thomas Buck <xythobuz@me.com>
  * Copyright 2011 Max Nuding <max.nuding@gmail.com>
@@ -43,10 +43,10 @@ public class cubeWorker {
     // Returns how many animations are defined
     public int numOfAnimations() {
 
-           return 0;
+           return 3;
     }
     
-    // Selects an animation, on wich the frame specific functions operate
+    // Selects an animation, on which the frame specific functions operate
     // Returns -1 if it does not exist
     public int selectAnimation(int index) {
 
@@ -55,7 +55,7 @@ public class cubeWorker {
     
     public String getAnimationName(int index) {
 
-           return "Test";
+           return "TestAnim";
     }
     
     public void setAnimationName(int index, String s) {
@@ -65,7 +65,7 @@ public class cubeWorker {
     // Returns how many frames are in the current animation
     public int numOfFrames() {
 
-           return 0;
+           return 3;
     }
     
     public String getFrameName(int index) {
@@ -131,12 +131,13 @@ public class cubeWorker {
     
     public String[] getSerialPorts() {
 
-           return null;
+           String[] sPorts = {"Select serial port..."};
+           return sPorts;
     }
     
     // Returns true if last saved state != current state
     public boolean changedStateSinceSave() {
 
-           return false;
+           return true;
     }
 }

Cube Control/frame.java

@@ -3,7 +3,7 @@ import java.awt.event.*;
 import javax.swing.*;
 
 /*
- * cube.c
+ * frame.java
  *
  * Copyright 2011 Thomas Buck <xythobuz@me.com>
  * Copyright 2011 Max Nuding <max.nuding@gmail.com>
@@ -28,6 +28,8 @@ import javax.swing.*;
 public class frame extends JFrame {
   // Anfang Variablen
   private Canvas cubeCanvas = new Canvas();
+
+  // Anfang Attribute
   private JButton editA = new JButton();
   private JButton editB = new JButton();
   private JButton editC = new JButton();
@@ -37,13 +39,15 @@ public class frame extends JFrame {
   private JButton editG = new JButton();
   private JButton editH = new JButton();
   private DefaultListModel frameListModel = new DefaultListModel();
-  private JList frameList = new JList(frameListModel);
+  private JList frameList = new JList();
+  private JScrollPane frameListScrollPane = new JScrollPane(frameList);
   private JButton frameUp = new JButton();
   private JButton frameDown = new JButton();
   private JButton frameAdd = new JButton();
   private JButton frameRemove = new JButton();
-  private DefaultListModel animationListModel = new DefaultListModel();
-  private JList jList2 = new JList(animationListModel);
+  private JList jList2 = new JList();
+  private DefaultListModel jList2Model = new DefaultListModel();
+  private JScrollPane jList2ScrollPane = new JScrollPane(jList2);
   private JButton animUp = new JButton();
   private JButton animDown = new JButton();
   private JButton animAdd = new JButton();
@@ -51,19 +55,19 @@ public class frame extends JFrame {
   private JTextField animPath = new JTextField();
   private JButton load = new JButton();
   private JButton save = new JButton();
-  private String[] jComboBox1Daten = {"Select serial port..."};
-  private JComboBox jComboBox1 = new JComboBox(jComboBox1Daten);
+  private JComboBox jComboBox1 = new JComboBox();
   private JButton upload = new JButton();
   private JButton download = new JButton();
   private JLabel jLabel4 = new JLabel();
   private JTextField frameRemaining = new JTextField();
-  
+  // Ende Attribute
+
   private cubeWorker worker = new cubeWorker();
   // Ende Variablen
 
   private int saveExitDialog() {
     String[] Optionen = {"Yes", "No"};
-    int Auswahl = JOptionPane.showOptionDialog(this, "Save?", "Yes/No", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, Optionen, Optionen[0]);
+    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;
@@ -72,16 +76,26 @@ public class frame extends JFrame {
     }
   }
 
+  private void errorMessage(String s) {
+	String[] Optionen = {"OK"};
+	JOptionPane.showOptionDialog(this, s, "Error!", JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE, null, Optionen, Optionen[0]);
+  }
+
   public frame(String title) {
     // Frame-Initialisierung
     super(title);
 
-    frameListModel.add(0, "Frame 1");
-    frameListModel.add(1, "Frame 2");
-    frameListModel.add(2, "Frame 3");
-    animationListModel.add(0, "Animation 1");
-    animationListModel.add(1, "Animation 2");
-    animationListModel.add(2, "Animation 3");
+    String[] sPorts = worker.getSerialPorts();
+    for(int i = 0; i < sPorts.length; i++){
+      jComboBox1.addItem(sPorts[i]);
+    }
+    
+    for(int i = 0; i < worker.numOfAnimations(); i++){
+      jList2Model.addElement(worker.getAnimationName(i));
+    }
+    for(int i = 0; i < worker.numOfFrames(); i++){
+      frameListModel.add(i, worker.getFrameName(i));
+    }
 
     addWindowListener(new WindowAdapter() {
       public void windowClosing(WindowEvent evt) {
@@ -91,8 +105,8 @@ public class frame extends JFrame {
              System.exit(0);
       }
     });
-    int frameWidth = 662;
-    int frameHeight = 416;
+    int frameWidth = 661; 
+    int frameHeight = 417;
     setSize(frameWidth, frameHeight);
     Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
     int x = (d.width - getSize().width) / 2;
@@ -107,242 +121,273 @@ public class frame extends JFrame {
     cp.add(cubeCanvas);
     editA.setBounds(264, 8, 107, 25);
     editA.setText("Layer A");
+    editA.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editA);
     editA.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editAActionPerformed(evt);
+        editA_ActionPerformed(evt);
       }
     });
 
     editB.setBounds(264, 40, 107, 25);
     editB.setText("Layer B");
+    editB.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editB);
     editB.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editBActionPerformed(evt);
+        editB_ActionPerformed(evt);
       }
     });
 
     editC.setBounds(264, 72, 107, 25);
     editC.setText("Layer C");
+    editC.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editC);
     editC.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editCActionPerformed(evt);
+        editC_ActionPerformed(evt);
       }
     });
 
     editD.setBounds(264, 104, 107, 25);
     editD.setText("Layer D");
+    editD.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editD);
     editD.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editDActionPerformed(evt);
+        editD_ActionPerformed(evt);
       }
     });
 
     editE.setBounds(264, 136, 107, 25);
     editE.setText("Layer E");
+    editE.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editE);
     editE.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editEActionPerformed(evt);
+        editE_ActionPerformed(evt);
       }
     });
 
     editF.setBounds(264, 168, 107, 25);
     editF.setText("Layer F");
+    editF.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editF);
     editF.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editFActionPerformed(evt);
+        editF_ActionPerformed(evt);
       }
     });
 
     editG.setBounds(264, 200, 107, 25);
     editG.setText("Layer G");
+    editG.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editG);
     editG.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editGActionPerformed(evt);
+        editG_ActionPerformed(evt);
       }
     });
 
     editH.setBounds(264, 232, 107, 25);
     editH.setText("Layer H");
+    editH.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(editH);
     editH.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        editHActionPerformed(evt);
+        editH_ActionPerformed(evt);
       }
     });
 
-    frameList.setBounds(384, 8, 145, 249);
-    cp.add(frameList);
+    frameListScrollPane.setBounds(384, 8, 145, 249);
+    frameList.setModel(frameListModel);
+    //frameListModel.addElement();
+    cp.add(frameListScrollPane);
     frameUp.setBounds(544, 8, 107, 33);
     frameUp.setText("Move up");
+    frameUp.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameUp);
     frameUp.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        frameUpActionPerformed(evt);
+        frameUp_ActionPerformed(evt);
       }
     });
 
     frameDown.setBounds(544, 152, 107, 33);
     frameDown.setText("Move down");
+    frameDown.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameDown);
     frameDown.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        frameDownActionPerformed(evt);
+        frameDown_ActionPerformed(evt);
       }
     });
 
     frameAdd.setBounds(544, 56, 107, 33);
     frameAdd.setText("Add");
+    frameAdd.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameAdd);
     frameAdd.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        frameAddActionPerformed(evt);
+        frameAdd_ActionPerformed(evt);
       }
     });
 
     frameRemove.setBounds(544, 104, 107, 33);
     frameRemove.setText("Remove");
+    frameRemove.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameRemove);
     frameRemove.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        frameRemoveActionPerformed(evt);
+        frameRemove_ActionPerformed(evt);
       }
     });
 
-    jList2.setBounds(8, 264, 209, 121);
-    cp.add(jList2);
+    jList2ScrollPane.setBounds(8, 264, 209, 121);
+    jList2.setModel(jList2Model);
+    //jList2Model.addElement("");
+    cp.add(jList2ScrollPane);
     animUp.setBounds(224, 264, 99, 25);
     animUp.setText("Move up");
+    animUp.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animUp);
     animUp.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        animUpActionPerformed(evt);
+        animUp_ActionPerformed(evt);
       }
     });
 
     animDown.setBounds(224, 360, 99, 25);
     animDown.setText("Move down");
+    animDown.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animDown);
     animDown.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        animDownActionPerformed(evt);
+        animDown_ActionPerformed(evt);
       }
     });
 
     animAdd.setBounds(224, 296, 99, 25);
     animAdd.setText("Add");
+    animAdd.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animAdd);
     animAdd.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        animAddActionPerformed(evt);
+        animAdd_ActionPerformed(evt);
       }
     });
 
     animRemove.setBounds(224, 328, 99, 25);
     animRemove.setText("Remove");
+    animRemove.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animRemove);
     animRemove.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        animRemoveActionPerformed(evt);
+        animRemove_ActionPerformed(evt);
       }
     });
 
     animPath.setBounds(344, 264, 305, 24);
     animPath.setEditable(false);
     animPath.setText("Load/Save an animation file...");
+    animPath.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(animPath);
     load.setBounds(344, 296, 147, 25);
     load.setText("Load");
+    load.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(load);
     load.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        loadActionPerformed(evt);
+        load_ActionPerformed(evt);
       }
     });
 
     save.setBounds(504, 296, 147, 25);
     save.setText("Save");
+    save.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(save);
     save.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        saveActionPerformed(evt);
+        save_ActionPerformed(evt);
       }
     });
 
     jComboBox1.setBounds(344, 328, 305, 24);
+    jComboBox1.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(jComboBox1);
     upload.setBounds(344, 360, 147, 25);
     upload.setText("Upload");
+    upload.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(upload);
     upload.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        uploadActionPerformed(evt);
+        upload_ActionPerformed(evt);
       }
     });
 
     download.setBounds(504, 360, 147, 25);
     download.setText("Download");
+    download.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(download);
     download.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
-        downloadActionPerformed(evt);
+        download_ActionPerformed(evt);
       }
     });
 
-    jLabel4.setBounds(536, 208, 111, 16);
+    jLabel4.setBounds(536, 208, 112, 20);
     jLabel4.setText("Frames remaining:");
-    jLabel4.setFont(new Font("MS Sans Serif", Font.PLAIN, 13));
+    jLabel4.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(jLabel4);
     frameRemaining.setBounds(536, 232, 113, 24);
     frameRemaining.setEditable(false);
     frameRemaining.setText("2048");
+    frameRemaining.setFont(new Font("Dialog", Font.PLAIN, 13));
     cp.add(frameRemaining);
+    jList2.setFont(new Font("Dialog", Font.PLAIN, 13));
+    frameList.setFont(new Font("Dialog", Font.PLAIN, 13));
     // Ende Komponenten
 
     setResizable(false);
     setVisible(true);
   }
 
+  // Anfang Methoden
+
   // Anfang Ereignisprozeduren
-  public void editAActionPerformed(ActionEvent evt) {
+  public void editA_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void editBActionPerformed(ActionEvent evt) {
+  public void editB_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void editCActionPerformed(ActionEvent evt) {
+  public void editC_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void editDActionPerformed(ActionEvent evt) {
+  public void editD_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void editEActionPerformed(ActionEvent evt) {
+  public void editE_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void editFActionPerformed(ActionEvent evt) {
+  public void editF_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void editGActionPerformed(ActionEvent evt) {
+  public void editG_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void editHActionPerformed(ActionEvent evt) {
+  public void editH_ActionPerformed(ActionEvent evt) {
 
   }
 
-  public void frameUpActionPerformed(ActionEvent evt) {
+  public void frameUp_ActionPerformed(ActionEvent evt) {
          int i = frameList.getSelectedIndex();
          if ((i > 0) && (frameListModel.getSize() >= 2)) {
             Object tmp = frameListModel.get(i);
@@ -352,7 +397,7 @@ public class frame extends JFrame {
          }
   }
 
-  public void frameDownActionPerformed(ActionEvent evt) {
+  public void frameDown_ActionPerformed(ActionEvent evt) {
          int i = frameList.getSelectedIndex();
          if ((i >= 0) && (frameListModel.getSize() >= 2) && (i < (frameListModel.getSize() - 1))) {
             Object tmp = frameListModel.get(i);
@@ -362,62 +407,67 @@ public class frame extends JFrame {
          }
   }
 
-  public void frameAddActionPerformed(ActionEvent evt) {
-
+  public void frameAdd_ActionPerformed(ActionEvent evt) {
+         worker.addFrame();
+         frameRemaining.setText(Integer.toString(worker.framesRemaining()));
   }
 
-  public void frameRemoveActionPerformed(ActionEvent evt) {
-
+  public void frameRemove_ActionPerformed(ActionEvent evt) {
+         worker.removeFrame(jList2.getSelectedIndex());
+         frameRemaining.setText(Integer.toString(worker.framesRemaining()));
   }
 
-  public void animUpActionPerformed(ActionEvent evt) {
+  public void animUp_ActionPerformed(ActionEvent evt) {
          int i = jList2.getSelectedIndex();
-         if ((i > 0) && (animationListModel.getSize() >= 2)) {
-            Object tmp = animationListModel.get(i);
-            animationListModel.set(i, animationListModel.get(i - 1));
-            animationListModel.set(i - 1, tmp);
+         if ((i > 0) && (jList2Model.getSize() >= 2)) {
+            Object tmp = jList2Model.get(i);
+            jList2Model.set(i, jList2Model.get(i - 1));
+            jList2Model.set(i - 1, tmp);
             jList2.setSelectedIndex(i - 1);
          }
   }
 
-  public void animDownActionPerformed(ActionEvent evt) {
+  public void animDown_ActionPerformed(ActionEvent evt) {
          int i = jList2.getSelectedIndex();
-         if ((i >= 0) && (animationListModel.getSize() >= 2) && (i < (animationListModel.getSize() - 1))) {
-            Object tmp = animationListModel.get(i);
-            animationListModel.set(i, animationListModel.get(i + 1));
-            animationListModel.set(i + 1, tmp);
+         if ((i >= 0) && (jList2Model.getSize() >= 2) && (i < (jList2Model.getSize() - 1))) {
+            Object tmp = jList2Model.get(i);
+            jList2Model.set(i, jList2Model.get(i + 1));
+            jList2Model.set(i + 1, tmp);
             jList2.setSelectedIndex(i + 1);
          }
   }
 
-  public void animAddActionPerformed(ActionEvent evt) {
+  public void animAdd_ActionPerformed(ActionEvent evt) {
+    if(worker.addAnimation() == -1){
+      //show error Dialog
+    }
 
   }
 
-  public void animRemoveActionPerformed(ActionEvent evt) {
-
+  public void animRemove_ActionPerformed(ActionEvent evt) {
+     worker.removeAnimation(jList2.getSelectedIndex());
   }
 
-  public void loadActionPerformed(ActionEvent evt) {
-
+  public void load_ActionPerformed(ActionEvent evt) {
+    worker.loadState(animPath.getText());
   }
 
-  public void saveActionPerformed(ActionEvent evt) {
-
+  public void save_ActionPerformed(ActionEvent evt) {
+    worker.saveState(animPath.getText());
   }
 
 
-  public void uploadActionPerformed(ActionEvent evt) {
+  public void upload_ActionPerformed(ActionEvent evt) {
          if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
-            JOptionPane.showMessageDialog(this, "No serial port selected...");
+            errorMessage("No serial port selected...");
          } else {
            worker.uploadState((String)jComboBox1.getSelectedItem());
          }
   }
 
-  public void downloadActionPerformed(ActionEvent evt) {
+  public void download_ActionPerformed(ActionEvent evt) {
          if (jComboBox1.getSelectedItem().equals("Select serial port...")) {
-            JOptionPane.showMessageDialog(this, "No serial port selected...");
+			errorMessage("No serial port selected...");
          } else {
            worker.downloadState((String)jComboBox1.getSelectedItem());
          }
@@ -428,5 +478,6 @@ public class frame extends JFrame {
   public static void main(String[] args) {
     new frame("Cube Control");
   }
+  // Ende Methoden
 }