Author: dgolovin Date: 2008-06-19 02:03:18 -0400 (Thu, 19 Jun 2008) New Revision: 8842 Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFBeanSearcher.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBeans.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java Log: coding style improved Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-06-19 05:59:11 UTC (rev 8841) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-06-19 06:03:18 UTC (rev 8842) @@ -210,7 +210,15 @@ class SFUtil extends XModelObjectLoaderUtil { - static String[] folders = new String[]{"Components", "Converters", "Managed Beans", "Navigation Rules", "Referenced Beans", "Render Kits", "Validators", "Extensions"}; + static String[] folders = new String[]{ + JSFConstants.FOLDER_COMPONENTS, + JSFConstants.FOLDER_CONVERTERS, + JSFConstants.FOLDER_MANAGED_BEANS, + JSFConstants.FOLDER_NAVIGATION_RULES, + JSFConstants.FOLDER_REFENCED_BEANS, + JSFConstants.FOLDER_RENDER_KITS, + JSFConstants.FOLDER_VALIDATORS, + JSFConstants.FOLDER_EXTENSIONS}; protected Set<String> getAllowedChildren(XModelEntity entity) { Set<String> children = super.getAllowedChildren(entity); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java 2008-06-19 05:59:11 UTC (rev 8841) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java 2008-06-19 06:03:18 UTC (rev 8842) @@ -32,7 +32,14 @@ public static final String ENT_PROCESS_ITEM_OUTPUT = "JSFProcessItemOutput"; public static final String FOLDER_NAVIGATION_RULES = "Navigation Rules"; - + public static final String FOLDER_MANAGED_BEANS = "Managed Beans"; + public static final String FOLDER_REFENCED_BEANS = "Referenced Beans"; + public static final String FOLDER_COMPONENTS = "Components"; + public static final String FOLDER_CONVERTERS = "Converters"; + public static final String FOLDER_RENDER_KITS = "Render Kits"; + public static final String FOLDER_VALIDATORS = "Validators"; + public static final String FOLDER_EXTENSIONS = "Extensions"; + public static final String ATT_ID = "id"; public static final String ATT_NAME = "name"; public static final String ATT_PATH = "path"; Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFBeanSearcher.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFBeanSearcher.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFBeanSearcher.java 2008-06-19 06:03:18 UTC (rev 8842) @@ -0,0 +1,76 @@ +package org.jboss.tools.jsf.model.pv; + +import java.util.ArrayList; +import java.util.StringTokenizer; + +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.jst.web.model.pv.WebProjectNode; + +public class JSFBeanSearcher { + WebProjectNode beans; + WebProjectNode conf; + + XModelObject bean; + JSFProjectBean beanClass; + String property; + + public JSFBeanSearcher(XModel model) { + WebProjectNode root = JSFProjectsTree.getProjectsRoot(model); + if(root == null) return; + beans = (WebProjectNode)root.getChildByPath("Beans"); + conf = (WebProjectNode)root.getChildByPath("Configuration"); + } + + public void parse(String path) { + String[] a = toArray(path); + if(a.length == 0) return; + bean = JSFPromptingProvider.findBean(conf, a[0]); + beanClass = (JSFProjectBean)JSFPromptingProvider.findBeanClass(beans, bean); + if(bean == null || a.length < 2) return; + property = a[1]; + for (int i = 1; i < a.length - 1; i++) { + if(!next()) return; + property = a[i + 1]; + } + } + + String[] toArray(String path) { + ArrayList<String> l = new ArrayList<String>(); + StringTokenizer st = new StringTokenizer(path, "."); + while(st.hasMoreElements()) l.add(st.nextToken()); + return l.toArray(new String[0]); + } + + private boolean next() { + if(bean == null || beanClass == null || property == null) return false; + XModelObject p = beanClass.getChildByPath(property); + if(p == null) return false; + String cls = p.getAttributeValue("class name"); + XModelObject b = JSFPromptingProvider.findBeanClassByClassName(beans, cls); + if(!(b instanceof JSFProjectBean)) { + b = JSFPromptingProvider.buildBean(p.getModel(), cls); + if(!(b instanceof JSFProjectBean)) return false; + } + beanClass = (JSFProjectBean)b; + XModelObject[] beanList = beanClass.getBeanList(); + if(beanList.length > 0) { + bean = beanList[0]; + } + //bean = beanList.length == 0 ? null : beanList[0]; + return true; + } + + public XModelObject getBean() { + return bean; + } + + public XModelObject getBeanClass() { + return beanClass; + } + + public String getProperty() { + return property; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFBeanSearcher.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBeans.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBeans.java 2008-06-19 05:59:11 UTC (rev 8841) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBeans.java 2008-06-19 06:03:18 UTC (rev 8842) @@ -23,6 +23,7 @@ import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.common.model.impl.RegularObjectImpl; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jsf.model.JSFConstants; import org.jboss.tools.jst.web.model.pv.WebProjectNode; public class JSFProjectBeans extends RegularObjectImpl implements WebProjectNode { @@ -168,8 +169,8 @@ } class BeanConstants { - static BeanConstants MANAGED_BEAN_CONSTANTS = new BeanConstants("Managed Beans", "managed-bean-name", "managed-bean-class"); - static BeanConstants REFERENCED_BEAN_CONSTANTS = new BeanConstants("Referenced Beans", "referenced-bean-name", "referenced-bean-class"); + static final BeanConstants MANAGED_BEAN_CONSTANTS = new BeanConstants(JSFConstants.FOLDER_MANAGED_BEANS, "managed-bean-name", "managed-bean-class"); + static final BeanConstants REFERENCED_BEAN_CONSTANTS = new BeanConstants(JSFConstants.FOLDER_REFENCED_BEANS, "referenced-bean-name", "referenced-bean-class"); String folder; String nameAttribute; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2008-06-19 05:59:11 UTC (rev 8841) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2008-06-19 06:03:18 UTC (rev 8842) @@ -34,9 +34,11 @@ import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; public class JSFPromptingProvider implements IWebPromptingProvider { + + public final String PROVIDER_ID = "jsf"; public boolean isSupporting(String id) { - return id != null && id.startsWith("jsf"); + return id != null && id.startsWith(PROVIDER_ID); } public List<Object> getList(XModel model, String id, String prefix, Properties properties) { @@ -298,7 +300,7 @@ JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model); if(root == null) return false; - BeanSearcher s = new BeanSearcher(model); + JSFBeanSearcher s = new JSFBeanSearcher(model); s.parse(prefix); XModelObject bean = s.getBeanClass(); String property = s.getProperty(); @@ -409,71 +411,3 @@ } } - -class BeanSearcher { - WebProjectNode beans; - WebProjectNode conf; - - XModelObject bean; - JSFProjectBean beanClass; - String property; - - public BeanSearcher(XModel model) { - WebProjectNode root = JSFProjectsTree.getProjectsRoot(model); - if(root == null) return; - beans = (WebProjectNode)root.getChildByPath("Beans"); - conf = (WebProjectNode)root.getChildByPath("Configuration"); - } - - public void parse(String path) { - String[] a = toArray(path); - if(a.length == 0) return; - bean = JSFPromptingProvider.findBean(conf, a[0]); - beanClass = (JSFProjectBean)JSFPromptingProvider.findBeanClass(beans, bean); - if(bean == null || a.length < 2) return; - property = a[1]; - for (int i = 1; i < a.length - 1; i++) { - if(!next()) return; - property = a[i + 1]; - } - } - - String[] toArray(String path) { - ArrayList<String> l = new ArrayList<String>(); - StringTokenizer st = new StringTokenizer(path, "."); - while(st.hasMoreElements()) l.add(st.nextToken()); - return l.toArray(new String[0]); - } - - private boolean next() { - if(bean == null || beanClass == null || property == null) return false; - XModelObject p = beanClass.getChildByPath(property); - if(p == null) return false; - String cls = p.getAttributeValue("class name"); - XModelObject b = JSFPromptingProvider.findBeanClassByClassName(beans, cls); - if(!(b instanceof JSFProjectBean)) { - b = JSFPromptingProvider.buildBean(p.getModel(), cls); - if(!(b instanceof JSFProjectBean)) return false; - } - beanClass = (JSFProjectBean)b; - XModelObject[] beanList = beanClass.getBeanList(); - if(beanList.length > 0) { - bean = beanList[0]; - } - //bean = beanList.length == 0 ? null : beanList[0]; - return true; - } - - public XModelObject getBean() { - return bean; - } - - public XModelObject getBeanClass() { - return beanClass; - } - - public String getProperty() { - return property; - } - -}