Merge branch 'Ohne_Drag_and_Drop' of

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

Conflicts:
	bin/ui/view/GUI$2.class
	bin/ui/view/GUI$3.class
	bin/ui/view/GUI$4.class
	bin/ui/view/GUI$5.class
	bin/ui/view/GUI$6.class
	bin/ui/view/GUI.class

src/ui/view/AddObjectPopUp.java

@@ -3,11 +3,14 @@ package ui.view;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FlowLayout;
+import java.awt.Image;
 import java.awt.event.*;
+import java.awt.image.ImageProducer;
 import java.io.*;
 import java.util.ArrayList;
 
 import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
@@ -47,6 +50,7 @@ public class AddObjectPopUp extends JDialog {
 	private File selectedFile = null;
 	private String filePath = " ";
 	private String givenCategory;
+	private JLabel lblImagePreview;
 
 	/**
 	 * Launch the application.
@@ -65,7 +69,7 @@ public class AddObjectPopUp extends JDialog {
 	 * Create the dialog.
 	 */
 	public AddObjectPopUp() {
-		setBounds(100, 100, 450, 300);
+		setBounds(100, 100, 450, 342);
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel, BorderLayout.CENTER);
@@ -75,18 +79,18 @@ public class AddObjectPopUp extends JDialog {
 		{
 			JLabel lblName = new JLabel("Name:");
 			lblName.setHorizontalAlignment(SwingConstants.CENTER);
-			lblName.setBounds(28, 11, 76, 14);
+			lblName.setBounds(28, 21, 76, 14);
 			contentPanel.add(lblName);
 		}
 		{
 			objectName = new JTextField();
-			objectName.setBounds(135, 8, 86, 20);
+			objectName.setBounds(98, 18, 172, 20);
 			contentPanel.add(objectName);
 			objectName.setColumns(10);
 		}
 		{
 			JButton btnBrowseImage = new JButton("Browse Image");
-			btnBrowseImage.setBounds(10, 50, 112, 23);
+			btnBrowseImage.setBounds(10, 75, 134, 23);
 			contentPanel.add(btnBrowseImage);
 			btnBrowseImage.addMouseListener(new MouseAdapter() {
 				public void mouseClicked(MouseEvent e) {
@@ -97,12 +101,12 @@ public class AddObjectPopUp extends JDialog {
 		}
 		{
 			sourcePath = new JTextField();
-			sourcePath.setBounds(135, 51, 271, 20);
+			sourcePath.setBounds(148, 77, 271, 20);
 			contentPanel.add(sourcePath);
 			sourcePath.setColumns(10);
 		}
 		{
-			JButton btnAddDefaultElement = new JButton("Add Default Element");
+			JButton btnAddDefaultElement = new JButton("Add Element");
 			btnAddDefaultElement.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
 					addElement = new AddElementPopUp();
@@ -112,28 +116,28 @@ public class AddObjectPopUp extends JDialog {
 				}
 			});
 
-			btnAddDefaultElement.setBounds(262, 95, 144, 23);
+			btnAddDefaultElement.setBounds(270, 144, 142, 23);
 			contentPanel.add(btnAddDefaultElement);
 		}
 		{
 			JScrollPane scrollPane = new JScrollPane();
-			scrollPane.setBounds(10, 84, 236, 133);
+			scrollPane.setBounds(10, 114, 236, 150);
 			contentPanel.add(scrollPane);
 			{
 
 				listModel = new DefaultListModel();
 				HolonElement hel = new HolonElement("Test", 100, 5);
 				String name = hel.getEleName();
-				for (int i = 0; i < 11; i++) {
+				/*for (int i = 0; i < 11; i++) {
 					hel.setEleName(name + i);
 					addElement(hel);
-				}
+				}*/
 				list = new JList(listModel);
 				scrollPane.setViewportView(list);
 			}
 		}
 		{
-			JButton btnNewButton = new JButton("Delete Default Element");
+			JButton btnNewButton = new JButton("Delete Element");
 			btnNewButton.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					int selectedIndex = list.getSelectedIndex();
@@ -143,9 +147,14 @@ public class AddObjectPopUp extends JDialog {
 					}
 				}
 			});
-			btnNewButton.setBounds(262, 129, 144, 23);
+			btnNewButton.setBounds(270, 182, 142, 27);
 			contentPanel.add(btnNewButton);
 		}
+		{
+			lblImagePreview = new JLabel("");
+			lblImagePreview.setBounds(295, 3, 50, 50);
+			contentPanel.add(lblImagePreview);
+		}
 
 		{
 			JPanel buttonPane = new JPanel();
@@ -182,6 +191,10 @@ public class AddObjectPopUp extends JDialog {
 				JButton cancelButton = new JButton("Cancel");
 				cancelButton.setActionCommand("Cancel");
 				buttonPane.add(cancelButton);
+				cancelButton.addActionListener(new ActionListener() {
+		            public void actionPerformed(ActionEvent e) {
+		                dispose();
+		            }});
 			}
 		}
 	}
@@ -201,6 +214,9 @@ public class AddObjectPopUp extends JDialog {
 			selectedFile = FileChooser.getSelectedFile();
 			filePath = selectedFile.getAbsolutePath();
 			sourcePath.setText(filePath);
+//			Image image = createImage((ImageProducer) selectedFile);
+			ImageIcon icon = new ImageIcon(new ImageIcon(filePath).getImage().getScaledInstance(50, 50, Image.SCALE_SMOOTH));
+			lblImagePreview.setIcon(icon);
 		} else {
 			System.out.println("Failed to Load");
 		}

src/ui/view/GUI.java

@@ -138,9 +138,9 @@ public class GUI implements CategoryListener {
 		menuBar.add(mnHelp);
 
 		// Table
-		String[] columnNames = { "Gadget", "Consumption", "Quantity" };
+		String[] columnNames = { "Gadget", "+/-", "Energy", "Quantity" };
 
-		Object[][] data = { { "TV", "20", "1" }, { "PC", "30", "2" }, { "Fridge", "40", "1" } };
+		Object[][] data = {};
 
 		canvas.setBackground(Color.WHITE);
 		canvas.setPreferredSize(new Dimension(10000, 10000));
@@ -228,6 +228,10 @@ public class GUI implements CategoryListener {
 						for (int i = 0; i < model.getObjectsOnCanvas().size(); i++) {
 							CpsObject temp = model.getObjectsOnCanvas().get(i);
 							String output = "Element: " + temp.getObjName() + " with ID: " + temp.getID();
+
+							if (temp.getClass() == HolonObject.class) {
+								output = output + " and Elements: " + ((HolonObject) temp).toStringElements();
+							}
 							System.out.println(output);
 						}
 						canvas.repaint();