Commit 93cb901b authored by Simon Barner's avatar Simon Barner
Browse files

Add hint that an allocation with a task -> HW mapping is required to define task parameters.

refs 2562
parent 53226fad
...@@ -7,7 +7,7 @@ OutputPortToTaskOutputPortAllocationTableEditor.java 1080012e6dac5c5e4ea920a5df2 ...@@ -7,7 +7,7 @@ OutputPortToTaskOutputPortAllocationTableEditor.java 1080012e6dac5c5e4ea920a5df2
OutputPortToTaskOutputPortAllocationTableEditorBinding.java fc088c794bb2f19af949a83530485264827ea026 YELLOW OutputPortToTaskOutputPortAllocationTableEditorBinding.java fc088c794bb2f19af949a83530485264827ea026 YELLOW
TaskArchitectureEditor.java 4757a4f54a3ac85e33acb385d1565c917019531e YELLOW TaskArchitectureEditor.java 4757a4f54a3ac85e33acb385d1565c917019531e YELLOW
TaskArchitectureEditorBinding.java 4162f885df649b59e05f8358a995f0064eec9b6d YELLOW TaskArchitectureEditorBinding.java 4162f885df649b59e05f8358a995f0064eec9b6d YELLOW
TaskArchitectureTimingEditor.java f991f582dd1e4462a1a418c1ae08f3ab368cefb8 YELLOW TaskArchitectureTimingEditor.java 928f017e17908cb2cf3c11752be0593796284cb0 YELLOW
TaskArchitectureTimingEditorBinding.java 712e8e99b08bd23ed8284b0b26339088c5b01cd7 YELLOW TaskArchitectureTimingEditorBinding.java 712e8e99b08bd23ed8284b0b26339088c5b01cd7 YELLOW
TaskToExecutionUnitTableEditor.java 9d1a8c93749a54fbf0c85ae41731dad72214c94a YELLOW TaskToExecutionUnitTableEditor.java 9d1a8c93749a54fbf0c85ae41731dad72214c94a YELLOW
TaskToExecutionUnitTableEditorBinding.java 7ad6f28ac297dfe14c3105960e0f0b6752dffd7e YELLOW TaskToExecutionUnitTableEditorBinding.java 7ad6f28ac297dfe14c3105960e0f0b6752dffd7e YELLOW
......
...@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.EObject; ...@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.fortiss.af3.allocation.model.AllocationTable; import org.fortiss.af3.allocation.model.AllocationTable;
import org.fortiss.af3.allocation.model.AllocationTableCollection; import org.fortiss.af3.allocation.model.AllocationTableCollection;
import org.fortiss.af3.allocation.ui.editor.AllocationTableEditorGUI; import org.fortiss.af3.allocation.ui.editor.AllocationTableEditorGUI;
...@@ -72,7 +73,9 @@ public class TaskArchitectureTimingEditor extends ModelListenerEditorBase<TaskAr ...@@ -72,7 +73,9 @@ public class TaskArchitectureTimingEditor extends ModelListenerEditorBase<TaskAr
@Override @Override
public void dispose() { public void dispose() {
super.dispose(); super.dispose();
taskWcetTableEditor.dispose(); if(taskWcetTableEditor != null) {
taskWcetTableEditor.dispose();
}
} }
/** /**
...@@ -149,12 +152,17 @@ public class TaskArchitectureTimingEditor extends ModelListenerEditorBase<TaskAr ...@@ -149,12 +152,17 @@ public class TaskArchitectureTimingEditor extends ModelListenerEditorBase<TaskAr
setupModelSelectionComboBox(gui.getComboViewerAllocation(), setupModelSelectionComboBox(gui.getComboViewerAllocation(),
this::setWcetTableFromRootElement, this::getWcetTableRootElement); this::setWcetTableFromRootElement, this::getWcetTableRootElement);
taskWcetTableEditor = new TaskWcetTableEditor(getEditedObject()); if(!getTaskAllocationTableCollections().isEmpty()) {
taskWcetTableEditor.createPartControl(gui.getWcetTableComposite()); taskWcetTableEditor = new TaskWcetTableEditor(getEditedObject());
taskWcetTableEditor.createPartControl(gui.getWcetTableComposite());
final AllocationTableEditorGUI taskWcetTableEditorGui = taskWcetTableEditor.getGUI(); final AllocationTableEditorGUI taskWcetTableEditorGui = taskWcetTableEditor.getGUI();
taskWcetTableEditorGui.getComboViewerSource().getControl().setEnabled(false); taskWcetTableEditorGui.getComboViewerSource().getControl().setEnabled(false);
taskWcetTableEditorGui.getComboViewerTarget().getControl().setEnabled(false); taskWcetTableEditorGui.getComboViewerTarget().getControl().setEnabled(false);
} else {
Label label2 = new Label(gui.getWcetTableComposite(), SWT.NONE);
label2.setText("\n\n\n Please create an Allocation with a Task to Hardware mapping in order to define task parameters (and restart this editor).");
}
refresh(); refresh();
super.createPartControl(parent); super.createPartControl(parent);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment