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

fixed PROBPLUGIN-33

parent 331338e3
No related branches found
No related tags found
No related merge requests found
...@@ -98,13 +98,6 @@ public class SchedulerObjectDialog extends Dialog { ...@@ -98,13 +98,6 @@ public class SchedulerObjectDialog extends Dialog {
column.getColumn().setWidth(100); column.getColumn().setWidth(100);
column.setEditingSupport(new RandomModeEditingSupport(tableViewer)); column.setEditingSupport(new RandomModeEditingSupport(tableViewer));
// column = new TableViewerColumn(tableViewer, SWT.NONE);
// column.getColumn().setText("Callback");
// column.getColumn().setWidth(100);
// column
// .setEditingSupport(new ObserverCallbackEditingSupport(
// tableViewer));
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObservableMapLabelProvider( tableViewer.setLabelProvider(new ObservableMapLabelProvider(
...@@ -112,15 +105,6 @@ public class SchedulerObjectDialog extends Dialog { ...@@ -112,15 +105,6 @@ public class SchedulerObjectDialog extends Dialog {
contentProvider.getKnownElements(), new String[] { contentProvider.getKnownElements(), new String[] {
"command", "parameter", "maxrandom" })) { "command", "parameter", "maxrandom" })) {
@Override
public String getColumnText(final Object element,
final int columnIndex) {
// if (columnIndex == 2) {
// return "Edit";
// }
return super.getColumnText(element, columnIndex);
}
@Override @Override
public Image getColumnImage(final Object element, public Image getColumnImage(final Object element,
final int columnIndex) { final int columnIndex) {
...@@ -195,57 +179,6 @@ public class SchedulerObjectDialog extends Dialog { ...@@ -195,57 +179,6 @@ public class SchedulerObjectDialog extends Dialog {
return animationScriptObject; return animationScriptObject;
} }
// private class ObserverCallbackEditingSupport extends EditingSupport {
//
// public ObserverCallbackEditingSupport(ColumnViewer viewer) {
// super(viewer);
// }
//
// @Override
// protected boolean canEdit(Object element) {
// return true;
// }
//
// @Override
// protected CellEditor getCellEditor(Object element) {
// return new ObserverCallbackCellEditor((Composite) getViewer()
// .getControl(), (AnimationScriptStep) element);
// }
//
// @Override
// protected Object getValue(Object element) {
// return "Edit";
// }
//
// @Override
// protected void setValue(Object element, Object value) {
// }
//
// }
// private class ObserverCallbackCellEditor extends DialogCellEditor {
//
// private final AnimationScriptStep step;
//
// public ObserverCallbackCellEditor(final Composite parent,
// final AnimationScriptStep step) {
// super(parent);
// this.step = step;
// }
//
// @Override
// protected Object openDialogBox(final Control cellEditorWindow) {
// ObserverCallBackDialog dialog = new ObserverCallBackDialog(
// PlatformUI.getWorkbench().getActiveWorkbenchWindow()
// .getShell(), step, control);
// if (dialog.open() == Dialog.OK) {
// return getValue();
// }
// return null;
// }
//
// }
private static class RandomModeEditingSupport extends EditingSupport { private static class RandomModeEditingSupport extends EditingSupport {
private CellEditor cellEditor; private CellEditor cellEditor;
......
...@@ -196,6 +196,7 @@ public class WizardExecuteScheduler extends SchedulerWizard { ...@@ -196,6 +196,7 @@ public class WizardExecuteScheduler extends SchedulerWizard {
private class AnimationScriptDialogCellEditor extends DialogCellEditor { private class AnimationScriptDialogCellEditor extends DialogCellEditor {
private AnimationScriptObject animObj; private AnimationScriptObject animObj;
private AnimationScriptObject clonedObj;
public AnimationScriptDialogCellEditor(Composite parent, public AnimationScriptDialogCellEditor(Composite parent,
AnimationScriptObject animObj) { AnimationScriptObject animObj) {
...@@ -205,13 +206,27 @@ public class WizardExecuteScheduler extends SchedulerWizard { ...@@ -205,13 +206,27 @@ public class WizardExecuteScheduler extends SchedulerWizard {
@Override @Override
protected Object openDialogBox(Control cellEditorWindow) { protected Object openDialogBox(Control cellEditorWindow) {
SchedulerObjectDialog dialog = new SchedulerObjectDialog(
PlatformUI.getWorkbench().getActiveWorkbenchWindow() SchedulerObjectDialog dialog = new SchedulerObjectDialog(PlatformUI
.getShell(), getBControl(), animObj); .getWorkbench().getActiveWorkbenchWindow().getShell(),
if (dialog.open() == Dialog.OK) { getBControl(), animObj);
try {
clonedObj = animObj.clone();
} catch (CloneNotSupportedException e) {
// TODO return some error?!
return getValue(); return getValue();
} }
return null;
int status = dialog.open();
if (status == Dialog.OK) {
return animObj;
}
animObj.setSteps(clonedObj.getSteps());
return getValue();
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment