cleanup

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

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,69 +118,14 @@
       </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"/>
+         <meta.section type="apiInfo"/>
       </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
    </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>
@@ -204,15 +145,6 @@
       </documentation>
    </annotation>
 
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
    <annotation>
       <appInfo>
          <meta.section type="implementation"/>

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/OpenWebsiteHandler.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationEditorHandler.java → 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;
 

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/StartVisualizationFileHandler.java → 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;
 

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BButtonService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCheckboxService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BCompositeService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BConnectionService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BEllipseService.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BEllipseService.java

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

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BImageService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRadioButtonService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BRectangleService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableCellService.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableCellService.java

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

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableColumnService.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableColumnService.java

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

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTableService.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/BTableService.java

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

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/BTextfieldService.java → 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;

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/LightService.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/service/LightService.java

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

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/service/SignalService.java → 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;