Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornitind2005-08-24 14:57:10 +0000
committernitind2005-08-24 14:57:10 +0000
commit5da8920903ae72039b20fa37ca704ec41d59ea84 (patch)
tree05ab89c5f16f1bcfd0ef4487340ba7b78b2b141c /bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal
parent8d3be7fb5b315ead31a7a8169736e071fed6e8c6 (diff)
downloadwebtools.sourceediting-5da8920903ae72039b20fa37ca704ec41d59ea84.tar.gz
webtools.sourceediting-5da8920903ae72039b20fa37ca704ec41d59ea84.tar.xz
webtools.sourceediting-5da8920903ae72039b20fa37ca704ec41d59ea84.zip
[104683] bugs in TextHoverManager
Diffstat (limited to 'bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal')
-rw-r--r--bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/TextHoverManager.java21
1 files changed, 19 insertions, 2 deletions
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/TextHoverManager.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/TextHoverManager.java
index e978c97c93..3bcd0058e9 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/TextHoverManager.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/TextHoverManager.java
@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.StringTokenizer;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.wst.sse.ui.internal.Logger;
import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames;
@@ -163,7 +164,15 @@ public class TextHoverManager {
if (modifierString.equals(NO_MODIFIER))
modifierString = ""; //$NON-NLS-1$
- TextHoverDescriptor descriptor = new TextHoverDescriptor(id, SSEUIMessages.getResourceBundle().getString(id + LABEL_KEY), SSEUIMessages.getResourceBundle().getString(id + DESCRIPTION_KEY), enabled, modifierString);
+ String label = null;
+ String description = null;
+ try {
+ label = SSEUIMessages.getResourceBundle().getString(id + LABEL_KEY);
+ description = SSEUIMessages.getResourceBundle().getString(id + DESCRIPTION_KEY);
+ } catch (Exception e) {
+ Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
+ }
+ TextHoverDescriptor descriptor = new TextHoverDescriptor(id, label, description, enabled, modifierString);
// should check to see if ids appear more than once
idToModifier.put(id, descriptor);
}
@@ -176,7 +185,15 @@ public class TextHoverManager {
if (desc != null) {
descriptors[i] = desc;
} else {
- descriptors[i] = new TextHoverDescriptor(TEXT_HOVER_IDS[i], SSEUIMessages.getResourceBundle().getString(TEXT_HOVER_IDS[i] + LABEL_KEY), SSEUIMessages.getResourceBundle().getString(TEXT_HOVER_IDS + DESCRIPTION_KEY));
+ String label = null;
+ String description = null;
+ try {
+ label = SSEUIMessages.getResourceBundle().getString(TEXT_HOVER_IDS[i] + LABEL_KEY);
+ description = SSEUIMessages.getResourceBundle().getString(TEXT_HOVER_IDS[i] + DESCRIPTION_KEY);
+ } catch (Exception e) {
+ Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
+ }
+ descriptors[i] = new TextHoverDescriptor(TEXT_HOVER_IDS[i], label, description);
}
}
return descriptors;

Back to the top