From f203f468f42dae3895ae8e26b9d918c4a39e9503 Mon Sep 17 00:00:00 2001
From: Lukas Ladenberger <lukas.ladenberger@googlemail.com>
Date: Tue, 11 Dec 2012 13:57:15 +0100
Subject: [PATCH] cleanup
---
de.bmotionstudio.gef.editor/plugin.xml | 69 ++++++++--------
.../de.bmotionstudio.gef.editor.control.exsd | 80 ++-----------------
.../OpenWebsiteHandler.java | 2 +-
.../StartVisualizationEditorHandler.java | 3 +-
.../StartVisualizationFileHandler.java | 3 +-
.../{ => model}/service/BButtonService.java | 2 +-
.../{ => model}/service/BCheckboxService.java | 2 +-
.../service/BCompositeService.java | 2 +-
.../service/BConnectionService.java | 2 +-
.../{ => model}/service/BEllipseService.java | 2 +-
.../{ => model}/service/BImageService.java | 2 +-
.../service/BRadioButtonService.java | 2 +-
.../service/BRectangleService.java | 2 +-
.../service/BTableCellService.java | 2 +-
.../service/BTableColumnService.java | 2 +-
.../{ => model}/service/BTableService.java | 2 +-
.../{ => model}/service/BTextService.java | 2 +-
.../service/BTextfieldService.java | 2 +-
.../{ => model}/service/LightService.java | 2 +-
.../{ => model}/service/SignalService.java | 2 +-
.../{ => model}/service/SwitchService.java | 2 +-
.../{ => model}/service/TankService.java | 2 +-
.../{ => model}/service/TrackNodeService.java | 2 +-
.../{ => model}/service/TrackService.java | 2 +-
.../gef/editor/util/FileUtil.java | 45 -----------
.../StartEventBVisualizationHandler.java | 2 +-
26 files changed, 64 insertions(+), 178 deletions(-)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{internal => handler}/OpenWebsiteHandler.java (93%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{internal => handler}/StartVisualizationEditorHandler.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{internal => handler}/StartVisualizationFileHandler.java (94%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BButtonService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BCheckboxService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BCompositeService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BConnectionService.java (94%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BEllipseService.java (95%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BImageService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BRadioButtonService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BRectangleService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BTableCellService.java (95%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BTableColumnService.java (95%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BTableService.java (93%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BTextService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/BTextfieldService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/LightService.java (93%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/SignalService.java (92%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/SwitchService.java (91%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/TankService.java (91%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/TrackNodeService.java (91%)
rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/{ => model}/service/TrackService.java (94%)
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/util/FileUtil.java
diff --git a/de.bmotionstudio.gef.editor/plugin.xml b/de.bmotionstudio.gef.editor/plugin.xml
index 3a5e5027..f7e7118b 100644
--- a/de.bmotionstudio.gef.editor/plugin.xml
+++ b/de.bmotionstudio.gef.editor/plugin.xml
@@ -120,7 +120,7 @@
<extension
point="org.eclipse.ui.commands">
<command
- defaultHandler="de.bmotionstudio.gef.editor.internal.OpenWebsiteHandler"
+ defaultHandler="de.bmotionstudio.gef.editor.handler.OpenWebsiteHandler"
id="de.bmotionstudio.gef.editor.command.openBMotionStudioWebsite"
name="Open website">
</command>
@@ -129,7 +129,7 @@
name="Start Visualization from Editor">
</command>
<command
- defaultHandler="de.bmotionstudio.gef.editor.internal.StartVisualizationFileHandler"
+ defaultHandler="de.bmotionstudio.gef.editor.handler.StartVisualizationFileHandler"
id="de.bmotionstudio.command.startVisualizationFromFile"
name="Start Visualization from File">
</command>
@@ -137,7 +137,7 @@
<extension
point="org.eclipse.ui.handlers">
<handler
- class="de.bmotionstudio.gef.editor.internal.StartVisualizationEditorHandler"
+ class="de.bmotionstudio.gef.editor.handler.StartVisualizationEditorHandler"
commandId="de.bmotionstudio.command.startVisualizationFromEditor">
<enabledWhen>
<with
@@ -166,6 +166,9 @@
<registerImages
class="de.bmotionstudio.gef.editor.EditorImageRegistry">
</registerImages>
+ <registerImages
+ class="de.bmotionstudio.gef.editor.ImageRegistry">
+ </registerImages>
</extension>
<extension
@@ -179,142 +182,142 @@
icon="icons/eclipse16/image_obj.gif"
id="de.bmotionstudio.gef.editor.image"
name="Image"
- service="de.bmotionstudio.gef.editor.service.BImageService">
+ service="de.bmotionstudio.gef.editor.model.service.BImageService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_button.gif"
id="de.bmotionstudio.gef.editor.button"
name="Button"
- service="de.bmotionstudio.gef.editor.service.BButtonService">
+ service="de.bmotionstudio.gef.editor.model.service.BButtonService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_radiobutton_c.gif"
id="de.bmotionstudio.gef.editor.radiobutton"
name="Radiobutton"
- service="de.bmotionstudio.gef.editor.service.BRadioButtonService">
+ service="de.bmotionstudio.gef.editor.model.service.BRadioButtonService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_checked.gif"
id="de.bmotionstudio.gef.editor.checkbox"
name="Checkbox"
- service="de.bmotionstudio.gef.editor.service.BCheckboxService">
+ service="de.bmotionstudio.gef.editor.model.service.BCheckboxService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/eclipse16/overview_obj.gif"
id="de.bmotionstudio.gef.editor.composite"
name="Composite"
- service="de.bmotionstudio.gef.editor.service.BCompositeService">
+ service="de.bmotionstudio.gef.editor.model.service.BCompositeService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_text.gif"
id="de.bmotionstudio.gef.editor.text"
name="Text"
- service="de.bmotionstudio.gef.editor.service.BTextService">
+ service="de.bmotionstudio.gef.editor.model.service.BTextService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_textfield.gif"
id="de.bmotionstudio.gef.editor.textfield"
name="Textfield"
- service="de.bmotionstudio.gef.editor.service.BTextfieldService">
+ service="de.bmotionstudio.gef.editor.model.service.BTextfieldService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_rectangle.gif"
id="de.bmotionstudio.gef.editor.rectangle"
name="Rectanlge"
- service="de.bmotionstudio.gef.editor.service.BRectangleService">
+ service="de.bmotionstudio.gef.editor.model.service.BRectangleService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_ellipse.gif"
id="de.bmotionstudio.gef.editor.ellipse"
name="Ellipse"
- service="de.bmotionstudio.gef.editor.service.BEllipseService">
+ service="de.bmotionstudio.gef.editor.model.service.BEllipseService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/icon_connection16.gif"
id="de.bmotionstudio.gef.editor.connection"
name="Connection"
- service="de.bmotionstudio.gef.editor.service.BConnectionService">
+ service="de.bmotionstudio.gef.editor.model.service.BConnectionService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/eclipse16/prop_ps.gif"
id="de.bmotionstudio.gef.editor.table"
name="Table"
- service="de.bmotionstudio.gef.editor.service.BTableService">
+ service="de.bmotionstudio.gef.editor.model.service.BTableService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/eclipse16/prop_ps2.gif"
id="de.bmotionstudio.gef.editor.tablecolumn"
name="Column"
- service="de.bmotionstudio.gef.editor.service.BTableColumnService">
+ service="de.bmotionstudio.gef.editor.model.service.BTableColumnService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.group.main"
icon="icons/eclipse16/prop_ps3.gif"
id="de.bmotionstudio.gef.editor.tablecell"
name="Cell"
- service="de.bmotionstudio.gef.editor.service.BTableCellService">
+ service="de.bmotionstudio.gef.editor.model.service.BTableCellService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.railway.group"
icon="icons/icon_signal.gif"
id="de.bmotionstudio.gef.editor.signal"
name="Signal"
- service="de.bmotionstudio.gef.editor.service.SignalService">
+ service="de.bmotionstudio.gef.editor.model.service.SignalService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.railway.group"
icon="icons/eclipse16/smartmode_co.gif"
id="de.bmotionstudio.gef.editor.light"
name="Light"
- service="de.bmotionstudio.gef.editor.service.LightService">
+ service="de.bmotionstudio.gef.editor.model.service.LightService">
</control>
+ <group
+ id="de.bmotionstudio.gef.editor.industry.group"
+ name="Industry">
+ </group>
<control
groupid="de.bmotionstudio.gef.editor.industry.group"
icon="icons/icon_tank.gif"
id="de.bmotionstudio.gef.editor.tank"
name="Tank"
- service="de.bmotionstudio.gef.editor.service.TankService">
+ service="de.bmotionstudio.gef.editor.model.service.TankService">
</control>
+ <group
+ id="de.bmotionstudio.gef.editor.railway.group"
+ name="Railway">
+ </group>
<control
groupid="de.bmotionstudio.gef.editor.railway.group"
icon="icons/icon_tracknode.gif"
id="de.bmotionstudio.gef.editor.tracknode"
name="Node"
- service="de.bmotionstudio.gef.editor.service.TrackNodeService">
+ service="de.bmotionstudio.gef.editor.model.service.TrackNodeService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.railway.group"
icon="icons/icon_track.gif"
id="de.bmotionstudio.gef.editor.track"
name="Trac"
- service="de.bmotionstudio.gef.editor.service.TrackService">
+ service="de.bmotionstudio.gef.editor.model.service.TrackService">
</control>
<control
groupid="de.bmotionstudio.gef.editor.railway.group"
icon="icons/icon_switch.gif"
id="de.bmotionstudio.gef.editor.switch"
name="Switch"
- service="de.bmotionstudio.gef.editor.service.SwitchService">
+ service="de.bmotionstudio.gef.editor.model.service.SwitchService">
</control>
- <group
- id="de.bmotionstudio.gef.editor.railway.group"
- name="Railway">
- </group>
- <group
- id="de.bmotionstudio.gef.editor.industry.group"
- name="Industry">
- </group>
</extension>
<extension
point="de.bmotionstudio.gef.editor.observer">
@@ -388,12 +391,6 @@
class="de.bmotionstudio.gef.editor.InstallMenu">
</menu>
</extension>
- <extension
- point="de.bmotionstudio.gef.editor.registerImages">
- <registerImages
- class="de.bmotionstudio.gef.editor.ImageRegistry">
- </registerImages>
- </extension>
<extension
point="de.bmotionstudio.gef.editor.language">
<language
diff --git a/de.bmotionstudio.gef.editor/schema/de.bmotionstudio.gef.editor.control.exsd b/de.bmotionstudio.gef.editor/schema/de.bmotionstudio.gef.editor.control.exsd
index ce1f1677..e35e7098 100644
--- a/de.bmotionstudio.gef.editor/schema/de.bmotionstudio.gef.editor.control.exsd
+++ b/de.bmotionstudio.gef.editor/schema/de.bmotionstudio.gef.editor.control.exsd
@@ -18,7 +18,6 @@
</annotation>
<complexType>
<sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="control" minOccurs="0" maxOccurs="1"/>
<element ref="group" minOccurs="0" maxOccurs="1"/>
<element ref="control" minOccurs="0" maxOccurs="1"/>
</sequence>
@@ -75,9 +74,6 @@
</appInfo>
</annotation>
<complexType>
- <sequence>
- <element ref="attributes" minOccurs="0" maxOccurs="1"/>
- </sequence>
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
@@ -122,94 +118,30 @@
</complexType>
</element>
- <element name="attribute-string">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The id of the referenced attribute. Since the same attribute could be assigned to different controls the corresponding attibute is defined in a seperate exention point (de.bmotionstudio.gef.editor.attribute).
- </documentation>
- </annotation>
- </attribute>
- <attribute name="default-value" type="string" use="required">
- <annotation>
- <documentation>
- The default value of this attribute for this control
- </documentation>
- </annotation>
- </attribute>
- <attribute name="editable" type="boolean" use="default" value="true">
- <annotation>
- <documentation>
- Boolean value - Option to decide whenever this attribute should be editable or not.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="show" type="boolean" use="default" value="true">
- <annotation>
- <documentation>
- Boolean value - Option to decide whenever this attribute should be displayed in the properties view.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="attribute-java">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="default-value" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":de.bmotionstudio.core.IGetDefaultValue"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="attributes">
- <complexType>
- <sequence>
- <element ref="attribute-java" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="attribute-string" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- </element>
-
<annotation>
<appInfo>
- <meta.section type="since"/>
+ <meta.section type="apiInfo"/>
</appInfo>
<documentation>
- [Enter the first release in which this extension point appears.]
+ [Enter API information here.]
</documentation>
</annotation>
<annotation>
<appInfo>
- <meta.section type="examples"/>
+ <meta.section type="since"/>
</appInfo>
<documentation>
- [Enter extension point usage example here.]
+ [Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
<appInfo>
- <meta.section type="apiInfo"/>
+ <meta.section type="examples"/>
</appInfo>
<documentation>
- [Enter API information here.]
+ [Enter extension point usage example here.]
</documentation>
</annotation>
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/OpenWebsiteHandler.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/OpenWebsiteHandler.java
similarity index 93%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/OpenWebsiteHandler.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/OpenWebsiteHandler.java
index 500bb85d..9122b15e 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/OpenWebsiteHandler.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/OpenWebsiteHandler.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.internal;
+package de.bmotionstudio.gef.editor.handler;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationEditorHandler.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartVisualizationEditorHandler.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationEditorHandler.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartVisualizationEditorHandler.java
index bda5ba1d..ebd89b02 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationEditorHandler.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartVisualizationEditorHandler.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.internal;
+package de.bmotionstudio.gef.editor.handler;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -19,6 +19,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
import de.bmotionstudio.gef.editor.BMotionEditorPlugin;
+import de.bmotionstudio.gef.editor.internal.VisualizationProgressBar;
import de.prob.core.Animator;
import de.prob.logging.Logger;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationFileHandler.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartVisualizationFileHandler.java
similarity index 94%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationFileHandler.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartVisualizationFileHandler.java
index 2c9964a2..945993e5 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationFileHandler.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartVisualizationFileHandler.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.internal;
+package de.bmotionstudio.gef.editor.handler;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -30,6 +30,7 @@ import org.eclipse.ui.part.FileEditorInput;
import de.bmotionstudio.gef.editor.BMotionEditorPlugin;
import de.bmotionstudio.gef.editor.BMotionStudioEditor;
+import de.bmotionstudio.gef.editor.internal.VisualizationProgressBar;
import de.prob.core.Animator;
import de.prob.logging.Logger;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BButtonService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BButtonService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BButtonService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BButtonService.java
index e0b5b38b..e7254978 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BButtonService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BButtonService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCheckboxService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BCheckboxService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCheckboxService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BCheckboxService.java
index dcaebcef..116a6e6c 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCheckboxService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BCheckboxService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCompositeService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BCompositeService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCompositeService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BCompositeService.java
index 4a11b1d1..c9a899bd 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCompositeService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BCompositeService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BConnectionService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BConnectionService.java
similarity index 94%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BConnectionService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BConnectionService.java
index 8c2c8e97..54fcc6bf 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BConnectionService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BConnectionService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.gef.palette.ConnectionCreationToolEntry;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BEllipseService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BEllipseService.java
similarity index 95%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BEllipseService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BEllipseService.java
index ffaf7f7d..12131e63 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BEllipseService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BEllipseService.java
@@ -1,4 +1,4 @@
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.AttributeConstants;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BImageService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BImageService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BImageService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BImageService.java
index e70769ac..c843bb52 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BImageService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BImageService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRadioButtonService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BRadioButtonService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRadioButtonService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BRadioButtonService.java
index ae4b4250..6092c7c7 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRadioButtonService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BRadioButtonService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRectangleService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BRectangleService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRectangleService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BRectangleService.java
index f29b430d..1c18ae9d 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRectangleService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BRectangleService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableCellService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableCellService.java
similarity index 95%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableCellService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableCellService.java
index 38c27cba..f9c21faf 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableCellService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableCellService.java
@@ -1,4 +1,4 @@
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableColumnService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableColumnService.java
similarity index 95%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableColumnService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableColumnService.java
index 6290adc3..893f8344 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableColumnService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableColumnService.java
@@ -1,4 +1,4 @@
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableService.java
similarity index 93%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableService.java
index 67da1a61..e54ddd5d 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableService.java
@@ -1,4 +1,4 @@
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTextService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTextService.java
index 77fcbaa3..6bf14bc4 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTextService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextfieldService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTextfieldService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextfieldService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTextfieldService.java
index 694879b1..1b66a40c 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextfieldService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTextfieldService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/LightService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/LightService.java
similarity index 93%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/LightService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/LightService.java
index 84b82155..71ebf592 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/LightService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/LightService.java
@@ -1,4 +1,4 @@
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/SignalService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/SignalService.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/SignalService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/SignalService.java
index fd0c914a..95dd51a6 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/SignalService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/SignalService.java
@@ -3,7 +3,7 @@
* Heinrich Heine Universitaet Duesseldorf
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/SwitchService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/SwitchService.java
similarity index 91%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/SwitchService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/SwitchService.java
index a4b441ea..bb4c4850 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/SwitchService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/SwitchService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TankService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TankService.java
similarity index 91%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TankService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TankService.java
index cc28f1ee..80c1a38c 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TankService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TankService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TrackNodeService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TrackNodeService.java
similarity index 91%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TrackNodeService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TrackNodeService.java
index d3b12c90..c01bcaa0 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TrackNodeService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TrackNodeService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import de.bmotionstudio.gef.editor.AbstractBControlService;
import de.bmotionstudio.gef.editor.IBControlService;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TrackService.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TrackService.java
similarity index 94%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TrackService.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TrackService.java
index 4b90a844..ccd22119 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/TrackService.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/TrackService.java
@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
-package de.bmotionstudio.gef.editor.service;
+package de.bmotionstudio.gef.editor.model.service;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.gef.palette.ConnectionCreationToolEntry;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/util/FileUtil.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/util/FileUtil.java
deleted file mode 100644
index f0087ca9..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/util/FileUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-
-public class FileUtil {
-
- /** Fast & simple file copy. */
- public static void copyFile(File source, File dest) throws IOException {
- FileChannel in = null, out = null;
- try {
- in = new FileInputStream(source).getChannel();
- out = new FileOutputStream(dest).getChannel();
-
- long size = in.size();
- MappedByteBuffer buf = in.map(FileChannel.MapMode.READ_ONLY, 0,
- size);
-
- out.write(buf);
- } finally {
- if (in != null)
- in.close();
- if (out != null)
- out.close();
- }
- }
-
- public static void deleteFile(File f) {
- // Attempt to delete it
- boolean success = f.delete();
- if (!success)
- throw new IllegalArgumentException("Delete: deletion failed");
- }
-
-}
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java b/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
index f591535b..b3598766 100644
--- a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
+++ b/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
@@ -10,7 +10,7 @@ import org.eclipse.core.commands.IHandler;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.viewers.IStructuredSelection;
-import de.bmotionstudio.gef.editor.internal.StartVisualizationFileHandler;
+import de.bmotionstudio.gef.editor.handler.StartVisualizationFileHandler;
/**
* @author Lukas Ladenberger
--
GitLab