(no commit message)

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MyCompletionProcessor.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MyCompletionProcessor.java
index 002bbbfaf84eb6ad5ff4961b5714323413d9b605..4448d5b360956101b25097cbc3497ae4fef7b273 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MyCompletionProcessor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MyCompletionProcessor.java
@@ -1,5 +1,6 @@
 package eu.etaxonomy.taxeditor.prototype1.view;\r
 \r
+import org.eclipse.jface.resource.ImageDescriptor;\r
 import org.eclipse.jface.text.ITextViewer;\r
 import org.eclipse.jface.text.contentassist.CompletionProposal;\r
 import org.eclipse.jface.text.contentassist.ContextInformation;\r
@@ -8,34 +9,60 @@ import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.contentassist.IContextInformation;\r
 import org.eclipse.jface.text.contentassist.IContextInformationValidator;\r
 import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.graphics.Image;\r
+\r
+import com.swtdesigner.ResourceManager;\r
+\r
+import eu.etaxonomy.taxeditor.prototype1.Activator;\r
 \r
 public class MyCompletionProcessor implements IContentAssistProcessor {\r
 \r
-       protected final static String[] myProposals = { "Create homotypic synonym",\r
+       protected final static String[] myProposals = { "Unknown synonymy", \r
+                                                       "Create homotypic synonym",\r
                                                        "Create heterotypic synoynm",\r
+                                                       "Create basionym",\r
+                                                       "Create replaced synonym",\r
+                                                       "Create homonym",\r
+                                                       "Create orthographic variant",\r
                                                        "Create misapplied name",\r
-                                                       "Create homonym"};\r
-\r
+                                                       "Create concept relation"};\r
+       protected final static String[] myIcons = { "icons/unknown.gif", \r
+                                                       "icons/homosyn.gif", \r
+                                                       "icons/heterosyn.gif",\r
+                                                       "icons/basionym.gif",\r
+                                                       "icons/repsyn.gif",\r
+                                                       "icons/homonym.gif",\r
+                                                       "icons/orthovariant.gif",\r
+                                                       "icons/misapplied.gif",\r
+                                                       "icons/concept.gif"};\r
+       protected final static String[] myContexts = { "To create a homotypic synonym, there are many things to consider. I could go on all day.",\r
+                                                       "Create homotypic synonym",\r
+                                                       "Create heterotypic synoynm",\r
+                                                       "Create basionym",\r
+                                                       "Create replaced synonym",\r
+                                                       "Create homonym",\r
+                                                       "Create orthographic variant",\r
+                                                       "Create misapplied name",\r
+                                                       "Create concept relation"};\r
+       \r
        /* (non-Javadoc)\r
         * Method declared on IContentAssistProcessor\r
         */\r
        public ICompletionProposal[] computeCompletionProposals(\r
                ITextViewer viewer, int documentOffset) {\r
+//             Image img = ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown.gif");\r
                ICompletionProposal[] result =\r
                        new ICompletionProposal[myProposals.length];\r
                for (int i = 0; i < myProposals.length; i++) {\r
-                       result[i] = new CompletionProposal(myProposals[i], \r
-                                                       documentOffset, \r
-                                                       0, \r
-                                                       myProposals[i].length());\r
-                                     // Compute a suitable context information\r
-//                                   IContextInformation contextInfo = \r
-//                                      new ContextInformation(null, myProposals[i]+" Style");\r
-//                                   // Construct proposal\r
-//                                   result[i] = new CompletionProposal(myProposals[i], \r
-//                                      10, 10, 10, null, "style label", \r
-//                                      contextInfo, myProposals[i]);\r
-\r
+                     IContextInformation contextInfo = \r
+                                new ContextInformation(null, myProposals[i]+" Style");\r
+//                     result[i] = new CompletionProposal(myProposals[i],documentOffset, 0, \r
+//                                     myProposals[i].length(), ResourceManager.getPluginImage(Activator.getDefault(), myIcons[i]), \r
+//                                     myProposals[i], contextInfo, myContexts[i]);\r
+                       result[i] = new CompletionProposal("party",documentOffset, 0, \r
+                                       myProposals[i].length(), ResourceManager.getPluginImage(Activator.getDefault(), myIcons[i]), \r
+                                       myProposals[i], contextInfo, myContexts[i]);\r
+                       \r
                }\r
                return result;\r
        }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MySourceViewerConfig.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MySourceViewerConfig.java
index 118e237b04fd639169c0ddcdb9b8d4e974c50144..7bc5678b1f872afac905ca42b7a182e31d7d8e85 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MySourceViewerConfig.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/MySourceViewerConfig.java
@@ -54,10 +54,11 @@ public class MySourceViewerConfig extends SourceViewerConfiguration {
                assistant.setProposalPopupOrientation(\r
                        IContentAssistant.PROPOSAL_OVERLAY);\r
                assistant.setStatusLineVisible(true);\r
-               assistant.setStatusMessage("Choose a nomenclatural or taxonomic relationship");\r
-//             assistant.setContextSelector();\r
+               assistant.setStatusMessage("Create a nomenclatural or taxonomic relationship");\r
                assistant.setProposalSelectorBackground(\r
                                new Color(Display.getCurrent(), new RGB(255, 255, 255)));\r
+               assistant.setInformationControlCreator(\r
+                               getInformationControlCreator(sourceViewer)); // this is what pops up the yellow context box\r
                return assistant;\r
        }\r
 }
\ No newline at end of file

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
index ed22cb8c1c2172dec57abbacaac57647e35f19f1..d2c7a03d71391501b80363f70bab2e0c354d6ac4 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
@@ -27,6 +27,7 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;\r
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.part.EditorPart;\r
+import com.swtdesigner.ResourceManager;\r
 \r
 //import org.eclipse.ui.texteditor.AbstractTextEditor;\r
 \r