Merge branch 'feature/observerview' into develop

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/SchedulerWizard.java

@@ -7,6 +7,7 @@
 package de.bmotionstudio.gef.editor.scheduler;
 
 import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Shell;
 
 import de.bmotionstudio.gef.editor.BMotionAbstractWizard;
 import de.bmotionstudio.gef.editor.model.BControl;
@@ -26,8 +27,9 @@ public abstract class SchedulerWizard extends BMotionAbstractWizard {
 
 	protected Boolean eventDelete = false;
 
-	public SchedulerWizard(BControl control, SchedulerEvent scheduler) {
-		super(control);
+	public SchedulerWizard(Shell shell, BControl control,
+			SchedulerEvent scheduler) {
+		super(shell, control);
 		this.event = scheduler;
 	}
 
@@ -35,21 +37,6 @@ public abstract class SchedulerWizard extends BMotionAbstractWizard {
 		return this.event;
 	}
 
-	protected abstract Boolean prepareToFinish();
-
-	@Override
-	public boolean performFinish() {
-		return prepareToFinish();
-	}
-
-	protected void setEventDelete(Boolean b) {
-		this.eventDelete = b;
-	}
-
-	public Boolean isEventDelete() {
-		return this.eventDelete;
-	}
-
 	public abstract Point getSize();
 
 	@Override

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/SchedulerObjectDialog.java

@@ -141,7 +141,7 @@ public class SchedulerObjectDialog extends Dialog {
 		Button btAdd = new Button(comp, SWT.PUSH);
 		btAdd.setText("Add");
 		btAdd.setImage(BMotionStudioImage
-				.getImage(EditorImageRegistry.IMG_ICON_ADD));
+				.getImage(EditorImageRegistry.IMG_ICON_NEW_WIZ));
 		btAdd.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(final SelectionEvent e) {

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteScheduler.java

@@ -19,7 +19,6 @@ import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -31,9 +30,9 @@ import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
-import de.bmotionstudio.gef.editor.BMotionAbstractWizard;
 import de.bmotionstudio.gef.editor.BMotionStudioImage;
 import de.bmotionstudio.gef.editor.EditorImageRegistry;
 import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
@@ -46,26 +45,18 @@ import de.bmotionstudio.gef.editor.util.BMotionWizardUtil;
 
 public class WizardExecuteScheduler extends SchedulerWizard {
 
-	private class SchedulerPage extends WizardPage {
-
 	private TableViewer tableViewer;
 	
-		protected SchedulerPage(String pageName) {
-			super(pageName);
-		}
-
-		public void createControl(final Composite parent) {
+	@Override
+	public Control createWizardContent(Composite parent) {
 		
 		DataBindingContext dbc = new DataBindingContext();
 
 		Composite container = new Composite(parent, SWT.NONE);
 		container.setLayout(new GridLayout(1, true));
 
-			setControl(container);
-
 		tableViewer = BMotionWizardUtil.createBMotionWizardTableViewer(
-					container, AnimationScriptObject.class,
-					((BMotionAbstractWizard) getWizard()).getName());
+				container, AnimationScriptObject.class, getName());
 
 		TableViewerColumn column = new TableViewerColumn(tableViewer,
 				SWT.NONE);
@@ -132,7 +123,7 @@ public class WizardExecuteScheduler extends SchedulerWizard {
 		Button btAdd = new Button(comp, SWT.PUSH);
 		btAdd.setText("Add");
 		btAdd.setImage(BMotionStudioImage
-					.getImage(EditorImageRegistry.IMG_ICON_ADD));
+				.getImage(EditorImageRegistry.IMG_ICON_NEW_WIZ));
 		btAdd.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -141,24 +132,24 @@ public class WizardExecuteScheduler extends SchedulerWizard {
 			}
 		});
 
-		}
-	}
-
-	public WizardExecuteScheduler(BControl bcontrol,
-			SchedulerEvent scheduler) {
-		super(bcontrol, scheduler);
-		addPage(new SchedulerPage("SchedulerPage"));
-	}
+		return container;
 
-	@Override
-	protected Boolean prepareToFinish() {
-		return true;
 	}
 		
-	@Override
-	public boolean performCancel() {
-		return true;
-	}
+	public WizardExecuteScheduler(Shell shell, BControl bcontrol,
+			SchedulerEvent scheduler) {
+		super(shell, bcontrol, scheduler);
+	}
+
+	// @Override
+	// protected Boolean prepareToFinish() {
+	// return true;
+	// }
+	//
+	// @Override
+	// public boolean performCancel() {
+	// return true;
+	// }
 
 	@Override
 	public Point getSize() {

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/util/BMotionWizardUtil.java

@@ -17,7 +17,6 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TableItem;
 
-import de.bmotionstudio.gef.editor.BMotionStudioSWTConstants;
 import de.bmotionstudio.gef.editor.action.BMotionWizardAddItemAction;
 import de.bmotionstudio.gef.editor.action.BMotionWizardDeleteItemsAction;
 import de.bmotionstudio.gef.editor.library.AttributeTransfer;
@@ -42,7 +41,7 @@ public class BMotionWizardUtil {
 		tableViewer.getTable().setLinesVisible(true);
 		tableViewer.getTable().setHeaderVisible(true);
 		tableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
-		tableViewer.getTable().setFont(BMotionStudioSWTConstants.fontArial10);
+		// tableViewer.getTable().setFont(BMotionStudioSWTConstants.fontArial10);
 		int operations = DND.DROP_COPY | DND.DROP_MOVE;
 		Transfer[] transferTypes = new Transfer[] { AttributeTransfer
 				.getInstance() };

de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java

@@ -11,6 +11,7 @@ import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
 import de.bmotionstudio.gef.editor.library.LibraryView;
+import de.bmotionstudio.gef.editor.observer.view.ObserverView;
 
 public class PerspectiveEditFactory implements IPerspectiveFactory {
 
@@ -37,6 +38,7 @@ public class PerspectiveEditFactory implements IPerspectiveFactory {
 				IPageLayout.BOTTOM, 0.75f, editorArea);
 		// Properties view
 		bottom.addView(IPageLayout.ID_PROP_SHEET);
+		bottom.addView(ObserverView.ID);
 
 	}