[jbosstools-commits] JBoss Tools SVN: r17074 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model: handlers/bean and 5 other directories.

Thursday, 13 August 2009


Author: scabanovich
Date: 2009-08-13 10:07:41 -0400 (Thu, 13 Aug 2009)
New Revision: 17074

Added:
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTreeConstants.java
Modified:
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldHelper.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenConverterHelper.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenRenderKitHelper.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenValidatorHelper.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/ResourceBundleHelper.java
  
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/JSFProjectsTree.java
  
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/JsfTreeListener.java
  
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/handler/CreateBeanRedirectHandler.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4755

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -59,7 +59,7 @@
 	IFile getJavaFile(XModelObject object) {
 		XModelObject o = JSFProjectsTree.getProjectsRoot(object.getModel());
 		if(o == null) return null;
-		JSFProjectBeans beans = (JSFProjectBeans)o.getChildByPath("Beans");
//$NON-NLS-1$
+		JSFProjectBeans beans =
(JSFProjectBeans)o.getChildByPath(JSFProjectTreeConstants.BEANS);
 		if(beans == null) return null;
 		IType type = beans.getType(object.getAttributeValue("managed-bean-class"));
//$NON-NLS-1$
 		if(type == null || type.isBinary()) return null;

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldHelper.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldHelper.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldHelper.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -45,7 +45,7 @@
 	public static XModelObject[] getBeanList(XModel model, IField field) {
 		String clsname = field.getDeclaringType().getFullyQualifiedName();
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
-		JSFProjectBeans beans = (root == null) ? null :
(JSFProjectBeans)root.getChildByPath("Beans"); //$NON-NLS-1$
+		JSFProjectBeans beans = (root == null) ? null :
(JSFProjectBeans)root.getChildByPath(JSFProjectTreeConstants.BEANS);
 		XModelObject[] cs = beans.getTreeChildren();
 		for (int i = 0; i < cs.length; i++) {
 			JSFProjectBean bean = (JSFProjectBean)cs[i];

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenameFolderFacesConfigChange.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -27,6 +27,7 @@
 import org.jboss.tools.jsf.model.handlers.RenameViewSupport;
 import org.jboss.tools.jsf.model.helpers.JSFProcessHelper;
 import org.jboss.tools.jsf.model.helpers.JSFProcessStructureHelper;
+import org.jboss.tools.jsf.model.pv.JSFProjectTreeConstants;
 import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
 import org.jboss.tools.common.model.refactoring.RefactoringHelper;
 import org.jboss.tools.jst.web.model.pv.WebProjectNode;
@@ -64,7 +65,7 @@
 	private void addChanges() {
 		if(object == null) return;
 		XModelObject root = JSFProjectsTree.getProjectsRoot(object.getModel());
-		XModelObject conf = (root == null) ? null :
root.getChildByPath("Configuration"); //$NON-NLS-1$
+		XModelObject conf = (root == null) ? null :
root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		fs = (conf == null) ? new XModelObject[0] : ((WebProjectNode)conf).getTreeChildren();
 		addChanges(fs);
 	}

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePageFacesConfigChange.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -27,6 +27,7 @@
 import org.jboss.tools.jsf.model.handlers.RenameViewSupport;
 import org.jboss.tools.jsf.model.helpers.JSFProcessHelper;
 import org.jboss.tools.jsf.model.helpers.JSFProcessStructureHelper;
+import org.jboss.tools.jsf.model.pv.JSFProjectTreeConstants;
 import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
 import org.jboss.tools.common.model.refactoring.RefactoringHelper;
 import org.jboss.tools.jst.web.model.pv.WebProjectNode;
@@ -67,7 +68,7 @@
 	private void addChanges() {
 		if(object == null) return;
 		XModelObject root = JSFProjectsTree.getProjectsRoot(object.getModel());
-		XModelObject conf = (root == null) ? null :
root.getChildByPath("Configuration"); //$NON-NLS-1$
+		XModelObject conf = (root == null) ? null :
root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		fs = (conf == null) ? new XModelObject[0] : ((WebProjectNode)conf).getTreeChildren();
 		addChanges(fs);
 	}

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenConverterHelper.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenConverterHelper.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenConverterHelper.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -10,6 +10,8 @@
  ******************************************************************************/ 
 package org.jboss.tools.jsf.model.helpers.converter;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 import org.eclipse.osgi.util.NLS;
@@ -50,7 +52,7 @@
 	public XModelObject findConverter(XModel model, String converterId) {
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return null;
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Configuration");
//$NON-NLS-1$
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null) return null;
 		XModelObject[] os = n.getTreeChildren();
 		for (int i = 0; i < os.length; i++) {
@@ -60,4 +62,23 @@
 		return null;
 	}
 
+	public List<Object> getConverterIDs(XModel model) {
+		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
+		if(root == null) return JSFPromptingProvider.EMPTY_LIST;
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
+		if(n == null) return JSFPromptingProvider.EMPTY_LIST;
+		XModelObject[] os = n.getTreeChildren();
+		List<Object> list = new ArrayList<Object>();
+		for (int i = 0; i < os.length; i++) {
+			XModelObject c = os[i].getChildByPath("Converters");
+			if(c == null) continue;
+			XModelObject[] cs = c.getChildren();
+			for (int j = 0; j < cs.length; j++) {
+				String id = cs[j].getAttributeValue("converter-id");
+				if(id != null && id.length() > 0) list.add(id);
+			}
+		}
+		return list;
+	}
+
 }

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -19,6 +19,7 @@
 import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.model.util.FindObjectHelper;
 import org.jboss.tools.jsf.messages.JSFUIMessages;
+import org.jboss.tools.jsf.model.pv.JSFProjectTreeConstants;
 import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
 import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
 import org.jboss.tools.jst.web.model.pv.WebProjectNode;
@@ -72,7 +73,7 @@
 	
 	public String getDeafultLocale(XModel model) {
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
-		WebProjectNode conf = root == null ? null :
(WebProjectNode)root.getChildByPath("Configuration"); //$NON-NLS-1$
+		WebProjectNode conf = root == null ? null :
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		XModelObject[] fs = conf == null ? new XModelObject[0] : conf.getTreeChildren();
 		for (int i = 0; i < fs.length; i++) {
 			XModelObject o = fs[i].getChildByPath("application/Locale Config");
//$NON-NLS-1$

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenRenderKitHelper.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenRenderKitHelper.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenRenderKitHelper.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -48,7 +48,7 @@
 	public XModelObject findRenderKit(XModel model, String renderkitId) {
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return null;
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Configuration");
//$NON-NLS-1$
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null) return null;
 		XModelObject[] os = n.getTreeChildren();
 		for (int i = 0; i < os.length; i++) {

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenValidatorHelper.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenValidatorHelper.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenValidatorHelper.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -10,6 +10,8 @@
  ******************************************************************************/ 
 package org.jboss.tools.jsf.model.helpers.converter;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 import org.eclipse.osgi.util.NLS;
@@ -49,7 +51,7 @@
 	public XModelObject findValidator(XModel model, String validatorId) {
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return null;
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Configuration");
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null) return null;
 		XModelObject[] os = n.getTreeChildren();
 		for (int i = 0; i < os.length; i++) {
@@ -59,4 +61,23 @@
 		return null;
 	}
 
+	public List<Object> getValidatorIDs(XModel model) {
+		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
+		if(root == null) return JSFPromptingProvider.EMPTY_LIST;
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
+		if(n == null) return JSFPromptingProvider.EMPTY_LIST;
+		XModelObject[] os = n.getTreeChildren();
+		List<Object> list = new ArrayList<Object>();
+		for (int i = 0; i < os.length; i++) {
+			XModelObject c = os[i].getChildByPath("Validators");
+			if(c == null) continue;
+			XModelObject[] cs = c.getChildren();
+			for (int j = 0; j < cs.length; j++) {
+				String id = cs[j].getAttributeValue("validator-id");
+				if(id != null && id.length() > 0) list.add(id);
+			}
+		}
+		return list;
+	}
+
 }

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/OpenCaseHelper.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -72,7 +72,7 @@
 		CaseSearchResult result = new CaseSearchResult();
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return result;
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Configuration");
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null) return result;
 		XModelObject[] os = n.getTreeChildren();
 		for (int i = 0; i < os.length; i++) {

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/ResourceBundleHelper.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/ResourceBundleHelper.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/pages/ResourceBundleHelper.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -14,6 +14,7 @@
 
 import org.jboss.tools.common.model.*;
 import org.jboss.tools.jsf.model.pv.JSFProjectConfiguration;
+import org.jboss.tools.jsf.model.pv.JSFProjectTreeConstants;
 import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
 import org.jboss.tools.jst.web.project.list.IWebPromptingProvider;
 
@@ -35,7 +36,7 @@
 	public static List<Object> getRegisteredResourceBundles(XModel model) {
 		XModelObject root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return IWebPromptingProvider.EMPTY_LIST;
-		JSFProjectConfiguration cg =
(JSFProjectConfiguration)root.getChildByPath("Configuration");
+		JSFProjectConfiguration cg =
(JSFProjectConfiguration)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(cg == null) return IWebPromptingProvider.EMPTY_LIST;
 		Map<String,String> map1 = new TreeMap<String,String>();
 		Map<String,String> map2 = new TreeMap<String,String>();

Modified:
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	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFBeanSearcher.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -18,8 +18,8 @@
 	public JSFBeanSearcher(XModel model) {
 		WebProjectNode root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return;
-		beans = (WebProjectNode)root.getChildByPath("Beans");
-		conf = (WebProjectNode)root.getChildByPath("Configuration");
+		beans = (WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.BEANS);
+		conf = (WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 	}
 	
 	public void parse(String path) {

Added:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTreeConstants.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTreeConstants.java	
                       (rev 0)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTreeConstants.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -0,0 +1,16 @@
+/******************************************************************************* 
+ * Copyright (c) 2009 Red Hat, Inc. 
+ * Distributed under license by Red Hat, Inc. All rights reserved. 
+ * This program is made available under the terms of the 
+ * Eclipse Public License v1.0 which accompanies this distribution, 
+ * and is available at http://www.eclipse.org/legal/epl-v10.html 
+ * 
+ * Contributors: 
+ * Red Hat, Inc. - initial API and implementation 
+ ******************************************************************************/ 
+package org.jboss.tools.jsf.model.pv;
+
+public interface JSFProjectTreeConstants {
+	public String CONFIGURATION = "Configuration"; //$NON-NLS-1$
+	public String BEANS = "Beans"; //$NON-NLS-1$
+}


Property changes on:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTreeConstants.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectsTree.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectsTree.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectsTree.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -86,7 +86,7 @@
     		String p = XModelObjectLoaderUtil.getResourcePath(object);
     		if(p == null || !p.endsWith(".java")) return object;
     		p = p.substring(1, p.length() - 5).replace('/', '.');
-    		JSFProjectBeans beans = (JSFProjectBeans)root.getChildByPath("Beans");
+    		JSFProjectBeans beans =
(JSFProjectBeans)root.getChildByPath(JSFProjectTreeConstants.BEANS);
     		XModelObject[] bs = beans == null ? new XModelObject[0] : beans.getTreeChildren();
     		for (int i = 0; i < bs.length; i++) {
     			if(p.equals(bs[i].getAttributeValue("class name"))) {

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	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -60,6 +60,8 @@
 		SUPPORTED_IDS.add(JSF_GET_URL);
 		SUPPORTED_IDS.add(JSF_CONVERT_URL_TO_PATH);
 		SUPPORTED_IDS.add(JSF_GET_TAGLIBS);
+		SUPPORTED_IDS.add(JSF_CONVERTER_IDS);
+		SUPPORTED_IDS.add(JSF_VALIDATOR_IDS);
 	}
 	public final static String PROVIDER_ID = "jsf"; //$NON-NLS-1$
 
@@ -166,6 +168,10 @@
 			Map<String,XModelObject> map = p.getTaglibMapping().getTaglibObjects();
 			list.addAll(map.keySet());
 			return list;
+		} else if(JSF_CONVERTER_IDS.equals(id)) {
+			return new OpenConverterHelper().getConverterIDs(model);
+		} else if(JSF_VALIDATOR_IDS.equals(id)) {
+			return new OpenValidatorHelper().getValidatorIDs(model);
 		}
 		if(error != null) throw new XModelException(error);
 		return EMPTY_LIST;
@@ -202,7 +208,7 @@
 	public List<Object> getBeans(XModel model) {
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return EMPTY_LIST;
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Configuration");
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null) return EMPTY_LIST;
 		XModelObject[] os = n.getTreeChildren();
 		List<Object> list = new ArrayList<Object>();
@@ -227,8 +233,8 @@
 		List<JSFELCompletionEngine.IJSFVariable> result = new
ArrayList<JSFELCompletionEngine.IJSFVariable>();
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return result;
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Configuration");
-		WebProjectNode beans = (WebProjectNode)root.getChildByPath("Beans");
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
+		WebProjectNode beans =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.BEANS);
 		XModelObject[] os = n.getTreeChildren();
 		for (int i = 0; i < os.length; i++) {
 			if(!os[i].getModelEntity().getName().startsWith(JSFConstants.ENT_FACESCONFIG))
continue;
@@ -272,8 +278,8 @@
 		int d = prefix.indexOf('.');
 		String beanName = (d < 0) ? prefix : prefix.substring(0, d);
 		String property = (d < 0) ? null : prefix.substring(d + 1);
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Beans");
-		WebProjectNode conf = (WebProjectNode)root.getChildByPath("Configuration");
+		WebProjectNode n = (WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.BEANS);
+		WebProjectNode conf =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null || conf == null) return EMPTY_LIST;
 		XModelObject bean = findBean(conf, beanName);
 		if(bean == null) return EMPTY_LIST;
@@ -317,7 +323,7 @@
 	 */	
 	private XModelObject addPropertyToBean(XModel model, String beanName) {
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
-		WebProjectNode conf = (WebProjectNode)root.getChildByPath("Configuration");
+		WebProjectNode conf =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		XModelObject bean = findBean(conf, beanName);
 		if(bean == null) return null;
 		Properties p = new Properties();
@@ -352,7 +358,7 @@
 	public static JSFProjectBean buildBean(XModel model, String className) {
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return null;
-		JSFProjectBeans n = (JSFProjectBeans)root.getChildByPath("Beans");
+		JSFProjectBeans n =
(JSFProjectBeans)root.getChildByPath(JSFProjectTreeConstants.BEANS);
 		IType cls = n.getType(className);
 		if(cls == null) return null;
 		JSFProjectBean beanClass =
(JSFProjectBean)model.createModelObject("JSFProjectBean", null);
@@ -416,8 +422,8 @@
 		int d = prefix.indexOf('.');
 		String beanName = (d < 0) ? prefix : prefix.substring(0, d);
 		String property = (d < 0) ? null : prefix.substring(d + 1);
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Beans");
-		WebProjectNode conf = (WebProjectNode)root.getChildByPath("Configuration");
+		WebProjectNode n = (WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.BEANS);
+		WebProjectNode conf =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null || conf == null) return EMPTY_LIST;
 		XModelObject bean = findBean(conf, beanName);
 		if(bean == null) return EMPTY_LIST;
@@ -440,7 +446,7 @@
 		if(viewPath == null) return EMPTY_LIST;
 		JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
 		if(root == null) return EMPTY_LIST;
-		WebProjectNode n = (WebProjectNode)root.getChildByPath("Configuration");
+		WebProjectNode n =
(WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null) return EMPTY_LIST;
 		XModelObject[] os = n.getTreeChildren();
 		List<Object> list = new ArrayList<Object>();
@@ -476,5 +482,5 @@
 		JSFUrlPattern pattern = p.getUrlPattern();
 		return (pattern == null) ? url : pattern.getJSFPath(url);
 	}
-	
+
 }

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JsfTreeListener.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JsfTreeListener.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JsfTreeListener.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -65,9 +65,9 @@
 			} else if(entity.startsWith(JSFConstants.ENT_FACESCONFIG)) {
 				invalidateConfig(source.getModel());
 			} else if("JSFManagedBean".equals(entity)) {
-				invalidateFolder(source.getModel(), "Beans");
+				invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS);
 			} else if("JSFReferencedBean".equals(entity)) {
-				invalidateFolder(source.getModel(), "Beans");
+				invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS);
 			} else if("FileTiles".equals(entity)) {
 				invalidateFolder(source.getModel(), "Tiles");
 			} else if("FileFolder".equals(entity)) {
@@ -83,9 +83,9 @@
 			} else if("FileSystems".equals(entity)) {
 				invalidateTagLibs(source.getModel());
 			} else if("JSFManagedBeans".equals(entity)) {
-				invalidateFolder(source.getModel(), "Beans");
+				invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS);
 			} else if("JSFReferencedBeans".equals(entity)) {
-				invalidateFolder(source.getModel(), "Beans");
+				invalidateFolder(source.getModel(), JSFProjectTreeConstants.BEANS);
 			}
 		} else if(event.kind() == XModelTreeEvent.STRUCTURE_CHANGED) {
 			String entity = event.getModelObject().getModelEntity().getName();
@@ -104,8 +104,8 @@
 	}
 
 	private void invalidateConfig(XModel model) {
-		invalidateFolder(model, "Configuration");
-		invalidateFolder(model, "Beans");
+		invalidateFolder(model, JSFProjectTreeConstants.CONFIGURATION);
+		invalidateFolder(model, JSFProjectTreeConstants.BEANS);
 	}
 	
 	private void invalidateFolder(XModel model, String name) {

Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/handler/CreateBeanRedirectHandler.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/handler/CreateBeanRedirectHandler.java	2009-08-13
14:05:52 UTC (rev 17073)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/handler/CreateBeanRedirectHandler.java	2009-08-13
14:07:41 UTC (rev 17074)
@@ -14,6 +14,7 @@
 import org.jboss.tools.common.model.XModel;
 import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.jsf.model.JSFConstants;
+import org.jboss.tools.jsf.model.pv.JSFProjectTreeConstants;
 import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
 import org.jboss.tools.jst.web.model.pv.WebProjectNode;
 
@@ -29,7 +30,7 @@
 		XModel model = source.getModel();
 		WebProjectNode r = JSFProjectsTree.getProjectsRoot(model);
 		if(r == null) return null;
-		WebProjectNode n = (WebProjectNode)r.getChildByPath("Configuration");
+		WebProjectNode n =
(WebProjectNode)r.getChildByPath(JSFProjectTreeConstants.CONFIGURATION);
 		if(n == null) return null;
 		XModelObject[] fs = n.getTreeChildren();
 		for (XModelObject f: fs) {


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r17074 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model: handlers/bean and 5 other directories.