Vocabulary now works partially with the argumentation diagram editors
diff --git a/org.eclipse.opencert.sam.arg.diagram/META-INF/MANIFEST.MF b/org.eclipse.opencert.sam.arg.diagram/META-INF/MANIFEST.MF
index d1f1b48..eeb5be2 100644
--- a/org.eclipse.opencert.sam.arg.diagram/META-INF/MANIFEST.MF
+++ b/org.eclipse.opencert.sam.arg.diagram/META-INF/MANIFEST.MF
@@ -61,7 +61,9 @@
  org.eclipse.opencert.infra.ui,

  org.eclipse.emf.cdo.dawn,

  org.eclipse.emf.cdo.dawn.ui,

- org.eclipse.emf.cdo.dawn.util;bundle-version="2.0.300"

+ org.eclipse.emf.cdo.dawn.util;bundle-version="2.0.300",

+ org.eclipse.opencert.userguidance,

+ org.eclipse.opencert.vocabulary;bundle-version="1.0.0"

 Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Import-Package: org.eclipse.emf.cdo.dawn.transaction;version="2.1.0"

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentElementCitationEditPart.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentElementCitationEditPart.java
index a0ebfc7..76f7656 100644
--- a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentElementCitationEditPart.java
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentElementCitationEditPart.java
@@ -54,6 +54,7 @@
 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.ArgumentElementCitationItemSemanticEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgVisualIDRegistry;

