[jbosstools-commits] JBoss Tools SVN: r7348 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: operation and 1 other directories.

Author: scabanovich Date: 2008-04-04 12:29:41 -0400 (Fri, 04 Apr 2008) New Revision: 7348 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java Log: JBIDE-893 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2008-04-04 16:24:20 UTC (rev 7347) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2008-04-04 16:29:41 UTC (rev 7348) @@ -108,7 +108,11 @@ fsProp.setProperty("info", "hidden=yes"); XModelObject fsJar = XModelObjectLoaderUtil.createValidObject(model, "FileSystemJar", fsProp); if(fss.getChildByPath(fsJar.getPathPart()) == null) { - DefaultCreateHandler.addCreatedObject(fss, fsJar, false, -1); + try { + DefaultCreateHandler.addCreatedObject(fss, fsJar, false, -1); + } catch (XModelException e) { + throw new InvocationTargetException(e); + } } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2008-04-04 16:24:20 UTC (rev 7347) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2008-04-04 16:29:41 UTC (rev 7348) @@ -55,6 +55,7 @@ import org.jboss.tools.common.meta.action.SpecialWizardFactory; 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.FileSystemsHelper; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -287,7 +288,7 @@ /* * */ - private void updateVersion() { + private void updateVersion() throws XModelException { Bundle bundle = ModelUIPlugin.getDefault().getBundle(); String version = (String) bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); model.changeObjectAttribute( @@ -302,7 +303,11 @@ */ private void registerServer2(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { XModelObject fs = FileSystemsHelper.getFileSystems(model); - model.changeObjectAttribute(fs, "application name", registry.getApplicationName()); + try { + model.changeObjectAttribute(fs, "application name", registry.getApplicationName()); + } catch (XModelException e) { + throw new InvocationTargetException(e); + } fs.setModified(true); model.save(); if(registry.isEnabled()) ModelPlugin.getDefault().getWorkbench().getDisplay().asyncExec(new Runnable() { Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2008-04-04 16:24:20 UTC (rev 7347) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2008-04-04 16:29:41 UTC (rev 7348) @@ -30,6 +30,7 @@ import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.reporting.ProblemReportingHelper; import org.jboss.tools.common.model.ui.ModelUIPlugin; @@ -124,7 +125,7 @@ return "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"; //$NON-NLS-1$ } - private boolean checkServletVersion() { + private boolean checkServletVersion() throws XModelException { if(context.isServletVersionConsistentToWebXML()) return true; ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService(); String servletVersion = context.getServletVersion();