[jboss-svn-commits] JBL Code SVN: r21146 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools: src/org/guvnor/tools and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 21 15:07:51 EDT 2008
Author: john.graham at jboss.org
Date: 2008-07-21 15:07:51 -0400 (Mon, 21 Jul 2008)
New Revision: 21146
Modified:
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
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/CommitAction.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/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/utils/PlatformUtils.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.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/AddResourceWizard.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:
Clean up error handling
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF 2008-07-21 19:07:51 UTC (rev 21146)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.guvnor.tools;singleton:=true
-Bundle-Version: 0.6.0.200807181615
+Bundle-Version: 0.6.0.200807211507
Bundle-Activator: org.guvnor.tools.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Activator.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -8,7 +8,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -74,6 +77,27 @@
super.getLog().log(status);
}
+ public void displayMessage(final int severity, final String msg) {
+ final Display display = PlatformUI.getWorkbench().getDisplay();
+ display.syncExec(new Runnable() {
+ public void run() {
+ switch (severity) {
+ case IStatus.ERROR:
+ MessageDialog.openError(display.getActiveShell(), "Error", msg);
+ break;
+ case IStatus.WARNING:
+ MessageDialog.openWarning(display.getActiveShell(), "Warning", msg);
+ break;
+ }
+ }
+ });
+ }
+
+ public void displayError(int severity, String msg, Throwable t) {
+ writeLog(severity, msg, t);
+ displayMessage(severity, msg);
+ }
+
/**
* Returns an image descriptor for the image file at the given
* plug-in relative path
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -43,7 +43,7 @@
try {
commit();
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
@@ -64,7 +64,7 @@
notifyListeners(IRepositorySetListener.REP_ADDED);
commit();
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
return res;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CommitAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CommitAction.java 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CommitAction.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -104,7 +104,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CompareVersionAction.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -91,7 +91,7 @@
rightContents, "UTF-8");
CompareUI.openCompareEditorOnPage(new GuvnorCompareEditorInput(left, right), page);
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
} 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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -97,7 +97,7 @@
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -64,7 +64,7 @@
IWorkspace ws = Activator.getDefault().getWorkspace();
ws.delete(mdFiles, true, null);
} catch (CoreException e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -95,7 +95,7 @@
}
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
} 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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -81,7 +81,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
} 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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -91,7 +91,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
} finally {
if (response != null) {
try {
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -132,7 +132,7 @@
page.openEditor(input, editorId);
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.java 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavClient.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -123,8 +123,6 @@
resProps.setRevision(revision);
}
}
- } catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.WARNING, e.getMessage(), e);
} finally {
if (response != null) {
response.close();
@@ -194,8 +192,6 @@
Exception nfe = new Exception("Failed to get Guvnor properties for " + filename);
Activator.getDefault().writeLog(IStatus.WARNING, nfe.getMessage(), nfe);
}
- } catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.WARNING, e.getMessage(), e);
} finally {
if (response != null) {
response.close();
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -128,7 +128,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().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
@@ -326,7 +326,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().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -176,7 +176,7 @@
PlatformUtils.openEditor(contents, editorTitle + ", " + theEntry.getRevision());
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -129,10 +129,10 @@
if (e.getErrorCode() == IResponse.SC_UNAUTHORIZED) {
PlatformUtils.reportAuthenticationFailure();
} else {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -125,7 +125,7 @@
GuvnorMetadataUtils.setGuvnorMetadataProps(selectedFile.getFullPath(), mdProps);
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
return res;
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -133,7 +133,7 @@
GuvnorMetadataUtils.markCurrentGuvnorResource(targetFile);
}
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -35,7 +35,7 @@
try {
WizardUtils.createGuvnorRepository(model);
} catch (Exception e) {
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
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 2008-07-21 16:09:44 UTC (rev 21145)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java 2008-07-21 19:07:51 UTC (rev 21146)
@@ -64,7 +64,7 @@
WizardUtils.createGuvnorRepository(model);
} catch (Exception e) {
super.setErrorMessage(e.getMessage());
- Activator.getDefault().writeLog(IStatus.ERROR, e.getMessage(), e);
+ Activator.getDefault().displayError(IStatus.ERROR, e.getMessage(), e);
}
}
}
More information about the jboss-svn-commits
mailing list