Checkin before trying crazy shit.

diff --git a/.gitattributes b/.gitattributes
index 053a8396410748b38b23dd808bf601e0874a2e59..302503f8bf6b31883f6bb64e88940debc1562084 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -664,6 +664,8 @@ 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/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
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorEntityCreatorService.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java -text
@@ -680,9 +682,7 @@ taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/Bul
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DeleteObjectContributionItem.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/NewObjectContributionItem.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java -text
-taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteObjectHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/MergeGroupHandler.java -text
-taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/NewObjectHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.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 fd9e6bc5c0d713747465f6561db434362e632f26..da59d3de070b16caa974892c897cd521aebb08b2 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
@@ -85,7 +85,15 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                                model = new LineAnnotationModel(getLineDisplayStrategy(element));\r
                                ((LineAnnotationModel) model).setEntityCreator(getEntityCreator(element));\r
                                annotationModels.put(input, model);\r
-                       }       \r
+                       } else {\r
+                               // debug code\r
+//                             int count = 0;\r
+//                             Iterator it = model.getAnnotationIterator();\r
+//                             while (it.hasNext()) {\r
+//                                     count++;\r
+//                             }\r
+//                             logger.info("Model has " + count + " annotations");\r
+                       }\r
                        return model;\r
                }\r
                \r
@@ -153,7 +161,6 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                        document.replace(docLength, 0, document.getDefaultLineDelimiter());\r
                }\r
                \r
-               docLength = document.getLength();\r
                String text;\r
                boolean doItalics = false;\r
                if (lineDisplay.isEntityCacheEmpty(entity)) {\r
@@ -162,13 +169,24 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                } else {\r
                        text = lineDisplay.getText(entity);\r
                }\r
+               docLength = document.getLength();\r
                document.replace(docLength, 0, text);\r
                \r
                Position position = new Position(docLength, text.length());\r
-               getAnnotationModel(element).addAnnotation(annotation, position);\r
-                               \r
+               \r
+               IAnnotationModel model = getAnnotationModel(element);\r
+               model.addAnnotation(annotation, position);\r
+                                       \r
                logger.info("Annotation added " + entity);\r
                \r
