Author: scabanovich Date: 2008-04-04 12:23:01 -0400 (Fri, 04 Apr 2008) New Revision: 7345 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/AbstractWebFileImpl.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java Log: JBIDE-893 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -39,7 +39,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.EclipseResourceUtil; import org.jboss.tools.common.projecttemplates.ProjectTemplatesPlugin; import org.osgi.framework.BundleContext; @@ -81,7 +83,11 @@ while(preferences.hasNext()) { Object preference = preferences.next(); if(preference instanceof WebPreference) { - PreferenceModelUtilities.initPreferenceValue(initialModel,(WebPreference)preference); + try { + PreferenceModelUtilities.initPreferenceValue(initialModel,(WebPreference)preference); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); + } } } PreferenceModelUtilities.getPreferenceModel().save(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/IImportWebProjectContext.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -12,6 +12,7 @@ import org.eclipse.core.resources.IProject; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; @@ -35,6 +36,6 @@ public RegisterServerContext getRegisterServerContext(); public String SERVLET_VERSION_WARNING = WebUIMessages.SERVLET_VERSION_WARNING; public boolean isServletVersionConsistentToWebXML(); - public void convertWebXML(boolean backup); + public void convertWebXML(boolean backup) throws XModelException; public boolean isLinkingToProjectOutsideWorkspace(); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -266,7 +266,7 @@ return true; } - public void convertWebXML(boolean backup) { + public void convertWebXML(boolean backup) throws XModelException { if(webxml == null) return; String entity = webxml.getModelEntity().getName(); if("2.3".equals(servletVersion) && !entity.equals("FileWebApp")) { //$NON-NLS-1$ //$NON-NLS-2$ @@ -286,7 +286,7 @@ return WebAppHelper.getServletVersion(webxml); } - private void convertWebXML(String entity, boolean backup) { + private void convertWebXML(String entity, boolean backup) throws XModelException { if(backup) backUp(); XModelObject newweb = XModelObjectLoaderUtil.createValidObject(webxml.getModel(), entity); XAttribute[] as = newweb.getModelEntity().getAttributes(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/AbstractWebFileImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/AbstractWebFileImpl.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/AbstractWebFileImpl.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -30,7 +30,7 @@ return process; } - protected void mergeAll(XModelObject f, boolean update) { + protected void mergeAll(XModelObject f, boolean update) throws XModelException { WebProcess process = provideWebProcess(); merge(f, !update); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPAdopt.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -12,6 +12,7 @@ import java.util.*; import org.jboss.tools.common.meta.XAdoptManager; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -22,7 +23,7 @@ return isAdoptableBundle(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(!isAcceptableTarget(target)) return; if(isAdoptableBundle(object)) adoptBundle(target, object, p); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebAppHelper.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -12,6 +12,7 @@ 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; @@ -99,7 +100,7 @@ * @param loadOnStartUp * @return */ - public static XModelObject findOrCreateServlet(XModelObject webxml, String className, String servletName, int loadOnStartUp) { + public static XModelObject findOrCreateServlet(XModelObject webxml, String className, String servletName, int loadOnStartUp) throws XModelException { if(webxml == null) return null; XModelObject s = findServlet(webxml, className, servletName); if(s == null) { @@ -142,7 +143,7 @@ * @param value * @return */ - public static XModelObject setWebAppInitParam(XModelObject servlet, String name, String value) { + public static XModelObject setWebAppInitParam(XModelObject servlet, String name, String value) throws XModelException { if(servlet == null) return null; XModelObject p = findWebAppInitParam(servlet, name); if(p == null) { @@ -162,7 +163,7 @@ * @param value * @return */ - public static XModelObject appendToWebAppInitParam(XModelObject servlet, String name, String valuePart) { + public static XModelObject appendToWebAppInitParam(XModelObject servlet, String name, String valuePart) throws XModelException { if(servlet == null) return null; XModelObject p = findWebAppInitParam(servlet, name); if(p == null) { @@ -177,7 +178,7 @@ return p; } - private static XModelObject createWebAppInitParam(XModelObject servlet, String name, String value) { + private static XModelObject createWebAppInitParam(XModelObject servlet, String name, String value) throws XModelException { if(servlet == null) return null; XModelObject p = servlet.getModel().createModelObject("WebAppInitParam", null); p.setAttributeValue("param-name", name); @@ -224,7 +225,7 @@ * @param value * @return */ - public static XModelObject setWebAppContextParam(XModelObject webxml, String name, String value) { + public static XModelObject setWebAppContextParam(XModelObject webxml, String name, String value) throws XModelException { if(webxml == null) return null; XModelObject p = findWebAppContextParam(webxml, name); if(p == null) { @@ -244,7 +245,7 @@ * @param value * @return */ - public static XModelObject appendToWebAppContextParam(XModelObject webxml, String name, String valuePart) { + public static XModelObject appendToWebAppContextParam(XModelObject webxml, String name, String valuePart) throws XModelException { if(webxml == null) return null; XModelObject p = findWebAppContextParam(webxml, name); if(p == null) { @@ -259,7 +260,7 @@ return p; } - private static XModelObject createWebAppContextParam(XModelObject webxml, String name, String value) { + private static XModelObject createWebAppContextParam(XModelObject webxml, String name, String value) throws XModelException { if(webxml == null) return null; XModelObject folder = webxml.getChildByPath("Context Params"); if(folder == null) folder = webxml; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/AddServletSupportWizard.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -14,6 +14,7 @@ import org.eclipse.jdt.core.*; import org.jboss.tools.common.meta.action.SpecialWizard; import org.jboss.tools.common.model.*; +import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.project.ClassPathUpdate; import org.jboss.tools.jst.web.*; @@ -27,11 +28,17 @@ } public int execute() { - addServletSupport(); + try { + addServletSupport(); + } catch (XModelException e) { + //TODO probably wizard should throw XModelException? + ModelPlugin.getPluginLog().logError(e); + return 1; + } return 0; } - private void addServletSupport() { + private void addServletSupport() throws XModelException { XModelObject web = model.getByPath("Web"); if(web == null) return; String servletVersion = web.getAttributeValue("servlet version"); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDAttribute21Impl.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.web.tld.model; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.impl.CustomizedObjectImpl; public class TLDAttribute21Impl extends CustomizedObjectImpl { @@ -17,7 +18,7 @@ static String DEFERRED_VALUE = "deferred-value type"; static String DEFERRED_METHOD = "deferred-method signature"; - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if(DEFERRED_VALUE.equals(name)) { setAttributeValue(DEFERRED_METHOD, ""); } else if(DEFERRED_METHOD.equals(name)) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDVariableImpl.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -13,6 +13,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.impl.*; //See WebAppErrorPageImpl @@ -32,7 +33,7 @@ return "variable:" + ((ng != null && ng.length() > 0) ? ng : na); } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if(NAME_GIVEN.equals(name) && newValue != null && newValue.length() > 0) { if(getAttributeValue(NAME_FROM_ATTRIBUTE).length() > 0) { Properties p = new Properties(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -29,7 +29,7 @@ || isAdoptableTaglib(object) || isAdoptableMacro(object) || isAdoptableGroup(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(!isAcceptableTarget(target)) return; if(isAdoptableTag(object)) adoptTag(target, object, p); else if(isAdoptableAttribute(object)) adoptAttribute(target, object, p); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/PaletteAdopt.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -29,7 +29,7 @@ return isAdoptableTag(target, object) || isAdoptableTaglib(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); else if(isAdoptableTaglib(target, object)) adoptTaglib(target, object); } @@ -53,7 +53,7 @@ return true; } - public void adoptTag(XModelObject target, XModelObject object) { + public void adoptTag(XModelObject target, XModelObject object) throws XModelException { if(target.getModelEntity().getName().startsWith("SharableMacro")) target = target.getParent(); //$NON-NLS-1$ add(target, object, helper.createMacroByTag(object, target.getModel())); } @@ -83,7 +83,7 @@ XActionInvoker.invoke("ImportTLDToPaletteWizard", "CreateActions.ImportTLD", paletteRoot, p); //$NON-NLS-1$ //$NON-NLS-2$ } - static void add(XModelObject target, XModelObject object, XModelObject created) { + static void add(XModelObject target, XModelObject object, XModelObject created) throws XModelException { if(created == null) return; XModelObject old = target.getChildByPath(created.getPathPart()); if(old != null) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tomcat/TomcatVMHelper.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -13,6 +13,7 @@ import java.io.File; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.launching.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.jst.web.*; @@ -32,7 +33,7 @@ return null; } - public static String createVM(String path) { + public static String createVM(String path) throws XModelException { String jvm = findVM(path); if(jvm == null) { jvm = new File(path).getName(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppErrorPageImpl.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -13,6 +13,7 @@ import java.util.Properties; import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.impl.*; public class WebAppErrorPageImpl extends RegularObjectImpl { @@ -23,7 +24,7 @@ return (code != null && code.length() > 0) ? code : getAttributeValue(WebAppConstants.EXCEPTION_TYPE); } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if(WebAppConstants.ERROR_CODE.equals(name) && newValue != null && newValue.length() > 0) { if(getAttributeValue(WebAppConstants.EXCEPTION_TYPE).length() > 0) { Properties p = new Properties(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppFilterMappingImpl.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.web.webapp.model; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.impl.*; public class WebAppFilterMappingImpl extends RegularObjectImpl { @@ -22,7 +23,7 @@ return getAttributeValue("filter-name") + ":" + v; } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if(WebAppConstants.URL_PATTERN.equals(name) && newValue != null && newValue.length() > 0) { setAttributeValue(WebAppConstants.SERVLET_NAME, ""); } else if(WebAppConstants.SERVLET_NAME.equals(name) && newValue != null && newValue.length() > 0) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java 2008-04-04 16:22:11 UTC (rev 7344) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/WebAppServletImpl.java 2008-04-04 16:23:01 UTC (rev 7345) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.web.webapp.model; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.impl.*; public class WebAppServletImpl extends OrderedObjectImpl { @@ -29,7 +30,7 @@ return "" + getAttributeValue("servlet-name") + ":" + c; } - protected void onAttributeValueEdit(String name, String oldValue, String newValue) { + protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException { if(WebAppConstants.SERVLET_CLASS.equals(name) && newValue != null && newValue.length() > 0) { setAttributeValue(WebAppConstants.JSP_FILE, ""); } else if(WebAppConstants.JSP_FILE.equals(name) && newValue != null && newValue.length() > 0) {