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/view/GUI.java

@@ -648,6 +648,7 @@ public class GUI implements CategoryListener {
 		splitPane.setRightComponent(splitPane_1);
 		splitPane.setDividerLocation(200);
 		splitPane_1.setDividerLocation(500);
+		
 		splitPane.setLeftComponent(scrollPane_1);
 		splitPane_1.setLeftComponent(tabbedPane);
 		splitPane_1.setRightComponent(split_HolonEl_Pro);
@@ -658,6 +659,15 @@ public class GUI implements CategoryListener {
 		split_Graph_HolonEl.setTopComponent(scrollGraph);
 		split_Graph_HolonEl.setBottomComponent(scrollElements);
 
+		tabbedPane.setBorder(null);
+		scrollProperties.setBorder(null);
+		scrollGraph.setBorder(null);
+		scrollElements.setBorder(null);
+		splitPane.setBorder(null);
+		splitPane_1.setBorder(null);
+		split_HolonEl_Pro.setBorder(null);
+		split_Graph_HolonEl.setBorder(null);
+		
 		frmCyberPhysical.getContentPane().add(timePanel, BorderLayout.SOUTH);
 	}
 

src/ui/view/TimePanel.java

@@ -57,7 +57,7 @@ public class TimePanel extends JPanel {
 
 		// Time Slider. Panels and Buttons
 		this.setLayout(new BorderLayout(0, 0));
-
+		this.setBorder(null);
 		// Slider
 		timeSlider.setPaintTicks(true);
 		timeSlider.setPaintLabels(true);