[jbosstools-commits] JBoss Tools SVN: r7075 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action: adf and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2008-03-24 10:53:57 -0400 (Mon, 24 Mar 2008)
New Revision: 7075

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java
   trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java
   trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java
   trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
Log:
JBIDE-893

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java	2008-03-24 14:53:47 UTC (rev 7074)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddOrm2NatureActionHandler.java	2008-03-24 14:53:57 UTC (rev 7075)
@@ -17,6 +17,7 @@
 import org.eclipse.ui.*;
 import org.osgi.framework.Bundle;
 import org.jboss.tools.common.meta.action.impl.*;
+import org.jboss.tools.common.model.XModelException;
 import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.model.plugin.ModelPlugin;
 import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -48,11 +49,24 @@
     	return hasNature ? REMOVE_CLASS_NAME : ADD_CLASS_NAME;
     }
 
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
+    public void executeHandler(XModelObject object, Properties p) throws XModelException {
     	Bundle b = Platform.getBundle(PLUGIN_ID);
     	if(b == null) return;
-    	Class c = b.loadClass(getClassName(object));
-    	IObjectActionDelegate actionDelegate = (IObjectActionDelegate)c.newInstance();
+    	
+    	Class c = null;
+    	try {
+    		c = b.loadClass(getClassName(object));
+    	} catch (ClassNotFoundException e) {
+    		throw new XModelException(e);
+    	}
+    	IObjectActionDelegate actionDelegate = null;
+    	try {
+    		actionDelegate = (IObjectActionDelegate)c.newInstance();
+    	} catch (InstantiationException e1) {
+    		throw new XModelException(e1);
+    	} catch (IllegalAccessException e2) {
+    		throw new XModelException(e2);
+    	}
     	Action action = new Action() {};
     	action.setEnabled(true);
     	IWorkbenchPart part = ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getPartService().getActivePart();

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java	2008-03-24 14:53:47 UTC (rev 7074)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java	2008-03-24 14:53:57 UTC (rev 7075)
@@ -335,7 +335,7 @@
 		return new String[]{FINISH, CANCEL};
 	}
 
-	public void action(String name) throws Exception {
+	public void action(String name) throws XModelException {
 		if(name.equals(FINISH)) {
 			returnCode = 0;
 			setFinished(true);

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java	2008-03-24 14:53:47 UTC (rev 7074)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHandler.java	2008-03-24 14:53:57 UTC (rev 7075)
@@ -10,8 +10,10 @@
  ******************************************************************************/ 
 package org.jboss.tools.jst.web.ui.action.adf;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
 import org.jboss.tools.common.model.XModelObject;
 
 public class AddADFSupportHandler extends AbstractHandler {
@@ -22,8 +24,15 @@
         return helper.isEnabled();
     }
 	
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
-    	if(isEnabled(object)) helper.execute();
+    public void executeHandler(XModelObject object, Properties p) throws XModelException {
+    	if(!isEnabled(object)) return;
+    	try {
+    		helper.execute();
+    	} catch (InvocationTargetException e1) {
+    		throw new XModelException(e1);
+    	} catch (InterruptedException e2) {
+    		throw new XModelException(e2);
+    	}
     }
 
 

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java	2008-03-24 14:53:47 UTC (rev 7074)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java	2008-03-24 14:53:57 UTC (rev 7075)
@@ -65,7 +65,7 @@
 		return false;
 	}
 	
-	public void execute() throws Exception {
+	public void execute() throws InvocationTargetException, InterruptedException {
 		ModelPlugin.getDefault().getWorkbench().getProgressService().run(false, true, new RunImpl());
 	}