Console removed

src/ui/controller/ConsoleController.java

@@ -1,63 +0,0 @@
-package ui.controller;
-
-import java.awt.Color;
-
-import ui.model.Model;
-
-/**
- * Controller for the Canvas.
- * 
- * @author Gruppe14
- */
-public class ConsoleController {
-
-	private Model model;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param model
-	 *            the Model
-	 */
-	public ConsoleController(Model model) {
-		this.model = model;
-	}
-
-	/**
-	 * Print Text on the console.
-	 *
-	 * @param text
-	 *            String the Text
-	 * @param color
-	 *            the color of the Text
-	 * @param p
-	 *            size of the Text
-	 * @param bold
-	 *            bold or not
-	 * @param italic
-	 *            italic or not
-	 * @param nl
-	 *            new line or not
-	 * 
-	 **/
-	public void addTextToConsole(String text, Color color, int p, boolean bold, boolean italic, boolean nl) {
-		model.getConsole().addText(text, color, p, bold, italic, nl);
-	}
-
-	/**
-	 * Print Text on the console in black and font size 12.
-	 *
-	 * @param text
-	 *            String the Text
-	 */
-	public void addTextToConsole(String text) {
-		model.getConsole().addText(text);
-	}
-
-	/**
-	 * Clears the console.
-	 */
-	public void clearConsole() {
-		model.getConsole().clearConsole();
-	}
-}

src/ui/controller/Control.java

