Merge branch 'develop' of github.com:bendisposto/prob into develop

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/AppContextMenuProvider.java

@@ -22,7 +22,7 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.actions.ActionFactory;
 
-import de.bmotionstudio.gef.editor.action.SchedulerEventAction;
+import de.bmotionstudio.gef.editor.action.OpenSchedulerEventAction;
 import de.bmotionstudio.gef.editor.model.BControl;
 import de.bmotionstudio.gef.editor.part.AppAbstractEditPart;
 import de.bmotionstudio.gef.editor.part.VisualizationPart;
@@ -233,7 +233,7 @@ public class AppContextMenuProvider extends ContextMenuProvider {
 
 				SchedulerEvent event = bcontrol.getEvent(eventIDs[0]);
 
-				SchedulerEventAction action = (SchedulerEventAction) getActionRegistry()
+				OpenSchedulerEventAction action = (OpenSchedulerEventAction) getActionRegistry()
 						.getAction(
 								"de.bmotionstudio.gef.editor.SchedulerEventAction."
 										+ event.getID());
@@ -264,7 +264,7 @@ public class AppContextMenuProvider extends ContextMenuProvider {
 
 							if (show) {
 
-								SchedulerEventAction action = (SchedulerEventAction) getActionRegistry()
+								OpenSchedulerEventAction action = (OpenSchedulerEventAction) getActionRegistry()
 										.getAction(
 												"de.bmotionstudio.gef.editor.SchedulerEventAction."
 														+ sClassName);

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/BMotionAbstractWizard.java

+/** 
+ * (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;
+
+import org.eclipse.jface.wizard.Wizard;
+
+import de.bmotionstudio.gef.editor.model.BControl;
+
+public abstract class BMotionAbstractWizard extends Wizard {
+
+	private BControl control;
+	
+	public BMotionAbstractWizard(BControl control) {
+		this.control = control;
+	}
+
+	@Override
+	public boolean performFinish() {
+		return prepareToFinish();
+	}
+	
+	public BControl getBControl() {
+		return this.control;
+	}
+
+	public abstract String getName();
+
+	protected abstract Boolean prepareToFinish();
+	
+}

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/BMotionStudioEditorPage.java

@@ -92,9 +92,9 @@ import org.eclipse.ui.views.properties.IPropertySheetPage;
 import com.thoughtworks.xstream.XStream;
 
 import de.bmotionstudio.gef.editor.action.CopyAction;
-import de.bmotionstudio.gef.editor.action.ObserverAction;
+import de.bmotionstudio.gef.editor.action.OpenObserverAction;
 import de.bmotionstudio.gef.editor.action.PasteAction;
-import de.bmotionstudio.gef.editor.action.SchedulerEventAction;
+import de.bmotionstudio.gef.editor.action.OpenSchedulerEventAction;
 import de.bmotionstudio.gef.editor.internal.BControlTransferDropTargetListener;
 import de.bmotionstudio.gef.editor.library.AttributeTransferDropTargetListener;
 import de.bmotionstudio.gef.editor.model.BMotionRuler;
@@ -355,10 +355,10 @@ public class BMotionStudioEditorPage extends GraphicalEditorWithFlyoutPalette {
 					String observerClassName = configurationElement
 							.getAttribute("class");
 
-					action = new ObserverAction(this);
+					action = new OpenObserverAction(this);
 					action.setId("de.bmotionstudio.gef.editor.observerAction."
 							+ observerClassName);
-					((ObserverAction) action).setClassName(observerClassName);
+					((OpenObserverAction) action).setClassName(observerClassName);
 					registry.registerAction(action);
 					getSelectionActions().add(
 							"de.bmotionstudio.gef.editor.observerAction."
@@ -390,10 +390,10 @@ public class BMotionStudioEditorPage extends GraphicalEditorWithFlyoutPalette {
 					String sClassName = configurationElement
 							.getAttribute("class");
 
-					action = new SchedulerEventAction(this);
+					action = new OpenSchedulerEventAction(this);
 					action.setId("de.bmotionstudio.gef.editor.SchedulerEventAction."
 							+ sClassName);
-					((SchedulerEventAction) action).setClassName(sClassName);
+					((OpenSchedulerEventAction) action).setClassName(sClassName);
 					registry.registerAction(action);
 					getSelectionActions().add(
 							"de.bmotionstudio.gef.editor.SchedulerEventAction."

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionAbstractWizard.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionAbstractWizardDialog.java

@@ -27,7 +27,7 @@ import org.eclipse.ui.IWorkbenchPart;
 import de.bmotionstudio.gef.editor.BMotionStudioImage;
 import de.bmotionstudio.gef.editor.EditorImageRegistry;
 
-public abstract class BMotionAbstractWizard extends WizardDialog {
+public abstract class BMotionAbstractWizardDialog extends WizardDialog {
 
 	public static final int DELETE = 3;
 
@@ -35,7 +35,7 @@ public abstract class BMotionAbstractWizard extends WizardDialog {
 
 	private String deleteToolTip;
 
-	public BMotionAbstractWizard(IWorkbenchPart workbenchPart, IWizard newWizard) {
+	public BMotionAbstractWizardDialog(IWorkbenchPart workbenchPart, IWizard newWizard) {
 		super(workbenchPart.getSite().getShell(), newWizard);
 		this.workbenchPart = workbenchPart;
 	}

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionObserverWizard.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionObserverWizardDialog.java

@@ -12,9 +12,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
 
-public class BMotionObserverWizard extends BMotionAbstractWizard {
+public class BMotionObserverWizardDialog extends BMotionAbstractWizardDialog {
 
-	public BMotionObserverWizard(IWorkbenchPart workbenchPart, IWizard newWizard) {
+	public BMotionObserverWizardDialog(IWorkbenchPart workbenchPart, IWizard newWizard) {
 		super(workbenchPart, newWizard);
 		setShellStyle(SWT.CLOSE);
 		setDeleteToolTip("Delete Observer");

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionSchedulerEventWizard.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionSchedulerEventWizardDialog.java

@@ -8,16 +8,18 @@ package de.bmotionstudio.gef.editor.action;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
 
 import de.bmotionstudio.gef.editor.scheduler.SchedulerWizard;
 
-public class BMotionSchedulerEventWizard extends BMotionAbstractWizard {
+public class BMotionSchedulerEventWizardDialog extends BMotionAbstractWizardDialog {
 
-	public BMotionSchedulerEventWizard(IWorkbenchPart workbenchPart,
+	public BMotionSchedulerEventWizardDialog(IWorkbenchPart workbenchPart,
 			IWizard newWizard) {
 		super(workbenchPart, newWizard);
+		setShellStyle(SWT.CLOSE);
 		setDeleteToolTip("Delete Event");
 	}
 

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverAddItemAction.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionWizardAddItemAction.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.observer.wizard;
+package de.bmotionstudio.gef.editor.action;
 
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.jface.action.Action;
@@ -13,12 +13,12 @@ import org.eclipse.jface.viewers.TableViewer;
 
 import de.bmotionstudio.gef.editor.BMotionStudioImage;
 
-public class WizardObserverAddItemAction extends Action {
+public class BMotionWizardAddItemAction extends Action {
 
 	private TableViewer viewer;
 	private Class<?> itemClass;
 
-	public WizardObserverAddItemAction(TableViewer viewer, Class<?> itemClass) {
+	public BMotionWizardAddItemAction(TableViewer viewer, Class<?> itemClass) {
 		this.viewer = viewer;
 		this.itemClass = itemClass;
 		setText("Add new item");

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverDeleteItemsAction.java → de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionWizardDeleteItemsAction.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.observer.wizard;
+package de.bmotionstudio.gef.editor.action;
 
 import java.util.Arrays;
 
@@ -17,11 +17,11 @@ import org.eclipse.swt.widgets.Display;
 
 import de.bmotionstudio.gef.editor.BMotionStudioImage;
 
-public class WizardObserverDeleteItemsAction extends Action {
+public class BMotionWizardDeleteItemsAction extends Action {
 
 	private TableViewer viewer;
 
-	public WizardObserverDeleteItemsAction(TableViewer viewer) {
+	public BMotionWizardDeleteItemsAction(TableViewer viewer) {
 		this.viewer = viewer;
 		setText("Delete selected items");
 		setImageDescriptor(BMotionStudioImage.getImageDescriptor(