[jbosstools-commits] JBoss Tools SVN: r7080 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: model/handlers/bean and 4 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Mar 24 11:19:50 EDT 2008
Author: scabanovich
Date: 2008-03-24 11:19:50 -0400 (Mon, 24 Mar 2008)
New Revision: 7080
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java
Log:
JBIDE-893
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddCaseToGroupHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -24,7 +24,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
p = DefaultCreateHandler.extractProperties(data[0]);
String fv = p.getProperty(ATT_TO_VIEW_ID);
if(fv.indexOf("*") >= 0 || fv.length() == 0) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddEntrySupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -14,6 +14,7 @@
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class AddEntrySupport extends SpecialWizardSupport {
@@ -42,7 +43,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -57,7 +58,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
if(isProperty) {
String kind = action.getProperty("value-kind");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddRuleToGroupHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -21,14 +21,13 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
String path = object.getAttributeValue(ATT_PATH);
JSFNavigationModel nm = (JSFNavigationModel)object.getParent().getParent();
XModelObject o = object.getModel().createModelObject(ENT_NAVIGATION_RULE, null);
o.setAttributeValue(ATT_FROM_VIEW_ID, path);
o.setAttributeValue("index", "" + nm.getRuleCount(path));
object.getParent().getParent().getChildByPath(FOLDER_NAVIGATION_RULES).addChild(o);
- /*TRIAL_JSF*/
}
- /*TRIAL_JSF_CLASS*/
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -13,12 +13,14 @@
import java.io.File;
import java.util.Properties;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator;
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
@@ -90,7 +92,7 @@
return v;
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -98,12 +100,12 @@
setFinished(true);
}
}
- /*TRIAL_JSF_CLASS*/
+
public String[] getActionNames(int stepId) {
return new String[]{FINISH, CANCEL, HELP};
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
boolean doNotCreateEmptyRule = "yes".equals(JSFPreference.DO_NOT_CREATE_EMPTY_RULE.getValue());
Properties p = extractStepData(0);
String path = p.getProperty("from-view-id");
@@ -242,7 +244,7 @@
return getTarget().getModel().getByPath(path) != null;
}
- void createFile(String path) throws Exception {
+ void createFile(String path) throws XModelException {
if(!canCreateFile(path)) return;
String lastCreateFileValue = getAttributeValue(0, "create file");
JSFModelPlugin.getDefault().getPluginPreferences().setDefault(LAST_CREATE_FILE_PREFERENCE, lastCreateFileValue);
@@ -250,14 +252,18 @@
String template = getAttributeValue(0, "template");
if(template != null) template = template.trim();
File fs = (File)templates.getPageTemplates().get(template);
- if(fs == null || !fs.isFile()) throw new Exception(NLS.bind(JSFUIMessages.TEMPLATE_IS_NOT_FOUND, template));
+ if(fs == null || !fs.isFile()) throw new XModelException(NLS.bind(JSFUIMessages.TEMPLATE_IS_NOT_FOUND, template));
String location = ((FileSystemImpl)getTarget().getModel().getByPath("FileSystems/WEB-ROOT")).getAbsoluteLocation();
location += path;
File ft = new File(location);
ft.getParentFile().mkdirs();
FileUtil.copyFile(fs, ft);
getTarget().getModel().update();
- EclipseResourceUtil.getResource(getTarget()).getProject().refreshLocal(IProject.DEPTH_INFINITE, null);
+ try {
+ EclipseResourceUtil.getResource(getTarget()).getProject().refreshLocal(IProject.DEPTH_INFINITE, null);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
protected DefaultWizardDataValidator viewValidator = new ViewValidator();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -23,7 +23,7 @@
return object.getAttributeValue(getAttr(object)).length() > 0;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
object.getModel().changeObjectAttribute(object, getAttr(object), "");
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeContentKindHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -48,7 +48,7 @@
return object != null && object.isObjectEditable() && isNewValueKind(object, action.getProperty(ATT_CONTENT_KIND));
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
if(!checkChangeSignificance(object)) return;
String targetValueKind = action.getProperty(ATT_CONTENT_KIND);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeToValueSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -32,7 +32,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -47,7 +47,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
getTarget().getModel().changeObjectAttribute(getTarget(), "value-kind", "value");
getTarget().getModel().changeObjectAttribute(getTarget(), "value", p.getProperty("value"));
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ChangeValueKindHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -49,7 +49,7 @@
return object != null && object.isObjectEditable() && isNewValueKind(object, action.getProperty("value-kind"));
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
if(!checkChangeSignificance(object)) return;
String targetValueKind = action.getProperty("value-kind");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateCommentHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -22,7 +22,7 @@
public CreateCommentHandler() {}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
pc = p;
/*TRIAL_JSF*/
super.executeHandler(object, p);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -43,7 +43,7 @@
return data;
}
- public void executeHandler(XModelObject object, Properties prop) throws Exception {
+ public void executeHandler(XModelObject object, Properties prop) throws XModelException {
Properties p = extractProperties(data[0]);
checkRegister(object, p);
/*TRIAL_JSF*/
@@ -66,16 +66,16 @@
}
}
- private void checkRegister(XModelObject object, Properties p) throws Exception {
+ private void checkRegister(XModelObject object, Properties p) throws XModelException {
boolean register = "yes".equals(extractProperties(data[0]).getProperty("register in web.xml"));
if(!register) return;
XModelObject webxml = WebAppHelper.getWebApp(object.getModel());
- if(webxml == null) throw new Exception ("Faces config cannot be registered because web.xml is not found.");
- if("yes".equals(webxml.get("isIncorrect"))) throw new Exception ("Faces config file cannot be registered because web.xml is incorrect.");
- if(!webxml.isObjectEditable()) throw new Exception ("Faces config file cannot be registered because web.xml is read only.");
+ if(webxml == null) throw new XModelException ("Faces config cannot be registered because web.xml is not found.");
+ if("yes".equals(webxml.get("isIncorrect"))) throw new XModelException ("Faces config file cannot be registered because web.xml is incorrect.");
+ if(!webxml.isObjectEditable()) throw new XModelException ("Faces config file cannot be registered because web.xml is read only.");
}
- private void register(XModelObject object, Properties prop) throws Exception {
+ private void register(XModelObject object, Properties prop) throws XModelException {
boolean register = "yes".equals(extractProperties(data[0]).getProperty("register in web.xml"));
if(!register) return;
String uri = "/WEB-INF/" + FileAnyImpl.toFileName(created);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -51,7 +51,7 @@
}
}
- protected void execute() throws Exception {
+ protected void execute() throws XModelException {
Properties p0 = extractStepData(0);
XUndoManager undo = getTarget().getModel().getUndoManager();
XTransactionUndo u = new XTransactionUndo("Create faces config in " + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString(), XTransactionUndo.ADD);
@@ -66,7 +66,7 @@
}
}
- private void doExecute(Properties p0) throws Exception {
+ private void doExecute(Properties p0) throws XModelException {
Properties p = extractStepData(0);
String path = p.getProperty("name");
path = revalidatePath(path);
@@ -81,7 +81,7 @@
open(file);
}
- private void register(XModelObject object, XModelObject created, Properties prop) throws Exception {
+ private void register(XModelObject object, XModelObject created, Properties prop) throws XModelException {
boolean register = "yes".equals(getAttributeValue(0, "register in web.xml"));
if(!register) return;
String uri = getURI(created);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteFacesConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -18,7 +18,7 @@
public class DeleteFacesConfigHandler extends DeleteFileHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
String path = XModelObjectLoaderUtil.getResourcePath(object);
if(object.getModel().getByPath("FileSystems/WEB-INF" + path) == object) {
path = "/WEB-INF" + path;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteGroupHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -36,7 +36,7 @@
return (path == null || path.length() == 0) ? null : object.getModel().getByPath(path);
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
ReferenceGroupImpl g = (ReferenceGroupImpl)object;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -25,7 +25,7 @@
public class DeleteManagedBeanHandler extends DefaultRemoveHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
boolean unregister = false;
IFile f = getJavaFile(object);
if(f != null) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteOutputHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,6 +12,7 @@
import java.util.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.jsf.JSFPreference;
import org.jboss.tools.jsf.model.JSFConstants;
@@ -19,7 +20,7 @@
public class DeleteOutputHandler extends DefaultRemoveHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject caseObject = JSFProcessStructureHelper.instance.getReference(object);
if(caseObject == null) return;
XModelObject group = object.getParent().getParent();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -29,7 +29,7 @@
return (path == null || path.length() == 0) ? null : object.getModel().getByPath(path);
}
- public void executeHandler(XModelObject object, java.util.Properties p) throws Exception {
+ public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException {
if(!isEnabled(object)) return;
XModelObject page = getPage(object);
if(page == null) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DiscardConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,6 +12,7 @@
import java.util.*;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler;
import org.jboss.tools.common.model.loaders.XObjectLoader;
@@ -21,7 +22,7 @@
public class DiscardConfigHandler extends DiscardFileHandler {
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
XModelObject process = JSFProcessStructureHelper.instance.getProcess(object);
if(process != null && JSFProcessStructureHelper.instance.isProcessLoaded(process)) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/HiddenLinksHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -27,7 +27,7 @@
//! 'short' is equivalent to 'no'
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.jst.web.ui.wizards.links.HiddenLinksWizard");
XModelObject[] links = getLinks(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/ModifyLinkHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -27,7 +27,7 @@
return !pv.equals(object.getAttributeValue(pn));
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
String pn = action.getProperty("property");
String pv = action.getProperty("value");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,13 +12,14 @@
import java.util.*;
import org.jboss.tools.common.meta.action.impl.handlers.MoveHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XOrderedObject;
import org.jboss.tools.jsf.model.ReferenceObjectImpl;
public class OutputMoveHandler extends MoveHandler {
- public void executeHandler(XModelObject object, Properties prop) throws Exception {
+ public void executeHandler(XModelObject object, Properties prop) throws XModelException {
if(!isEnabled(object)) return;
ReferenceObjectImpl o1 = (ReferenceObjectImpl)object;
ReferenceObjectImpl o2 = (ReferenceObjectImpl)object.getModel().getModelBuffer().source();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameFacesConfigHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -13,6 +13,7 @@
import java.util.*;
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultEditHandler;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -20,7 +21,7 @@
public class RenameFacesConfigHandler extends DefaultEditHandler {
- public void executeHandler(XModelObject object, Properties prop) throws Exception {
+ public void executeHandler(XModelObject object, Properties prop) throws XModelException {
//prompt file object to compute body.
((FileAnyImpl)object).getAsText();
String oldConfigName = FileAnyImpl.toFileName(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -20,7 +20,6 @@
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.model.*;
-import org.jboss.tools.jsf.model.handlers.AddViewSupport.ViewValidator;
import org.jboss.tools.jsf.model.helpers.*;
import org.jboss.tools.jsf.model.impl.NavigationRuleObjectImpl;
@@ -49,7 +48,7 @@
}
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -64,7 +63,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
String path = AddViewSupport.revalidatePath(p.getProperty(ATT_FROM_VIEW_ID));
if(initialPath.equals(path)) return;
@@ -76,7 +75,11 @@
} else {
replace(group, initialPath, path);
if(page != null && "true".equals(p.getProperty("rename file")) && isFieldEditorEnabled(0, "rename file", p)) {
- renameFile(page, path);
+ try {
+ renameFile(page, path);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
}
} finally {
@@ -156,7 +159,7 @@
}
}
- public static void renameFile(XModelObject page, String path) throws Exception {
+ public static void renameFile(XModelObject page, String path) throws XModelException, CoreException {
IResource r = (IResource)page.getAdapter(IResource.class);
String initialPath = XModelObjectLoaderUtil.getResourcePath(page);
String p = r.getFullPath().toString();
@@ -168,12 +171,12 @@
page.getModel().update();
}
- public static void provideParent(IResource resource) throws Exception {
+ public static void provideParent(IResource resource) throws XModelException, CoreException {
IResource parent = resource.getParent();
if(parent.exists()) return;
IFolder folder = resource.getWorkspace().getRoot().getFolder(parent.getFullPath());
provideParent(folder);
- if(!folder.exists()) folder.create(true, true, null);
+ folder.create(true, true, null);
}
/*
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectBeanSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.XEntityDataImpl;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.model.pv.JSFProjectBean;
@@ -67,7 +68,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
Properties p = extractStepData(0);
getProperties().setProperty(ATTR_SELECTED, p.getProperty(ATTR_SELECTED));
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -25,7 +25,7 @@
return (object != null && object.isActive());
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject item = getItemOnProcess(object);
if(item == null) return;
FindObjectHelper.findModelObject(item, FindObjectHelper.IN_EDITOR_ONLY, "Diagram");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetApplicationHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -25,7 +25,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject child = object.getChildByPath(NAME_APPLICATION);
if(child == null) {
String childEntity = getApplicationEntity(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SetFactoryHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -24,7 +24,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
XModelObject child = object.getChildByPath(NAME_FACTORY);
if(child == null) child = object.getModel().createModelObject(ENTITY_FACTORY, null);
long ts = child.getTimeStamp();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,10 +11,13 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.*;
import org.jboss.tools.common.java.generation.*;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.jsf.messages.JSFUIMessages;
@@ -72,7 +75,7 @@
values[i] = v;
}
- public void addProperties(XModelObject bean) throws Exception {
+ public void addProperties(XModelObject bean) throws XModelException, CoreException {
List<PropertyData> toGenerate = new ArrayList<PropertyData>();
int applyForAll = 0;
for (int i = 0; i < names.length; i++) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,11 +11,14 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.java.generation.*;
import org.jboss.tools.common.meta.action.*;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintQClassName;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -50,7 +53,7 @@
if(isLight) setAttributeValue(0, "generate source code", "false");
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -74,18 +77,22 @@
return new String[]{BACK, FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
String entity = action.getProperty("entity");
XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p);
- if(getStepId() == 1) {
- propertiesContext.addProperties(c);
+ try {
+ if(getStepId() == 1) {
+ propertiesContext.addProperties(c);
+ }
+ if(isGenerationOn()) generate();
+ } catch (CoreException e) {
+ throw new XModelException(e);
}
- if(isGenerationOn()) generate();
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
}
- boolean isGenerationOn() throws Exception {
+ boolean isGenerationOn() throws XModelException {
Properties p = extractStepData(0);
if(!"true".equals(p.getProperty("generate source code"))) return false;
if(!isFieldEditorEnabled(0, "generate source code", p)) return false;
@@ -117,7 +124,7 @@
return true;
}
- void generate() throws Exception {
+ void generate() throws CoreException {
Properties input = getGenerateProperties();
generator.setInput(input);
generator.generate();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySafeHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -14,6 +14,7 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
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 AddManagedPropertySafeHandler extends AbstractHandler {
@@ -24,7 +25,7 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
XActionInvoker.invoke("CreateActions.CreateProperty", object, p);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedPropertySupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -12,6 +12,7 @@
import java.util.*;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.JavaModelException;
@@ -20,6 +21,7 @@
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintJavaName;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -71,7 +73,7 @@
if(isLight) setAttributeValue(0, "add java property", "false");
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
execute();
setFinished(true);
@@ -86,7 +88,7 @@
return new String[]{FINISH, CANCEL, HELP};
}
- void execute() throws Exception {
+ void execute() throws XModelException {
Properties p = extractStepData(0);
getTarget().setAttributeValue("content-kind", "properties");
String entity = action.getProperty("entity");
@@ -94,7 +96,11 @@
DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties());
getProperties().put("created", c);
if(!isGenerationOn(p)) return;
- generate(p);
+ try {
+ generate(p);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
boolean isGenerationOn(Properties p) {
@@ -125,7 +131,7 @@
return (m == null) ? null : EclipseJavaUtil.getMemberTypeAsString(m);
}
- void generate(Properties p) throws Exception {
+ void generate(Properties p) throws CoreException {
generator.setOwner(classCheck.getExistingClass());
String type = p.getProperty("property-class");
if(type.length() == 0) type = "String";
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/DeleteManagedPropertyHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,6 +11,8 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.*;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
@@ -26,7 +28,7 @@
return object != null && object.isObjectEditable();
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
ServiceDialog d = object.getModel().getService();
IMember member = ManagedBeanHelper.getMember(object);
String title = DefaultCreateHandler.title(object, false);
@@ -45,12 +47,16 @@
}
DefaultRemoveHandler.removeFromParent(object);
if(deleteField) {
- IMember[] ms = findRelevantMembers(member);
- for (int i = 0; i < ms.length; i++) ms[i].delete(true, null);
+ try {
+ IMember[] ms = findRelevantMembers(member);
+ for (int i = 0; i < ms.length; i++) ms[i].delete(true, null);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
}
}
- private IMember[] findRelevantMembers(IMember member) throws Exception {
+ private IMember[] findRelevantMembers(IMember member) throws CoreException {
List<IMember> list = new ArrayList<IMember>();
list.add(member);
IType type = member.getDeclaringType();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedBeanHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -32,14 +32,14 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if (!isEnabled(object)) return;
XUndoManager undo = object.getModel().getUndoManager();
XTransactionUndo u = new XTransactionUndo("rename " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT);
undo.addUndoable(u);
try {
transaction(object, p);
- } catch (Exception e) {
+ } catch (XModelException e) {
undo.rollbackTransactionInProgress();
throw e;
} finally {
@@ -47,7 +47,7 @@
}
}
- protected void transaction(XModelObject object, Properties p) throws Exception {
+ protected void transaction(XModelObject object, Properties p) throws XModelException {
IType type = ManagedBeanHelper.getType(object);
if(type != null && !type.isBinary()) {
RenameManagedBeanClassRunnable r = new RenameManagedBeanClassRunnable(object, type);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/RenameManagedPropertyHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,6 +11,8 @@
package org.jboss.tools.jsf.model.handlers.bean;
import java.util.*;
+
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.*;
import org.eclipse.jdt.ui.refactoring.RenameSupport;
import org.eclipse.swt.widgets.Shell;
@@ -29,13 +31,14 @@
return true;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
IMember member = ManagedBeanHelper.getMember(object);
String name = object.getAttributeValue("property-name");
if(member != null) {
name = member.getElementName();
RenameSupport renameSupport = null;
+ try {
if (member instanceof IField)
renameSupport = RenameSupport.create((IField)member, null, RenameSupport.UPDATE_REFERENCES | RenameSupport.UPDATE_GETTER_METHOD | RenameSupport.UPDATE_SETTER_METHOD);
else if (member instanceof IMethod)
@@ -44,6 +47,9 @@
Shell shell = ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
renameSupport.openDialog(shell);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
} else {
JSFRenameFieldProcessor processor = new JSFRenameFieldProcessor();
processor.setModelObject(object);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/run/RunOnServerHandler.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -33,7 +33,7 @@
return IPathSourceImpl.getPath(object) != null;
}
- public void executeHandler(XModelObject object, Properties p) throws Exception {
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
context.execute(object);
/*TRIAL_JSF*/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/AddJSFCapabilitiesSupport.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -49,7 +49,7 @@
setAttributeValue(0, ATTR_CAPABILITY, options[0]);
}
- public void action(String name) throws Exception {
+ public void action(String name) throws XModelException {
if(FINISH.equals(name)) {
boolean b = executeWithContext();
if(b) setStepId(1);
@@ -65,11 +65,15 @@
return new String[]{CLOSE, HELP};
}
- protected boolean executeWithContext() throws Exception {
+ protected boolean executeWithContext() throws XModelException {
IRunnableContext context = (IRunnableContext)getProperties().get("IRunnableContext");
final Executor executor = new Executor();
- context.run(false, true, executor);
- if(executor.exception != null) throw executor.exception;
+ try {
+ context.run(false, true, executor);
+ } catch (Exception e) {
+ throw new XModelException(e);
+ }
+ if(executor.exception != null) throw new XModelException(executor.exception);
getProperties().put("addedCapabilities", (executor.added != null) ? executor.added : new String[0]);
return !executor.cancelled;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilitiesPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -11,6 +11,7 @@
package org.jboss.tools.jsf.project.capabilities;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public class CapabilitiesPerformer extends PerformerItem {
@@ -37,7 +38,7 @@
return capabilities;
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
boolean b = true;
for (int i = 0; i < capabilities.length; i++) {
if(!capabilities[i].isSelected()) continue;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/CapabilityPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -39,7 +39,7 @@
fileAdditionsPerformer.init(model, capability);
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
context.monitor.worked(1);
context.monitor.subTask(getDisplayName());
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -71,7 +71,7 @@
return true;
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
if(targetAttribute != null && attributeValue != null) {
targetObject.getModel().editObjectAttribute(targetObject, targetAttribute, attributeValue);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/FileAdditionsPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -105,7 +105,7 @@
return (f == null) ? null : EclipseResourceUtil.getObjectByResource(f);
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
for (int i = 0; i < performers.length; i++) {
if(performers[i].isSelected()) performers[i].execute(context);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/IPerformerItem.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.project.capabilities;
+import org.jboss.tools.common.model.XModelException;
+
public interface IPerformerItem {
public String getDisplayName();
public IPerformerItem getParent();
@@ -18,5 +20,5 @@
public boolean isSelected();
public void setSelected(boolean enabled);
public boolean isEnabled();
- public boolean execute(PerformerContext context) throws Exception;
+ public boolean execute(PerformerContext context) throws XModelException;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -136,7 +136,7 @@
return l.toArray(new String[0]);
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
if(!isSelected()) return true;
boolean changed = false;
boolean zip = false;
@@ -196,7 +196,11 @@
}
}
if(changed) {
- libResource.refreshLocal(IResource.DEPTH_INFINITE, null);
+ try {
+ libResource.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (CoreException e) {
+ throw new XModelException(e);
+ }
model.save();
}
if(zip) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/PerformerItem.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.project.capabilities;
+import org.jboss.tools.common.model.XModelException;
+
public abstract class PerformerItem implements IPerformerItem {
protected IPerformerItem parent;
protected boolean selected = true;
@@ -47,7 +49,7 @@
return true;
}
- public boolean execute(PerformerContext context) throws Exception {
+ public boolean execute(PerformerContext context) throws XModelException {
throw new RuntimeException("Not implemented in " + getClass().getName());
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/JSFWatcherContributor.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -41,7 +41,7 @@
return null;
}
- private void checkCorrectness() throws Exception {
+ private void checkCorrectness() throws XModelException {
}
public void updateProject() {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/AdoptJSFProjectFinisher.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -19,6 +19,7 @@
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelConstants;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.web.context.IImportWebProjectContext;
@@ -38,7 +39,7 @@
this.model = model;
}
- public void execute() throws Exception {
+ public void execute() throws XModelException {
filesystems.clear();
workspace = context.getWebInfLocation();
fss = model.getByPath("FileSystems");
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java 2008-03-24 15:18:50 UTC (rev 7079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportJSFWarContext.java 2008-03-24 15:19:50 UTC (rev 7080)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.web.helpers.context;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jsf.web.JSFWebHelper;
@@ -27,11 +28,11 @@
createAllModules();
}
- protected void loadWebXML(String body, String location) throws Exception {
+ protected void loadWebXML(String body, String location) throws XModelException {
super.loadWebXML(body, location);
if(WebAppHelper.findServlet(webxml, "javax.faces.webapp.FacesServlet", null) == null) {
String webXMLErrorMessage = "No JSF support found in the project.";
- throw new Exception(webXMLErrorMessage);
+ throw new XModelException(webXMLErrorMessage);
}
}
More information about the jbosstools-commits
mailing list