[jbosstools-commits] JBoss Tools SVN: r7077 - in trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts: model/handlers/page and 9 other directories.

Author: scabanovich Date: 2008-03-24 11:01:06 -0400 (Mon, 24 Mar 2008) New Revision: 7077 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java Log: JBIDE-893 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/AutolayoutTransitionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -24,7 +24,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/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/BuildProcessHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -22,7 +22,7 @@ public BuildProcessHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { XUndoManager undo = object.getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("Build " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT); undo.addUndoable(u); @@ -34,7 +34,7 @@ object.setModified(true); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -20,7 +20,7 @@ public CleanActionForwardAttrHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String attr = getAttribute(object); if(attr != null) object.getModel().changeObjectAttribute(object, attr, ""); //$NON-NLS-1$ } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateActionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -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 CreateActionHandler extends AbstractHandler { @@ -22,7 +23,7 @@ return (object != null && object.isObjectEditable()); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { ///no trial XActionInvoker.invoke("CreateActions.CreateAction", object, p); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentForItemHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -21,7 +21,7 @@ public CreateCommentForItemHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; String entity = data[0].getModelEntity().getName(); Properties p = extractProperties(data[0]); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateCommentHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -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; super.executeHandler(object, p); StrutsProcessStructureHelper.instance.showComments(object); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateConfigElementHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -24,7 +24,7 @@ public CreateConfigElementHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { createdObject = null; if(!createUnconfirmedAction(object, p)) { executeHandler0(object, p); @@ -34,7 +34,7 @@ Properties runProperties = null; - public void executeHandler0(XModelObject object, Properties p) throws Exception { + public void executeHandler0(XModelObject object, Properties p) throws XModelException { runProperties = p; try { super.executeHandler(object, p); @@ -99,7 +99,7 @@ // create unconfirmed action - private boolean createUnconfirmedAction(XModelObject object, Properties p) throws Exception { + private boolean createUnconfirmedAction(XModelObject object, Properties p) throws XModelException { if(!"CreateAction".equals(action.getName())) return false; Properties p2 = extractProperties(data[0]); setOtherProperties(object, p2); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -38,7 +38,7 @@ return false; } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; XUndoManager undo = object.getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("create element in " + DefaultCreateHandler.title(object, false), XTransactionUndo.ADD); @@ -47,7 +47,7 @@ transaction(object, prop); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } @@ -87,7 +87,7 @@ p.setProperty(ATT_PATH, path); } - protected void transaction(XModelObject object, Properties prop) throws Exception { + protected void transaction(XModelObject object, Properties prop) throws XModelException { executeHandler0(object, prop); Properties p = extractProperties(data[0]); String path = p.getProperty(ATT_PATH); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateLinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -22,7 +22,7 @@ public CreateLinkHandler() {} - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { super.executeHandler(object, prop); StrutsProcessImpl pi = (StrutsProcessImpl)object.getParent(); pi.getHelper().updatePages(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -75,7 +75,7 @@ } - 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); XUndoManager undo = object.getModel().getUndoManager(); @@ -98,16 +98,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")); //$NON-NLS-1$ //$NON-NLS-2$ if(!register) return; XModelObject webxml = WebAppHelper.getWebApp(object.getModel()); - if(webxml == null) throw new Exception (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_ISNOT_FOUND); - if("yes".equals(webxml.get("isIncorrect"))) throw new Exception (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_INCORRECT); //$NON-NLS-1$ //$NON-NLS-2$ - if(!webxml.isObjectEditable()) throw new Exception (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_READONLY); + if(webxml == null) throw new XModelException (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_ISNOT_FOUND); + if("yes".equals(webxml.get("isIncorrect"))) throw new XModelException (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_INCORRECT); //$NON-NLS-1$ //$NON-NLS-2$ + if(!webxml.isObjectEditable()) throw new XModelException (StrutsUIMessages.MODULE_CANNOT_BE_REGISTERED_IS_READONLY); } - private void register(XModelObject object, Properties prop) throws Exception { + private void register(XModelObject object, Properties prop) throws XModelException { String uri = "/WEB-INF/" + FileAnyImpl.toFileName(created); XModelObject m = object.getModel().getByPath("Web/" + module.replace('/', '#')); if(incompleteModules.contains(module)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.files.handlers.*; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; @@ -76,7 +77,7 @@ setAttributeValue(0, "name", namef); //$NON-NLS-1$ } - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p0 = extractStepData(0); XUndoManager undo = getTarget().getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo(StrutsUIMessages.CREATE_STRUTS_CONFIG + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString(), XTransactionUndo.ADD); //$NON-NLS-2$ //$NON-NLS-3$ @@ -91,7 +92,7 @@ } } - private void doExecute(Properties p0) throws Exception { + private void doExecute(Properties p0) throws XModelException { Properties p = extractStepData(0); String path = p.getProperty("name"); //$NON-NLS-1$ path = revalidatePath(path); @@ -126,7 +127,7 @@ return null; } - private void register(XModelObject object, Properties prop) throws Exception { + private void register(XModelObject object, Properties prop) throws XModelException { String uri = getURI(object); XModelObject m = object.getModel().getByPath("Web/" + module.replace('/', '#')); //$NON-NLS-1$ if(incompleteModules.contains(module)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Handler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public class CreateStrutsConfig_1_0Handler extends CreateFileHandler implements StrutsConstants { private XModelObject created = null; - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { try { super.executeHandler(object, prop); if(created != null) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfig_1_0Support.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,7 @@ import java.util.Properties; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.files.handlers.*; import org.jboss.tools.struts.*; @@ -20,7 +21,7 @@ public class CreateStrutsConfig_1_0Support extends CreateFileSupport implements StrutsConstants { - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p = extractStepData(0); String path = p.getProperty("name"); path = revalidatePath(path); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -20,7 +20,7 @@ public class DeleteStrutsConfigHandler extends DeleteFileHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String uri = getURI(object); if(uri == null) return; boolean unregister = false; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DiscardConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,8 @@ package org.jboss.tools.struts.model.handlers; 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; @@ -20,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 = StrutsProcessStructureHelper.instance.getProcess(object); if(process != null && StrutsProcessStructureHelper.instance.isProcessLoaded(process)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/EditGlobalElementPath.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public EditGlobalElementPath() {} - public void executeHandler0(XModelObject object, Properties prop) throws Exception { + public void executeHandler0(XModelObject object, Properties prop) throws XModelException { Properties p = extractProperties(data[0]); setOtherProperties(object, p); modifyCreatedObject(object); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenActionCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -67,7 +68,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_TYPE); String nc = p2.getProperty("action class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenBaseSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -129,7 +129,7 @@ target.getModel().getOut().println(msg + FindObjectHelper.makeRef(path, className)); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if (GENERATE.equals(name)) { doStep(target, getStepId()); setStepId(steps.length-2); @@ -260,11 +260,14 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { if (exc != null) { setStepId(getStepId()+1); + if(exc instanceof XModelException) { + throw (XModelException)exc; + } if (exc instanceof Exception) { - throw (Exception)exc; + throw new XModelException(exc); } throw new RuntimeException(exc.getMessage()); } @@ -299,7 +302,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { return 1; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenExceptionCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -68,7 +69,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_TYPE); String nc = p2.getProperty("exception class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenFormBeanCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -68,7 +69,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_TYPE); String nc = p2.getProperty("formbean class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenForwardCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -67,7 +68,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String oc = object.getAttributeValue(ATT_CLASSNAME); String nc = p2.getProperty("forward class"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/GenJavaCodeSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -10,6 +10,7 @@ import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -166,7 +167,7 @@ return 0; } - public int doStep(XModelObject object) throws Exception { + public int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); actions = "true".equals(p2.getProperty("actions")); //$NON-NLS-1$ //$NON-NLS-2$ formbeans = "true".equals(p2.getProperty("formbeans")); //$NON-NLS-1$ //$NON-NLS-2$ @@ -208,7 +209,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(1); action_base = p2.getProperty("base class"); //$NON-NLS-1$ ////action_imports = p2.getProperty("imports"); @@ -246,7 +247,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(2); formbean_base = p2.getProperty("base class"); //$NON-NLS-1$ formbean_imports = p2.getProperty("imports"); //$NON-NLS-1$ @@ -282,7 +283,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(3); forward_base = p2.getProperty("base class"); //$NON-NLS-1$ forward_imports = p2.getProperty("imports"); //$NON-NLS-1$ @@ -314,7 +315,7 @@ return 0; } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(1); exception_base = p2.getProperty("base class"); //$NON-NLS-1$ exception_imports = p2.getProperty("imports"); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpByForwardPathHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -37,7 +37,7 @@ object.getAttributeValue(attr).length() > 0); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; String attr = getJumpAttributeName(); XModelObject target = findForwardTarget(object, attr); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JumpToItemFromOtherModule.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -25,7 +25,7 @@ StrutsProcessStructureHelper.instance.isItemFromOtherModule(object)); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject item = StrutsProcessStructureHelper.instance.findItemInOtherModule(object); if(item == null) return; if(item instanceof ReferenceObject) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/OpenMessageResourcesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -33,7 +33,7 @@ return (object != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String parameter = object.getAttributeValue("parameter"); if(parameter == null || parameter.length() == 0) return; String path = "/" + parameter.replace('.', '/') + ".properties"; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/ProcessItemHelpHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public ProcessItemHelpHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String key = object.getModelEntity().getName() + "_" + object.getAttributeValue(ATT_TYPE) + "_" + object.getAttributeValue(ATT_SUBTYPE); super.help(object.getModel(), key); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -23,7 +23,7 @@ public class RenameStrutsConfigHandler extends DefaultEditHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { WebModulesHelper wh = WebModulesHelper.getInstance(object.getModel()); String module = "" + wh.getModuleForConfig(object); XModelObject m = object.getModel().getByPath("Web/" + module.replace('/', '#')); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RestoreUnconfirmedActionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -38,7 +38,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; StrutsProcessImpl process = (StrutsProcessImpl)object.getParent(); XModelObject parent = process.getParent().getChildByPath(ELM_ACTIONMAP); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectInNavigatorHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -24,7 +24,7 @@ return (object != null && object.isActive() && getItemInConfig(object) != null); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject item = getItemInConfig(object); if(item != null) FindObjectHelper.findModelObject(item, FindObjectHelper.EVERY_WHERE); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SelectOnDiagramHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -26,7 +26,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/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetUnknownActionHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -20,7 +20,7 @@ public SetUnknownActionHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if (object == null) return; @@ -45,7 +45,7 @@ } } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsCopyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -8,6 +8,7 @@ import org.jboss.tools.struts.model.*; import org.jboss.tools.common.meta.action.impl.handlers.CopyHandler; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import java.util.Properties; @@ -22,7 +23,7 @@ public StrutsCopyHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if (object instanceof ReferenceObjectImpl) { referentBuffer = object.getPath(); XModelObject ref = ((ReferenceObjectImpl)object).getReference(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -34,7 +34,7 @@ public StrutsDeleteHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { // Diagram object may be removed by update. if(object.getParent() == null) return; XModelObject process = StrutsProcessStructureHelper.instance.getProcess(object); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsEditPropertiesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -23,7 +23,7 @@ return /*wizard != null &&*/ object != null; } - 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.struts.ui.wizard.editproperties.StrutsEditPropertiesWizard"); StrutsEditPropertiesContext context = createContext(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsMoveHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -43,7 +43,7 @@ return TYPE_LINK.equals(tp) && super.isEnabled(object); } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if(!isEnabled(object)) return; if(isMoveOfLink(object)) { super.executeHandler(object, prop); @@ -72,7 +72,7 @@ return null; } - public void executeTransaction(XModelObject[] ps) throws Exception { + public void executeTransaction(XModelObject[] ps) throws XModelException { XUndoManager undo = ps[0].getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("move " + DefaultCreateHandler.title(ps[1], false), XTransactionUndo.EDIT); undo.addUndoable(u); @@ -80,7 +80,7 @@ transaction(ps); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,7 @@ import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.handlers.*; import org.jboss.tools.common.model.XModelBuffer; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.XFileObject; import org.jboss.tools.common.model.util.*; @@ -27,7 +28,7 @@ Properties _p = null; - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if (prop == null) prop = new Properties(); _p = prop; if("true".equals(prop.getProperty("secondPass"))) { @@ -105,7 +106,7 @@ } - protected void pasteOnDrop(XModelObject parent, int sourceIndex, Properties p) throws Exception { + protected void pasteOnDrop(XModelObject parent, int sourceIndex, Properties p) throws XModelException { XModelObject o = parent.getModel().getModelBuffer().source(sourceIndex); String gui = p.getProperty("actionSourceGUIComponentID"); String entity = o.getModelEntity().getName(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/UnlinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -25,7 +25,7 @@ public UnlinkHandler() { } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { if (!isEnabled(object)) return; String type = object.getAttributeValue(ATT_TYPE); if(TYPE_LINK.equals(type) && Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -16,6 +16,7 @@ import org.eclipse.osgi.util.NLS; 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.DeleteFileHandler; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; @@ -33,7 +34,7 @@ public DeletePageHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String target = object.getAttributeValue(ATT_NAME); if(!object.isActive()) return; if(StrutsProcessHelper.getReferers(object.getParent(), target).size() > 0) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageLinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -19,7 +19,7 @@ public DeletePageLinkHandler() {} - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(new ReplaceConfirmedLinkHelper().replace(object, "", null)) p.setProperty("consumed", "true"); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HiddenLinksHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -29,7 +29,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 = object.getChildren(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/HideLinkHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -28,7 +28,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/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenTileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -25,7 +25,7 @@ SUBTYPE_TILE.equals(object.getAttributeValue(ATT_SUBTYPE))); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { String path = object.getAttributeValue(ATT_PATH); XModelObject o = (XModelObject)TilesHelper.getTiles(object).get(path); if(o == null) return; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -30,11 +30,11 @@ return object.isObjectEditable() && "page".equals(object.getAttributeValue("type")); //$NON-NLS-1$ //$NON-NLS-2$ } - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { Properties p = extractProperties(data[0]); String oldpath = object.getAttributeValue("path"); //$NON-NLS-1$ String path = p.getProperty("path"); //$NON-NLS-1$ - if(path.equals("/")) throw new Exception("Path is not valid."); //$NON-NLS-1$ //$NON-NLS-2$ + if(path.equals("/")) throw new XModelException("Path is not valid."); //$NON-NLS-1$ //$NON-NLS-2$ boolean isTile = oldpath != null && !oldpath.startsWith("/"); //$NON-NLS-1$ if(!isTile && !path.startsWith("/")) path = "/" + path; //$NON-NLS-1$ //$NON-NLS-2$ if(path.startsWith("/") && path.indexOf('.') < 0) path += ".jsp"; //$NON-NLS-1$ //$NON-NLS-2$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -44,7 +44,7 @@ return false; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; getContext().execute(object); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -21,6 +21,7 @@ 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.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.XFileObject; import org.jboss.tools.common.model.filesystems.impl.FolderImpl; @@ -82,7 +83,7 @@ } } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { finish(); setFinished(true); @@ -95,7 +96,7 @@ } } - private void callSelector() throws Exception { + private void callSelector() throws XModelException { String b = getValidatedName(false); if(b != null && b.endsWith("/")) b = b.substring(0, b.length() - 1); XModelObject so = (b == null || b.length() == 0) ? null : getTarget().getModel().getByPath(b); @@ -116,7 +117,7 @@ onSelection(); } - private void onSelection() throws Exception { + private void onSelection() throws XModelException { XModelObject so = (XModelObject)getProperties().get("selectedObject"); if(so != null) { String p = XModelObjectLoaderUtil.getResourcePath(so); @@ -170,7 +171,7 @@ return b; } - private void finish() throws Exception { + private void finish() throws XModelException { getValidatedName(true); extractStepData(getStepId()); context.update(); @@ -181,7 +182,7 @@ transaction(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/SelectPageSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,7 @@ package org.jboss.tools.struts.model.handlers.page.create; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; public class SelectPageSupport extends SpecialWizardSupport { @@ -23,7 +24,7 @@ if(context != null) setAttributeContext(0, "name", context); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { extractStepData(0); getProperties().setProperty("name", getAttributeValue(0, "name")); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,12 +11,13 @@ package org.jboss.tools.struts.model.handlers.page.create; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; public class WebSupport extends SpecialWizardSupport { public WebSupport() {} - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { setFinished(true); } else if(CANCEL.equals(name)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -77,7 +77,7 @@ p.put("tiles", tiles); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { finish(); setFinished(true); @@ -129,7 +129,7 @@ return (a == null || actions == null) ? "" : actions.getModule(a); } - protected void finish() throws Exception { + protected void finish() throws XModelException { XUndoManager undo = getTarget().getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("create forward in " + DefaultCreateHandler.title(getTarget(), false), XTransactionUndo.ADD); undo.addUndoable(u); @@ -137,7 +137,7 @@ transaction(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -28,7 +28,7 @@ return handler.isEnabled(object); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { execute(); setFinished(true); @@ -41,7 +41,7 @@ return new String[]{FINISH, CANCEL, HELP}; } - void execute() throws Exception { + void execute() throws XModelException { handler.executeHandler(getTarget(), getProperties()); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -105,7 +105,7 @@ pkg + "SelectActionForwardPathStep"; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { setFinished(true); setStepId(-1); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectPathSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -54,7 +54,7 @@ return null; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { setFinished(true); } else if(CANCEL.equals(name)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -29,7 +29,7 @@ public class DeleteModuleHandler extends AbstractHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { StrutsProjectModule pm = (StrutsProjectModule)object; XModelObject m = pm.getModule(); if(m == null) return; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -31,7 +31,7 @@ return true; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject rso = getTemplate(PreferenceModelUtilities.getPreferenceModel()); if(rso == null) return; String text = rso.getAttributeValue("text"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -35,7 +35,7 @@ return rs != null; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject[] os = OpenMessageResourcesHandler.getResourceObject(object); if(os == null || os.length == 0) return; object = os[0]; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -50,7 +50,7 @@ } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { XModelObject plugin = getPlugin(PreferenceModelUtilities.getPreferenceModel()); if(plugin == null) return; String text = plugin.getAttributeValue("text"); //$NON-NLS-1$ @@ -84,7 +84,7 @@ return (i < ps.length) ? ps[i] : null; } - private Element getElement(String text) throws Exception { + private Element getElement(String text) { StringReader sr = new StringReader(text); return XMLUtil.getElement(sr); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/AddFormsetSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -26,7 +26,7 @@ return StrutsUIMessages.LEAVE_FIELDS_EMPTY; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(CANCEL.equals(name)) { setFinished(true); } else if(OK.equals(name) || FINISH.equals(name)) { @@ -35,7 +35,7 @@ } } - private void finish() throws Exception { + private void finish() throws XModelException { Properties p0 = extractStepData(0); XModelObject fs = findFormset(getTarget(), p0); if(fs != null) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateArgSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -32,7 +32,7 @@ if(n != null) setAttributeValue(0, "name", n); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { execute(); setFinished(true); @@ -45,7 +45,7 @@ return "true".equals(action.getProperty("edit")); } - private void execute() throws Exception { + private void execute() throws XModelException { Properties p0 = extractStepData(0); if(isEditMode()) { DefaultEditHandler.edit(getTarget(), p0, getTarget().isActive()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateDependencyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -23,7 +23,7 @@ return object != null && object.isObjectEditable(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.struts.validator.ui.wizard.depends.DependencyWizard"); if(wizard==null) throw new NullPointerException("Cannot find wizard class 'org.jboss.tools.struts.validator.ui.wizard.depends.DependencyWizard'."); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateMsgForNameSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -32,7 +32,7 @@ if(n != null) setAttributeValue(0, "name", n); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { execute(); setFinished(true); @@ -45,7 +45,7 @@ return "true".equals(action.getProperty("edit")); } - private void execute() throws Exception { + private void execute() throws XModelException { Properties p0 = extractStepData(0); if(isEditMode()) { DefaultEditHandler.edit(getTarget(), p0, getTarget().isActive()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/CreateValidationFileSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -27,7 +27,7 @@ // setAttributeValue(0, "register", (canRegisterInternal()) ? "yes" : "no"); } - protected void execute() throws Exception { + protected void execute() throws XModelException { Properties p0 = extractStepData(0); XUndoManager undo = getTarget().getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("Create tiles " + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString(), XTransactionUndo.ADD); @@ -42,7 +42,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); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,7 @@ import java.util.Properties; 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.DeleteFileHandler; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; @@ -20,7 +21,7 @@ public class DeleteValidationFileHandler extends DeleteFileHandler { - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { boolean unregister = false; if(ValidatorRegistrationHelper.getInstance().isRegistered(object.getModel(), object)) { String checkboxMessage = StrutsUIMessages.DELETE_REFERENCE; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RemoveDependencyHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -26,7 +26,7 @@ return object != null && object.isObjectEditable(); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { if(!isEnabled(object)) return; if(p == null) return; String nm = p.getProperty("dependency name"); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/RenameValidationFileHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,13 +13,14 @@ import java.util.Properties; 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.struts.validators.model.helpers.ValidatorRegistrationHelper; public class RenameValidationFileHandler extends DefaultEditHandler { - public void executeHandler(XModelObject object, Properties prop) throws Exception { + public void executeHandler(XModelObject object, Properties prop) throws XModelException { // prompt file object to build body if it has not been done yet. ((FileAnyImpl)object).getAsText(); String oldPath = ((FileAnyImpl)object).getAbsolutePath(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/CreateWebPrjSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -69,7 +69,7 @@ return 0; } - public int doStep(XModelObject object) throws Exception { + public int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(0); String name = p2.getProperty("name"); //$NON-NLS-1$ String version = p2.getProperty("version"); //$NON-NLS-1$ @@ -134,7 +134,7 @@ } - public synchronized int doStep(XModelObject object) throws Exception { + public synchronized int doStep(XModelObject object) throws XModelException { Properties p2 = extractStepData(1); String location = p2.getProperty("location"); //$NON-NLS-1$ String template = p2.getProperty("template"); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/RegisterInServerXmlHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -27,7 +27,7 @@ return false; } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.jst.web.ui.wizards.appregister.AppRegisterWizard"); if(p == null) p = new Properties(); p.setProperty("title", action.getDisplayName()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/UnregisterInServerXmlHandler.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.impl.AbstractHandler; import org.jboss.tools.common.meta.action.impl.XActionImpl; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.web.server.RegistrationHelper; @@ -35,7 +36,7 @@ return object != null && isRegistered(object); } - public void executeHandler(XModelObject object, Properties p) throws Exception { + public void executeHandler(XModelObject object, Properties p) throws XModelException { // String name = "/" + object.getAttributeValue("application name"); RegistrationHelper.unregister(EclipseResourceUtil.getProject(object)); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -29,7 +29,7 @@ prepareStep(target, getStepId()); } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if (NEXT.equals(name)) { int step = getStepId(); try { @@ -116,7 +116,7 @@ return getStep(stepId).prepareStep(object); } - public int doStep(XModelObject object, int stepId) throws Exception { + public int doStep(XModelObject object, int stepId) throws XModelException { return getStep(stepId).doStep(object); } @@ -126,7 +126,7 @@ public interface Step { public int prepareStep(XModelObject object); - public int doStep(XModelObject object) throws Exception; + public int doStep(XModelObject object) throws XModelException; public int undoStep(XModelObject object); public String getTitle(); public String[] getActionNames(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AWStep.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -11,6 +11,7 @@ package org.jboss.tools.struts.webprj.model.helpers.adopt; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; public abstract class AWStep { protected SpecialWizardSupport support; @@ -36,7 +37,7 @@ context = ((AdoptProjectSupport)support).context(); } - public int onNext() throws Exception { + public int onNext() throws XModelException { support.extractStepData(id); validate(); return id + 1; @@ -46,9 +47,9 @@ public void set() {} - protected void validate() throws Exception {} + protected void validate() throws XModelException {} - public void action(String name) throws Exception {} + public void action(String name) throws XModelException {} public String getMessage() { return null; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectFinisher.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -17,6 +17,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(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepFolders.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,8 @@ import java.io.*; +import org.jboss.tools.common.model.XModelException; + public class AdoptProjectStepFolders extends AWStep { public String getTitle() { @@ -24,7 +26,7 @@ "Ant Build File"; } - protected void validate() throws Exception { + protected void validate() throws XModelException { String bf = support.getAttributeValue(3, "build"); File f = new File(bf); if(f.isFile()) f = f.getParentFile(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -16,6 +16,7 @@ import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; import org.jboss.tools.jst.web.project.helpers.NewWebProjectHelper; @@ -33,7 +34,7 @@ return StrutsUIMessages.ENTER_PATH_TO_THE_FOLDER_WHERE_STRUTSCONFIGXML_IS_LOCATED; } - public int onNext() throws Exception { + public int onNext() throws XModelException { support.extractStepData(id); String location = support.getAttributeValue(id, "location"); //$NON-NLS-1$ File f = new File(location); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepModules.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.webprj.model.helpers.adopt; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; public class AdoptProjectStepModules extends AWStep { @@ -18,7 +19,7 @@ return StrutsUIMessages.ADOPT_PROJECTS_TEPMODULES; } - public void validate() throws Exception { + public void validate() throws XModelException { context.validateModules(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepName.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.webprj.model.helpers.adopt; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; public class AdoptProjectStepName extends AWStep { @@ -22,7 +23,7 @@ return ("name".equals(name)) ? "Application Name*" : "web.xml Location*"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - public void validate() throws Exception { + public void validate() throws XModelException { context.setWebXMLLocation(support.getAttributeValue(id, "web.xml location")); //$NON-NLS-1$ } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.StrutsModelPlugin; public class AdoptProjectSupport extends SpecialWizardSupport { @@ -85,7 +86,7 @@ new String[]{}; } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(FINISH.equals(name)) { steps[getStepId()].onNext(); finish(); @@ -105,7 +106,7 @@ } } - protected void finish() throws Exception { + protected void finish() throws XModelException { Properties properties = getProperties(); if ("yes".equals(properties.getProperty("returnData"))) properties.put("context", context); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportStrutsWarContext.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,7 @@ import java.util.ArrayList; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.struts.StrutsProject; import org.jboss.tools.jst.web.context.ImportWebWarContext; @@ -31,12 +32,12 @@ createAllModules(); } - protected void loadWebXML(String body, String location) throws Exception { + protected void loadWebXML(String body, String location) throws XModelException { super.loadWebXML(body, location); String[][] ms = AdoptProjectContext.getModules(webxml); if(ms == null || ms.length == 0) { String webXMLErrorMessage = "No Struts support found in the project."; - throw new Exception(webXMLErrorMessage); + throw new XModelException(webXMLErrorMessage); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/AddModuleSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; public class AddModuleSupport extends SpecialWizardSupport { @@ -22,7 +23,7 @@ context = (SyncProjectContext)p.get("context"); //$NON-NLS-1$ } - public void action(String name) throws Exception { + public void action(String name) throws XModelException { if(OK.equals(name) || FINISH.equals(name)) { finish(); setFinished(true); @@ -34,7 +35,7 @@ } } - protected void finish() throws Exception { + protected void finish() throws XModelException { Properties p0 = extractStepData(0); String name = p0.getProperty("name"); //$NON-NLS-1$ String path = p0.getProperty("path").replace('\\', '/'); //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -32,6 +32,7 @@ import org.jboss.tools.common.model.ServiceDialog; 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.model.filesystems.XFileObject; import org.jboss.tools.common.model.undo.XTransactionUndo; @@ -237,15 +238,15 @@ return XModelObjectUtil.getExpandedValue(fs, "location", null) + modelPath; //$NON-NLS-1$ } - void addModule(String name, String path) throws Exception { + void addModule(String name, String path) throws XModelException { File f = new File(path); - if(!f.isFile()) throw new Exception("File " + " does not exist."); //$NON-NLS-1$ //$NON-NLS-2$ + if(!f.isFile()) throw new XModelException("File " + " does not exist."); //$NON-NLS-1$ //$NON-NLS-2$ String uri = "/WEB-INF/" + f.getName(); //$NON-NLS-1$ if(name.length() > 0 && !name.startsWith("/")) name = "/" + name; //$NON-NLS-1$ //$NON-NLS-2$ XModelObject m = (XModelObject)modulesMap.get(name); if(m != null) { if("deleted".equals(m.get("state"))) { //$NON-NLS-1$ //$NON-NLS-2$ - if(m != null) throw new Exception("Module " + getModuleDisplayName(name) + " exists."); //$NON-NLS-1$ //$NON-NLS-2$ + if(m != null) throw new XModelException("Module " + getModuleDisplayName(name) + " exists."); //$NON-NLS-1$ //$NON-NLS-2$ } checkStrutsConfig(path); XModelObject cc = m.getModel().createModelObject(WebModuleConstants.ENTITY_WEB_CONFIG, null); //$NON-NLS-1$ @@ -258,7 +259,7 @@ XModelObjectLoaderUtil.mergeAttributes(cc1, cc, false); cc1.set("state", "added"); //$NON-NLS-1$ //$NON-NLS-2$ } else { - throw new Exception("Configuration file is used."); //$NON-NLS-1$ + throw new XModelException("Configuration file is used."); //$NON-NLS-1$ } } else { m.addChild(cc); @@ -269,7 +270,7 @@ m = findModuleByPathOnDisk(path); if(m != null) { if(!"deleted".equals(m.get("state"))) //$NON-NLS-1$ //$NON-NLS-2$ - throw new Exception("The path is used by another module."); //$NON-NLS-1$ + throw new XModelException("The path is used by another module."); //$NON-NLS-1$ modules.remove(m); modulesMap.remove(name); } else { @@ -329,22 +330,22 @@ return null; } - private void checkStrutsConfig(String path) throws Exception { + private void checkStrutsConfig(String path) throws XModelException { File f = new File(path); - if(!f.isFile()) throw new Exception("Path is not a path to a file."); //$NON-NLS-1$ + if(!f.isFile()) throw new XModelException("Path is not a path to a file."); //$NON-NLS-1$ String s = FileUtil.readFile(f); boolean is11 = s.indexOf(StrutsConstants.DOC_PUBLICID_11) >= 0; boolean is12 = s.indexOf(StrutsConstants.DOC_PUBLICID_12) >= 0; if(!is11 && !is12) - throw new Exception("File is not Struts Configuration 1.1 or 1.2."); //$NON-NLS-1$ + throw new XModelException("File is not Struts Configuration 1.1 or 1.2."); //$NON-NLS-1$ String[] es = XMLUtil.getXMLErrors(new StringReader(s), false); //never validate dtd if(es != null && es.length > 0) { String version = (is11) ? "1.1" : "1.2"; //$NON-NLS-1$ //$NON-NLS-2$ - throw new Exception("Struts Configuration " + version + " file is not correct:\n" + es[0]); //$NON-NLS-1$ //$NON-NLS-2$ + throw new XModelException("Struts Configuration " + version + " file is not correct:\n" + es[0]); //$NON-NLS-1$ //$NON-NLS-2$ } } - public boolean apply() throws Exception { + public boolean apply() throws XModelException { validateAttributes(); if(!checkNewPaths()) return false; XUndoManager undo = model.getUndoManager(); @@ -354,7 +355,7 @@ transaction(); } catch (Exception e) { undo.rollbackTransactionInProgress(); - throw e; + throw new XModelException(e); } finally { u.commit(); } @@ -612,21 +613,21 @@ return adoptOrCreateFileSystem(name, location, info); } - private void validateAttributes() throws Exception { + private void validateAttributes() throws XModelException { validateAttr(ATTR_URI); validateAttr(ATTR_DISK_PATH); validateAttr(ATTR_ROOT); } - private void validateAttr(String attr) throws Exception { + private void validateAttr(String attr) throws XModelException { Set<String> set = new HashSet<String>(); for (int i = 0; i < modules.size(); i++) { XModelObject o = (XModelObject)modules.get(i); if("deleted".equals(o.get("state"))) continue; //$NON-NLS-1$ //$NON-NLS-2$ String v = o.getAttributeValue(attr); if(v == null) continue; - if(v.length() == 0) throw new Exception("Attribute '" + attr + "' is required."); //$NON-NLS-1$ //$NON-NLS-2$ - if(set.contains(v)) throw new Exception("More than one module has '" + attr + "' set to " + v + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if(v.length() == 0) throw new XModelException("Attribute '" + attr + "' is required."); //$NON-NLS-1$ //$NON-NLS-2$ + if(set.contains(v)) throw new XModelException("More than one module has '" + attr + "' set to " + v + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ set.add(v); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java 2008-03-24 14:54:24 UTC (rev 7076) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectSupport.java 2008-03-24 15:01:06 UTC (rev 7077) @@ -12,6 +12,7 @@ import java.util.*; 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.util.EclipseResourceUtil; import org.jboss.tools.struts.StrutsProject; @@ -60,7 +61,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)) { /// steps[getStepId()].onNext(); if(!finish()) return; @@ -76,7 +77,7 @@ } } - protected boolean finish() throws Exception { + protected boolean finish() throws XModelException { return context.apply(); }