[stp-commits] r2977 - in org.eclipse.stp.model/trunk: org.eclipse.stp.im

[genie@xxxxxxxxxxx]

Author: azoppello
Date: 2009-10-05 10:50:48 -0400 (Mon, 05 Oct 2009)
New Revision: 2977

Modified:
   org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java
   org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java
Log:


Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java
===================================================================
--- org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java	2009-09-30 09:34:37 UTC (rev 2976)
+++ org.eclipse.stp.model/trunk/org.eclipse.stp.im.in.bpmn/src/org/eclipse/stp/im/in/bpmn2im/popup/actions/Bpmn2ImAction.java	2009-10-05 14:50:48 UTC (rev 2977)
@@ -109,9 +109,11 @@
 
 	public static IStatus makeStatus(Throwable x) {
 
-		return new Status(IStatus.ERROR, Bpmn2ImActivator.PLUGIN_ID,
-				IStatus.ERROR, x.getMessage(), null);
+		return new Status(IStatus.ERROR, Bpmn2ImActivator.PLUGIN_ID, IStatus.ERROR,
+				(x.getMessage() != null) ? x.getMessage()
+				: (x.getCause() != null) ? x.getCause().getMessage() : "", null);
 
+
 	}
 	
 	public final void selectionChanged(final IAction action,

Modified: org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java
===================================================================
--- org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java	2009-09-30 09:34:37 UTC (rev 2976)
+++ org.eclipse.stp.model/trunk/org.eclipse.stp.im.tool.in.bpmneditor/src/org/eclipse/stp/im/tool/in/bpmneditor/action/VersionBpmnDiagramAction.java	2009-10-05 14:50:48 UTC (rev 2977)
@@ -9,34 +9,26 @@
  *******************************************************************************/
 package org.eclipse.stp.im.tool.in.bpmneditor.action;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.stp.bpmn.BpmnDiagram;
-import org.eclipse.stp.im.constants.ImConstants;
 import org.eclipse.stp.im.tool.in.bpmneditor.BpmnEditorExtensionActivator;
 import org.eclipse.stp.im.tool.in.bpmneditor.dialog.BpmnImVersionDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 
 public class VersionBpmnDiagramAction implements IObjectActionDelegate {
@@ -133,11 +125,11 @@
 	   public static IStatus makeStatus(Throwable x)
 	   {
 		   		
-		   return new Status(IStatus.ERROR,
-                BpmnEditorExtensionActivator.PLUGIN_ID,
-                IStatus.ERROR,
-                x.getMessage(), null);
+		   return new Status(IStatus.ERROR, BpmnEditorExtensionActivator.PLUGIN_ID, IStatus.ERROR,
+				   (x.getMessage() != null) ? x.getMessage()
+				   : (x.getCause() != null) ? x.getCause().getMessage() : "", null);
 
+
 	   }
 }