Skip to content
Snippets Groups Projects
Commit 89fcbd0b authored by Florian Hölzl's avatar Florian Hölzl
Browse files

Fixed opening of editor for atomic tutorial steps.

refs 2567
parent 2797f210
No related branches found
No related tags found
No related merge requests found
......@@ -31,9 +31,9 @@ import org.fortiss.tooling.kernel.extension.ITutorialProvider;
import org.fortiss.tooling.kernel.extension.data.TutorialStepBase;
import org.fortiss.tooling.kernel.service.ITutorialService;
import org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator;
import org.fortiss.tooling.kernel.ui.extension.ITutorialStepUI;
import org.fortiss.tooling.kernel.ui.extension.ITutorialUIProvider;
import org.fortiss.tooling.kernel.ui.extension.ITutorialUIWhitelistProvider;
import org.fortiss.tooling.kernel.ui.extension.base.TutorialStepUICompositeBase;
import org.fortiss.tooling.kernel.ui.internal.editor.TutorialStepUIEditor;
import org.fortiss.tooling.kernel.ui.internal.editor.TutorialStepUIEditorInput;
import org.fortiss.tooling.kernel.ui.service.ITutorialUIService;
......@@ -134,7 +134,7 @@ public final class TutorialUIService implements ITutorialUIService, ITutorialUIW
/** {@inheritDoc} */
@Override
public void openInEditor(TutorialStepUICompositeBase selected) {
public void openInEditor(ITutorialStepUI selected) {
try {
IEditorInput input = new TutorialStepUIEditorInput(selected);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
......
......@@ -24,6 +24,7 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.EditorPart;
import org.fortiss.tooling.kernel.ui.ESharedImages;
import org.fortiss.tooling.kernel.ui.extension.ITutorialStepUI;
import org.fortiss.tooling.kernel.ui.extension.base.TutorialStepUICompositeBase;
/**
......@@ -42,7 +43,7 @@ public final class TutorialStepUIEditor extends ReadonlyEditorBase {
if(input instanceof TutorialStepUIEditorInput) {
setSite(site);
setInput(input);
TutorialStepUICompositeBase step = ((TutorialStepUIEditorInput)input).getStep();
ITutorialStepUI step = ((TutorialStepUIEditorInput)input).getStep();
setPartName(step.getShortTitle());
setTitleImage(ESharedImages.TUTORIAL_TODO.getImage());
} else {
......@@ -54,7 +55,7 @@ public final class TutorialStepUIEditor extends ReadonlyEditorBase {
/** {@inheritDoc} */
@Override
public void createPartControl(Composite parent) {
TutorialStepUICompositeBase step = ((TutorialStepUIEditorInput)getEditorInput()).getStep();
ITutorialStepUI step = ((TutorialStepUIEditorInput)getEditorInput()).getStep();
step.createDetailsComposite(parent);
}
......
......@@ -21,7 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
import org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator;
import org.fortiss.tooling.kernel.ui.extension.base.TutorialStepUICompositeBase;
import org.fortiss.tooling.kernel.ui.extension.ITutorialStepUI;
/**
* {@link IEditorInput} for {@link TutorialStepUIEditorInput}.
......@@ -33,16 +33,16 @@ import org.fortiss.tooling.kernel.ui.extension.base.TutorialStepUICompositeBase;
*/
public final class TutorialStepUIEditorInput implements IEditorInput {
/** The underlying {@link TutorialStepUICompositeBase}. */
private final TutorialStepUICompositeBase step;
/** The underlying {@link ITutorialStepUI}. */
private final ITutorialStepUI step;
/** Constructor. */
public TutorialStepUIEditorInput(TutorialStepUICompositeBase step) {
public TutorialStepUIEditorInput(ITutorialStepUI step) {
this.step = step;
}
/** Returns step. */
public TutorialStepUICompositeBase getStep() {
public ITutorialStepUI getStep() {
return step;
}
......
......@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.TutorialStepUICompositeBase;
import org.fortiss.tooling.kernel.ui.extension.ITutorialStepUI;
import org.fortiss.tooling.kernel.ui.service.IModelEditorBindingService;
import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
import org.fortiss.tooling.kernel.ui.service.ITutorialUIService;
......@@ -68,8 +68,8 @@ class DoubleClick implements IDoubleClickListener {
IModelEditorBindingService.INSTANCE.openInEditor(element);
} else {
Object selected = ((IStructuredSelection)event.getSelection()).getFirstElement();
if(selected instanceof TutorialStepUICompositeBase) {
ITutorialUIService.INSTANCE.openInEditor((TutorialStepUICompositeBase)selected);
if(selected instanceof ITutorialStepUI) {
ITutorialUIService.INSTANCE.openInEditor((ITutorialStepUI)selected);
}
}
}
......
......@@ -19,9 +19,9 @@ package org.fortiss.tooling.kernel.ui.service;
import org.fortiss.tooling.kernel.extension.ITutorialProvider;
import org.fortiss.tooling.kernel.service.ITutorialService;
import org.fortiss.tooling.kernel.ui.extension.ITutorialStepUI;
import org.fortiss.tooling.kernel.ui.extension.ITutorialUIProvider;
import org.fortiss.tooling.kernel.ui.extension.ITutorialUIWhitelistProvider;
import org.fortiss.tooling.kernel.ui.extension.base.TutorialStepUICompositeBase;
import org.fortiss.tooling.kernel.ui.internal.TutorialUIService;
/**
......@@ -41,5 +41,5 @@ public interface ITutorialUIService extends ITutorialUIWhitelistProvider {
Class<? extends ITutorialUIProvider> uiProvider);
/** Opens the editor for the given tutorial step. */
public void openInEditor(TutorialStepUICompositeBase selected);
public void openInEditor(ITutorialStepUI selected);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment