Skip to content
Snippets Groups Projects
Commit 6cdd481f authored by Lukas Ladenberger's avatar Lukas Ladenberger
Browse files

extended observer wizard context menu (add menu item)

parent 1dd15235
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 166 additions and 103 deletions
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java
+ 82
− 76
View file @ 6cdd481f
......@@ -23,6 +23,8 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
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";
public static final String IMG_ICON_DELETE_EDIT = "icon_delete_edit";
public static final String IMG_ICON_JPG = "icon_jpg";
public static final String IMG_ICON_GIF = "icon_gif";
......@@ -59,6 +61,10 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_connection16.gif");
BMotionStudioImage.registerImage(IMG_ICON_CONNECTION24,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_connection24.gif");
BMotionStudioImage.registerImage(IMG_ICON_NEW_WIZ, "org.eclipse.ui",
"$nl$/icons/full/etool16/new_wiz.gif");
BMotionStudioImage.registerImage(IMG_ICON_DELETE_EDIT,
"org.eclipse.ui", "$nl$/icons/full/etool16/delete_edit.gif");
BMotionStudioImage.registerImage(IMG_ICON_JPG,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_jpg.gif");
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionAbstractWizard.java
+ 7
− 6
View file @ 6cdd481f
......@@ -67,7 +67,8 @@ public abstract class BMotionAbstractWizard extends WizardDialog {
}
private Control createDeleteControl(Composite parent) {
return createDeleteImageButton(parent, BMotionStudioImage
return createDeleteImageButton(parent,
BMotionStudioImage
.getImage(EditorImageRegistry.IMG_ICON_DELETE21));
}
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/ObserverEvalObject.java
+ 1
− 0
View file @ 6cdd481f
......@@ -29,6 +29,7 @@ public class ObserverEvalObject extends BindingObject implements Cloneable {
private transient Boolean hasError;
public ObserverEvalObject() {
this.isExpressionMode = false;
}
public ObserverEvalObject(String type, String eval, Boolean isExpressionMode) {
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverAddItemAction.java 0 → 100644
+ 50
− 0
View file @ 6cdd481f
/**
* (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.observer.wizard;
import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import de.bmotionstudio.gef.editor.BMotionStudioImage;
public class WizardObserverAddItemAction extends Action {
private TableViewer viewer;
private Class<?> itemClass;
public WizardObserverAddItemAction(TableViewer viewer, Class<?> itemClass) {
this.viewer = viewer;
this.itemClass = itemClass;
setText("Add new item");
setImageDescriptor(BMotionStudioImage.getImageDescriptor(
"org.eclipse.ui", "$nl$/icons/full/etool16/new_wiz.gif"));
}
@Override
public void run() {
try {
IStructuredSelection sel = (IStructuredSelection) viewer
.getSelection();
Object firstElement = sel.getFirstElement();
WritableList list = (WritableList) viewer.getInput();
int indexOf = list.size();
if (firstElement != null)
indexOf = list.indexOf(firstElement) + 1;
Object newInstance = itemClass.newInstance();
list.add(indexOf, newInstance);
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverCSwitchCoordinates.java
+ 4
− 4
View file @ 6cdd481f
......@@ -67,8 +67,8 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
Composite container = new Composite(parent, SWT.NONE);
container.setLayout(new GridLayout(1, true));
tableViewer = WizardObserverUtil
.createObserverWizardTableViewer(container);
tableViewer = WizardObserverUtil.createObserverWizardTableViewer(
container, ToggleObjectCoordinates.class);
TableViewerColumn column = new TableViewerColumn(tableViewer,
SWT.NONE);
......@@ -149,7 +149,7 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
Button btRemove = new Button(comp, SWT.PUSH);
btRemove.setText("Remove");
btRemove.setImage(BMotionStudioImage
.getImage(EditorImageRegistry.IMG_ICON_DELETE));
.getImage(EditorImageRegistry.IMG_ICON_DELETE_EDIT));
btRemove.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
......@@ -165,7 +165,7 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
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) {
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverListenOperationByPredicate.java
+ 4
− 4
View file @ 6cdd481f
......@@ -78,8 +78,8 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard {
setControl(container);
tableViewer = WizardObserverUtil
.createObserverWizardTableViewer(container);
tableViewer = WizardObserverUtil.createObserverWizardTableViewer(
container, PredicateOperation.class);
TableViewerColumn column = new TableViewerColumn(tableViewer,
SWT.NONE);
......@@ -182,7 +182,7 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard {
Button btRemove = new Button(comp, SWT.PUSH);
btRemove.setText("Remove");
btRemove.setImage(BMotionStudioImage
.getImage(EditorImageRegistry.IMG_ICON_DELETE));
.getImage(EditorImageRegistry.IMG_ICON_DELETE_EDIT));
btRemove.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
......@@ -198,7 +198,7 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard {
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) {
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSetAttribute.java
+ 4
− 4
View file @ 6cdd481f
......@@ -85,8 +85,8 @@ public class WizardObserverSetAttribute extends ObserverWizard {
Composite container = new Composite(parent, SWT.NONE);
container.setLayout(gl);
tableViewer = WizardObserverUtil
.createObserverWizardTableViewer(container);
tableViewer = WizardObserverUtil.createObserverWizardTableViewer(
container, SetAttributeObject.class);
TableViewerColumn column = new TableViewerColumn(tableViewer,
SWT.NONE);
......@@ -136,7 +136,7 @@ public class WizardObserverSetAttribute extends ObserverWizard {
Button btRemove = new Button(comp, SWT.PUSH);
btRemove.setText("Remove");
btRemove.setImage(BMotionStudioImage
.getImage(EditorImageRegistry.IMG_ICON_DELETE));
.getImage(EditorImageRegistry.IMG_ICON_DELETE_EDIT));
btRemove.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
......@@ -155,7 +155,7 @@ public class WizardObserverSetAttribute extends ObserverWizard {
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) {
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchCoordinates.java
+ 4
− 4
View file @ 6cdd481f
......@@ -68,8 +68,8 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
Composite container = new Composite(parent, SWT.NONE);
container.setLayout(new GridLayout(1, true));
tableViewer = WizardObserverUtil
.createObserverWizardTableViewer(container);
tableViewer = WizardObserverUtil.createObserverWizardTableViewer(
container, ToggleObjectCoordinates.class);
TableViewerColumn column = new TableViewerColumn(tableViewer,
SWT.NONE);
......@@ -142,7 +142,7 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
Button btRemove = new Button(comp, SWT.PUSH);
btRemove.setText("Remove");
btRemove.setImage(BMotionStudioImage
.getImage(EditorImageRegistry.IMG_ICON_DELETE));
.getImage(EditorImageRegistry.IMG_ICON_DELETE_EDIT));
btRemove.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
......@@ -158,7 +158,7 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
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) {
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchImage.java
+ 6
− 4
View file @ 6cdd481f
......@@ -67,8 +67,8 @@ public class WizardObserverSwitchImage extends ObserverWizard {
Composite container = new Composite(parent, SWT.NONE);
container.setLayout(new GridLayout(1, true));
tableViewer = WizardObserverUtil
.createObserverWizardTableViewer(container);
tableViewer = WizardObserverUtil.createObserverWizardTableViewer(
container, ToggleObjectImage.class);
TableViewerColumn column = new TableViewerColumn(tableViewer,
SWT.NONE);
......@@ -131,8 +131,9 @@ public class WizardObserverSwitchImage extends ObserverWizard {
comp.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
Button btRemove = new Button(comp, SWT.PUSH);
btRemove.setText("Remove");
btRemove.setImage(BMotionStudioImage
.getImage(EditorImageRegistry.IMG_ICON_DELETE));
.getImage(EditorImageRegistry.IMG_ICON_DELETE_EDIT));
btRemove.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(final SelectionEvent e) {
......@@ -146,8 +147,9 @@ public class WizardObserverSwitchImage extends ObserverWizard {
});
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/util/WizardObserverUtil.java
+ 4
− 1
View file @ 6cdd481f
......@@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.TableItem;
import de.bmotionstudio.gef.editor.BMotionStudioSWTConstants;
import de.bmotionstudio.gef.editor.library.AttributeTransfer;
import de.bmotionstudio.gef.editor.observer.wizard.WizardObserverAddItemAction;
import de.bmotionstudio.gef.editor.observer.wizard.WizardObserverDeleteItemsAction;
import de.bmotionstudio.gef.editor.observer.wizard.WizardObserverDragListener;
import de.bmotionstudio.gef.editor.observer.wizard.WizardObserverDropListener;
......@@ -32,7 +33,8 @@ public class WizardObserverUtil {
return false;
}
public static TableViewer createObserverWizardTableViewer(Composite parent) {
public static TableViewer createObserverWizardTableViewer(Composite parent,
Class<?> itemClass) {
final TableViewer tableViewer = new TableViewer(parent, SWT.BORDER
| SWT.FULL_SELECTION | SWT.MULTI);
......@@ -53,6 +55,7 @@ public class WizardObserverUtil {
tableViewer.getControl().setMenu(
manager.createContextMenu(tableViewer.getControl()));
manager.add(new WizardObserverDeleteItemsAction(tableViewer));
manager.add(new WizardObserverAddItemAction(tableViewer, itemClass));
tableViewer.getTable().addListener(SWT.MouseDown, new Listener() {
public void handleEvent(Event event) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment