summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-06-17 04:44:27 (EDT)
committerSteffen Kriese2011-06-17 04:44:27 (EDT)
commitace36dfed288992d31b9a50cb625b5e107425248 (patch)
tree09fef5593b370abec81a5b42bf42df1ffd7dfaed
parente3bbf9194bd6705d5a39a6cf79a57292833bd371 (diff)
downloadorg.eclipse.riena.toolbox-ace36dfed288992d31b9a50cb625b5e107425248.zip
org.eclipse.riena.toolbox-ace36dfed288992d31b9a50cb625b5e107425248.tar.gz
org.eclipse.riena.toolbox-ace36dfed288992d31b9a50cb625b5e107425248.tar.bz2
added warning if toolbox is run with different jre versions in ide and workspace
-rw-r--r--org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java2
-rw-r--r--org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java
index dd0a853..a0eaf7d 100644
--- a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java
+++ b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/WorkspaceClassLoader.java
@@ -121,6 +121,8 @@ public final class WorkspaceClassLoader {
WorkbenchUtil.handleException(e);
} catch (final SecurityException e) {
WorkbenchUtil.handleException(e);
+ } catch (final UnsupportedClassVersionError e) {
+ WorkbenchUtil.handleException(e, "UnsupportedClassVersionError: Make sure that you use the same java version to start the Eclipse IDE and for the workspace"); //$NON-NLS-1$
}
return null;
}
diff --git a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java
index bfda0e4..13357e3 100644
--- a/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java
+++ b/org.eclipse.riena.toolbox.previewer/src/org/eclipse/riena/toolbox/previewer/ui/WorkbenchUtil.java
@@ -36,11 +36,11 @@ public final class WorkbenchUtil {
}
}
- public static void handleException(final Exception e) {
+ public static void handleException(final Throwable e) {
handleException(e, null);
}
- public static void handleException(final Exception e, final String message) {
+ public static void handleException(final Throwable e, final String message) {
Activator.getDefault().getLog().log(new Status(Status.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
if (null != message) {
MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Warning",