Author: scabanovich Date: 2011-08-23 18:21:03 -0400 (Tue, 23 Aug 2011) New Revision: 34188 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RemoveJSFNatureContribution.java Log: JBIDE-9427 https://issues.jboss.org/browse/JBIDE-9427 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RemoveJSFNatureContribution.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RemoveJSFNatureContribution.java 2011-08-23 22:20:19 UTC (rev 34187) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RemoveJSFNatureContribution.java 2011-08-23 22:21:03 UTC (rev 34188) @@ -24,24 +24,26 @@ public int execute() { if(model == null) return 1; XModelObject webxml = WebAppHelper.getWebApp(model); - XModelObject servlet = WebAppHelper.findServlet(webxml, - JSFConstants.FACES_SERVLET_CLASS, "Faces Config"); //$NON-NLS-1$ - String servletName = servlet == null ? null : servlet.getAttributeValue("servlet-name"); //$NON-NLS-1$ - XModelObject mapping = WebAppHelper.findServletMapping(webxml, servletName); + if(webxml != null) { + XModelObject servlet = WebAppHelper.findServlet(webxml, + JSFConstants.FACES_SERVLET_CLASS, "Faces Config"); //$NON-NLS-1$ + String servletName = servlet == null ? null : servlet.getAttributeValue("servlet-name"); //$NON-NLS-1$ + XModelObject mapping = WebAppHelper.findServletMapping(webxml, servletName); - if(servlet != null) { - DefaultRemoveHandler.removeFromParent(servlet); - } - if(mapping != null) { - DefaultRemoveHandler.removeFromParent(mapping); - } - XModelObject folder = webxml.getChildByPath("Context Params"); //$NON-NLS-1$ - XModelObject[] params = folder.getChildren(); - for (int i = 0; i < params.length; i++) { - String name = params[i].getAttributeValue("param-name"); //$NON-NLS-1$ - if(name != null && name.startsWith("javax.faces.")) { //$NON-NLS-1$ - DefaultRemoveHandler.removeFromParent(params[i]); + if(servlet != null) { + DefaultRemoveHandler.removeFromParent(servlet); } + if(mapping != null) { + DefaultRemoveHandler.removeFromParent(mapping); + } + XModelObject folder = webxml.getChildByPath("Context Params"); //$NON-NLS-1$ + XModelObject[] params = folder.getChildren(); + for (int i = 0; i < params.length; i++) { + String name = params[i].getAttributeValue("param-name"); //$NON-NLS-1$ + if(name != null && name.startsWith("javax.faces.")) { //$NON-NLS-1$ + DefaultRemoveHandler.removeFromParent(params[i]); + } + } } IProject project = EclipseResourceUtil.getProject(model.getRoot());