[jbosstools-commits] JBoss Tools SVN: r23000 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: model/handlers and 1 other directory.

Author: scabanovich Date: 2010-06-24 11:29:51 -0400 (Thu, 24 Jun 2010) New Revision: 23000 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java Log: https://jira.jboss.org/browse/JBIDE-6515 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java 2010-06-24 15:22:49 UTC (rev 22999) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java 2010-06-24 15:29:51 UTC (rev 23000) @@ -107,6 +107,7 @@ public static String CreateFaceletTaglibSupport_WebXMLReadOnly; public static String CreateFacesConfigHandler_CreateFacesConfig; public static String CreateFacesConfigHandler_WebXMLIncorrect; + public static String CreateFacesConfigHandler_JSFCapabilitiesAreMissing; public static String CreateFacesConfigHandler_WebXMLNotFound; public static String CreateFacesConfigHandler_WebXMLReadOnly; public static String CreateFacesConfigSupport_CreateFacesConfig; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2010-06-24 15:22:49 UTC (rev 22999) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2010-06-24 15:29:51 UTC (rev 23000) @@ -85,6 +85,7 @@ CreateFacesConfigHandler_CreateFacesConfig=Create faces config in {0} {1} CreateFacesConfigHandler_WebXMLIncorrect=Faces config file cannot be registered because web.xml is incorrect. CreateFacesConfigHandler_WebXMLReadOnly=Faces config file cannot be registered because web.xml is read only. +CreateFacesConfigHandler_JSFCapabilitiesAreMissing=To enable registering in web.xml please configure JSF Capabilities for this project. CreateFacesConfigHandler_WebXMLNotFound=Faces config cannot be registered because web.xml is not found. CreateFacesConfigSupport_CreateFacesConfig=Create faces config in {0} {1} CreateFacesConfigSupport_WebXMLIncorrect=Faces config file cannot be registered because web.xml is incorrect. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java 2010-06-24 15:22:49 UTC (rev 22999) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigHandler.java 2010-06-24 15:29:51 UTC (rev 23000) @@ -18,9 +18,11 @@ import org.jboss.tools.common.model.filesystems.impl.CreateFileHandler; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.undo.*; +import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.model.FacesProcessImpl; import org.jboss.tools.jsf.model.JSFConstants; +import org.jboss.tools.jsf.project.JSFNature; import org.jboss.tools.jsf.web.JSFWebHelper; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; @@ -73,7 +75,13 @@ 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 XModelException (JSFUIMessages.CreateFacesConfigHandler_WebXMLNotFound); + if(webxml == null) { + if(!EclipseResourceUtil.hasNature(object.getModel(), JSFNature.NATURE_ID)) { + throw new XModelException(JSFUIMessages.CreateFacesConfigHandler_JSFCapabilitiesAreMissing); + } + + throw new XModelException (JSFUIMessages.CreateFacesConfigHandler_WebXMLNotFound); + } if("yes".equals(webxml.get("isIncorrect"))) throw new XModelException (JSFUIMessages.CreateFacesConfigHandler_WebXMLIncorrect); //$NON-NLS-1$ //$NON-NLS-2$ if(!webxml.isObjectEditable()) throw new XModelException (JSFUIMessages.CreateFacesConfigHandler_WebXMLReadOnly); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java 2010-06-24 15:22:49 UTC (rev 22999) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/CreateFacesConfigSupport.java 2010-06-24 15:29:51 UTC (rev 23000) @@ -17,8 +17,10 @@ import org.jboss.tools.common.model.files.handlers.CreateFileSupport; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.undo.*; +import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.model.*; +import org.jboss.tools.jsf.project.JSFNature; import org.jboss.tools.jsf.web.JSFWebHelper; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; @@ -119,7 +121,13 @@ private String checkRegister(XModelObject object, String register) { if(!"yes".equals(register)) return null; //$NON-NLS-1$ XModelObject webxml = WebAppHelper.getWebApp(object.getModel()); - if(webxml == null) return JSFUIMessages.CreateFacesConfigSupport_WebXMLNotFound; + if(webxml == null) { + if(!EclipseResourceUtil.hasNature(object.getModel(), JSFNature.NATURE_ID)) { + return JSFUIMessages.CreateFacesConfigHandler_JSFCapabilitiesAreMissing; + } + + return JSFUIMessages.CreateFacesConfigHandler_WebXMLNotFound; + } if("yes".equals(webxml.get("isIncorrect"))) return JSFUIMessages.CreateFacesConfigSupport_WebXMLIncorrect; //$NON-NLS-1$ //$NON-NLS-2$ if(!webxml.isObjectEditable()) return JSFUIMessages.CreateFacesConfigSupport_WebXMLReadOnly; return null;