[jbosstools-commits] JBoss Tools SVN: r15072 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory.

Author: yradtsevich Date: 2009-05-06 09:29:55 -0400 (Wed, 06 May 2009) New Revision: 15072 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: issue JBIDE-4256: Make VPE error message more information and user friendly https://jira.jboss.org/jira/browse/JBIDE-4256 - the messages changed - the link updated - cut-and-paste code removed Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-05-06 12:59:36 UTC (rev 15071) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-05-06 13:29:55 UTC (rev 15072) @@ -106,7 +106,6 @@ private IVpeToolBarManager vpeToolBarManager; private FormatControllerManager formatControllerManager = new FormatControllerManager(); private VpeController controller; - private Link link = null; private boolean isRefreshPage = false; private String doctype; @@ -422,50 +421,8 @@ } catch (XulRunnerException e) { - VpePlugin.getPluginLog().logError(e); - - layout.verticalSpacing = 10; - Label title = new Label(cmpEd, SWT.WRAP); - title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR); - title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - link = new Link(cmpEd, SWT.WRAP); - link.setText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK_TEXT); - link.setToolTipText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK); - link.setForeground(link.getDisplay().getSystemColor(SWT.COLOR_BLUE)); - link.addMouseListener(new MouseListener() { - public void mouseDown(org.eclipse.swt.events.MouseEvent e) { - BusyIndicator.showWhile(link.getDisplay(), new Runnable() { - public void run() { - URL theURL=null;; - try { - theURL = new URL(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK); - } catch (MalformedURLException e) { - VpePlugin.reportProblem(e); - } - IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport(); - try { - support.getExternalBrowser().openURL(theURL); - } catch (PartInitException e) { - VpePlugin.reportProblem(e); - } - } - }); - } - - public void mouseDoubleClick(MouseEvent e) { - // TODO Auto-generated method stub - - } - - public void mouseUp(MouseEvent e) { - // TODO Auto-generated method stub - - } - }); - link.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - Label fill = new Label(cmpEd, SWT.WRAP); - fill.setLayoutData(new GridData(GridData.FILL_BOTH)); + layout.verticalSpacing = 10; + showXulRunnerException(cmpEd, e); } /* @@ -479,6 +436,53 @@ sc.setMinSize(totalSize); } + /** + * Logs given {@code exception} and shows error message in + * the {@code parent} composite. + */ + protected void showXulRunnerException(Composite parent, + XulRunnerException exception) { + VpePlugin.getPluginLog().logError( + VpeUIMessages.MOZILLA_LOADING_ERROR_LOG_ENTRY, exception); + + Label title = new Label(parent, SWT.WRAP); + title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR); + title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + final Link link = new Link(parent, SWT.WRAP); + link.setText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK_TEXT); + link.setToolTipText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK); + link.setForeground(link.getDisplay().getSystemColor(SWT.COLOR_BLUE)); + link.addMouseListener(new MouseListener() { + public void mouseDown(org.eclipse.swt.events.MouseEvent e) { + BusyIndicator.showWhile(link.getDisplay(), new Runnable() { + public void run() { + URL theURL=null;; + try { + theURL = new URL(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK); + } catch (MalformedURLException e) { + VpePlugin.reportProblem(e); + } + IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport(); + try { + support.getExternalBrowser().openURL(theURL); + } catch (PartInitException e) { + VpePlugin.reportProblem(e); + } + } + }); + } + + public void mouseDoubleClick(MouseEvent e) { + } + public void mouseUp(MouseEvent e) { + } + }); + link.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Label fill = new Label(parent, SWT.WRAP); + fill.setLayoutData(new GridData(GridData.FILL_BOTH)); + } + private ToolItem createToolItem(ToolBar parent, int type, String image, String toolTipText) { ToolItem item = new ToolItem(parent, type); @@ -752,20 +756,6 @@ } /** - * @return the link - */ - protected Link getLink() { - return link; - } - - /** - * @param link the link to set - */ - protected void setLink(Link link) { - this.link = link; - } - - /** * @return the contentAreaEventTarget */ public nsIDOMEventTarget getContentAreaEventTarget() { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2009-05-06 12:59:36 UTC (rev 15071) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2009-05-06 13:29:55 UTC (rev 15072) @@ -10,24 +10,12 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.mozilla; -import java.net.MalformedURLException; -import java.net.URL; - import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Link; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.browser.IWorkbenchBrowserSupport; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.editor.VpePreviewDomBuilder; import org.jboss.tools.vpe.editor.VpeSourceDomBuilder; @@ -37,7 +25,6 @@ import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.util.DocTypeUtil; -import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.xulrunner.XulRunnerException; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; @@ -96,43 +83,7 @@ getEditorInput())); getXulRunnerEditor().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); } catch (XulRunnerException e) { - Label title = new Label(parent, SWT.WRAP); - title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR); - title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - setLink(new Link(parent, SWT.WRAP)); - getLink().setText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK_TEXT); - getLink().setToolTipText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK); - getLink().setForeground(getLink().getDisplay().getSystemColor(SWT.COLOR_BLUE)); - getLink().addMouseListener(new MouseListener() { - public void mouseDown(org.eclipse.swt.events.MouseEvent e) { - BusyIndicator.showWhile(getLink().getDisplay(), new Runnable() { - public void run() { - URL theURL=null;; - try { - theURL = new URL(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK); - } catch (MalformedURLException e) { - VpePlugin.reportProblem(e); - } - IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport(); - try { - support.getExternalBrowser().openURL(theURL); - } catch (PartInitException e) { - VpePlugin.reportProblem(e); - } - } - }); - } - - public void mouseDoubleClick(MouseEvent e) { - } - - public void mouseUp(MouseEvent e) { - } - }); - getLink().setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - Label fill = new Label(parent, SWT.WRAP); - fill.setLayoutData(new GridData(GridData.FILL_BOTH)); + showXulRunnerException(parent, e); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-05-06 12:59:36 UTC (rev 15071) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-05-06 13:29:55 UTC (rev 15072) @@ -26,6 +26,7 @@ public static String PAGE_DESIGN_OPTIONS; public static String HIDE_SELECTION_BAR; public static String SHOW_SELECTION_BAR; + public static String MOZILLA_LOADING_ERROR_LOG_ENTRY; public static String MOZILLA_LOADING_ERROR; public static String MOZILLA_LOADING_ERROR_LINK_TEXT; public static String MOZILLA_LOADING_ERROR_LINK; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-05-06 12:59:36 UTC (rev 15071) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-05-06 13:29:55 UTC (rev 15072) @@ -4,10 +4,12 @@ PAGE_DESIGN_OPTIONS=Page Design Options HIDE_SELECTION_BAR=Hide Selection Bar SHOW_SELECTION_BAR=Show Selection Bar -MOZILLA_LOADING_ERROR=The VPE editor can't be run because your system environment needs to be changed slightly. +MOZILLA_LOADING_ERROR_LOG_ENTRY=Cannot run the Visual Page Editor +MOZILLA_LOADING_ERROR=Cannot run the Visual Page Editor. See the Error Log view for the stack trace of the error.\n\ + Probably your system environment needs to be slightly changed. MOZILLA_LOADING_ERROR_LINK_TEXT=Find out more. # START NON-TRANSLATABLE -MOZILLA_LOADING_ERROR_LINK=http://labs.jboss.com/wiki/JBosstoolsVisualEditorFAQ +MOZILLA_LOADING_ERROR_LINK=http://www.jboss.org/community/docs/DOC-10862 # END NON-TRANSLATABLE GENERAL=General TEMPLATES=Templates