Author: scabanovich Date: 2008-04-04 12:31:51 -0400 (Fri, 04 Apr 2008) New Revision: 7350 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.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/SetupModuleHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.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/page/RenamePageHandler.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/helpers/StrutsLinkHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.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/WebModulesHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java Log: JBIDE-893 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -12,7 +12,9 @@ import org.jboss.tools.common.log.IPluginLog; 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.options.PreferenceModelUtilities; +import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -39,12 +41,16 @@ XModel initialModel = PreferenceModelUtilities.createPreferenceModel(p); if (initialModel != null) { - PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.USE_DEFAULT_PROJECT_ROOT); - PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_STRUTS_VERSION); - PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_TEMPLATE); - PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_ROOT_DIR); - PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_TLD_SET); - PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.REMOVE_PAGE_AND_FILE); + try { + PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.USE_DEFAULT_PROJECT_ROOT); + PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_STRUTS_VERSION); + PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_TEMPLATE); + PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_PROJECT_ROOT_DIR); + PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.DEFAULT_TLD_SET); + PreferenceModelUtilities.initPreferenceValue(initialModel, StrutsPreference.REMOVE_PAGE_AND_FILE); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); + } PreferenceModelUtilities.getPreferenceModel().save(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProject.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -15,6 +15,7 @@ import org.osgi.framework.Bundle; import org.jboss.tools.common.model.XModelConstants; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.project.ModelNature; @@ -54,10 +55,14 @@ if (obsoleteVersion) { Bundle bundle = ModelPlugin.getDefault().getBundle(); String version = (String) bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); + try { model.changeObjectAttribute( FileSystemsHelper.getFileSystems(model), XModelConstants.MODEL_VERSION, version ); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); + } model.save(); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsUtils.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -13,6 +13,7 @@ import java.io.File; import java.util.*; import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.jst.web.project.helpers.*; @@ -86,7 +87,11 @@ } public void setDefaultTemplate(String template) { - StrutsPreference.DEFAULT_PROJECT_TEMPLATE.setValue(template); + try { + StrutsPreference.DEFAULT_PROJECT_TEMPLATE.setValue(template); + } catch (XModelException e) { + throw new IllegalArgumentException(e); + } } public String getDefaultPageTemplate() { @@ -95,7 +100,11 @@ } public void setDefaultPageTemplate(String template) { - StrutsPreference.DEFAULT_PAGE_TEMPLATE.setValue(template); + try { + StrutsPreference.DEFAULT_PAGE_TEMPLATE.setValue(template); + } catch (XModelException e) { + throw new IllegalArgumentException(e); + } } protected String getWizardEntitySuffix() { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/ActionObjectImpl.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.model; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.*; @@ -31,7 +32,7 @@ return new OrderedByEntityChildren(); } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if("unknown".equals(name) && "true".equals(newValue)) { if(!isActive()) return; XModelObject[] s = getParent().getChildren(getModelEntity().getName()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -17,6 +17,7 @@ import org.jboss.tools.common.model.filesystems.*; import org.jboss.tools.common.model.filesystems.impl.*; import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader; +import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.*; import java.io.*; @@ -142,6 +143,8 @@ f.setUpdateLock(); try { f.edit(body, true); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); } finally { f.releaseUpdateLock(); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/JSPAdopt.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -23,7 +23,7 @@ return isAdoptableAction(object); } - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { if(isAdoptableAction(object)) adoptAction(target, object, p); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/MessageResourcesFolderAdopt.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -24,7 +24,7 @@ return object != null && "FilePROPERTIES".equals(object.getModelEntity().getName()); } - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { String path = XModelObjectLoaderUtil.getResourcePath(object); String ext = ".properties"; if(path == null || !path.toLowerCase().endsWith(ext) || !path.startsWith("/")) return; 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-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/RenameStrutsConfigHandler.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -55,7 +55,7 @@ } } - private void renameConfigInWebXML(XModel model, String module, String oldURI, String newURI) { + private void renameConfigInWebXML(XModel model, String module, String oldURI, String newURI) throws XModelException { XModelObject webxml = WebAppHelper.getWebApp(model); if(webxml == null) return; XModelObject servlet = StrutsWebHelper.findServlet(webxml); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -25,7 +25,7 @@ public class SetupModuleHandler implements StrutsConstants { - public static void setupModule(XModelObject object, String module, String fsname) { + public static void setupModule(XModelObject object, String module, String fsname) throws XModelException { XModel model = object.getModel(); if (module.length() > 0 && module.charAt(0) != '/') { throw new RuntimeException(StrutsUIMessages.MODULE_NAME); @@ -122,7 +122,7 @@ return s; } - private static XModelObject createFileSystem(XModelObject webroot, String module) { + private static XModelObject createFileSystem(XModelObject webroot, String module) throws XModelException { XModel model = webroot.getModel(); String mn = module; if(mn.startsWith("/")) mn = mn.substring(1); @@ -143,7 +143,7 @@ return fs; } - private static XModelObject createFolder(XModelObject parent, String path) { + private static XModelObject createFolder(XModelObject parent, String path) throws XModelException { int i = path.indexOf('/'); String part = (i < 0) ? path : path.substring(0, i); XModelObject folder = parent.getChildByPath(part); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -26,7 +26,7 @@ /** Creates a new instance of StrutsAdoptManager */ public StrutsAdoptManager() {} - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { if(isAdoptableJSP(target, object)) { adoptJSP(target, object, p); } else if(isAdoptableProcessItem(target, object)) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsLinkManager.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -8,6 +8,7 @@ import org.jboss.tools.struts.model.helpers.*; import org.jboss.tools.common.meta.XAdoptManager; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; /** @@ -22,7 +23,7 @@ public StrutsLinkManager() { } - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { helper.link(target, object, p); } 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-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsPasteHandler.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -138,7 +138,7 @@ static String ENT_ACTION_11 = StrutsConstants.ENT_ACTION + StrutsConstants.VER_SUFFIX_11; static String ENT_ACTION_12 = StrutsConstants.ENT_ACTION + StrutsConstants.VER_SUFFIX_12; - protected boolean insertReference(XModelObject parent, String entity, XModelObject o, Properties p) { + protected boolean insertReference(XModelObject parent, String entity, XModelObject o, Properties p) throws XModelException { if((!entity.equals(ENT_ACTION_11) && !entity.equals(ENT_ACTION_12)) || o.getParent() == parent) return false; XModelObject process = StrutsProcessStructureHelper.instance.getProcess(parent); 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-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RenamePageHandler.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -85,7 +85,7 @@ return null; } - public static void changeMatchingAttributesInHierarhy(XModelObject object, String oldpath, String newpath) { + public static void changeMatchingAttributesInHierarhy(XModelObject object, String oldpath, String newpath) throws XModelException { RenamePageHandler.changeMatchingAttributes(object, oldpath, newpath); XModelObject[] os = object.getChildrenForSave(); for (int i = 0; i < os.length; i++) { @@ -96,7 +96,7 @@ static String[] PATH_ATTRIBUTES = new String[]{"path", "include", "forward", "input"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - public static void changeMatchingAttributes(XModelObject ref, String oldpath, String path) { + public static void changeMatchingAttributes(XModelObject ref, String oldpath, String path) throws XModelException { for (int i = 0; i < PATH_ATTRIBUTES.length; i++) { if(oldpath.equals(ref.getAttributeValue(PATH_ATTRIBUTES[i]))) { ref.getModel().changeObjectAttribute(ref, PATH_ATTRIBUTES[i], path); 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-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -222,7 +222,7 @@ createPage(getTarget(), fullpath, getProperties()); } - public static XModelObject createPage(XModelObject process, String path, Properties p) { + public static XModelObject createPage(XModelObject process, String path, Properties p) throws XModelException { XModelObject item = StrutsProcessHelper.createPage(process, path); String x = (p == null) ? null : p.getProperty("process.mouse.x"); String y = (p == null) ? null : p.getProperty("process.mouse.y"); @@ -257,7 +257,7 @@ createFile(fs, path, body); } - public static void createFile(XModelObject fs, String path, String body) { + public static void createFile(XModelObject fs, String path, String body) throws XModelException { StringTokenizer st = new StringTokenizer(path, "/"); int c = st.countTokens(), i = 0; while(i < c - 1) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsLinkHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsLinkHelper.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsLinkHelper.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -79,7 +79,7 @@ return LINK_TYPES[targetType][objectType] != U_K; } - public void link(XModelObject target, XModelObject object, java.util.Properties p) { + public void link(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { if (target == null || object == null) return; XModelObject config = getConfig(target, object); if (config == null) return; @@ -147,7 +147,7 @@ } } - private void redirect_link(XModelObject object, String target, String path, String attr) { + private void redirect_link(XModelObject object, String target, String path, String attr) throws XModelException { XUndoManager undo = object.getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("redirect " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT); //$NON-NLS-1$ undo.addUndoable(u); @@ -172,7 +172,7 @@ } } - private void redirect(XModelObject object, String target, String path) { + private void redirect(XModelObject object, String target, String path) throws XModelException { XUndoManager undo = object.getModel().getUndoManager(); XTransactionUndo u = new XTransactionUndo("redirect " + DefaultCreateHandler.title(object, false), XTransactionUndo.EDIT); //$NON-NLS-1$ undo.addUndoable(u); @@ -198,7 +198,7 @@ } } - private XModelObject createLink(XModelObject page, String target, String path) { + private XModelObject createLink(XModelObject page, String target, String path) throws XModelException { XModelObject link = findDuplicateLink(page, target, path); if(link != null) return link; String name = StrutsProcessHelper.createName(page, "link"); //$NON-NLS-1$ @@ -218,7 +218,7 @@ return link; } - private XModelObject createForward(XModelObject action, String path) { + private XModelObject createForward(XModelObject action, String path) throws XModelException { String name = path.substring(path.lastIndexOf('/')+1); int dot = name.indexOf('.'); if (dot != -1) name = name.substring(0, dot); @@ -302,7 +302,7 @@ return config; } - private XModelObject findDuplicateLink(XModelObject object, String target, String path) { + private XModelObject findDuplicateLink(XModelObject object, String target, String path) throws XModelException { if(!TYPE_PAGE.equals(object.getAttributeValue("type"))) return null; //$NON-NLS-1$ XModelObject[] cs = object.getChildren(); for (int i = 0; i < cs.length; i++) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -84,7 +84,7 @@ links.update(object); } - public void restoreDefaults(XModelObject object) { + public void restoreDefaults(XModelObject object) throws XModelException { EnginesLoader.merge(object, load(getDefaultValue())); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/ReplaceConfirmedLinkHelper.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -24,7 +24,7 @@ public ReplaceConfirmedLinkHelper() {} - public boolean replace(XModelObject link, String newpath, String attr) { + public boolean replace(XModelObject link, String newpath, String attr) throws XModelException { UrlPattern up = StrutsProcessStructureHelper.instance.getUrlPattern(link); String jsppath = link.getParent().getAttributeValue(ATT_PATH); XModelObject jsp = StrutsProcessStructureHelper.instance.findReferencedJSPInCurrentModule(link.getParent()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/PluginRegistration.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -16,6 +16,7 @@ import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectUtil; import org.jboss.tools.struts.webprj.model.helpers.WebModulesHelper; @@ -41,6 +42,15 @@ public int execute() { if(cfg == null) return 1; + try { + return doExecute(); + } catch (XModelException e) { + if(p != null) p.put("exception", e); + return 1; + } + } + + private int doExecute() throws XModelException { if(test) { return test(); } else if(path == null && oldPath != null) { @@ -56,16 +66,16 @@ return 0; } - void append() { + void append() throws XModelException { XModelObject plugin = getPlugin(true); XModelObject property = getSetProperty(plugin, true); addPathIfNeeded(property, path); } - protected void modifyProperties(XModelObject plugin) { + protected void modifyProperties(XModelObject plugin) throws XModelException { } - void replace() { + void replace() throws XModelException { boolean isDefault = isOldNameDefault(); XModelObject plugin = getPlugin(isDefault); if(plugin == null) return; @@ -73,14 +83,14 @@ replacePath(property); } - void remove() { + void remove() throws XModelException { XModelObject plugin = getPlugin(false); if(plugin == null) return; XModelObject property = getSetProperty(plugin, false); replacePath(property); } - private XModelObject getPlugin(boolean create) { + private XModelObject getPlugin(boolean create) throws XModelException { XModelObject plugins = cfg.getChildByPath("plug-ins"); XModelObject[] os = plugins.getChildren(); for (int i = 0; i < os.length; i++) { @@ -94,11 +104,11 @@ return plugin; } - private XModelObject getSetProperty(XModelObject plugin, boolean create) { + private XModelObject getSetProperty(XModelObject plugin, boolean create) throws XModelException { return getSetProperty(plugin, getSetPropertyName(), create, getDefaultSetPropertyValue()); } - protected XModelObject getSetProperty(XModelObject plugin, String name, boolean create, String value) { + protected XModelObject getSetProperty(XModelObject plugin, String name, boolean create, String value) throws XModelException { XModelObject[] ps = plugin.getChildren(); for (int i = 0; i < ps.length; i++) { if(name.equals(ps[i].getAttributeValue("property"))) { @@ -113,7 +123,7 @@ return property; } - private void addPathIfNeeded(XModelObject property, String path) { + private void addPathIfNeeded(XModelObject property, String path) throws XModelException { String value = property.getAttributeValue("value"); String[] array = XModelObjectUtil.asStringArray(value); StringBuffer sb = new StringBuffer(); @@ -128,7 +138,7 @@ property.getModel().changeObjectAttribute(property, "value", value); } - private void replacePath(XModelObject property) { + private void replacePath(XModelObject property) throws XModelException { String value = property.getAttributeValue("value"); String[] s = XModelObjectUtil.asStringArray(value); StringBuffer sb = new StringBuffer(); @@ -154,7 +164,7 @@ property.getModel().changeObjectAttribute(property, "value", value); } - int test() { + int test() throws XModelException { if(path == null) return 1; XModelObject plugin = getPlugin(false); if(plugin == null) return 1; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/TilesFileRegistration.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.plugins.model.handlers; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; public class TilesFileRegistration extends PluginRegistration { @@ -22,11 +23,11 @@ return "definitions-config"; } - protected void modifyProperties(XModelObject plugin) { + protected void modifyProperties(XModelObject plugin) throws XModelException { setModuleAwareIfNeeded(plugin); } - private void setModuleAwareIfNeeded(XModelObject plugin) { + private void setModuleAwareIfNeeded(XModelObject plugin) throws XModelException { XModelObject property = getSetProperty(plugin, "moduleAware", true, null); String value = property.getAttributeValue("value"); if(value.length() == 0) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/tiles/model/handlers/JSPAdopt.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -22,7 +22,7 @@ return isAdoptableTag(target, object); } - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { if(isAdoptableTag(target, object)) adoptTag(target, object, p); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/FormsetAdopt.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -34,7 +34,7 @@ return entity.startsWith(StrutsConstants.ENT_ACTION); } - public void adopt(XModelObject target, XModelObject object, java.util.Properties p) { + public void adopt(XModelObject target, XModelObject object, java.util.Properties p) throws XModelException { String entity = XModelEntityResolver.resolveEntity(target, ValidatorConstants.ENT_FORM); XModelObject o = object.getModel().createModelObject(entity, null); String attr = (isAction(object.getModelEntity().getName())) ? "path" : "name"; 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-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/handlers/WebPrjSupport.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -13,6 +13,7 @@ import org.jboss.tools.common.meta.action.impl.*; import org.jboss.tools.common.meta.action.impl.handlers.*; import org.jboss.tools.common.model.*; + import java.util.*; /** @@ -90,7 +91,7 @@ c.setValues(vs); } - protected void changeAttributeValue(XModelObject object, String name, String value) { + protected void changeAttributeValue(XModelObject object, String name, String value) throws XModelException { object.getModel().changeObjectAttribute(object, name, value); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/WebModulesHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/WebModulesHelper.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/WebModulesHelper.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -148,7 +148,7 @@ } } - public XModelObject setModule(XModel model, String oldname, String name, String modelpath, String rootfilesystem) { + public XModelObject setModule(XModel model, String oldname, String name, String modelpath, String rootfilesystem) throws XModelException { XModelObject web = model.getByPath("Web"); XModelObject module = (oldname == null || oldname.length() == 0) ? null : web.getChildByPath(oldname); if(module == null) module = web.getChildByPath(name); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java 2008-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/StrutsWebHelper.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -12,6 +12,7 @@ import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; @@ -22,27 +23,27 @@ return WebAppHelper.findServlet(webxml, ACTION_SERVLET, "action"); } - public static XModelObject getServlet(XModelObject webxml) { + public static XModelObject getServlet(XModelObject webxml) throws XModelException { return WebAppHelper.findOrCreateServlet(webxml, ACTION_SERVLET, "action", -1); } - public static void revalidateInitParam(XModelObject servlet, String modulename, String uri) { + public static void revalidateInitParam(XModelObject servlet, String modulename, String uri) throws XModelException { WebAppHelper.setWebAppInitParam(servlet, "config" + modulename, uri); } - public static void revalidateInitParam(XModel model, String modulename, String uri) { + public static void revalidateInitParam(XModel model, String modulename, String uri) throws XModelException { XModelObject webxml = WebAppHelper.getWebApp(model); if(webxml == null) return; XModelObject servlet = getServlet(webxml); if(servlet != null) revalidateInitParam(servlet, modulename, uri); } - public static String registerConfig(XModelObject servlet, String modulename, String uri) { + public static String registerConfig(XModelObject servlet, String modulename, String uri) throws XModelException { XModelObject init = WebAppHelper.appendToWebAppInitParam(servlet, "config" + modulename, uri); return init == null ? "" : init.getAttributeValue("param-value"); } - public static String registerConfig(XModel model, String modulename, String uri) { + public static String registerConfig(XModel model, String modulename, String uri) throws XModelException { XModelObject webxml = WebAppHelper.getWebApp(model); if(webxml == null) return null; XModelObject servlet = getServlet(webxml); @@ -65,7 +66,7 @@ return false; } - public static void unregisterConfig(XModel model, String uri) { + public static void unregisterConfig(XModel model, String uri) throws XModelException { XModelObject webxml = WebAppHelper.getWebApp(model); XModelObject servlet = WebAppHelper.findServlet(webxml, ACTION_SERVLET, "action"); if(servlet == null) return; 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-04-04 16:30:22 UTC (rev 7349) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-04-04 16:31:51 UTC (rev 7350) @@ -503,7 +503,7 @@ revalidateSrcFileSystem(m); } - private XModelObject createFileSystem(String name, String location, String info) { + private XModelObject createFileSystem(String name, String location, String info) throws XModelException { XModelObject fs = model.createModelObject("FileSystemFolder", null); //$NON-NLS-1$ fs.setAttributeValue("name", name); //$NON-NLS-1$ fs.setAttributeValue("location", location); //$NON-NLS-1$ @@ -513,7 +513,7 @@ return fs; } - private XModelObject adoptOrCreateFileSystem(String name, String location, String info) { + private XModelObject adoptOrCreateFileSystem(String name, String location, String info) throws XModelException { XModelObject fs = model.getByPath("FileSystems/" + name); //$NON-NLS-1$ if(fs != null && location.equals(fs.getAttributeValue("location"))) { //$NON-NLS-1$ if(info != null) model.changeObjectAttribute(fs, "info", info); //$NON-NLS-1$ @@ -544,7 +544,7 @@ m.getModel().changeObjectAttribute(m, ATTR_ROOT_FS, fs.getAttributeValue("name")); //$NON-NLS-1$ } - private XModelObject revalidateModuleFileSystem(String name, String location, String info) { + private XModelObject revalidateModuleFileSystem(String name, String location, String info) throws XModelException { XModelObject fs = (XModelObject)oldFileSystems.get(location); if(fs != null && name.equals(fs.getAttributeValue("name"))) { //$NON-NLS-1$ if(info != null) model.changeObjectAttribute(fs, "info", info); //$NON-NLS-1$ @@ -597,7 +597,7 @@ m.getModel().changeObjectAttribute(m, ATTR_SRC_FS, fs.getAttributeValue("name")); //$NON-NLS-1$ } - private XModelObject revalidateSrcFileSystem(String name, String location, String info) { + private XModelObject revalidateSrcFileSystem(String name, String location, String info) throws XModelException { XModelObject fs = (XModelObject)oldFileSystems.remove(location); if(fs != null) { newFileSystems.put(location, fs);