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

Conflicts:
	src/ui/view/AddObjectPopUp.java

.project

@@ -10,14 +10,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>

src/exceptions/NewException1.java

@@ -0,0 +1,8 @@
+package exceptions;
+
+/**
+ * First Exception.
+ */
+public class NewException1 {
+
+}

src/exceptions/newException1.java

@@ -1,10 +0,0 @@
-package exceptions;
-
-/**
- * First Exception
- *
- */
-
-public class newException1 {
-
-}

src/tests/praktikumHolonsAdapter.java → src/tests/PraktikumHolonsAdapter.java

@@ -15,7 +15,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 
 
-public class praktikumHolonsAdapter {
+public class PraktikumHolonsAdapter {
 
 	
 	/**

src/tests/praktikumHolonsTestAutoSaveController.java → src/tests/PraktikumHolonsTestAutoSaveControlle.java

@@ -13,8 +13,8 @@ import ui.controller.StoreController;
 import ui.model.Model;
 import ui.model.IdCounter;
 
-public class praktikumHolonsTestAutoSaveController {
-	protected praktikumHolonsAdapter adapter;
+public class PraktikumHolonsTestAutoSaveControlle {
+	protected PraktikumHolonsAdapter adapter;
 	protected Model model;
 	protected MultiPurposeController mp;
 	protected CategoryController cg;
@@ -30,7 +30,7 @@ public class praktikumHolonsTestAutoSaveController {
 	 */
 	@Before
 	public void setUp() {
-		adapter = new praktikumHolonsAdapter();
+		adapter = new PraktikumHolonsAdapter();
 		model = new Model();
 		mp = new MultiPurposeController(model);
 		cg = new CategoryController(model, mp);

src/tests/praktikumHolonsTestCanvasController.java → src/tests/PraktikumHolonsTestCanvasController.java

@@ -15,9 +15,9 @@ import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.assertTrue;
 
-public class praktikumHolonsTestCanvasController {
+public class PraktikumHolonsTestCanvasController {
 
-	protected praktikumHolonsAdapter adapter;
+	protected PraktikumHolonsAdapter adapter;
 	protected Model model;
 	protected MultiPurposeController mp;
 	protected CategoryController cg;
@@ -28,7 +28,7 @@ public class praktikumHolonsTestCanvasController {
 	 */
 	@Before
 	public void setUp() {
-		adapter = new praktikumHolonsAdapter();
+		adapter = new PraktikumHolonsAdapter();
 		model = new Model();
 		mp = new MultiPurposeController(model);
 		cg = new CategoryController(model, mp);

src/tests/praktikumHolonsTestCategoryController.java → src/tests/PraktikumHolonsTestCategoryController.java

@@ -10,9 +10,9 @@ import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
 import ui.model.Model;
 
-public class praktikumHolonsTestCategoryController {
+public class PraktikumHolonsTestCategoryController {
 
-	protected praktikumHolonsAdapter adapter;
+	protected PraktikumHolonsAdapter adapter;
 	protected Model model;
 	protected MultiPurposeController mp;
 	protected CategoryController controller;
@@ -22,7 +22,7 @@ public class praktikumHolonsTestCategoryController {
 	 */
 	@Before
 	public void setUp() {
-		adapter = new praktikumHolonsAdapter();
+		adapter = new PraktikumHolonsAdapter();
 		model = new Model();
 		mp = new MultiPurposeController(model);
 		controller = new CategoryController(model, mp);

src/tests/praktikumHolonsTestClasses.java → src/tests/PraktikumHolonsTestClasses.java

@@ -3,12 +3,13 @@ package tests;
 import classes.*;
 import static org.junit.Assert.assertTrue;
 
+import java.awt.Color;
 import java.util.ArrayList;
 
 import org.junit.Before;
 import org.junit.Test;
 
-public class praktikumHolonsTestClasses {
+public class PraktikumHolonsTestClasses {
 
 	@Test
 	public void testCategory() {
@@ -17,7 +18,6 @@ public class praktikumHolonsTestClasses {
 		HolonObject obj1 = new HolonObject("Test Object");
 		ArrayList<AbstractCpsObject> arr = new ArrayList<>();
 
-		
 		assertTrue("Name not correct", test1.getName().equals("Test1"));
 		assertTrue("Name not correct", test2.getName().equals("Test2"));
 		assertTrue("Name should not be the same", !test1.getName().equals(test2.getName()));
@@ -34,17 +34,17 @@ public class praktikumHolonsTestClasses {
 		arr = test2.getObjects();
 		assertTrue("Shoud not be empty", !arr.isEmpty());
 	}
-	
+
 	@Test
 	public void testHolonObject() {
-		
+
 		HolonObject test1 = new HolonObject("Test1");
 		HolonObject test2 = new HolonObject("Test2");
 		HolonObject test3 = new HolonObject(test1);
 		HolonElement ele = new HolonElement("Element", 1, 10);
-		
+
 		ArrayList<HolonElement> arr = new ArrayList<>();
-		
+
 		assertTrue("Should be Empty", test1.getElements().isEmpty());
 		test1.setElements(arr);
 		assertTrue("Should be Empty", test1.getElements().isEmpty());
@@ -59,15 +59,74 @@ public class praktikumHolonsTestClasses {
 		String str = test2.toStringElements();
 		assertTrue("String not corrent", str.equals("Element, Element"));
 		test2.deleteElement(0);
-		assertTrue("Current Energy not corrent", test2.getCurrentEnergy() == 10);
-		
+		test2.addElements(ele);
+		assertTrue("Current Energy not corrent", test2.getCurrentEnergy() == 20);
+
 		assertTrue("Should be Empty", test3.getElements().isEmpty());
 		test3.setElements(test2.copyElements(test2.getElements()));
 		assertTrue("Should be Empty", !test3.getElements().isEmpty());
 		assertTrue("Should be state 0", test3.getState() == 0);
 		test3.setState(1);
+		assertTrue("Should be state 1", test3.getState() == 1);
+		test3.setState(2);
+		assertTrue("Should be state 2", test3.getState() == 2);
+		test3.setState(3);
+		assertTrue("Should be state 3", test3.getState() == 3);
+		test3.setState(4);
+		assertTrue("Should be state 4", test3.getState() == 4);
+		assertTrue("Element not Found", test3.searchElement("Element") != null);
+		test1.setElements(new ArrayList<>());
+		assertTrue("Not Empty", !test1.checkIfPartiallySupplied(1));
+		test3.addElements(new HolonElement("Element2", 1, -10));
+
+		assertTrue("Not Partially Supplied", test3.checkIfPartiallySupplied(1));
+		test3.addElements(new HolonElement("Element2", 2, -10));
+		assertTrue("Not Partially Supplied", test3.checkIfPartiallySupplied(1));
+		test1.addElements(new HolonElement("Element2", 2, -10));
+		assertTrue("minSupply < 0", !test1.checkIfPartiallySupplied(1));
+		Color color = test3.getColor();
+		test3.setColor(new Color(0, 255, 255));
+		assertTrue(color.getBlue() != test3.getColor().getBlue());
+	}
+
+	@Test
+	public void testHolonSwitch() {
+		HolonSwitch test1 = new HolonSwitch("Test1");
+		HolonSwitch test2 = new HolonSwitch(test1);
 		
+		assertTrue("Manuel Mode is on", !test2.getManualMode());
+		test2.switchState();
+		assertTrue(test2.getState());
+		assertTrue(test2.getState(1));
+		test2.setManualMode(true);
+		test2.switchState();
+		test2.switchState();
+		assertTrue(test2.getState());
+		assertTrue(test2.getState(1));
+		assertTrue("Manuel Mode is off", test2.getManualMode());
+		assertTrue("ManuelActive is off", test2.getActiveManual());
+		test2.switchState();
+		assertTrue("ManuelActive is on", !test2.getActiveManual());
+		test2.switchState();
+		assertTrue("ManuelActive is off", test2.getActiveManual());
+		assertTrue(test1.getGraphPoints() != test2.getGraphPoints());
+		test2.setGraphPoints(test1.getGraphPoints());
+		assertTrue(test1.getGraphPoints() == test2.getGraphPoints());
 	}
 	
+	@Test
+	public void testCpsEdge() {
+		CpsNode node1 = new CpsNode("Node1");
+		CpsNode node2 = new CpsNode("Node2");
+		CpsNode node3 = new CpsNode("Node3");
+		CpsEdge edge1 = new CpsEdge(node1, node2, 100);
+		CpsEdge edge2 = new CpsEdge(node2, node3);
+		
+	}
 	
+	@Test
+	public void testHolonElement() {
+		
+	}
+
 }

src/tests/praktikumHolonsTestGlobalController.java → src/tests/PraktikumHolonsTestGlobalController.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import ui.controller.GlobalController;
 import ui.model.Model;
 
-public class praktikumHolonsTestGlobalController {
+public class PraktikumHolonsTestGlobalController {
 
 	protected Model model;
 	protected GlobalController controller;

src/tests/praktikumHolonsTestLoadAndStoreController.java → src/tests/PraktikumHolonsTestLoadAndStoreController.java

@@ -38,9 +38,9 @@ import ui.model.Model;
 import ui.model.IdCounter;
 import ui.view.UnitGraph;
 
-public class praktikumHolonsTestLoadAndStoreController {
+public class PraktikumHolonsTestLoadAndStoreController {
 
-	protected praktikumHolonsAdapter adapter;
+	protected PraktikumHolonsAdapter adapter;
 	protected Model model;
 	protected MultiPurposeController mp;
 	protected CategoryController cg;
@@ -56,7 +56,7 @@ public class praktikumHolonsTestLoadAndStoreController {
 	 */
 	@Before
 	public void setUp() {
-		adapter = new praktikumHolonsAdapter();
+		adapter = new PraktikumHolonsAdapter();
 		model = new Model();
 		mp = new MultiPurposeController(model);
 		cg = new CategoryController(model, mp);
@@ -238,9 +238,9 @@ public class praktikumHolonsTestLoadAndStoreController {
 			assertTrue("Canvas File was not found", new File(path + "TestCanvasBasic.json").exists());
 			loadController.readJSON(path + "TestCanvasBasic.json");
 
-			assertTrue("NUmber of Objects on Canvas does not match", model.getObjectsOnCanvas().size() == 10);
+			assertTrue("NUmber of Objects on Canvas does not match", model.getObjectsOnCanvas().size() == 11);
 			for (AbstractCpsObject obj : model.getObjectsOnCanvas()) {
-				assertTrue("Not instance of HolonObject", obj instanceof HolonObject);
+				assertTrue("Not instance of HolonObject", obj instanceof HolonObject || obj instanceof HolonSwitch);
 
 			}
 			

src/tests/praktikumHolonsTestObjectController.java → src/tests/PraktikumHolonsTestObjectController.java

@@ -13,9 +13,9 @@ import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
 import ui.model.Model;
 
-public class praktikumHolonsTestObjectController {
+public class PraktikumHolonsTestObjectController {
 
-	protected praktikumHolonsAdapter adapter;
+	protected PraktikumHolonsAdapter adapter;
 	protected Model model;
 	protected MultiPurposeController mp;
 	protected CategoryController cg;
@@ -27,7 +27,7 @@ public class praktikumHolonsTestObjectController {
 	 */
 	@Before
 	public void setUp() {
-		adapter = new praktikumHolonsAdapter();
+		adapter = new PraktikumHolonsAdapter();
 		model = new Model();
 		mp = new MultiPurposeController(model);
 		cg = new CategoryController(model, mp);

src/tests/praktikumHolonsTestSuite.java → src/tests/PraktikumHolonsTestSuite.java

@@ -4,7 +4,7 @@ import junit.framework.JUnit4TestAdapter;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class praktikumHolonsTestSuite {
+public class PraktikumHolonsTestSuite {
 
 
 	/**
@@ -14,13 +14,13 @@ public class praktikumHolonsTestSuite {
 	 */
 	public static Test suite() {
 		TestSuite suite = new TestSuite("Tests for prakikum-holons");
-		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCategoryController.class));
-		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestCanvasController.class));
-		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestObjectController.class));
-		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestLoadAndStoreController.class));
-		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestGlobalController.class));
+		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestCategoryController.class));
+		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestCanvasController.class));
+		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestObjectController.class));
+		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestLoadAndStoreController.class));
+		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestGlobalController.class));
 //		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestAutoSaveController.class));
-		suite.addTest(new JUnit4TestAdapter(praktikumHolonsTestClasses.class));
+		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestClasses.class));
 		return suite;
 	}
 }

src/ui/view/AddObjectPopUp.java

@@ -1,436 +0,0 @@
-package ui.view;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.Image;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLDecoder;
-import java.security.CodeSource;
-import java.util.ArrayList;
-
-import javax.swing.DefaultListModel;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.filechooser.FileNameExtensionFilter;
-
-import classes.AbstractCpsObject;
-import classes.HolonElement;
-import classes.HolonObject;
-import ui.controller.Control;
-
-/**
- * Popup for adding a Holon Object to a Category.
- * 
- * @author Gruppe14
- */
-public class AddObjectPopUp extends JDialog {
-
-	private static final long serialVersionUID = 1L;
-	private final JPanel contentPanel = new JPanel();
-	private AddElementPopUp addElement;
-	private JTextField objectName;
-	private JTextField sourcePath;
-	private ArrayList<HolonElement> hElements;
-	private DefaultListModel listModel;
-	private JList list;
-	private String imagePath;
-	private HolonObject theObject;
-	private Control controller;
-	private File selectedFile = null;
-	private String filePath = " ";
-	private String givenCategory;
-	private JLabel lblImagePreview;
-	private AbstractCpsObject toEdit;
-	private boolean editState;
-	private boolean imageChanged = false;
-
-	/**
-	 * Launch the application.
-	 * 
-	 * @param args
-	 *            standard
-	 */
-	public static void main(String[] args) {
-		try {
-			AddObjectPopUp dialog = new AddObjectPopUp(false, null, null);
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 * 
-	 * @param edit
-	 *            true if edit
-	 * @param obj
-	 *            the object
-	 * @param cat
-	 *            the categorie
-	 */
-	public AddObjectPopUp(boolean edit, AbstractCpsObject obj, String cat) {
-		toEdit = obj;
-		editState = edit;
-		this.setIconImage(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
-				.getScaledInstance(30, 30, Image.SCALE_SMOOTH));
-		setBounds(100, 100, 450, 342);
-		getContentPane().setLayout(new BorderLayout());
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel, BorderLayout.CENTER);
-		contentPanel.setLayout(null);
-		hElements = new ArrayList<HolonElement>();
-		this.setTitle("Add Object Menu");
-		{
-			JLabel lblName = new JLabel("Name:");
-			lblName.setHorizontalAlignment(SwingConstants.CENTER);
-			lblName.setBounds(28, 21, 76, 14);
-			contentPanel.add(lblName);
-		}
-		{
-			objectName = new JTextField();
-			objectName.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) {
-					objectName.setBackground(Color.WHITE);
-				}
-			});
-			if (edit) {
-				objectName.setText(obj.getName());
-			}
-			objectName.setBounds(98, 18, 172, 20);
-			contentPanel.add(objectName);
-			objectName.setColumns(10);
-		}
-		{
-			JButton btnBrowseImage = new JButton("Browse Image");
-			btnBrowseImage.setBounds(10, 75, 134, 23);
-			contentPanel.add(btnBrowseImage);
-			btnBrowseImage.addMouseListener(new MouseAdapter() {
-				public void mouseClicked(MouseEvent e) {
-					fileChooser();
-				}
-			});
-
-		}
-		{
-			lblImagePreview = new JLabel("");
-			lblImagePreview.setBounds(295, 3, 50, 50);
-			contentPanel.add(lblImagePreview);
-		}
-		{
-			sourcePath = new JTextField();
-			sourcePath.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) {
-					sourcePath.setBackground(Color.WHITE);
-				}
-			});
-			if (edit) {
-				File checkPath = new File(obj.getImage());
-				if (checkPath.exists()) {
-					selectedFile = new File(obj.getImage());
-				} else {
-					selectedFile = new File(this.getClass().getResource(obj.getImage()).getFile());
-				}
-				filePath = selectedFile.getAbsolutePath();
-				sourcePath.setText(filePath);
-				ImageIcon icon = new ImageIcon(
-						new ImageIcon(filePath).getImage().getScaledInstance(50, 50, Image.SCALE_SMOOTH));
-				if (icon != null)
-					lblImagePreview.setIcon(icon);
-			}
-			sourcePath.setBounds(148, 77, 271, 20);
-			contentPanel.add(sourcePath);
-			sourcePath.setColumns(10);
-		}
-		{
-			JButton btnAddDefaultElement = new JButton("Add Element");
-			btnAddDefaultElement.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					addElement = new AddElementPopUp();
-					addElement.setActualCps(toEdit);
-					addElement.setVisible(true);
-					HolonElement hl = addElement.getElement();
-					hl.setSav(givenCategory);
-					hl.setObj(objectName.getText());
-					addElement(hl);
-				}
-			});
-
-			btnAddDefaultElement.setBounds(270, 144, 142, 23);
-			contentPanel.add(btnAddDefaultElement);
-		}
-		{
-			JScrollPane scrollPane = new JScrollPane();
-			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++) {
-				 * hel.setEleName(name + i); addElement(hel); }
-				 */
-				list = new JList(listModel);
-				scrollPane.setViewportView(list);
-			}
-		}
-		if (edit) {
-			for (HolonElement e : ((HolonObject) obj).getElements()) {
-				addElement(e);
-			}
-		}
-		{
-			JButton btnNewButton = new JButton("Delete Element");
-			btnNewButton.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					int selectedIndex = list.getSelectedIndex();
-					if (selectedIndex != -1) {
-						listModel.remove(selectedIndex);
-						hElements.remove(selectedIndex);
-					}
-				}
-			});
-			btnNewButton.setBounds(270, 182, 142, 27);
-			contentPanel.add(btnNewButton);
-		}
-
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				JButton okButton = new JButton("OK");
-				okButton.addMouseListener(new MouseAdapter() {
-					public void mouseClicked(MouseEvent e) {
-						Component frame = null;
-						if (objectName.getText().length() > 0) {
-							if (sourcePath.getText().equals(filePath)) {
-								imagePath = filePath;
-								if (imageChanged)
-									copieFile();
-								imageChanged = false;
-								// theObject = new
-								// HolonObject(objectName.getText());
-								// theObject.setElements(hElements);
-								// theObject.setImage(imagePath);
-								if (editState) {
-									controller.delObjectCategory(givenCategory, toEdit.getName());
-									controller.addObject(controller.searchCategory(givenCategory), objectName.getText(),
-											hElements, imagePath);
-								} else {
-									controller.addObject(controller.searchCategory(givenCategory), objectName.getText(),
-											hElements, imagePath);
-								}
-								// controller.addObjectCategory(controller.searchCategory(givenCategory),
-								// theObject);
-								//
-								// System.out.println(theObject.getImage());
-								System.out.println(givenCategory);
-								dispose();
-							} else {
-								sourcePath.setBackground(new Color(255, 50, 50));
-							}
-						} else {
-							objectName.setBackground(new Color(255, 50, 50));
-							if (!sourcePath.getText().equals(filePath))
-								sourcePath.setBackground(new Color(255, 50, 50));
-
-						}
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Cancel");
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						dispose();
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * adds a Holon Element.
-	 * 
-	 * @param hl
-	 *            the HolonElement
-	 */
-	public void addElement(HolonElement hl) {
-		hElements.add(hl);
-		listModel.addElement(hl.getAmount() + "x: " + hl.getEleName() + " " + hl.getEnergy() + "U");
-	}
-
-	/**
-	 * Choose the file.
-	 */
-	protected void fileChooser() {
-		// TODO Auto-generated method stub
-		JFileChooser fileChooser = new JFileChooser();
-		FileNameExtensionFilter filter = new FileNameExtensionFilter("png, jpg or jpeg", "png", "jpg", "jpeg");
-		fileChooser.setFileFilter(filter);
-		int returnValue = fileChooser.showOpenDialog(null);
-		if (returnValue == JFileChooser.APPROVE_OPTION) {
-			selectedFile = fileChooser.getSelectedFile();
-			filePath = selectedFile.getAbsolutePath();
-			sourcePath.setText(filePath);
-			ImageIcon icon = new ImageIcon(
-					new ImageIcon(filePath).getImage().getScaledInstance(50, 50, Image.SCALE_SMOOTH));
-			lblImagePreview.setIcon(icon);
-			imageChanged = true;
-		} else {
-			System.out.println("Failed to Load");
-		}
-
-	}
-
-	/**
-	 * Copies the File.
-	 */
-	protected void copieFile() {
-		InputStream inStream = null;
-		OutputStream outStream = null;
-		try {
-			File source = new File(filePath);
-			File dest = new File(System.getProperty("user.home") + "/HolonGUI/Images/");
-			dest.mkdirs();
-			dest = new File(dest, selectedFile.getName());
-			imagePath = "" + dest;
-
-			inStream = new FileInputStream(source);
-			outStream = new FileOutputStream(dest);
-			byte[] buffer = new byte[1024];
-
-			int length;
-			while ((length = inStream.read(buffer)) > 0) {
-				outStream.write(buffer, 0, length);
-			}
-
-			if (inStream != null)
-				inStream.close();
-			if (outStream != null)
-				outStream.close();
-			System.out.println("File Copied..");
-		} catch (IOException eex) {
-			eex.printStackTrace();
-		}
-	}
-
-	/**
-	 * Edit the Information.
-	 * 
-	 * @param obj
-	 *            the CpsObject
-	 */
-	public void editInformation(HolonObject obj) {
-		objectName.setText(obj.getName());
-	}
-
-	/**
-	 * Get Jar Containing Folder.
-	 * 
-	 * @param aclass
-	 *            aClass
-	 * @return String
-	 * @throws Exception
-	 *             Exception
-	 */
-	public static String getJarContainingFolder(Class aclass) throws Exception {
-		CodeSource codeSource = aclass.getProtectionDomain().getCodeSource();
-
-		File jarFile;
-
-		if (codeSource.getLocation() != null) {
-			jarFile = new File(codeSource.getLocation().toURI());
-		} else {
-			String path = aclass.getResource(aclass.getSimpleName() + ".class").getPath();
-			String jarFilePath = path.substring(path.indexOf(":") + 1, path.indexOf("!"));
-			jarFilePath = URLDecoder.decode(jarFilePath, "UTF-8");
-			jarFile = new File(jarFilePath);
-		}
-		return jarFile.getParentFile().getAbsolutePath();
-	}
-
-	/**
-	 * Return the Object.
-	 * 
-	 * @return the CpsObject
-	 */
-	public HolonObject getObject() {
-		return theObject;
-	}
-
-	/**
-	 * Sets the Controller.
-	 * 
-	 * @param controller the controller
-	 */
-	public void setController(Control controller) {
-		this.controller = controller;
-	}
-
-	/**
-	 * Set the Category.
-	 * 
-	 * @param cat the Category
-	 */
-	public void setCategory(String cat) {
-		givenCategory = cat;
-	}
-}

src/ui/view/Console.java

@@ -79,6 +79,7 @@ public class Console extends JScrollPane {
 
 		// MouseListener
 		consoleText.addMouseListener(new MouseAdapter() {
+			@SuppressWarnings("static-access")
 			@Override
 			public void mouseReleased(MouseEvent e) {
 				if (e.getButton() == e.BUTTON3) {

src/ui/view/EditEdgesPopUp.java

@@ -21,21 +21,29 @@ import ui.controller.Control;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 
-public class EditEdgesPopUp extends JDialog{
+/**
+ * Popup for Editing Edges.
+ * 
+ * @author Gruppe14
+ */
+public class EditEdgesPopUp extends JDialog {
+
+	private static final long serialVersionUID = 1L;
 	private final JPanel contentPanel = new JPanel();
-	private JTextField textField;
-	private final JButton btnOk = new JButton("OK");
 	private JTextField capacityField;
 	private float capacity;
 	private JRadioButton rdbtnChangeForAll;
 	private JRadioButton rdbtnChangeForNew;
-	private JRadioButton rdbtnChangeForAll_1;
+	private JRadioButton rdbtnChangeForAll1;
 	private Control controller;
 	private MyCanvas canvas;
 	private JLabel lblenterinfiniteFor;
-	
+
 	/**
 	 * Launch the application.
+	 * 
+	 * @param args
+	 *            standard
 	 */
 	public static void main(String[] args) {
 		try {
@@ -47,7 +55,10 @@ public class EditEdgesPopUp extends JDialog{
 			e.printStackTrace();
 		}
 	}
-	
+
+	/**
+	 * Constructor.
+	 */
 	public EditEdgesPopUp() {
 		super((java.awt.Frame) null, true);
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);
@@ -57,29 +68,29 @@ public class EditEdgesPopUp extends JDialog{
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel, BorderLayout.CENTER);
 		contentPanel.setLayout(null);
-		
+
 		JLabel lblMaximumCapacity = new JLabel("Maximum Capacity:");
 		lblMaximumCapacity.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		lblMaximumCapacity.setBounds(10, 11, 98, 14);
 		contentPanel.add(lblMaximumCapacity);
-		
+
 		capacityField = new JTextField();
 		capacityField.setBounds(107, 8, 120, 20);
 		contentPanel.add(capacityField);
 		capacityField.setColumns(10);
-		
+
 		rdbtnChangeForAll = new JRadioButton("Change for all existing Edges only");
 		rdbtnChangeForAll.setBounds(10, 39, 265, 23);
 		contentPanel.add(rdbtnChangeForAll);
-		
+
 		rdbtnChangeForNew = new JRadioButton("Change for new created Edges only");
 		rdbtnChangeForNew.setBounds(10, 65, 265, 23);
 		contentPanel.add(rdbtnChangeForNew);
-		
-		rdbtnChangeForAll_1 = new JRadioButton("Change for all existing and new created Edges");
-		rdbtnChangeForAll_1.setBounds(10, 95, 296, 23);
-		contentPanel.add(rdbtnChangeForAll_1);
-		
+
+		rdbtnChangeForAll1 = new JRadioButton("Change for all existing and new created Edges");
+		rdbtnChangeForAll1.setBounds(10, 95, 296, 23);
+		contentPanel.add(rdbtnChangeForAll1);
+
 		JButton btnCancel = new JButton("Cancel");
 		btnCancel.setActionCommand("Cancel");
 		btnCancel.addActionListener(new ActionListener() {
@@ -89,82 +100,113 @@ public class EditEdgesPopUp extends JDialog{
 		});
 		btnCancel.setBounds(285, 147, 89, 23);
 		contentPanel.add(btnCancel);
-		
-		JButton btnOk_1 = new JButton("OK");
-		btnOk_1.addActionListener(new ActionListener() {
+
+		JButton btnOk1 = new JButton("OK");
+		btnOk1.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				if(capacityField.getText().equals("infinite")){
+				if (capacityField.getText().equals("infinite")) {
 					capacity = -1;
-					if(rdbtnChangeForAll.isSelected()){
+					if (rdbtnChangeForAll.isSelected()) {
 						changeForExisting(capacity);
 						dispose();
-					}else if (rdbtnChangeForNew.isSelected()){
+					} else if (rdbtnChangeForNew.isSelected()) {
 						changeForNew(capacity);
 						dispose();
-					}else if(rdbtnChangeForAll_1.isSelected()){
+					} else if (rdbtnChangeForAll1.isSelected()) {
 						changeForExAndNew(capacity);
 						dispose();
-					}else{
-						JOptionPane.showMessageDialog(new JFrame(),
-								"Please select one of the options");
+					} else {
+						JOptionPane.showMessageDialog(new JFrame(), "Please select one of the options");
 					}
-				}else{
+				} else {
 					try {
 						capacity = Float.parseFloat(capacityField.getText().toString());
-						if(capacity < 0){
+						if (capacity < 0) {
 							throw new NumberFormatException();
 						}
-						if(rdbtnChangeForAll.isSelected()){
+						if (rdbtnChangeForAll.isSelected()) {
 							changeForExisting(capacity);
 							dispose();
-						}else if (rdbtnChangeForNew.isSelected()){
+						} else if (rdbtnChangeForNew.isSelected()) {
 							changeForNew(capacity);
 							dispose();
-						}else if(rdbtnChangeForAll_1.isSelected()){
+						} else if (rdbtnChangeForAll1.isSelected()) {
 							changeForExAndNew(capacity);
 							dispose();
-						}else{
-							JOptionPane.showMessageDialog(new JFrame(),
-									"Please select one of the options");
+						} else {
+							JOptionPane.showMessageDialog(new JFrame(), "Please select one of the options");
 						}
-					} catch (NumberFormatException e1) {
+					} catch (NumberFormatException eex) {
 						JOptionPane.showMessageDialog(new JFrame(),
-							"Please enter a number greater or equal 0 in the Field for Maximum Capacity");
+								"Please enter a number greater or equal 0 in the Field for Maximum Capacity");
 					}
-				}			}
+				}
+			}
 		});
-		btnOk_1.setBounds(186, 147, 89, 23);
-		contentPanel.add(btnOk_1);
+		btnOk1.setBounds(186, 147, 89, 23);
+		contentPanel.add(btnOk1);
 		this.setTitle("Edit Edge Capacities");
 		ButtonGroup bG = new ButtonGroup();
-		bG.add(rdbtnChangeForAll_1);
+		bG.add(rdbtnChangeForAll1);
 		bG.add(rdbtnChangeForNew);
 		bG.add(rdbtnChangeForAll);
-		
+
 		lblenterinfiniteFor = new JLabel("(enter \"infinite\" for infinite Capacity)");
 		lblenterinfiniteFor.setBounds(237, 11, 175, 14);
 		contentPanel.add(lblenterinfiniteFor);
 	}
-	
-	public void setCanvas(MyCanvas can){
+
+	/**
+	 * Set the Canvas.
+	 * 
+	 * @param can
+	 *            the Canvas
+	 */
+	public void setCanvas(MyCanvas can) {
 		canvas = can;
 	}
-	
-	public void setController(Control cont){
+
+	/**
+	 * set the Controller.
+	 * 
+	 * @param cont
+	 *            the Controller
+	 */
+	public void setController(Control cont) {
 		controller = cont;
 	}
-	
-	public void changeForNew(float cap){
+
+	/**
+	 * set edge capacity for new edges.
+	 * 
+	 * @param cap
+	 *            the capacity
+	 */
+	public void changeForNew(float cap) {
 		canvas.setEdgeCapacity(cap);
 	}
-	public void changeForExisting(float cap){
-		for(CpsEdge edge : controller.getModel().getEdgesOnCanvas()){
+
+	/**
+	 * Set Capacity for all existing Edges.
+	 * 
+	 * @param cap
+	 *            the Capacity
+	 */
+	public void changeForExisting(float cap) {
+		for (CpsEdge edge : controller.getModel().getEdgesOnCanvas()) {
 			edge.setCapacity(cap);
 		}
 		controller.calculateStateForCurrentTimeStep();
 		canvas.repaint();
 	}
-	public void changeForExAndNew(float cap){
+
+	/**
+	 * Set the Capacity for all existing and new edges.
+	 * 
+	 * @param cap
+	 *            the capacity
+	 */
+	public void changeForExAndNew(float cap) {
 		changeForNew(cap);
 		changeForExisting(cap);
 	}

src/ui/view/GUI.java

@@ -405,7 +405,7 @@ public class GUI<E> implements CategoryListener {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				searchPopUp dialog = new searchPopUp(controller, canvas);
+				SearchPopUp dialog = new SearchPopUp(controller, canvas);
 				dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 				dialog.setVisible(true);
 			}
@@ -490,7 +490,7 @@ public class GUI<E> implements CategoryListener {
 			public void actionPerformed(ActionEvent e) {
 				try {
 
-					searchPopUp dialog = new searchPopUp(controller, canvas);
+					SearchPopUp dialog = new SearchPopUp(controller, canvas);
 					dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 					dialog.setVisible(true);
 				} catch (Exception e1) {

src/ui/view/searchPopUp.java → src/ui/view/SearchPopUp.java

@@ -24,7 +24,7 @@ import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.awt.event.ActionEvent;
 
-public class searchPopUp extends JDialog {
+public class SearchPopUp extends JDialog {
 	private final JPanel contentPanel = new JPanel();
 	private JTextField replaceTextField;
 	private JTextField findTextField;
@@ -36,7 +36,7 @@ public class searchPopUp extends JDialog {
 	private JRadioButton rdbtnSingle;
 	private int idx;
 
-	searchPopUp(Control contr, MyCanvas can) {
+	SearchPopUp(Control contr, MyCanvas can) {
 		super((java.awt.Frame) null, true);
 		idx = -1;
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);