+               // debug code\r
+//             int count = 0;\r
+//             Iterator it = model.getAnnotationIterator();\r
+//             while (it.hasNext()) {\r
+//                     count++;\r
+//             }\r
+//             logger.info("Model has " + count + " annotations");\r
+               \r
                if (doItalics) {\r
                        \r
                        // TODO implement italics for non-named objects in presentation repairer à la\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java
index 76f757cc07438f947b48fabec0e01c6e580d8698..3b71e707bce35a357a96568e77abf7639b86b68f 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java
@@ -15,7 +15,6 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;\r
 import org.eclipse.jface.text.source.ISourceViewer;\r
 import org.eclipse.jface.text.source.IVerticalRuler;\r
-import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IEditorSite;\r
@@ -67,7 +66,7 @@ public class AnnotatedLineEditor extends TextEditor implements IConversationEnab
                        throws PartInitException {\r
                \r
                AnnotatedLineDocumentProvider provider = \r
-                                                       createAnnotatedLineEditorDocumentProvider();\r
+                                                       createAnnotatedLineDocumentProvider();\r
                if (entityCreatorService != null) {\r
                        provider.setEntityCreator(entityCreatorService.getEntityCreator(input), input);\r
                } else {\r
@@ -83,7 +82,7 @@ public class AnnotatedLineEditor extends TextEditor implements IConversationEnab
        /**\r
         * @return\r
         */\r
-       protected AnnotatedLineDocumentProvider createAnnotatedLineEditorDocumentProvider() {\r
+       protected AnnotatedLineDocumentProvider createAnnotatedLineDocumentProvider() {\r
                return new AnnotatedLineDocumentProvider();\r
        }\r
 \r
@@ -200,7 +199,7 @@ public class AnnotatedLineEditor extends TextEditor implements IConversationEnab
        public void setFocus() {\r
                super.setFocus();\r
                getConversationHolder().bind();\r
-               // TODO pass focus to underlying widgets?\r
+               // TODO pass focus to underlying widgets\r
        }\r
 \r
        /* (non-Javadoc)\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IdentifiableEntityComparator.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IdentifiableEntityComparator.java
index ce488356261a14bee2b09b37535ffe8a1c525e7a..5869f4ddd011965d509d5f20271b3c8b01878a2a 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IdentifiableEntityComparator.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IdentifiableEntityComparator.java
@@ -38,7 +38,6 @@ public class IdentifiableEntityComparator implements Comparator {
        public int compare(Object o1, Object o2) {\r
                String titleCache1 = getTitleCache(o1);\r
                String titleCache2 = getTitleCache(o2);\r
-               logger.warn(titleCache1 + " <> " + titleCache2);\r
         return fIgnoreCase ? titleCache1.compareToIgnoreCase(titleCache2) : \r
                                                        titleCache1.compareTo(titleCache2);\r
        }\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotation.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotation.java
index 790a28805ff02e62ac151bd1684674d4320595c5..8ae66fbe85b2b8d310afd8260a4882b9d71129a9 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotation.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotation.java
@@ -142,7 +142,7 @@ public class LineAnnotation extends Annotation implements IEntityContainer {
         */\r
        public void markAsNew(boolean isNew) {\r
                markedAsNew = isNew;\r
-               lineDisplayStrategy.setStatusMessage("New entry created.", entity);\r
+               lineDisplayStrategy.setStatusMessage("New entity created.", entity);\r
        }\r
 \r
        /* (non-Javadoc)\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java
index 56cd487c1e19c95afd411198b462a6ae319503d0..541f2bc2681f36d45d8068e01189ba70ab1c9ddb 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java
@@ -26,6 +26,8 @@ import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationModel;\r
 import org.eclipse.jface.text.source.AnnotationModelEvent;\r
 \r
+import eu.etaxonomy.cdm.model.name.BotanicalName;\r
+\r
 /**\r
  * An <code>AnnotationModel</code> which holds <code>LineAnnotation</code>'s.\r
  * <p>\r
@@ -132,7 +134,21 @@ public class LineAnnotationModel extends AnnotationModel {
                try {\r
                        int offset = document.getLineOffset(line);\r
                        int length = document.getLineLength(line);\r
-                       Iterator<?> iterator = getAnnotationIterator(offset, length, true, true);\r
+                       \r
+                       // test explicitly add annotation, see if the iterator still returns nothing\r
+//                     LineAnnotation newAnnotation = new LineAnnotation(BotanicalName.NewInstance(null), lineDisplayStrategy);\r
+//                     Position position = new Position(offset, length);\r
+//                     addAnnotation(newAnnotation, position);\r
+                       // newly added annotation gets returned\r
+                       \r
+                       // test whether an annotation iterator w no position returns anything\r
+//                     Iterator<?> iterator = getAnnotationIterator();\r
+                       // also return nothing\r
+                       \r
+                       // so annotations which have been added to this annotation model are disappearing\r
+                       // model stays the same\r
+                       \r
+                       Iterator<?> iterator = getAnnotationIterator(offset, length, true, true); // returning nothing\r
                        if (iterator.hasNext()) {\r
                                annotation = (Annotation) iterator.next();\r
                        }\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteObjectHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java
similarity index 58%
rename from taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteObjectHandler.java
rename to taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java
index fd14da26b5a62a5ae8fa0e576e684e21b2843e4f..8366c04f2d86f04bedaaf9e0407dd9aacfebc7a6 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteObjectHandler.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java
@@ -7,23 +7,17 @@
 * 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
-package eu.etaxonomy.taxeditor.bulkeditor.handler;\r
+package eu.etaxonomy.taxeditor.annotatedlineeditor.handler;\r
 \r
 import org.eclipse.core.commands.AbstractHandler;\r
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r
-import org.eclipse.jface.text.IDocument;\r
 import org.eclipse.jface.text.TextSelection;\r
 import org.eclipse.jface.viewers.ISelection;\r
-import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IEditorPart;\r
 import org.eclipse.ui.handlers.HandlerUtil;\r
-import org.eclipse.ui.texteditor.IDocumentProvider;\r
 \r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor;\r
-import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;\r
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;\r
-import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInput;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -38,24 +32,16 @@ public class DeleteObjectHandler extends AbstractHandler {
        public Object execute(ExecutionEvent event) throws ExecutionException {\r
                                \r
                IEditorPart editor = HandlerUtil.getActiveEditor(event);\r
-               IEditorInput input = editor.getEditorInput();\r
                \r
-               if (editor instanceof AnnotatedLineEditor && input instanceof BulkEditorInput) {\r
-                       \r
-                       IDocumentProvider provider = ((AnnotatedLineEditor) editor).getDocumentProvider();\r
-                       LineAnnotationModel model = \r
-                                       (LineAnnotationModel) provider.getAnnotationModel(input);\r
-                       IDocument document = provider.getDocument(input);\r
-                       \r
+               if (editor instanceof AnnotatedLineEditor) {\r
+                                               \r
                        ISelection selection = HandlerUtil.getActiveMenuSelection(event);\r
                        if (selection instanceof TextSelection) {\r
                                \r
                                // Get current line\r
                                int line = ((TextSelection) selection).getStartLine();\r
                                \r
-                               if (editor instanceof BulkEditor) {\r
-                                       ((BulkEditor) editor).removeAnnotatedLine(line);\r
-                               }\r
+                               ((AnnotatedLineEditor) editor).removeAnnotatedLine(line);\r
                        }\r
                }               \r
                return null;\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/NewObjectHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java
similarity index 79%
rename from taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/NewObjectHandler.java
rename to taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java
index aaa6d1556906ae28416a57484716b7a9013355a1..63c5e77118cd6ee87ee7a72997f331abab318905 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/NewObjectHandler.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.bulkeditor.handler;\r
+package eu.etaxonomy.taxeditor.annotatedlineeditor.handler;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.AbstractHandler;\r
@@ -18,7 +18,7 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;\r
 import org.eclipse.ui.handlers.HandlerUtil;\r
 \r
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;\r
+import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -36,8 +36,8 @@ public class NewObjectHandler extends AbstractHandler {
                \r
                IEditorPart editor = HandlerUtil.getActiveEditor(event);\r
                IEditorInput input = editor.getEditorInput();\r
-               if (editor instanceof BulkEditor) {\r
-                       ((BulkEditor) editor).createAnnotatedLineNewObject();\r
+               if (editor instanceof AnnotatedLineEditor) {\r
+                       ((AnnotatedLineEditor) editor).createAnnotatedLineNewObject();\r
                }\r
                return null;\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 b81ea2a13e3ce9e3ef03af27e03d9e5ddbbdf7b7..8c983254d8718a16cdc6925b7ba286f176df5aed 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
@@ -14,7 +14,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.eclipse.core.runtime.CoreException;\r
 import org.eclipse.jface.dialogs.MessageDialog;\r
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;\r
 import org.eclipse.jface.preference.IPreferenceStore;\r
@@ -119,15 +118,6 @@ public class BulkEditor extends AnnotatedLineEditor implements PropertyChangeLis
                        }\r
                }\r
        }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.ui.editors.text.TextEditor#doSetInput(org.eclipse.ui.IEditorInput)\r
-        */\r
-       @Override\r
-       protected void doSetInput(IEditorInput input) throws CoreException {\r
-               // TODO Auto-generated method stub\r
-               super.doSetInput(input);\r
-       }\r
        \r
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#isEditable()\r
@@ -142,10 +132,9 @@ public class BulkEditor extends AnnotatedLineEditor implements PropertyChangeLis
         */\r
        @Override\r
        public void setFocus() {\r
-               // TODO Auto-generated method stub\r
                super.setFocus();\r
 \r
-               // TODO find a better place to put this - I wanted to show this dialog after initial contents of \r
+               // TODO find a better place to put this - this dialog should be shown after initial contents of \r
                //      Editor are displayed\r
                if (isInitialFocus) {\r
                        displayWarningDialog();\r
@@ -227,4 +216,4 @@ public class BulkEditor extends AnnotatedLineEditor implements PropertyChangeLis
                        setInput(getEditorInput());\r
                }\r
        }\r
-}\r
+}
\ No newline at end of file

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java
index b208ce151aaada3b3b8a14f2a4c274c25522c341..7c39a9ffd1f0ad17cd7bc4e3b43dbe5d21eac849 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ShowReferencingObjectsHandler.java
@@ -14,7 +14,6 @@ import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;\r
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r
-import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.handlers.HandlerUtil;\r
 \r
@@ -34,7 +33,6 @@ public class ShowReferencingObjectsHandler extends AbstractHandler {
         */\r
        public Object execute(ExecutionEvent event) throws ExecutionException {\r
                try {\r
-                       ISelection selection = HandlerUtil.getActiveMenuSelection(event);\r
                        ReferencingObjectsView view = (ReferencingObjectsView) HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().\r
                                                showView(ReferencingObjectsView.ID);\r
                        view.updateReferencingObjects();\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index e04ec6890fb86facf54ed993e745f46b6705e485..57016ebd48a4d25f3c30c9a13ab41e8b50558685 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -126,7 +126,7 @@ public class ReferencingObjectsView extends ViewPart implements IConversationEna
                        for (Object object : referencingObjectsTemp) {\r
                                this.referencingObjects.add((CdmBase) HibernateProxyHelper.deproxy(object));\r
                        }\r
-//                     Collections.sort(this.referencingObjects, new ReferencingClassComparator());\r
+                       Collections.sort(this.referencingObjects, new ReferencingClassComparator());\r
                        updateView();\r
                }       \r
             }\r
@@ -161,7 +161,7 @@ public class ReferencingObjectsView extends ViewPart implements IConversationEna
        private void updateView() {\r
                \r
                referencingObjectsViewer.setInput(referencingObjects);\r
-               setContentDescription("'" + referencedObject + "' is referenced by:");\r
+               setContentDescription("'" + referencingObjectsService.getObjectDescription(referencedObject) + "' is referenced by:");\r
        }\r
 \r
        /* (non-Javadoc)\r