Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop

# Conflicts:
#	src/ui/controller/Control.java

.gitignore

@@ -1 +1 @@
-/bin/
+bin/

src/ui/controller/Control.java

@@ -95,7 +95,11 @@ public class Control {
 		objectController.deleteElementInCanvas(id, element);
 	}
 
+<<<<<<< HEAD
 	public CpsObject searchByID(int ID) {
+=======
+	public CpsObject searchByID(int ID){
+>>>>>>> 9d32e63f53c4e733d9fe9afe6c64c2dd90d87428
 		return objectController.searchByID(ID);
 	}
 

src/ui/view/AddElementPopUp.java

@@ -1,6 +1,7 @@
 package ui.view;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.FlowLayout;
 import java.util.ArrayList;
 
@@ -18,6 +19,8 @@ import javax.swing.DefaultComboBoxModel;
 import classes.HolonElement;
 
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.awt.event.ActionEvent;
 
 public class AddElementPopUp extends JDialog {
@@ -67,6 +70,24 @@ public class AddElementPopUp extends JDialog {
 		contentPanel.add(lblAmount);
 		
 		elementName = new JTextField();
+		elementName.addKeyListener(new KeyListener() {
+			@Override
+			public void keyPressed(KeyEvent arg0) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void keyTyped(KeyEvent e) {
+				elementName.setBackground(Color.WHITE);
+			}
+		});
 		elementName.setBounds(140, 8, 110, 20);
 		contentPanel.add(elementName);
 		elementName.setColumns(10);
@@ -108,7 +129,8 @@ public class AddElementPopUp extends JDialog {
 								JOptionPane.showMessageDialog(new JFrame(),"Please enter numbers in the Fields amount and providedEnergy");
 							}
 						}else{
-							JOptionPane.showMessageDialog(new JFrame(), "Please enter a Name");
+							//JOptionPane.showMessageDialog(new JFrame(), "Please enter a Name");
+							elementName.setBackground(new Color(255, 50, 50));
 						}
 					}
 				});

src/ui/view/GUI.java

@@ -59,6 +59,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.awt.event.ActionEvent;
 import javax.swing.JSlider;
 import javax.swing.event.ChangeListener;
@@ -153,7 +155,7 @@ public class GUI implements CategoryListener {
 		menuBar.add(mnNewMenu_3);
 
 		mnNewMenu_3.add(splitPane_3);
-		
+
 		slider.setMinimum(15);
 		slider.setMaximum(115);
 		slider.addChangeListener(new ChangeListener() {
@@ -358,7 +360,36 @@ public class GUI implements CategoryListener {
 						tableModel.addRow(temp);
 					}
 				}
-				table.clearSelection();
+			}
+		});
+
+		table.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				try {
+
+					tempCps = controller.searchByID(model.getSelectedObjectID());
+					if (tempCps != null) {
+						System.out.println("change: " + tempCps.toString());
+						for (int r = 0; r < tableModel.getRowCount(); r++) {
+							ArrayList<Object> temp = new ArrayList<>();
+							for (int c = 0; c < tableModel.getColumnCount(); c++) {
+								temp.add(table.getValueAt(r, c));
+							}
+							char ch = (char) temp.get(1);
+							float fa = (float)temp.get(2);
+							int i = (int)temp.get(3);
+							((HolonObject) tempCps).getElements().get(r).setEleName((String) temp.get(0));
+							((HolonObject) tempCps).getElements().get(r).setSign(ch);
+							((HolonObject) tempCps).getElements().get(r).setEnergy(fa);
+							((HolonObject) tempCps).getElements().get(r).setAmount(i);
+							System.out.println(table.getRowCount() + " " + temp.get(0) + " " + ch + " "
+									+ fa + " " + i);
+						}
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
 		});