commit be8dbe334aa29993f4807668435a4b3fde16706d
author vbaciu <vbaciu> Wed Apr 21 21:05:40 2010 +0000
committer vbaciu <vbaciu> Wed Apr 21 21:05:40 2010 +0000
tree a0fc04590c2d36198f25a68b572966f77747c0f0
parent 2bd4a06018b0ff9d26a4c446ef4559773dc6ccf2

[194624] XSD preview of the Element or Type is difficult to close

bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java
index 37203f0..33adbde 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java
@@ -72,7 +72,8 @@
 
   public XSDGraphViewerDialog(Shell parentShell, String titleText, String infoText, Object model, String ID)
   {
-    super(parentShell, HOVER_SHELLSTYLE, true, true, true, true, false, titleText, infoText);
+    // INFOPOPUP_SHELLSTYLE works properly on both Windows and Linux.
+    super(parentShell, INFOPOPUP_SHELLSTYLE, true, true, true, true, false, titleText, infoText);
     setModel(model);
     linkListener = new OpenEditorLinkListener();
     this.infoText = infoText;
@@ -196,7 +197,9 @@
     nsInfoLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
 
     link = new Hyperlink(infoComposite, SWT.RIGHT);
-    link.setText(Messages._UI_ACTION_OPEN_IN_NEW_EDITOR);
+    // Remove mnemonic ampersand. It would be better to have a separate string in the future.
+    String label = Messages._UI_ACTION_OPEN_IN_NEW_EDITOR.replaceAll("&", "");
+    link.setText(label);
     link.setFont(infoFont);
     link.addHyperlinkListener(linkListener);
     return infoComposite;