Using shared images for tutorial elements.

refs 2567

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ESharedImages.java

@@ -38,7 +38,16 @@ public enum ESharedImages {
 	ERROR_OVERLAY,
 
 	/** Warning overlay icon. */
-	WARNING_OVERLAY;
+	WARNING_OVERLAY,
+
+	/** Tutorial (closed book) image. */
+	TUTORIAL_TODO,
+
+	/** Tutorial (open book) image. */
+	TUTORIAL,
+
+	/** The OK image. */
+	OK;
 
 	/**
 	 * Register all images defined in this enumeration with the given image

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java

@@ -70,6 +70,7 @@ public class ToolingKernelUIActivator extends AbstractUIPlugin {
 	/** {@inheritDoc} */
 	@Override
 	public void stop(BundleContext context) throws Exception {
+		getImageRegistry().dispose();
 		plugin = null;
 		super.stop(context);
 	}

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/TutorialUIService.java

@@ -26,7 +26,6 @@ import java.util.Map;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.fortiss.tooling.kernel.extension.ITutorialProvider;
@@ -153,10 +152,8 @@ public final class TutorialUIService implements ITutorialUIService {
 	public void openInEditor(TutorialStepUI selected) {
 		try {
 			IEditorInput input = new TutorialStepUIEditorInput(selected);
-			IEditorPart part =
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-							.openEditor(input, TutorialStepUIEditor.class.getName(), true);
-			// TODO: go on HERE
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+					.openEditor(input, TutorialStepUIEditor.class.getName(), true);
 		} catch(PartInitException pex) {
 			error(ToolingKernelUIActivator.getDefault(), pex.getMessage(), pex);
 		}

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditor.java

@@ -23,6 +23,7 @@ import org.eclipse.ui.IEditorInput;
 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.data.TutorialStepUI;
 
 /**
@@ -43,7 +44,7 @@ public final class TutorialStepUIEditor extends ReadonlyEditorBase {
 			setInput(input);
 			TutorialStepUI step = ((TutorialStepUIEditorInput)input).getStep();
 			setPartName(step.getShortTitle());
-			// TODO: go on HERE
+			setTitleImage(ESharedImages.TUTORIAL_TODO.getImage());
 		} else {
 			throw new PartInitException(
 					"Tutorial step editor initialized with wrong editor input object.");

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/TutorialDefinitionModelElementLabelProvider.java

@@ -17,12 +17,11 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.kernel.ui.presentation;
 
-import static org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator.getImageDescriptor;
-
 import org.eclipse.swt.graphics.Image;
 import org.fortiss.tooling.kernel.extension.data.TutorialDefinition;
 import org.fortiss.tooling.kernel.extension.data.TutorialStep;
 import org.fortiss.tooling.kernel.service.ITutorialService;
+import org.fortiss.tooling.kernel.ui.ESharedImages;
 
 /**
  * A {@link ModelElementLabelProvider} that also handles {@link TutorialDefinition}s and
@@ -35,13 +34,6 @@ import org.fortiss.tooling.kernel.service.ITutorialService;
  */
 public class TutorialDefinitionModelElementLabelProvider extends ModelElementLabelProvider {
 
-	/** The image for the {@link TutorialDefinition} node. */
-	private Image tutorialDefinitionImage;
-	/** The image for the {@link TutorialStep} node when completed. */
-	private Image tutorialStepDoneImage;
-	/** The image for the {@link TutorialStep} node when still in the future. */
-	private Image tutorialStepTodoImage;
-
 	/** {@inheritDoc} */
 	@Override
 	public String getText(Object element) {
@@ -60,10 +52,7 @@ public class TutorialDefinitionModelElementLabelProvider extends ModelElementLab
 	@Override
 	public Image getImage(Object element) {
 		if(element instanceof TutorialDefinition) {
-			if(tutorialDefinitionImage == null) {
-				tutorialDefinitionImage = getImageDescriptor("icons/tutorial.gif").createImage();
-			}
-			return tutorialDefinitionImage;
+			return ESharedImages.TUTORIAL.getImage();
 		}
 		if(element instanceof TutorialStep) {
 			return getTutorialStepImage((TutorialStep)element);
@@ -75,21 +64,11 @@ public class TutorialDefinitionModelElementLabelProvider extends ModelElementLab
 	private Image getTutorialStepImage(TutorialStep element) {
 		ITutorialService s = ITutorialService.INSTANCE;
 		if(s.isEarlierStep(element)) {
-			if(tutorialStepDoneImage == null) {
-				tutorialStepDoneImage = getImageDescriptor("icons/ok.png").createImage();
-			}
-			return tutorialStepDoneImage;
+			return ESharedImages.OK.getImage();
 		}
 		if(s.isLaterStep(element)) {
-			if(tutorialStepTodoImage == null) {
-				tutorialStepTodoImage = getImageDescriptor("icons/tutorial_todo.gif").createImage();
-			}
-			return tutorialStepTodoImage;
-		}
-
-		if(tutorialDefinitionImage == null) {
-			tutorialDefinitionImage = getImageDescriptor("icons/tutorial.gif").createImage();
+			return ESharedImages.TUTORIAL_TODO.getImage();
 		}
-		return tutorialDefinitionImage;
+		return ESharedImages.TUTORIAL.getImage();
 	}
 }