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

src/ui/controller/Control.java

@@ -100,6 +100,11 @@ public class Control {
 	public int getScaleDiv2(){
 		return globalController.getScaleDiv2();
 	}
+	
+	public void setScale(int s){
+		globalController.setScale(s);
+	}
+	
 	////////// etc
 	public void initListener(CategoryListener catLis) {
 		categoryController.addCategoryListener(catLis);

src/ui/controller/GlobalController.java

@@ -27,5 +27,14 @@ public class GlobalController {
 	public int getScaleDiv2(){
 		return MODEL.getScaleDiv2();
 	}
+	
+	/**
+	 * Changes the value of SCALE and SCALEDIV2
+	 * 
+	 * @param int Scale
+	 */
+	public void setScale(int s){
+		MODEL.setScale(s);
+	}
 
 }

src/ui/model/Model.java

@@ -168,5 +168,10 @@ public class Model {
 	public int getScaleDiv2(){
 		return SCALE_DIV2;
 	}
+	
+	public void setScale(int s){
+		SCALE = s;
+		SCALE_DIV2 = SCALE/2;
+	}
 
 }

src/ui/view/GUI.java

@@ -60,6 +60,10 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
 import java.awt.event.ActionEvent;
+import javax.swing.JSlider;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.SwingConstants;
 
 public class GUI implements CategoryListener {
 
@@ -106,6 +110,9 @@ public class GUI implements CategoryListener {
 	private CpsObject tempCps = null;
 
 	private MyCanvas canvas;
+	private final JSplitPane splitPane_3 = new JSplitPane();
+	private final JSlider slider = new JSlider();
+	private final JLabel lblImageSize = new JLabel("Image Size");
 
 	/**
 	 * Create the application.
@@ -145,6 +152,23 @@ public class GUI implements CategoryListener {
 
 		menuBar.add(mnNewMenu_3);
 
+		mnNewMenu_3.add(splitPane_3);
+		
+		slider.setMinimum(15);
+		slider.setMaximum(115);
+		slider.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				controller.setScale(slider.getValue());
+				updateCategories(model.getCategories());
+				canvas.objectSelectionHighlighting();
+				canvas.repaint();
+			}
+		});
+		splitPane_3.setRightComponent(slider);
+
+		splitPane_3.setLeftComponent(lblImageSize);
+
 		menuBar.add(mnHelp);
 
 		canvas.setBackground(Color.WHITE);

src/ui/view/MyCanvas.java

@@ -141,10 +141,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			System.out.println("trans double click");
 			if (tempCps.getImage().compareTo("/Images/switch-on.png") == 0) {
 				tempCps.setImage("/Images/switch-off.png");
-				System.out.println("off");
 			} else {
 				tempCps.setImage("/Images/switch-on.png");
-				System.out.println("on");
 			}
 		}
 		repaint();
@@ -276,7 +274,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	/**
 	 * Sets the Highlighting of the Selected Object
 	 */
-	private void objectSelectionHighlighting() {
+	public void objectSelectionHighlighting() {
 		if (tempCps != null) {
 			selectRect.setBounds(tempCps.getPosition().x - (controller.getScale() / 20),
 					tempCps.getPosition().y - (controller.getScale() / 20),