Fixed bug 325408: [call hierarchy] Adjust Call Hierarchy view's label rendering to other views
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
index ad333cf..cc103d7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyLifeCycle.java
@@ -210,7 +210,7 @@
context.run(true, true, op);
fHierarchyRefreshNeeded= false;
} else {
- final String label= Messages.format(TypeHierarchyMessages.TypeHierarchyLifeCycle_computeInput, TypeHierarchyViewPart.getElementLabel(elements));
+ final String label= Messages.format(TypeHierarchyMessages.TypeHierarchyLifeCycle_computeInput, HistoryAction.getElementLabel(elements));
synchronized (this) {
fRefreshHierarchyJob= new Job(label) {
/*
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.java
index 8d3efef..722e588 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.java
@@ -75,9 +75,6 @@
public static String TypeHierarchyViewPart_ws_tooltip;
public static String TypeHierarchyViewPart_restoreinput;
public static String TypeHierarchyViewPart_layout_submenu;
- public static String TypeHierarchyViewPart_inputElements_1;
- public static String TypeHierarchyViewPart_inputElements_2;
- public static String TypeHierarchyViewPart_inputElements_more;
public static String TypeHierarchyLifeCycle_computeInput;
public static String ToggleViewAction_subtypes_label;
public static String ToggleViewAction_subtypes_tooltip;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.properties
index 9fa60cf..b876fd3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyMessages.properties
@@ -47,9 +47,6 @@
HistoryAction_inputElements_1={0}
HistoryAction_inputElements_2={0}, {1}
HistoryAction_inputElements_more= {0}, {1}, ...
-TypeHierarchyViewPart_inputElements_1= ''{0}''
-TypeHierarchyViewPart_inputElements_2= ''{0}'', ''{1}''
-TypeHierarchyViewPart_inputElements_more= ''{0}'', ''{1}'', ...
HistoryListDialog_title=Type Hierarchy History
HistoryListDialog_label=&Select the element to open in the type hierarchy:
@@ -80,8 +77,8 @@
TypeHierarchyViewPart_exception_message=Creating hierarchy failed. See log for details.
TypeHierarchyViewPart_tooltip=Type Hierarchy of ''{0}''
-TypeHierarchyViewPart_ws_description={0} - in working set: {1}
-TypeHierarchyViewPart_ws_tooltip=Type Hierarchy of {0} - in working set: {1}
+TypeHierarchyViewPart_ws_description=''{0}'' - in working set: {1}
+TypeHierarchyViewPart_ws_tooltip=Type Hierarchy of ''{0}'' - in working set: {1}
TypeHierarchyViewPart_restoreinput=Restoring type hierarchy of ''{0}''...
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
index 267ec45..8418c8f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
@@ -112,7 +112,6 @@
import org.eclipse.jdt.ui.IContextMenuConstants;
import org.eclipse.jdt.ui.ITypeHierarchyViewPart;
-import org.eclipse.jdt.ui.JavaElementLabels;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jdt.ui.actions.CCPActionGroup;
@@ -606,7 +605,7 @@
}
fInputElements= inputElements;
fNoHierarchyShownLabel
- .setText(Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_createinput, getElementLabel(fInputElements)));
+ .setText(Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_createinput, HistoryAction.getElementLabel(fInputElements)));
try {
fHierarchyLifeCycle.ensureRefreshedTypeHierarchy(inputElements, JavaPlugin.getActiveWorkbenchWindow());
// fHierarchyLifeCycle.ensureRefreshedTypeHierarchy(inputElement, getSite().getWorkbenchWindow());
@@ -1232,7 +1231,7 @@
setViewerVisibility(true);
}
} else if (!isKeepShowingEmptyViewers()) {//Show the empty hierarchy viewer till fresh computation is done.
- fEmptyTypesViewer.setText(Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_nodecl, getElementLabel(fInputElements)));
+ fEmptyTypesViewer.setText(Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_nodecl, HistoryAction.getElementLabel(fInputElements)));
setViewerVisibility(false);
}
}
@@ -1368,7 +1367,7 @@
String description;
if (fInputElements != null) {
IWorkingSet workingSet= fWorkingSetActionGroup.getWorkingSet();
- String elementName= getElementLabel(fInputElements);
+ String elementName= HistoryAction.getElementLabel(fInputElements);
if (workingSet == null) {
description= elementName;
tooltip= Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_tooltip, elementName);
@@ -1657,7 +1656,7 @@
final IJavaElement[] hierarchyInput= (IJavaElement[])inputList.toArray(new IJavaElement[inputList.size()]);
synchronized (this) {
- String label= Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_restoreinput, getElementLabel(hierarchyInput));
+ String label= Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_restoreinput, HistoryAction.getElementLabel(hierarchyInput));
fNoHierarchyShownLabel.setText(label);
fRestoreStateJob= new Job(label) {
@@ -1921,40 +1920,4 @@
public boolean isKeepShowingEmptyViewers() {
return fKeepShowingEmptyViewers;
}
-
- /**
- * Fetches the label for all the java elements.
- *
- * @param elements the java elements
- * @return the label for all the java elements
- * @since 3.7
- */
- static String getElementLabel(IJavaElement[] elements) {
- switch (elements.length) {
- case 0:
- Assert.isTrue(false);
- return null;
-
- case 1:
- return Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_inputElements_1,
- new String[] { getShortLabel(elements[0]) });
- case 2:
- return Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_inputElements_2,
- new String[] { getShortLabel(elements[0]), getShortLabel(elements[1]) });
- default:
- return Messages.format(TypeHierarchyMessages.TypeHierarchyViewPart_inputElements_more,
- new String[] { getShortLabel(elements[0]), getShortLabel(elements[1]), getShortLabel(elements[2]) });
- }
- }
-
- /**
- * Fetches the short label for the java element.
- *
- * @param element the java element
- * @return the short label for the java element
- * @since 3.7
- */
- private static String getShortLabel(IJavaElement element) {
- return JavaElementLabels.getElementLabel(element, JavaElementLabels.ALL_DEFAULT | JavaElementLabels.ALL_POST_QUALIFIED);
- }
}
