First functioning version of choose markers.

diff --git a/.gitattributes b/.gitattributes
index 331a98693b947119abba214b4a91d2183f38f199..464932e4fce724f3c5228c08f6c797dac39e2019 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -678,6 +678,7 @@ taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/Li
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineSelection.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineSelectionSource.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineSelectionViewer.java -text
+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/SupplementalTextScanner.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java -text

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
index cbc08f17b6bd3c48435e51e6eb009fb6104862f3..4749617da0e5e75eaa9a6f3f82ee598151b60d91 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
@@ -29,7 +29,10 @@ import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.jface.text.Position;\r
 import org.eclipse.jface.text.TypedRegion;\r
 import org.eclipse.jface.text.rules.FastPartitioner;\r
+import org.eclipse.jface.text.rules.IPartitionTokenScanner;\r
+import org.eclipse.jface.text.rules.IToken;\r
 import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;\r
+import org.eclipse.jface.text.rules.Token;\r
 import org.eclipse.jface.text.source.Annotation;\r
 import org.eclipse.jface.text.source.IAnnotationModel;\r
 import org.eclipse.swt.SWT;\r
@@ -74,12 +77,6 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
 \r
        private Map<IEditorInput, ILineDisplayStrategy> lineDisplayStrategies = \r
                new HashMap<IEditorInput, ILineDisplayStrategy>();\r
-\r
-//     private ITextViewer viewer;\r
-//     \r
-//     public AnnotatedLineEditorDocumentProvider(ITextViewer viewer) {\r
-//             this.viewer = viewer;\r
-//     }\r
        \r
        @Override\r
        public IAnnotationModel getAnnotationModel(Object element) {\r
@@ -130,13 +127,7 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                                        // TODO Auto-generated catch block\r
                                        e.printStackTrace();\r
                                }\r
-                       }\r
-                       \r
-                       // Create partitioner to put supplemental, non-cache text in different colors\r
-                       IDocumentPartitioner partitioner = \r
-                                       new AnnotatedLineEditorPartitioner(document, (LineAnnotationModel) model, lineDisplayStrategies.get(element));\r
-                       partitioner.connect(document);\r
-                       document.setDocumentPartitioner(partitioner);                   \r
+                       }       \r
                        \r
                        return document;\r
                }\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorPartitioner.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorPartitioner.java
index f86dbd42aa5885b7ff72d3bde066ba50b7306a21..b22569a119feb7efd87ef540ac19fe0538b22496 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorPartitioner.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorPartitioner.java
@@ -36,6 +36,7 @@ import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
  * @author p.ciardelli\r
  * @created 28.10.2009\r
  * @version 1.0\r
