[jboss-svn-commits] JBL Code SVN: r25109 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools: actions and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 4 17:17:57 EST 2009
Author: john.graham at jboss.org
Date: 2009-02-04 17:17:57 -0500 (Wed, 04 Feb 2009)
New Revision: 25109
Modified:
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Activator.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CompareVersionAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/OpenGuvnorWebConsoleAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java
Log:
[JBIDE-3742] Display better error message when server is not reachable.
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Activator.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Activator.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -8,6 +8,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.widgets.Display;
@@ -72,8 +73,15 @@
return ResourcesPlugin.getWorkspace();
}
+ private IStatus createStatus(int severity, String msg, Throwable t) {
+ return new Status(severity, PLUGIN_ID, msg, t);
+ }
+
public void writeLog(int severity, String msg, Throwable t) {
- IStatus status = new Status(severity, PLUGIN_ID, msg, t);
+ super.getLog().log(createStatus(severity, msg, t));
+ }
+
+ public void writeLog(IStatus status) {
super.getLog().log(status);
}
@@ -83,19 +91,32 @@
public void run() {
switch (severity) {
case IStatus.ERROR:
- MessageDialog.openError(display.getActiveShell(), Messages.getString("error"), msg); //$NON-NLS-1$
+ MessageDialog.openError(display.getActiveShell(),
+ Messages.getString("error"), msg); //$NON-NLS-1$
break;
case IStatus.WARNING:
- MessageDialog.openWarning(display.getActiveShell(), Messages.getString("warning"), msg); //$NON-NLS-1$
+ MessageDialog.openWarning(display.getActiveShell(),
+ Messages.getString("warning"), msg); //$NON-NLS-1$
break;
}
}
});
}
- public void displayError(int severity, String msg, Throwable t) {
- writeLog(severity, msg, t);
- displayMessage(severity, msg);
+ public void displayError(int severity, final String msg,
+ Throwable t, boolean shouldLog) {
+ final IStatus status = createStatus(severity, msg, t);
+ if (shouldLog) {
+ writeLog(status);
+ }
+ final Display display = PlatformUI.getWorkbench().getDisplay();
+ display.syncExec(new Runnable() {
+ public void run() {
+ ErrorDialog.openError(display.getActiveShell(),
+ null,
+ Messages.getString("error"), status); //$NON-NLS-1$
+ }
+ });
}
/**
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -47,7 +47,7 @@
try {
commit();
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
@@ -68,7 +68,7 @@
notifyListeners(IRepositorySetListener.REP_ADDED);
commit();
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
return res;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CompareVersionAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CompareVersionAction.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CompareVersionAction.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -90,7 +90,7 @@
rightContents, "UTF-8"); //$NON-NLS-1$
CompareUI.openCompareEditorOnPage(new GuvnorCompareEditorInput(left, right), page);
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
} finally {
if (response != null) {
try {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -103,7 +103,7 @@
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -67,7 +67,7 @@
IWorkspace ws = Activator.getDefault().getWorkspace();
ws.delete(mdFiles, true, null);
} catch (CoreException e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/OpenGuvnorWebConsoleAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/OpenGuvnorWebConsoleAction.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/OpenGuvnorWebConsoleAction.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -50,8 +50,7 @@
browserSupport.getExternalBrowser().openURL(consoleURL);
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -97,7 +97,7 @@
}
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
} finally {
if (response != null) {
try {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -83,7 +83,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
} finally {
if (response != null) {
try {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -92,7 +92,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
} finally {
if (response != null) {
try {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties 2009-02-04 22:17:57 UTC (rev 25109)
@@ -100,3 +100,4 @@
version.dialog.caption=Resource Versions
version.dialog.message=Choose a version for {0}
warning=Warning
+rep.connect.fail=Server not reachable
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -113,7 +113,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
return res;
}
@@ -170,7 +170,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -151,7 +151,7 @@
page.openEditor(input, editorId);
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -137,7 +137,7 @@
// for the server, currently we do not have a situation requiring authentication
// for specific files. This might be different in the future if the Guvnor security
// model changes, or users can directly connect to specific files.
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
@@ -179,7 +179,7 @@
msg.append("\r\n"); //$NON-NLS-1$
}
Activator.getDefault().
- displayMessage(IStatus.ERROR, msg.toString());
+ displayError(IStatus.ERROR, msg.toString(), new Exception(), true);
}
if (items.length != errors.length) {
// At least one item did not have an error,
@@ -451,7 +451,7 @@
// for the server, currently we do not have a situation requiring authentication
// for specific files. This might be different in the future if the Guvnor security
// model changes, or users can directly connect to specific files.
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -161,7 +161,7 @@
PlatformUtils.openEditor(contents, editorTitle + ", " + theEntry.getRevision()); //$NON-NLS-1$
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -1,5 +1,6 @@
package org.guvnor.tools.views.model;
+import java.net.ConnectException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -134,10 +135,19 @@
if (e.getErrorCode() == IResponse.SC_UNAUTHORIZED) {
PlatformUtils.reportAuthenticationFailure();
} else {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ if (e.getErrorCode() == IResponse.SC_NOT_IMPLEMENTED) {
+ Activator.getDefault().displayMessage(IStatus.ERROR,
+ Messages.getString("rep.connect.fail")); //$NON-NLS-1$
+ } else {
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
+ }
}
+ } catch (ConnectException ce) {
+ Activator.getDefault().
+ displayMessage(IStatus.ERROR,
+ Messages.getString("rep.connect.fail")); //$NON-NLS-1$
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -139,7 +139,7 @@
GuvnorMetadataUtils.markCurrentGuvnorResource(targetFile);
}
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
return true;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -41,7 +41,7 @@
try {
WizardUtils.createGuvnorRepository(model);
} catch (Exception e) {
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
return true;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java 2009-02-04 19:44:31 UTC (rev 25108)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java 2009-02-04 22:17:57 UTC (rev 25109)
@@ -69,7 +69,7 @@
WizardUtils.createGuvnorRepository(model);
} catch (Exception e) {
super.setErrorMessage(e.getMessage());
- Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e, true);
}
}
}
More information about the jboss-svn-commits
mailing list