Classnames changed

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

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import org.junit.Before;
 import org.junit.Test;
 
-public class praktikumHolonsTestClasses {
+public class PraktikumHolonsTestClasses {
 
 	@Test
 	public void testCategory() {

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);

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

@@ -199,15 +199,14 @@ public class AddObjectPopUp extends JDialog {
 					addElement.setActualCps(toEdit);
 					addElement.setVisible(true);
 					HolonElement hl = addElement.getElement();
-<<<<<<< HEAD
+					
 					if (hl != null) {
 						addElement(hl);
 					}
-=======
+
 					hl.setSav(givenCategory);
 					hl.setObj(objectName.getText());
 					addElement(hl);
->>>>>>> e31b286b827a2f60952b26ca6921853e95260ca5
 				}
 			});
 

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);