+ * @deprecated\r
  */\r
 public class AnnotatedLineEditorPartitioner extends FastPartitioner {\r
        private static final Logger logger = Logger\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorReconcilingStrategy.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorReconcilingStrategy.java
index 26cf0b1250e94cb880e3b3b2f7d66e4eef554e31..4419705119daf99b425a66d4eea8af5f35d0cca4 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorReconcilingStrategy.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorReconcilingStrategy.java
@@ -24,9 +24,12 @@ import org.eclipse.jface.text.source.ISourceViewer;
 \r
 \r
 /**\r
+ * Doesn't work!\r
+ * \r
  * @author p.ciardelli\r
  * @created 25.06.2009\r
  * @version 1.0\r
+ * @deprecated\r
  */\r
 public class AnnotatedLineEditorReconcilingStrategy implements IReconcilingStrategy {\r
        private static final Logger logger = Logger\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/SupplementalTextScanner.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/SupplementalTextScanner.java
new file mode 100644 (file)
index 0000000..31d245f
--- /dev/null
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/SupplementalTextScanner.java
@@ -0,0 +1,135 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
+package eu.etaxonomy.taxeditor.annotatedlineeditor;\r
+\r
+import java.util.HashMap;\r
+import java.util.Iterator;\r
+import java.util.Map;\r
+\r
+import org.apache.log4j.Logger;\r
+import org.eclipse.jface.text.BadLocationException;\r
+import org.eclipse.jface.text.Document;\r
+import org.eclipse.jface.text.IDocument;\r
+import org.eclipse.jface.text.TextAttribute;\r
+import org.eclipse.jface.text.rules.IPredicateRule;\r
+import org.eclipse.jface.text.rules.IToken;\r
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;\r
+import org.eclipse.jface.text.rules.SingleLineRule;\r
+import org.eclipse.jface.text.rules.Token;\r
+import org.eclipse.jface.text.source.ISourceViewer;\r
+import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.widgets.Display;\r
+\r
+/**\r
+ * @author p.ciardelli\r
+ * @created 28.10.2009\r
+ * @version 1.0\r
+ */\r
+public class SupplementalTextScanner extends RuleBasedPartitionScanner {\r
+       private static final Logger logger = Logger\r
+                       .getLogger(SupplementalTextScanner.class);\r
+       \r
+       private ILineDisplayStrategy lineDisplayStrategy;\r
+       private Document document;\r
+       private ISourceViewer sourceViewer;\r
+\r
+       private Map<Integer, String> supplementalTexts;\r
+       private SupplementalTextRule rule;\r
+       private int lastLine;\r
+       \r
+       /**\r
+        * @param sourceViewer\r
+        * @param lineDisplayStrategy\r
+        */\r
+       public SupplementalTextScanner(ISourceViewer sourceViewer, ILineDisplayStrategy lineDisplayStrategy) {\r
+               this.sourceViewer = sourceViewer;\r
+               this.lineDisplayStrategy = lineDisplayStrategy;\r
+               \r
+               TextAttribute textAttribute = new TextAttribute(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GRAY), null, SWT.ITALIC);\r
+               IToken supplementalTextToken = new Token(textAttribute);\r
+               \r
+               rule = new SupplementalTextRule(supplementalTextToken);\r
+               setPredicateRules(new IPredicateRule[] {rule});\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.text.rules.RuleBasedPartitionScanner#setPartialRange(org.eclipse.jface.text.IDocument, int, int, java.lang.String, int)\r
+        */\r
+       @Override\r
+       public void setPartialRange(IDocument document, int offset, int length,\r
+                       String contentType, int partitionOffset) {\r
+               \r
+               // Get all supplemental texts in the partial range\r
+               supplementalTexts = new HashMap<Integer, String>();\r
+               LineAnnotationModel model = (LineAnnotationModel) sourceViewer.getAnnotationModel();\r
+               Iterator iter = model.getAnnotationIterator(offset, length, true, true);\r
+               while (iter.hasNext()) {\r
+                       Object next = iter.next();\r
+                       if (next instanceof LineAnnotation) {\r
+                                Object entity = ((LineAnnotation) next).getEntity();\r
+                                String supplementalText = lineDisplayStrategy.getSupplementalText(entity);\r
+                                if (supplementalText != null && supplementalText.length() > 0) {\r
+                                        try {\r
+                                               int line = document.getLineOfOffset(model.getPosition((LineAnnotation) next).getOffset());\r
+                                               supplementalTexts.put(line, supplementalText);\r
+                                       } catch (BadLocationException e) {\r
+                                               // TODO Auto-generated catch block\r
+                                               e.printStackTrace();\r
+                                       }\r
+                                        \r
+                                }\r
+                       }\r
+               }\r
+               this.document = (Document) document; \r
+               super.setPartialRange(document, offset, length, contentType, partitionOffset);\r
+       }\r
+       \r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.text.rules.RuleBasedPartitionScanner#nextToken()\r
+        */\r
+       @Override\r
+       public IToken nextToken() {\r
+               try {\r
+                       int line = document.getLineOfOffset(getTokenOffset());\r
+                       if (line != lastLine) {\r
+                               rule.setStartSequence(supplementalTexts.get(line));\r
+                       }\r
+                       lastLine = line;\r
+               } catch (BadLocationException e) {\r
+                       // TODO Auto-generated catch block\r
+                       e.printStackTrace();\r
+               }\r
+               return super.nextToken();\r
+       }\r
+       \r
+       class SupplementalTextRule extends SingleLineRule {\r
+\r
+               static final String DUMMY_SEQUENCE = "_dummy_sequence";\r
+               \r
+               /**\r
+                * @param startSequence\r
+                * @param endSequence\r
+                * @param token\r
+                * @param escapeCharacter\r
+                * @param breaksOnEOL\r
+                */\r
+               public SupplementalTextRule(IToken token) {\r
+                       super(DUMMY_SEQUENCE, null, token, '\\', true);\r
+               }\r
+                               \r
+               protected void setStartSequence(String sequence) {\r
+                       if (sequence != null && sequence.length() > 0) {\r
+                               fStartSequence = sequence.toCharArray();\r
+                       }\r
+               }\r
+               \r
+       }\r
+}\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
index 1a7ed69e304605e3c874096999abb2ef89bfdc06..3474ea7693a73ba4ce65f1ce9eaf0f2efea74b24 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
@@ -67,6 +67,8 @@ public class BulkEditor extends AnnotatedLineEditor implements PropertyChangeLis
        public static final String ID = "bulkeditor.editor";\r
 \r
        private boolean isInitialFocus = true;\r
+\r
+       private IPropertyChangeListener markerPreferenceListener;\r
        \r
        /**\r
         * \r
@@ -93,7 +95,7 @@ public class BulkEditor extends AnnotatedLineEditor implements PropertyChangeLis
                \r
                setLineDisplayStrategy(new BulkEditorLineDisplay(this));\r
                \r
-               setSourceViewerConfiguration(new BulkEditorViewerConfiguration());\r
+               setSourceViewerConfiguration(new BulkEditorViewerConfiguration(lineDisplayStrategy));\r
        }\r
        \r
        /* (non-Javadoc)\r
@@ -158,14 +160,26 @@ public class BulkEditor extends AnnotatedLineEditor implements PropertyChangeLis
        private void createMarkerEditing(Composite parent) {\r
                final BulkEditorMarkerPreferenceComposite markerPreferenceBar = \r
                                new BulkEditorMarkerPreferenceComposite((BulkEditorInput) getEditorInput(), parent, SWT.NONE);\r
-               PreferencesUtil.getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() {\r
+               markerPreferenceListener = new IPropertyChangeListener() {\r
                        public void propertyChange(\r
                                        org.eclipse.jface.util.PropertyChangeEvent event) {\r
                                if (event.getProperty().contains(PreferencesUtil.EDIT_MARKER_TYPE_PREFIX)) {\r
                                        refreshLineDisplay();\r
                                }\r
                        }\r
-               });\r
+               };\r
+               PreferencesUtil.getPreferenceStore().addPropertyChangeListener(markerPreferenceListener);\r
+       }\r
+       \r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.ui.editors.text.TextEditor#dispose()\r
+        */\r
+       @Override\r
+       public void dispose() {\r
+               if (markerPreferenceListener != null ) {\r
+                       PreferencesUtil.getPreferenceStore().removePropertyChangeListener(markerPreferenceListener);\r
+               }\r
+               super.dispose();\r
        }\r
        \r
        /**\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorViewerConfiguration.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorViewerConfiguration.java
index 2365d7bbed5d6d655f695d86e6c428815e981381..efc3501331855fd02604a93bd16c0995381435e3 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorViewerConfiguration.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorViewerConfiguration.java
@@ -11,17 +11,13 @@ package eu.etaxonomy.taxeditor.bulkeditor;
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.jface.text.IDocument;\r
-import org.eclipse.jface.text.ITypedRegion;\r
-import org.eclipse.jface.text.TextPresentation;\r
 import org.eclipse.jface.text.presentation.IPresentationReconciler;\r
 import org.eclipse.jface.text.presentation.PresentationReconciler;\r
 import org.eclipse.jface.text.rules.DefaultDamagerRepairer;\r
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;\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.custom.StyleRange;\r
 \r
+import eu.etaxonomy.taxeditor.annotatedlineeditor.SupplementalTextScanner;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy;\r
 \r
 \r
@@ -33,7 +29,14 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy;
 public class BulkEditorViewerConfiguration extends SourceViewerConfiguration {\r
        private static final Logger logger = Logger\r
                        .getLogger(BulkEditorViewerConfiguration.class);\r
+       \r
+       private ILineDisplayStrategy lineDisplayStrategy;\r
 \r
+       public BulkEditorViewerConfiguration(ILineDisplayStrategy lineDisplayStrategy) {\r
+               this.lineDisplayStrategy = lineDisplayStrategy;\r
+       }\r
+       \r
+       \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getPresentationReconciler(org.eclipse.jface.text.source.ISourceViewer)\r
         */\r
@@ -43,19 +46,9 @@ public class BulkEditorViewerConfiguration extends SourceViewerConfiguration {
                \r
                PresentationReconciler reconciler = new PresentationReconciler();\r
                \r
-               DefaultDamagerRepairer damageRepairer = new DefaultDamagerRepairer(new RuleBasedPartitionScanner()) {\r
-                       /* (non-Javadoc)\r
-                        * @see org.eclipse.jface.text.rules.DefaultDamagerRepairer#createPresentation(org.eclipse.jface.text.TextPresentation, org.eclipse.jface.text.ITypedRegion)\r
-                        */\r
-                       @Override\r
-                       public void createPresentation(TextPresentation presentation,\r
-                                       ITypedRegion region) {\r
-                               presentation.addStyleRange(new StyleRange(region.getOffset(), region.getLength(),\r
-                                               sourceViewer.getTextWidget().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY), null, SWT.ITALIC));\r
-                       }\r
-               };\r
-               reconciler.setDamager(damageRepairer, ILineDisplayStrategy.SUPPLEMENTAL_TEXT);\r
-               reconciler.setRepairer(damageRepairer, ILineDisplayStrategy.SUPPLEMENTAL_TEXT);\r
+               DefaultDamagerRepairer damageRepairer = new DefaultDamagerRepairer(new SupplementalTextScanner(sourceViewer, lineDisplayStrategy));\r
+               reconciler.setDamager(damageRepairer, IDocument.DEFAULT_CONTENT_TYPE);\r
+               reconciler.setRepairer(damageRepairer, IDocument.DEFAULT_CONTENT_TYPE);\r
                \r
                return reconciler;\r
        }\r