@@ -34,7 +34,6 @@ import javax.swing.JFrame;
  */
 public class Control {
 
-    private final ConsoleController consoleController;
     private final MultiPurposeController multiPurposeController;
     private final CategoryController categoryController;
     private final ObjectController objectController;
@@ -74,7 +73,6 @@ public class Control {
                 nodeController, multiPurposeController);
         this.simulationManager = new SimulationManager(model);
         this.autoSaveController = new AutoSaveController(model);
-        this.consoleController = new ConsoleController(model);
         this.statsController = new StatsController(model);
         this.clipboardController = new ClipboardController(model, saveController, loadController, canvasController,
                 objectController, nodeController, multiPurposeController);
@@ -694,36 +692,7 @@ public class Control {
         return simulationManager;
     }
 
-    /**
-     * Getter for selected CpsObject.
-     *
-     * @param text   String the Text
-     * @param color  the color of the Text
-     * @param p      size of the Text
-     * @param bold   bold or not
-     * @param italic italic or not
-     * @param nl     new line or not
-     */
-    public void addTextToConsole(String text, Color color, int p, boolean bold, boolean italic, boolean nl) {
-        consoleController.addTextToConsole(text, color, p, bold, italic, nl);
-    }
-
-    /**
-     * Print Text on the console in black and font size 12.
-     *
-     * @param text String the Text
-     */
-    public void addTextToConsole(String text) {
-        consoleController.addTextToConsole(text);
-    }
-
-    /**
-     * Clears the console.
-     */
-    public void clearConsole() {
-        consoleController.clearConsole();
-    }
-
+  
     /**
      * Set the timerSpeed.
      *
@@ -1047,14 +1016,6 @@ public class Control {
         globalController.setIsSimRunning(isRunning);
     }
 
-    /**
-     * Sets showConsoleLog.
-     *
-     * @param showConsoleLog
-     */
-    public void setShowConsoleLog(boolean showConsoleLog) {
-        globalController.setShowConsoleLog(showConsoleLog);
-    }
 
     /**
      * Sets show

src/ui/model/Model.java

@@ -536,23 +536,6 @@ public class Model {
         this.clipboardObjects = c;
     }
 
-    /**
-     * Returns the Console.
-     *
-     * @return console the console
-     */
-    public Console getConsole() {
-        return console;
-    }
-
-    /**
-     * Sets the console.
-     *
-     * @param console the console
-     */
-    public void setConsole(Console console) {
-        this.console = console;
-    }
 
     /**
      * @return the maxCapacity

src/ui/view/AbstractCanvas.java

@@ -427,14 +427,7 @@ public abstract class AbstractCanvas extends JPanel {
 		}
 	}
 
-	void setConsoleTextAfterSelect(AbstractCpsObject cps) {
-		if (model.getShowConsoleLog()) {
-			controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
-			controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
-			controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-			controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
-		}
-	}
+
 
 	void setRightClickMenu(MouseEvent e) {
 		if (e.getButton() == MouseEvent.BUTTON3) {

src/ui/view/Console.java

@@ -24,7 +24,7 @@ import javax.swing.JPopupMenu;
  * 
  * @author Gruppe14
  * 
- */
+ */@Deprecated
 public class Console extends JScrollPane {
 
 	private static final long serialVersionUID = 1L;

src/ui/view/GUI.java

@@ -121,8 +121,6 @@ public class GUI implements CategoryListener {
 	private final JMenuItem mntmSplitView = new JMenuItem("Split View");
 	private final JSplitPane splitPane = new JSplitPane();
 	private final JSplitPane splitPane1 = new JSplitPane();
-	private final JSplitPane splitPaneCanvasConsole = new JSplitPane(
-			JSplitPane.VERTICAL_SPLIT);
 	// the tabbed canvas containing the different sub-net tabs of the grid (Main
 	// Grid + Nodes of Nodes)
 	
@@ -237,7 +235,6 @@ public class GUI implements CategoryListener {
 	private final JMenuItem germanBtn = new JMenuItem("DE");
 	private final JMenuItem czechBtn = new JMenuItem("CZ");
 	private final JMenuItem chineseBtn = new JMenuItem("ZH");
-	private final Console console = new Console();
 	private final MyCanvas canvas;
 	private final HolonCanvas holonCanvas;
 	private final UnitGraph unitGraph;
@@ -329,7 +326,6 @@ public class GUI implements CategoryListener {
 		control.initListener(this);
 		controller.setCanvas(canvas);
 		control.setGui(this);
-		model.setConsole(console);
 		model.setTableProperties(tableProperties);
 		algorithmMenu = new AlgorithmMenu(model, control, this);
 		initialize();
@@ -368,7 +364,7 @@ public class GUI implements CategoryListener {
 			public void windowClosing(java.awt.event.WindowEvent windowEvent) {
 				if (JOptionPane.showConfirmDialog(frmCyberPhysical,
 						Languages.getLanguage()[88],
-						"Cyber Physical Systems Model",
+						"HOLEG",
 						JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
 					controller.deleteDirectory(new File(System
 							.getProperty("user.home")
@@ -801,10 +797,7 @@ public class GUI implements CategoryListener {
 
 			tree.repaint();
 		});
-		mnNewMenuOptions.add(consoleLogCheckBox);
-		consoleLogCheckBox.setSelected(true);
-		consoleLogCheckBox.addActionListener(arg0 -> controller
-				.setShowConsoleLog(consoleLogCheckBox.isSelected()));
+
 
 		mnNewMenuOptions.add(useFlexibleDevicesCheckBox);
 		useFlexibleDevicesCheckBox.setSelected(true);
@@ -926,42 +919,31 @@ public class GUI implements CategoryListener {
 		// Split View
 		mntmSplitView
 				.addActionListener(actionEvent -> {
-					if (splitPaneCanvasConsole.getLeftComponent() instanceof JSplitPane) {
-						initSplit = true;
-						Component tempC = tabbedPaneSplit
-								.getSelectedComponent();
-						tabbedPaneOriginal.setComponentAt(
-								tabbedPaneSplit.getSelectedIndex(), tempC);
-						tabbedPaneSplit.removeAll();
-						splitPaneCanvasConsole
-								.setLeftComponent(tabbedPaneOriginal);
+					for (int i = 0; i < tabbedPaneOriginal.getTabCount(); i++) {
+						// add outer tabs
+						// (inner tabs are added by tabbedPaneSplit
+						// changelistener)
+						tabbedPaneSplit.addTab(
+								tabbedPaneOriginal.getTitleAt(i), null);
+					}
+					if (tabbedPaneOriginal.getSelectedComponent() == statScrollPane) {
+						tabbedPaneOriginal.setComponentAt(0, null);
+						tabbedPaneSplit.setComponentAt(0, canvasSP);
+						tabbedPaneSplit.setSelectedIndex(0);
 					} else {
-						for (int i = 0; i < tabbedPaneOriginal.getTabCount(); i++) {
-							// add outer tabs
-							// (inner tabs are added by tabbedPaneSplit
-							// changelistener)
-							tabbedPaneSplit.addTab(
-									tabbedPaneOriginal.getTitleAt(i), null);
-						}
-						if (tabbedPaneOriginal.getSelectedComponent() == statScrollPane) {
-							tabbedPaneOriginal.setComponentAt(0, null);
-							tabbedPaneSplit.setComponentAt(0, canvasSP);
-							tabbedPaneSplit.setSelectedIndex(0);
-						} else {
-							tabbedPaneOriginal.setComponentAt(1, null);
-							tabbedPaneSplit.setComponentAt(1, statScrollPane);
-							tabbedPaneSplit.setSelectedIndex(1);
-						}
-						tempSplit = new JSplitPane();
-						tempSplit.setBorder(null);
-						tempSplit.setRightComponent(tabbedPaneSplit);
-						tempSplit.setLeftComponent(tabbedPaneOriginal);
-						tempSplit.setDividerLocation(tabbedPaneOriginal
-								.getWidth() / 2);
-						tempSplit.setResizeWeight(0.9);
-						splitPaneCanvasConsole.setLeftComponent(tempSplit);
-						initSplit = false;
+						tabbedPaneOriginal.setComponentAt(1, null);
+						tabbedPaneSplit.setComponentAt(1, statScrollPane);
+						tabbedPaneSplit.setSelectedIndex(1);
 					}
+					tempSplit = new JSplitPane();
+					tempSplit.setBorder(null);
+					tempSplit.setRightComponent(tabbedPaneSplit);
+					tempSplit.setLeftComponent(tabbedPaneOriginal);
+					tempSplit.setDividerLocation(tabbedPaneOriginal
+							.getWidth() / 2);
+					tempSplit.setResizeWeight(0.9);
+					initSplit = false;
+				
 					contentPane.updateUI();
 				});
 		
@@ -2440,11 +2422,8 @@ public class GUI implements CategoryListener {
 		splitPane.setRightComponent(splitPane1);
 		splitPane.setDividerLocation(200);
 		splitPane1.setDividerLocation(500);
-		splitPaneCanvasConsole.setDividerLocation(550);
-		splitPaneCanvasConsole.setResizeWeight(0.9);
 
 		splitPane.setLeftComponent(scrollPane1);
-		splitPaneCanvasConsole.setLeftComponent(tabbedPaneOriginal);
 		tabbedPaneOriginal.addTab("View", tabbedPaneInnerOriginal);
 		
 		
@@ -2461,9 +2440,7 @@ public class GUI implements CategoryListener {
 		controller.setFlexiblePane(flexPane);
 		controller.getModel().getObjectListeners().add(flexPane);
 		tabbedPaneOriginal.addTab("Flexibility", flexPane);
-
-		splitPaneCanvasConsole.setRightComponent(console);
-		splitPane1.setLeftComponent(splitPaneCanvasConsole);
+		splitPane1.setLeftComponent(tabbedPaneOriginal);
 		splitPane1.setRightComponent(splitHolonElPro);
 
 		splitPane1.setResizeWeight(0.9);
@@ -2486,7 +2463,6 @@ public class GUI implements CategoryListener {
 		scrollElements.setBorder(null);
 		splitPane.setBorder(null);
 		splitPane1.setBorder(null);
-		splitPaneCanvasConsole.setBorder(null);
 		splitHolonElPro.setBorder(null);
 		splitGraphHolonEl.setBorder(null);
 		panelHolonEl.setBorder(null);
@@ -2496,10 +2472,7 @@ public class GUI implements CategoryListener {
 
 		frmCyberPhysical.getContentPane().add(timePanel, BorderLayout.SOUTH);
 
-		MouseAdapter focusCanvasAdapter = new FocusCanvasMouseAdapter();
-		model.getTableHolonElement().addMouseListener(focusCanvasAdapter);
-		tableProperties.addMouseListener(focusCanvasAdapter);
-		console.getConsoleText().addMouseListener(focusCanvasAdapter);
+
 
 		try {
 			controller.loadAutoSave(System.getProperty("user.home")

src/ui/view/MyCanvas.java

@@ -207,16 +207,6 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 						((HolonObject) o).updateTrackingInfo();
 					}
 				}
-				if (model.getShowConsoleLog()) {
-					controller.addTextToConsole("Tracking: ", Color.BLACK, 12,
-							false, false, false);
-					controller.addTextToConsole("" + o.getName(), Color.BLUE,
-							12, true, false, false);
-					controller.addTextToConsole(", ID:", Color.BLACK, 12,
-							false, false, false);
-					controller.addTextToConsole("" + o.getId(), Color.RED, 12,
-							true, false, true);
-				}
 			}
 		});
 
@@ -241,16 +231,6 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 				((HolonObject) o).setTrackingProd(new float[100]);
 				((HolonObject) o).setTrackingCons(new float[100]);
 			}
-			if (model.getShowConsoleLog()) {
-				controller.addTextToConsole("Untracking: ", Color.BLACK, 12,
-						false, false, false);
-				controller.addTextToConsole("" + o.getName(), Color.BLUE, 12,
-						true, false, false);
-				controller.addTextToConsole(", ID:", Color.BLACK, 12, false,
-						false, false);
-				controller.addTextToConsole("" + o.getId(), Color.RED, 12,
-						true, false, true);
-			}
 		}
 	}
 })		;
@@ -628,7 +608,6 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 					&& y - controller.getScale() <= cy && x >= cx && y >= cy) {
 				tempCps = cps;
 
-				setConsoleTextAfterSelect(cps);
 
 				dragging = true;
 

src/ui/view/StatisticGraph.java

@@ -564,7 +564,6 @@ public class StatisticGraph extends JPanel {
                     convertToCanvasY((set.getValues()[1] * (maximum / 3 * 2)) + (maximum / 6)));
         }
         for (int i = 0; i < model.getCurIteration(); i++) {
-            controller.addTextToConsole(set.getValues()[i] + "");
             if (set.getValues()[i + 1] != -1) {
                 path.lineTo((i + 1) * this.getWidth() / model.getIterations(),
                         convertToCanvasY((set.getValues()[i + 1] * (maximum / 3 * 2)) + (maximum / 6)));

src/ui/view/UpperNodeCanvas.java

@@ -210,12 +210,6 @@ public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, Mo
                         controller.addTrackingObj(o);
                         ((HolonObject) o).updateTrackingInfo();
                     }
-                    if (model.getShowConsoleLog()) {
-                        controller.addTextToConsole("Tracking: ", Color.BLACK, 12, false, false, false);
-                        controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
-                        controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-                        controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
-                    }
                 }
             }
         });
@@ -627,7 +621,6 @@ public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, Mo
                 if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
                     tempCps = cps;
 
-                    setConsoleTextAfterSelect(cps);
 
                     dragging = true;
                     if (e.isControlDown() && tempCps != null) {
@@ -667,13 +660,6 @@ public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, Mo
                         && x >= (upperNode.getLeftBorder() >> 1) - model.getScaleDiv2()
                         && y >= (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count)) {
                     tempCps = cps;
-                    if (model.getShowConsoleLog()) {
-                        controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
-                        controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
-                        controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-                        controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
-                        controller.setSelectedObjectID(tempCps.getId());
-                    }
                     // If drawing an Edge (CTRL down)
                     if (tempCps.getClass() == HolonObject.class) {
                         HolonObject tempObj = ((HolonObject) tempCps);

tests/tests/PraktikumHolonsTestConsoleController.java

@@ -1,42 +0,0 @@
-package tests;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import ui.controller.ConsoleController;
-import ui.model.Model;
-import ui.view.Console;
-
-import java.awt.Color;
-
-/**
- * Tests for the ConsoleController.
- * 
- * @author Gruppe14
- */
-public class PraktikumHolonsTestConsoleController {
-
-	protected Model model;
-	protected ConsoleController controller;
-
-	/**
-	 * Setup.
-	 */
-	@Before
-	public void setUp() {
-		model = new Model();
-		model.setConsole(new Console());
-		controller = new ConsoleController(model);
-	}
-
-	/**
-	 * Test for ConsoleController.
-	 */
-	@Test
-	public void testConsoleController() {
-		controller.addTextToConsole("Hello World");
-		controller.addTextToConsole("Hello World2!", new Color(255, 255, 255), 11, false, true, false);
-		controller.clearConsole();
-
-	}
-}

tests/tests/PraktikumHolonsTestSuite.java

@@ -25,7 +25,6 @@ public class PraktikumHolonsTestSuite {
 		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestLoadAndStoreController.class));
 		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestGlobalController.class));
 		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestAutoSaveController.class));
-		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestConsoleController.class));
 		suite.addTest(new JUnit4TestAdapter(PraktikumHolonsTestClasses.class));
 		return suite;
 	}