Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-07-20 09:46:16 -0400
committervlorenzo2012-07-20 09:46:16 -0400
commit48d9526d8c7a3adde4468190fa7faf2325c9d40d (patch)
treee7abfe711a5d29da419a999627f824dd55737ce8 /plugins/infra
parent8f60a841b4db7d0237120cc79aada4e294f8ff18 (diff)
downloadorg.eclipse.papyrus-48d9526d8c7a3adde4468190fa7faf2325c9d40d.tar.gz
org.eclipse.papyrus-48d9526d8c7a3adde4468190fa7faf2325c9d40d.tar.xz
org.eclipse.papyrus-48d9526d8c7a3adde4468190fa7faf2325c9d40d.zip
385599: [Hyperlink] We can't select the diagram/table for referencing them
https://bugs.eclipse.org/bugs/show_bug.cgi?id=385599 385600: [Hyperlink] Change the name of the tab : Editor hyperlinks https://bugs.eclipse.org/bugs/show_bug.cgi?id=385600
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java3
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java7
5 files changed, 11 insertions, 7 deletions
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java
index 479f2431c92..5e709edb490 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java
@@ -21,7 +21,7 @@ public class Messages extends NLS {
public static String EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject;
- public static String EditorHyperLinkEditorShell_Table;
+ public static String EditorHyperLinkEditorShell_View;
public static String EditorHyperLinkHelper_Editor;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
index 657a3054cb5..b06e66579e6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
@@ -1,6 +1,6 @@
EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject=I can't find the HyperlinkEditorObject for : {0}
-EditorHyperLinkEditorShell_Table=Table :
-EditorHyperLinkHelper_Editor=Editor
+EditorHyperLinkEditorShell_View=View :
+EditorHyperLinkHelper_Editor=View
HyperLinkEditorHelpersRegistrationUtil_ICantCreateTheClassForAnHelper=I can't create the class for an helper
HyperLinkEditorHelpersRegistrationUtil_NotAnInstanceOf={0} is not an instanceof {1}
HyperLinkHelpersRegistrationUtil_ICantCreateTheClassForAnHelper=I can't create the class for an helper
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java
index 8be508db105..bd4a0c5c9a6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java
@@ -75,7 +75,7 @@ public class EditorHyperLinkEditorShell extends AbstractEditHyperlinkDocumentShe
this.amodel = model;
this.editorRegistry = editorFactoryRegistry;
createEditHyperlinkShell();
- getObjectcLabel().setText(Messages.EditorHyperLinkEditorShell_Table); //TODO : where is it used?
+ getObjectcLabel().setText(Messages.EditorHyperLinkEditorShell_View); //TODO : where is it used?
// intialize "use default" check box
getUseDefaultCheckBox().setSelection(usedefaultTooltip);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
index 048572aa1bd..de49c068e78 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
@@ -233,6 +233,9 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell {
// fill list of diagram
//TODO
//diagramListTreeViewer.setLabelProvider(new ObjectLabelProvider(null));
+
+ //we can't reuse the same instance of the label provider see bug 385599: [Hyperlink] We can't select the diagram/table for referencing them
+ labelProvider = new LocalLabelProvider();
diagramListTreeViewer.setLabelProvider(labelProvider);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java
index 82b459e3259..667ac2ed180 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.hyperlink.util;
import java.util.Collection;
import java.util.Iterator;
+import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
@@ -77,9 +78,9 @@ public class HyperLinkTabsRegistrationUtil {
final Object h = e.createExecutableExtension(TAB);
if(h instanceof AbstractHyperLinkTab) {
tab = (AbstractHyperLinkTab)h;
- String o = e.getAttribute(POSITION, null);
- Integer position = Integer.valueOf(o);
- String tabId = e.getAttribute(TAB_ID, null);
+ final String o = e.getAttribute(POSITION);
+ final Integer position = Integer.valueOf(o);
+ final String tabId = e.getAttribute(TAB_ID);
tab.setTabId(tabId);
allTabs.put(position, tab);
} else {

Back to the top