+import org.eclipse.opencert.userguidance.label.WrappingLabel2;

 

 /**

  * @generated

@@ -663,7 +664,7 @@
 

 			this.add(fFigureArgumentationElementDescriptionLabelFigure);

 

-			fFigureArgumentElementCitationArgumentationReferenceLabelFigure = new WrappingLabel();

+			fFigureArgumentElementCitationArgumentationReferenceLabelFigure = new WrappingLabel2();

 

 			fFigureArgumentElementCitationArgumentationReferenceLabelFigure

 					.setText("");

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentReasoningEditPart.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentReasoningEditPart.java
index 4564379..1ac4fef 100644
--- a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentReasoningEditPart.java
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentReasoningEditPart.java
@@ -47,7 +47,7 @@
 import org.eclipse.opencert.sam.arg.arg.ArgumentReasoning;

 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.ArgumentReasoningItemSemanticEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgVisualIDRegistry;

-//import org.eclipse.opencert.userguidance.label.WrappingLabel2;

+import org.eclipse.opencert.userguidance.label.WrappingLabel2;

 

 /**

  * @generated

@@ -372,8 +372,8 @@
 

 			this.add(fFigureArgumentReasoningLabelFigure);

 

-//			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

-			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

+			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

+			//fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

 

 			fFigureArgumentationElementDescriptionLabelFigure.setText("");

 

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentationEditPart.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentationEditPart.java
index 66322e8..be00087 100644
--- a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentationEditPart.java
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ArgumentationEditPart.java
@@ -47,7 +47,7 @@
 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.OpenFileDiagramEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgVisualIDRegistry;

-//import org.eclipse.opencert.userguidance.label.WrappingLabel2;

+import org.eclipse.opencert.userguidance.label.WrappingLabel2;

 

 /**

  * @generated

@@ -342,8 +342,8 @@
 

 			this.add(fFigureArgumentationLabelFigure);

 

-//			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

-			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

+			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

+			//fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

 

 			fFigureArgumentationElementDescriptionLabelFigure.setText("");

 

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimDescriptionEditPart.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimDescriptionEditPart.java
index 966e316..b1baa78 100644
--- a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimDescriptionEditPart.java
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimDescriptionEditPart.java
@@ -70,7 +70,7 @@
 import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgVisualIDRegistry;

 import org.eclipse.opencert.sam.arg.arg.diagram.providers.ArgElementTypes;

 import org.eclipse.opencert.sam.arg.arg.diagram.providers.ArgParserProvider;

-//import org.eclipse.opencert.userguidance.celleditor.TextDirectEditManager3;

+import org.eclipse.opencert.userguidance.celleditor.TextDirectEditManager3;

 

 /**

  * @generated

@@ -339,16 +339,16 @@
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-//		if (manager == null) {

-//			TextDirectEditManager3 manager = new TextDirectEditManager3(this,

-//					null, ArgEditPartFactory.getTextCellEditorLocator(this),

-//					getModelElement(), ArgPackage.CLAIM__DESCRIPTION);

-//			setManager(manager);

-//		}

 		if (manager == null) {

-			setManager(new TextDirectEditManager2(this, null,

-					ArgEditPartFactory.getTextCellEditorLocator(this)));

+			TextDirectEditManager3 manager = new TextDirectEditManager3(this,

+					null, ArgEditPartFactory.getTextCellEditorLocator(this),

+					getModelElement(), ArgPackage.CLAIM__DESCRIPTION);

+			setManager(manager);

 		}

+		//if (manager == null) {

+		//	setManager(new TextDirectEditManager2(this, null,

+		//			ArgEditPartFactory.getTextCellEditorLocator(this)));

+		//}

 		return manager;

 	}

 

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimEditPart.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimEditPart.java
index dfa4e3f..0387216 100644
--- a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimEditPart.java
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/ClaimEditPart.java
@@ -59,7 +59,7 @@
 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.ClaimCanonicalEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.ClaimItemSemanticEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgVisualIDRegistry;

-//import org.eclipse.opencert.userguidance.label.WrappingLabel2;

+import org.eclipse.opencert.userguidance.label.WrappingLabel2;

 

 /**

  * @generated

@@ -943,8 +943,8 @@
 

 			this.add(fFigureClaimLabelFigure);

 

-//			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

-			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

+			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

+			//fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

 

 			fFigureArgumentationElementDescriptionLabelFigure.setText("");

 

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/InformationElementCitationEditPart.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/InformationElementCitationEditPart.java
index 0c456f0..39611a8 100644
--- a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/InformationElementCitationEditPart.java
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/edit/parts/InformationElementCitationEditPart.java
@@ -53,7 +53,7 @@
 import org.eclipse.opencert.sam.arg.arg.InformationElementType;

 import org.eclipse.opencert.sam.arg.arg.diagram.edit.policies.InformationElementCitationItemSemanticEditPolicy;

 import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgVisualIDRegistry;

-//import org.eclipse.opencert.userguidance.label.WrappingLabel2;

+import org.eclipse.opencert.userguidance.label.WrappingLabel2;

 

 /**

  * @generated

@@ -640,8 +640,8 @@
 

 			this.add(fFigureInformationElementCitationLabelFigure);

 

-//			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

-			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

+			fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel2();

+			//fFigureArgumentationElementDescriptionLabelFigure = new WrappingLabel();

 			

 			fFigureArgumentationElementDescriptionLabelFigure.setText("");

 

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiateVariableHandler.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiateVariableHandler.java
new file mode 100644
index 0000000..1fa62be
--- /dev/null
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiateVariableHandler.java
@@ -0,0 +1,45 @@
+package org.eclipse.opencert.sam.arg.arg.diagram.instantiation;

+

+import java.util.Map;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgDiagramEditor;

+

+public class InstantiateVariableHandler extends AbstractHandler {

+

+	@Override

+	@SuppressWarnings("unchecked")

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		Map<String, String> parameters = event.getParameters();

+

+		String itemRawString = parameters.get(ParameterNames.itemBody);

+		String replacement = parameters.get(ParameterNames.replacement);

+		String commandName = parameters.get(ParameterNames.commandName);

+		String editorHash = parameters.get(ParameterNames.editorHash);

+		ArgDiagramEditor editor = getArgEditors(editorHash);

+

+		InstantiationEMFCommand command = new InstantiationEMFCommand(

+				commandName, itemRawString, replacement, editor);

+		editor.getEditingDomain().getCommandStack().execute(command);

+

+		return null;

+	}

+

+	private ArgDiagramEditor getArgEditors(String editorHash) {

+		ArgDiagramEditor result = null;

+

+		IEditorPart editor = PlatformUI.getWorkbench()

+				.getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+		if (editor instanceof ArgDiagramEditor) {

+			if (editor.hashCode() == Integer.parseInt(editorHash)){

+				result = (ArgDiagramEditor) editor;

+			}

+		}

+

+		return result;

+	}

+}

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiationCommandFactory.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiationCommandFactory.java
new file mode 100644
index 0000000..f4099c2
--- /dev/null
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiationCommandFactory.java
@@ -0,0 +1,118 @@
+package org.eclipse.opencert.sam.arg.arg.diagram.instantiation;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.menus.CommandContributionItem;

+import org.eclipse.ui.menus.CommandContributionItemParameter;

+import org.eclipse.ui.menus.ExtensionContributionFactory;

+import org.eclipse.ui.menus.IContributionRoot;

+import org.eclipse.ui.services.IServiceLocator;

+import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgDiagramEditor;

+import org.eclipse.opencert.userguidance.labelparser.tokens.HighlightItem;

+import org.eclipse.opencert.userguidance.labelparser.tokens.HighlightItem.ItemHeaderType;

+import org.eclipse.opencert.userguidance.util.HitTestUtil;

+import org.eclipse.opencert.userguidance.util.VocabFetcher;

+import org.eclipse.opencert.vocabulary.Category;

+import org.eclipse.opencert.vocabulary.Term;

+import org.eclipse.opencert.vocabulary.Vocabulary;

+

+public class InstantiationCommandFactory extends ExtensionContributionFactory {

+

+	@Override

+	public void createContributionItems(IServiceLocator serviceLocator,

+			IContributionRoot additions) {

+		List<CommandContributionItemParameter> parameters = createCommandParameters(serviceLocator);

+

+		for (CommandContributionItemParameter parameter : parameters) {

+			CommandContributionItem item = new CommandContributionItem(

+					parameter);

+			item.setVisible(true);

+			item.setId(parameter.commandId);

+			additions.addContributionItem(item, null);

+		}

+	}

+

+	public List<CommandContributionItemParameter> createCommandParameters(

+			final IServiceLocator serviceLocator) {

+		final List<CommandContributionItemParameter> result = new ArrayList<CommandContributionItemParameter>();

+		Point screenMouseLocation = PlatformUI.getWorkbench().getDisplay()

+				.getCursorLocation();

+		IEditorPart editorPart = PlatformUI.getWorkbench()

+				.getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+

+		if (editorPart instanceof ArgDiagramEditor) {

+			final ArgDiagramEditor editor = (ArgDiagramEditor) editorPart;

+			HighlightItem highlightItem = HitTestUtil.getHighlightItemScreen(

+					editor, screenMouseLocation.x, screenMouseLocation.y);

+

+			if (highlightItem != null

+					&& highlightItem.getHeaderType() == ItemHeaderType.var) {

+				final String itemBody = highlightItem.getBody();

+

+				VocabFetcher fetcher = new VocabFetcher() {

+					@Override

+					public void readFromVocab(List<Vocabulary> vocabularies) {

+						List<Term> terms = getSubTerms(itemBody, vocabularies);

+						for (Term term : terms) {

+							Map<String, Object> parameters = new HashMap<String, Object>();

+

+							parameters.put(ParameterNames.itemBody, itemBody);

+

+							String replacement = "";

+

+							String name = term.getName();

+							if (name.contains(" ")) {

+								name = "\"" + name + "\"";

+							}

+							replacement = "voc:" + name;

+

+							parameters.put(ParameterNames.replacement,

+									replacement);

+							parameters.put(ParameterNames.itemBody, itemBody);

+							parameters.put(ParameterNames.commandName,

+									"Instantiate " + itemBody);

+

+							parameters.put(ParameterNames.editorHash,

+									editor.hashCode() + "");

+

+							CommandContributionItemParameter parameter = new CommandContributionItemParameter(

+									serviceLocator, "",

+									ParameterNames.commandID, SWT.PUSH);

+							parameter.label = term.getName();

+							parameter.parameters = parameters;

+

+							result.add(parameter);

+						}

+					}

+				};

+				fetcher.execute();

+

+			}

+		}

+		return result;

+	}

+

+	private List<Term> getSubTerms(String categoryName,

+			List<Vocabulary> vocabularies) {

+		List<Term> result = new ArrayList<Term>();

+

+		for (Vocabulary vocabulary : vocabularies) {

+			for (Category category : vocabulary.getCategories()) {

+				if (category.getName().equalsIgnoreCase(categoryName)) {

+					for (Term term : category.getTerms()) {

+						result.add(term);

+					}

+				}

+			}

+		}

+

+		return result;

+	}

+}
\ No newline at end of file
diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiationEMFCommand.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiationEMFCommand.java
new file mode 100644
index 0000000..3d0e772
--- /dev/null
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/InstantiationEMFCommand.java
@@ -0,0 +1,60 @@
+package org.eclipse.opencert.sam.arg.arg.diagram.instantiation;

+

+import java.util.List;

+

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.opencert.sam.arg.arg.ArgumentElement;

+import org.eclipse.opencert.sam.arg.arg.Case;

+import org.eclipse.opencert.sam.arg.arg.diagram.part.ArgDiagramEditor;

+import org.eclipse.opencert.userguidance.labelparser.LabelParserUtil;

+import org.eclipse.opencert.userguidance.labelparser.tokens.HighlightItem;

+import org.eclipse.opencert.userguidance.labelparser.tokens.HighlightItem.ItemHeaderType;

+import org.eclipse.opencert.userguidance.labelparser.tokens.Token;

+

+public class InstantiationEMFCommand extends RecordingCommand {

+

+	private String itemBody;

+	private String replacement;

+	private ArgDiagramEditor editor;

+

+	public InstantiationEMFCommand(String commandName, String itemBody,

+			String replacement, ArgDiagramEditor editor) {

+		super(editor.getEditingDomain(), commandName);

+		this.itemBody = itemBody;

+		this.replacement = replacement;

+		this.editor = editor;

+	}

+

+	@Override

+	protected void doExecute() {

+		Diagram diagram = (Diagram) editor.getDiagramEditPart().getModel();

+		Case rootElement = (Case) diagram.getElement();

+

+		for (ArgumentElement argumentElement : rootElement.getArgument()) {

+			while (replaceInArgumentElement(argumentElement)) {

+			}

+

+		}

+	}

+

+	private boolean replaceInArgumentElement(ArgumentElement argumentElement) {

+		List<Token> tokens = LabelParserUtil.parse(argumentElement

+				.getDescription());

+		for (Token token : tokens) {

+			if (token instanceof HighlightItem) {

+				HighlightItem item = (HighlightItem) token;

+				if (item.getHeaderType() == ItemHeaderType.var

+						&& item.getBody().equalsIgnoreCase(itemBody)) {

+					String newDescription = argumentElement.getDescription()

+							.replaceAll(item.getRawString(), replacement);

+					argumentElement.setDescription(newDescription);

+					return true;

+				}

+			}

+		}

+

+		return false;

+	}

+

+}

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/ParameterNames.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/ParameterNames.java
new file mode 100644
index 0000000..ebfe3e0
--- /dev/null
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/instantiation/ParameterNames.java
@@ -0,0 +1,10 @@
+package org.eclipse.opencert.sam.arg.arg.diagram.instantiation;

+

+public interface ParameterNames {

+	public static final String commandID = "org.eclipse.opencert.arg.diagram.contextmenu.command.instantiate";

+

+	public static final String itemBody = "org.eclipse.opencert.sam.arg.diagram.instantiante.command.itemBody";

+	public static final String replacement = "org.eclipse.opencert.sam.arg.diagram.instantiante.command.replacement";

+	public static final String commandName = "org.eclipse.opencert.sam.arg.diagram.instantiante.command.commandName";

+	public static final String editorHash = "org.eclipse.opencert.sam.arg.diagram.instantiante.command.editorHash";

+}

diff --git a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/part/ArgDiagramEditor.java b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/part/ArgDiagramEditor.java
index b275bcd..b21cbd1 100644
--- a/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/part/ArgDiagramEditor.java
+++ b/org.eclipse.opencert.sam.arg.diagram/src/org/eclipse/opencert/sam/arg/arg/diagram/part/ArgDiagramEditor.java
@@ -81,7 +81,7 @@
 import org.eclipse.ui.part.ShowInContext;

 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

 import org.eclipse.opencert.sam.arg.arg.diagram.navigator.ArgNavigatorItem;

-//import org.eclipse.opencert.userguidance.hover.ToolTip;

+import org.eclipse.opencert.userguidance.hover.ToolTip;

 

 /**

  * @generated

@@ -406,7 +406,7 @@
 		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU,

 				provider, getDiagramGraphicalViewer());

 		

-//		new ToolTip(this);

+		new ToolTip(this);

 	}

 

 	/**