From 289d27201186cd260b49bd7a3bb5b8b1d1f4fdef Mon Sep 17 00:00:00 2001
From: Matthew Horridge <matthew.horridge@stanford.edu>
Date: Wed, 15 Apr 2015 15:11:12 -0700
Subject: [PATCH] Closes #206, closes #212 and closes #213

---
 .../ui/renderer/OWLEntityQNameRenderer.java   | 21 +++++++++++++------
 ...iedName.java => RenderByPrefixedName.java} |  2 +-
 .../src/main/resources/plugin.xml             | 16 +++++++++++---
 3 files changed, 29 insertions(+), 10 deletions(-)
 rename org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/menu/{RenderByQualifiedName.java => RenderByPrefixedName.java} (89%)

diff --git a/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/OWLEntityQNameRenderer.java b/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/OWLEntityQNameRenderer.java
index 35d80a46..f17e0051 100644
--- a/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/OWLEntityQNameRenderer.java
+++ b/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/OWLEntityQNameRenderer.java
@@ -5,6 +5,8 @@ import org.protege.editor.owl.ui.prefix.PrefixUtilities;
 import org.protege.editor.owl.ui.renderer.prefix.PrefixBasedRenderer;
 import org.semanticweb.owlapi.model.IRI;
 import org.semanticweb.owlapi.model.PrefixManager;
+import org.semanticweb.owlapi.util.DefaultPrefixManager;
+import org.semanticweb.owlapi.vocab.Namespaces;
 
 
 /**
@@ -17,10 +19,20 @@ import org.semanticweb.owlapi.model.PrefixManager;
  * www.cs.man.ac.uk/~horridgm<br><br>
  */
 public class OWLEntityQNameRenderer extends AbstractOWLEntityRenderer implements PrefixBasedRenderer {
-	private PrefixManager prefixManager;
+
+    private final DefaultPrefixManager prefixManager = new DefaultPrefixManager();
 
 	public void initialise() {
-    	prefixManager = PrefixUtilities.getPrefixOWLOntologyFormat(getOWLModelManager());
+    	for(Namespaces ns : Namespaces.values()) {
+            String prefixName = ns.getPrefixName();
+            String prefixIRI = ns.getPrefixIRI();
+            prefixManager.setPrefix(prefixName + ":", prefixIRI);
+        }
+        PrefixManager localPrefixes = PrefixUtilities.getPrefixOWLOntologyFormat(getOWLModelManager());
+        for(String prefixName : localPrefixes.getPrefixNames()) {
+            String prefixIRI = localPrefixes.getPrefix(prefixName);
+            prefixManager.setPrefix(prefixName, prefixIRI);
+        }
     }
     
     @Override
@@ -33,10 +45,7 @@ public class OWLEntityQNameRenderer extends AbstractOWLEntityRenderer implements
         try {
         	String s = prefixManager.getPrefixIRI(iri);
             if (s != null) {
-            	if (s.startsWith(":")) {
-            		s = s.substring(1);
-            	}
-                return s;
+            	return s;
             }
             else {
                 // No mapping
diff --git a/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/menu/RenderByQualifiedName.java b/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/menu/RenderByPrefixedName.java
similarity index 89%
rename from org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/menu/RenderByQualifiedName.java
rename to org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/menu/RenderByPrefixedName.java
index 5fed84d5..3c7f6953 100644
--- a/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/menu/RenderByQualifiedName.java
+++ b/org.protege.editor.owl/src/main/java/org/protege/editor/owl/ui/renderer/menu/RenderByPrefixedName.java
@@ -3,7 +3,7 @@ package org.protege.editor.owl.ui.renderer.menu;
 import org.protege.editor.owl.ui.renderer.OWLEntityQNameRenderer;
 import org.protege.editor.owl.ui.renderer.plugin.RendererPlugin;
 
-public class RenderByQualifiedName extends AbstractByRendererMenu {
+public class RenderByPrefixedName extends AbstractByRendererMenu {
 	private static final long serialVersionUID = 7364664042805363135L;
 
 	protected boolean isMyRendererPlugin(RendererPlugin plugin) {
diff --git a/org.protege.editor.owl/src/main/resources/plugin.xml b/org.protege.editor.owl/src/main/resources/plugin.xml
index f5628045..1730bb52 100644
--- a/org.protege.editor.owl/src/main/resources/plugin.xml
+++ b/org.protege.editor.owl/src/main/resources/plugin.xml
@@ -113,11 +113,21 @@
         <checkbox value="true"/>
     </extension>
 
+    <extension id="ui.view.menu.byprefixedname"
+               point="org.protege.editor.core.application.EditorKitMenuAction">
+        <name value="Render by prefixed name"/>
+        <toolTip value="Render entity by prefixed name e.g. owl:Thing"/>
+        <path value="org.protege.editor.owl.ui.view.menu/SlotAA-B"/>
+        <class value="org.protege.editor.owl.ui.renderer.menu.RenderByPrefixedName"/>
+        <editorKitId value="OWLEditorKit"/>
+        <checkbox value="true"/>
+    </extension>
+
     <extension id="ui.view.menu.bylabel"
                point="org.protege.editor.core.application.EditorKitMenuAction">
         <name value="Render by label (rdfs:label)"/>
         <toolTip value="Render entity by the values of rdfs:label"/>
-        <path value="org.protege.editor.owl.ui.view.menu/SlotAA-B"/>
+        <path value="org.protege.editor.owl.ui.view.menu/SlotAA-C"/>
         <class value="org.protege.editor.owl.ui.renderer.menu.RenderByLabel"/>
         <editorKitId value="OWLEditorKit"/>
         <checkbox value="true"/>
@@ -127,7 +137,7 @@
                point="org.protege.editor.core.application.EditorKitMenuAction">
         <name value="Render by annotation property"/>
         <toolTip value="Render entity by the values of an annotation property"/>
-        <path value="org.protege.editor.owl.ui.view.menu/SlotAA-C"/>
+        <path value="org.protege.editor.owl.ui.view.menu/SlotAA-D"/>
         <class value="org.protege.editor.owl.ui.renderer.menu.RenderByProperty"/>
         <editorKitId value="OWLEditorKit"/>
         <dynamic value="true"/>
@@ -138,7 +148,7 @@
                point="org.protege.editor.core.application.EditorKitMenuAction">
         <name value="Custom rendering..."/>
         <toolTip value="Open the rendering configuration panel" />
-        <path value="org.protege.editor.owl.ui.view.menu/SlotAA-D"/>
+        <path value="org.protege.editor.owl.ui.view.menu/SlotAA-E"/>
         <class value="org.protege.editor.owl.ui.renderer.menu.ConfigureRenderer"/>
         <editorKitId value="OWLEditorKit"/>
     </extension>