(no commit message)

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
index 035b8684be80a2196001c158547395b339019368..beb85f672267ee270b8a4ff998736b1b0a0c453c 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Activator: eu.etaxonomy.taxeditor.designproposal1.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.forms,
- org.eclipse.jface.text
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors
 Eclipse-LazyStart: true
 Export-Package: com.swtdesigner,
  eu.etaxonomy.taxeditor.designproposal1,

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml
index 181e95f138fc82003122ec4961c9b0594cc9fd6e..5f23eeb0801bfdab406747d5ae6fc39d102e57fd 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml
@@ -71,6 +71,7 @@
       </editor>\r
       <editor\r
             class="eu.etaxonomy.taxeditor.designproposal1.view.EmptyEditorView"\r
+            icon="icons/edit_16x16.gif"\r
             id="eu.etaxonomy.taxeditor.designproposal1.view.EmptyEditorView"\r
             name="New EditorPart">\r
       </editor>\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
index 95ae9994f1f6d43c3b474e0ec7c9cd6c84426bb3..3e52b5d05e8f0b99e146f17601e4415b7bdc9017 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
@@ -18,7 +18,7 @@ public class Activator extends AbstractUIPlugin {
 \r
        // The shared instance\r
        private static Activator plugin;\r
-       \r
+               \r
 //     private CdmApplicationController cdmApp = new CdmApplicationController();\r
        \r
        /**\r
@@ -27,6 +27,7 @@ public class Activator extends AbstractUIPlugin {
        public Activator() {\r
        }\r
 \r
+       \r
        /*\r
         * (non-Javadoc)\r
         * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
index 71298442601e095e6fb35744a9a32ab700b6faea..c68ce97f8a4deb15d1e9d63ef5e6de7f78ef157c 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
@@ -7,25 +7,31 @@ import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.RuleBasedScanner;\r
 import org.eclipse.jface.text.rules.SingleLineRule;\r
 import org.eclipse.jface.text.rules.Token;\r
+import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.graphics.Color;\r
 import org.eclipse.swt.graphics.RGB;\r
 import org.eclipse.swt.widgets.Display;\r
 \r
+import com.swtdesigner.SWTResourceManager;\r
+\r
 public class MyRuleScanner extends RuleBasedScanner {\r
        private static Color TAG_COLOR= new Color(Display.getCurrent(), new RGB(200, 0, 0));\r
        private static Color COMMENT_COLOR= new Color(Display.getCurrent(), new RGB(0, 200, 0));\r
 \r
        public MyRuleScanner() {\r
                IToken tagToken =\r
-                       new Token(\r
-                               new TextAttribute(TAG_COLOR));\r
+                       new Token(new TextAttribute(TAG_COLOR));\r
+//                             new TextAttribute(TAG_COLOR,\r
+//                             null,\r
+//                             SWT.BOLD,\r
+//                             SWTResourceManager.getFont("Georgia", 11, SWT.NONE)));\r
 \r
                IToken commentToken= new Token(new TextAttribute(COMMENT_COLOR));\r
 \r
                IRule[] rules = new IRule[2];\r
                //Add rule for processing instructions\r
                rules[0] = new SingleLineRule("<myTag", "myTag>", tagToken);\r
-               rules[1] = (new EndOfLineRule("//", commentToken)); //$NON-NLS-1$\r
+               rules[1] = new EndOfLineRule("//", commentToken); //$NON-NLS-1$\r
                setRules(rules);\r
        }\r
 }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
index 41d112e3c9004344570a3dc577daa04d5e3886e7..a66fade8567eafbc22cfc0c71a19f726c058621f 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
@@ -10,24 +10,31 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.rules.Token;\r
 import org.eclipse.jface.text.source.ISourceViewer;\r
 import org.eclipse.jface.text.source.SourceViewerConfiguration;\r
+import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.graphics.Color;\r
 import org.eclipse.swt.graphics.RGB;\r
 import org.eclipse.swt.widgets.Display;\r
 \r
+import com.swtdesigner.SWTResourceManager;\r
+\r
 public class MySourceViewerConfig extends SourceViewerConfiguration {\r
        private MyRuleScanner scanner;\r
        private static Color DEFAULT_TAG_COLOR =\r
-               new Color(Display.getCurrent(), new RGB(0, 0, 200));\r
+               new Color(Display.getCurrent(), new RGB(0, 0, 0));\r
 \r
        public MySourceViewerConfig() {\r
-\r
        }\r
 \r
        protected MyRuleScanner getTagScanner() {\r
                if (scanner == null) {\r
                        scanner = new MyRuleScanner();\r
                        scanner.setDefaultReturnToken(\r
-                               new Token(new TextAttribute(DEFAULT_TAG_COLOR)));\r
+                               new Token(\r
+                                       new TextAttribute(DEFAULT_TAG_COLOR,\r
+                                       null,\r
+                                       0,\r
+                                       SWTResourceManager.getFont("Georgia", 11, SWT.BOLD | SWT.ITALIC))\r
+                               ));\r
                }\r
                return scanner;\r
        }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
index 31a71072e9510da434612da82d0146a689c1a9e2..bf66c06f28f7a66ac3c4aca9a8401ba8b9157d8a 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;\r
 import org.eclipse.swt.events.MouseAdapter;\r
 import org.eclipse.swt.events.MouseEvent;\r
+import org.eclipse.swt.events.MouseListener;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.SelectionEvent;\r
 import org.eclipse.swt.events.SelectionListener;\r
@@ -48,6 +49,7 @@ import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IEditorSite;\r
 import org.eclipse.ui.PartInitException;\r
+import org.eclipse.ui.editors.text.TextEditor;\r
 import org.eclipse.ui.part.EditorPart;\r
 import com.swtdesigner.ResourceManager;\r
 import com.swtdesigner.SWTResourceManager;\r
@@ -62,8 +64,8 @@ import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;
 import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction;\r
 import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;\r
 \r
-//public class PilosellaEditorView extends EditorPart implements ICdmEventListener {\r
 public class PilosellaEditorView extends EditorPart {\r
+//public class PilosellaEditorView extends TextEditor {\r
 \r
        private Text hieraciumFuscoatrumSubspText_1;\r
        private Text hieraciumRubroonegenseNorrlText;\r
@@ -148,7 +150,7 @@ public class PilosellaEditorView extends EditorPart {
 //                     }\r
 //             });\r
                parent.setLayout(new GridLayout());\r
-               Document doc = new Document("");\r
+               Document doc = new Document();\r
 \r
                final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);\r
                taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));\r
@@ -361,7 +363,7 @@ public class PilosellaEditorView extends EditorPart {
                final GridData gd_text_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
                gd_text_1.widthHint = 300;\r
                text_1.setLayoutData(gd_text_1);\r
-               text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
+               text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.BOLD | SWT.ITALIC));\r
                text_1.setText("Hieracium fuscoatrum Nägeli & Peter, Hierac. Mitt.-Eur. 1: 315. 1885");\r
                text_1.addFocusListener(new FocusListener() {\r
 \r
@@ -405,6 +407,8 @@ public class PilosellaEditorView extends EditorPart {
                label_2.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
                label_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
 \r
+//             addDropDown(label_2, menuAddRel);\r
+               \r
                hieraciumFuscoatrumSubspText = new Text(composite, SWT.WRAP);\r
                final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
                gd_hieraciumFuscoatrumSubspText.widthHint = 300;\r
@@ -477,6 +481,23 @@ public class PilosellaEditorView extends EditorPart {
 \r
                final Menu menu1 = new Menu(labelWithMenu);\r
                labelWithMenu.setMenu(menu1);\r
+               labelWithMenu.addMouseListener(new MouseListener() {\r
+\r
+                       public void mouseDoubleClick(MouseEvent e) {\r
+                               // TODO Auto-generated method stub\r
+                               \r
+                       }\r
+\r
+                       public void mouseDown(MouseEvent e) {\r
+                               menu1.setVisible(true);\r
+                       }\r
+\r
+                       public void mouseUp(MouseEvent e) {\r
+                               // TODO Auto-generated method stub\r
+                               \r
+                       }\r
+                       \r
+               });\r
 \r
                final MenuItem deletehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
                deletehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));\r
@@ -539,7 +560,7 @@ public class PilosellaEditorView extends EditorPart {
                styledText.setLayoutData(gd_styledText);\r
                sourceviewer.setDocument(doc);\r
                sourceviewer.configure(new MySourceViewerConfig());\r
-               sourceviewer.setTabsToSpacesConverter(null);\r
+//             sourceviewer.setTabsToSpacesConverter(null);\r
 \r
                \r
 //             final Menu menu = new Menu(toolBar);\r