Skip to content
Snippets Groups Projects
Commit 48129a0f authored by dgelessus's avatar dgelessus
Browse files

Merge branch 'develop'

parents 68c52b89 a7ffcebc
No related branches found
No related tags found
No related merge requests found
Pipeline #138810 passed
Showing
with 138 additions and 83 deletions
de.bmotionstudio.gef.editor/icons/icon_label.gif

582 B

de.bmotionstudio.gef.editor/icons/icon_list.gif

609 B

de.bmotionstudio.gef.editor/icons/icon_motion.gif

1017 B

de.bmotionstudio.gef.editor/icons/icon_motion_wiz.gif

1.09 KiB

de.bmotionstudio.gef.editor/icons/icon_screenshot.gif

613 B

de.bmotionstudio.gef.editor/icons/icon_table.gif

343 B

de.bmotionstudio.gef.editor/icons/icon_up.gif

309 B

de.bmotionstudio.gef.editor/icons/logo_b.gif

1.04 KiB

de.bmotionstudio.gef.editor/icons/logo_bmotion_32.png

3.81 KiB

......@@ -10,6 +10,21 @@
<extension-point id="de.bmotionstudio.gef.editor.observer" name="BMotion Studio Observer" schema="schema/de.bmotionstudio.gef.editor.observer.exsd"/>
<extension-point id="de.bmotionstudio.gef.editor.paletteEntry" name="Add a custom Palette Entry" schema="schema/de.bmotionstudio.gef.editor.paletteEntry.exsd"/>
<extension-point id="de.bmotionstudio.gef.editor.includeObserver" name="Include Observer Extension Point" schema="schema/de.bmotionstudio.gef.editor.includeObserver.exsd"/>
<extension
point="org.eclipse.ui.perspectives">
<perspective
class="de.bmotionstudio.gef.editor.internal.PerspectiveEditFactory"
icon="icons/logo_bmotion.png"
id="de.bmotionstudio.perspective.edit"
name="BMS Edit">
</perspective>
<perspective
class="de.bmotionstudio.gef.editor.internal.PerspectiveRunFactory"
icon="icons/icon_run.png"
id="de.bmotionstudio.perspective.run"
name="BMS Run">
</perspective>
</extension>
<extension
point="org.eclipse.ui.editors">
<editor
......@@ -56,19 +71,7 @@
<extension
point="org.eclipse.ui.menus">
<menuContribution
locationURI="menu:org.eclipse.ui.main.menu">
<menu
id="de.bmotionstudio.gef.editor.menu"
label="BMotion Studio">
<command
commandId="de.bmotionstudio.gef.editor.command.openBMotionStudioWebsite"
label="Open website"
style="push">
</command>
<separator
name="group.filter"
visible="true">
</separator>
locationURI="menu:org.eclipse.ui.run">
<command
commandId="de.bmotionstudio.command.startVisualizationFromEditor"
icon="icons/icon_run.png"
......@@ -84,7 +87,6 @@
</with>
</visibleWhen>
</command>
</menu>
</menuContribution>
<menuContribution
locationURI="toolbar:org.eclipse.ui.main.toolbar">
......@@ -107,14 +109,29 @@
</command>
</toolbar>
</menuContribution>
<menuContribution
locationURI="popup:fr.systerel.explorer.navigator.view">
<command
commandId="de.bmotionstudio.rodin.command.startVisualization"
icon="icons/icon_run.png"
label="Start Visualization"
style="push">
<visibleWhen>
<with
variable="selection">
<iterate
operator="or">
<instanceof
value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile">
</instanceof>
</iterate>
</with>
</visibleWhen>
</command>
</menuContribution>
</extension>
<extension
point="org.eclipse.ui.commands">
<command
defaultHandler="de.bmotionstudio.gef.editor.handler.OpenWebsiteHandler"
id="de.bmotionstudio.gef.editor.command.openBMotionStudioWebsite"
name="Open website">
</command>
<command
id="de.bmotionstudio.command.startVisualizationFromEditor"
name="Start Visualization from Editor">
......@@ -124,6 +141,11 @@
id="de.bmotionstudio.command.startVisualizationFromFile"
name="Start Visualization from File">
</command>
<command
defaultHandler="de.bmotionstudio.gef.editor.handler.StartEventBVisualizationHandler"
id="de.bmotionstudio.rodin.command.startVisualization"
name="Start Visualization">
</command>
</extension>
<extension
point="org.eclipse.ui.handlers">
......@@ -140,6 +162,61 @@
</enabledWhen>
</handler>
</extension>
<extension
point="org.eclipse.ui.navigator.navigatorContent">
<navigatorContent
contentProvider="de.bmotionstudio.gef.editor.internal.BMotionStudioContentProvider"
id="de.bmotionstudio.ui.navigatorContent"
labelProvider="de.bmotionstudio.gef.editor.internal.BMotionLabelProvider"
name="BMotion Studio Navigator Content"
priority="normal">
<triggerPoints>
<instanceof
value="org.eclipse.core.resources.IProject">
</instanceof>
</triggerPoints>
<possibleChildren>
<instanceof
value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile">
</instanceof>
</possibleChildren>
<actionProvider
class="de.bmotionstudio.gef.editor.action.BMotionStudioActionProvider"
id="de.bmotionstudio.ui.navigatorAction"
priority="normal">
<enablement>
<instanceof value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile">
</instanceof>
</enablement>
</actionProvider>
</navigatorContent>
</extension>
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
viewerId="fr.systerel.explorer.navigator.view">
<includes>
<contentExtension
pattern="de.bmotionstudio.ui.navigatorContent">
</contentExtension>
</includes>
</viewerContentBinding>
<viewerActionBinding
viewerId="fr.systerel.explorer.navigator.view">
<includes>
<actionExtension
pattern="de.bmotionstudio.ui.navigatorAction">
</actionExtension>
</includes>
</viewerActionBinding>
</extension>
<extension
point="org.rodinp.core.fileAssociations">
<fileAssociation
content-type-id="de.bmotionstudio.gef.editor.BMotionStudioFile"
root-element-type="de.bmotionstudio.gef.editor.BMotionStudioFile">
</fileAssociation>
</extension>
<extension
point="de.prob.core.animation">
<listener
......
......@@ -75,23 +75,19 @@ public class BMotionStudioContributor extends ActionBarContributor {
super.contributeToMenu(menuManager);
IContributionItem bMenu = menuManager
.find("de.bmotionstudio.gef.editor.menu");
if (bMenu != null) {
IMenuManager bmotionMenu = (IMenuManager) bMenu;
MenuManager viewMenu = new MenuManager("Editor");
IContributionItem editMenuContribution = menuManager.find("edit");
if (editMenuContribution != null) {
IMenuManager editMenu = (IMenuManager)editMenuContribution;
MenuManager viewMenu = new MenuManager("BMotion Studio", "de.bmotionstudio.gef.editor.menu");
viewMenu.add(getAction(GEFActionConstants.ZOOM_IN));
viewMenu.add(getAction(GEFActionConstants.ZOOM_OUT));
viewMenu.add(new Separator());
viewMenu.add(getAction(GEFActionConstants.TOGGLE_RULER_VISIBILITY));
viewMenu.add(getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY));
viewMenu.add(getAction(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY));
bmotionMenu
.insertAfter(
"de.bmotionstudio.gef.editor.command.openBMotionStudioWebsite",
viewMenu);
editMenu.insertAfter("additions", new Separator("de.bmotionstudio.gef.editor.group"));
editMenu.insertAfter("de.bmotionstudio.gef.editor.group", viewMenu);
}
}
......
......@@ -22,13 +22,9 @@ public class BMotionStudioImage {
private static ImageRegistry imageReg = new ImageRegistry();
private static boolean isInit = false;
public static final String IMG_LOGO_B = "logo_b";
public static final String IMG_LOGO_BMOTION = "logo_bmotion";
public static final String IMG_LOGO_BMOTION64 = "logo_bmotion64";
public static final String IMG_ICON_MOTION = "icon_motion";
public static final String IMG_ICON_MOTION_WIZ = "icon_motion_wiz";
public static ImageDescriptor getImageDescriptor(final String path) {
return getImageDescriptor(BMotionEditorPlugin.PLUGIN_ID, path);
}
......@@ -62,12 +58,8 @@ public class BMotionStudioImage {
}
private static void initializeImageRegistry() {
registerImage(IMG_LOGO_B, "icons/logo_b.gif");
registerImage(IMG_LOGO_BMOTION, "icons/logo_bmotion.png");
registerImage(IMG_LOGO_BMOTION64, "icons/logo_bmotion_64.png");
registerImage(IMG_ICON_MOTION, "icons/icon_motion.gif");
registerImage(IMG_ICON_MOTION_WIZ, "icons/icon_motion_wiz.gif");
registerBControlImages();
......
......@@ -12,15 +12,11 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
public static final String IMG_ICON_CHOP = "icon_chop";
public static final String IMG_ICON_DELETE = "icon_delete";
public static final String IMG_ICON_DELETE21 = "icon_delete21";
public static final String IMG_ICON_EDIT = "icon_edit";
public static final String IMG_ICON_CHECKED = "icon_checked";
public static final String IMG_ICON_UNCHECKED = "icon_unchecked";
public static final String IMG_ICON_OBSERVER = "icon_observer";
public static final String IMG_ICON_LOADING = "icon_loading";
public static final String IMG_ICON_LIBRARY = "icon_library";
public static final String IMG_ICON_ASCRIPT = "icon_ascript";
public static final String IMG_ICON_UP = "icon_up";
public static final String IMG_ICON_DOWN = "icon_down";
public static final String IMG_ICON_CONNECTION16 = "icon_connection16";
public static final String IMG_ICON_CONNECTION24 = "icon_connection24";
public static final String IMG_ICON_NEW_WIZ = "icon_new_wiz";
......@@ -48,18 +44,10 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_checked.gif");
BMotionStudioImage.registerImage(IMG_ICON_UNCHECKED,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_unchecked.gif");
BMotionStudioImage.registerImage(IMG_ICON_EDIT,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_edit.gif");
BMotionStudioImage.registerImage(IMG_ICON_LOADING,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_loading.gif");
BMotionStudioImage.registerImage(IMG_ICON_LIBRARY,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_library.gif");
BMotionStudioImage.registerImage(IMG_ICON_ASCRIPT,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_ascript.png");
BMotionStudioImage.registerImage(IMG_ICON_UP,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_up.gif");
BMotionStudioImage.registerImage(IMG_ICON_DOWN,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_down.gif");
BMotionStudioImage.registerImage(IMG_ICON_CONNECTION16,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_connection16.gif");
BMotionStudioImage.registerImage(IMG_ICON_CONNECTION24,
......
......@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
package de.bmotionstudio.rodin;
package de.bmotionstudio.gef.editor.action;
import java.util.ArrayList;
import java.util.Collection;
......@@ -30,6 +30,7 @@ import org.eclipse.ui.navigator.ICommonActionExtensionSite;
import org.eclipse.ui.part.FileEditorInput;
import de.bmotionstudio.gef.editor.BMotionEditorPlugin;
import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile;
public class ActionCollection {
......
......@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
package de.bmotionstudio.rodin;
package de.bmotionstudio.gef.editor.action;
import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IMenuManager;
......@@ -20,6 +20,7 @@ import org.eclipse.ui.navigator.ICommonActionExtensionSite;
import org.eclipse.ui.navigator.ICommonMenuConstants;
import de.bmotionstudio.gef.editor.BMotionEditorPlugin;
import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile;
public class BMotionStudioActionProvider extends CommonActionProvider {
......
......@@ -4,7 +4,7 @@
* This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
* */
package de.bmotionstudio.rodin;
package de.bmotionstudio.gef.editor.action;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
......
......@@ -7,9 +7,9 @@
package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TableViewer;
......@@ -47,13 +47,13 @@ public class IntEditingSupport extends ObservableValueEditingSupport {
@Override
protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) {
return SWTObservables.observeText(cellEditor.getControl(), SWT.Modify);
return WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl());
}
@Override
protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) {
return BeansObservables.observeValue(element, atr);
return BeanProperties.value(atr).observe(element);
}
@Override
......
......@@ -6,9 +6,9 @@
package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TableViewer;
......@@ -41,13 +41,13 @@ public class PredicateEditingSupport extends ObservableValueEditingSupport {
@Override
protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) {
return SWTObservables.observeText(cellEditor.getControl(), SWT.Modify);
return WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl());
}
@Override
protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) {
return BeansObservables.observeValue(element, property);
return BeanProperties.value(property).observe(element);
}
@Override
......
......@@ -7,9 +7,9 @@
package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnViewer;
......@@ -34,13 +34,13 @@ public class TextEditingSupport extends ObservableValueEditingSupport {
@Override
protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) {
return SWTObservables.observeText(cellEditor.getControl(), SWT.Modify);
return WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl());
}
@Override
protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) {
return BeansObservables.observeValue(element, property);
return BeanProperties.value(property).observe(element);
}
@Override
......
......@@ -7,9 +7,9 @@
package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnViewer;
......@@ -33,13 +33,13 @@ public class TypeEditingSupport extends ObservableValueEditingSupport {
@Override
protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) {
return SWTObservables.observeSelection(cellEditor.getControl());
return WidgetProperties.widgetSelection().observe(cellEditor.getControl());
}
@Override
protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) {
return BeansObservables.observeValue(element, propertyName);
return BeanProperties.value(propertyName).observe(element);
}
@Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment