JBoss Tools SVN: r32466 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 17:13:27 -0400 (Wed, 29 Jun 2011)
New Revision: 32466
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-06-29 21:12:50 UTC (rev 32465)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-06-29 21:13:27 UTC (rev 32466)
@@ -21,13 +21,13 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
import org.jboss.tools.cdi.core.CDICoreNature;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigConstants;
import org.jboss.tools.cdi.seam.config.core.definition.SeamMethodDefinition;
import org.jboss.tools.cdi.seam.config.core.definition.SeamParameterDefinition;
import org.jboss.tools.cdi.seam.config.core.xml.SAXElement;
import org.jboss.tools.cdi.seam.config.core.xml.SAXText;
+import org.jboss.tools.common.java.IParametedType;
/**
*
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32465 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 17:12:50 -0400 (Wed, 29 Jun 2011)
New Revision: 32465
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -9,9 +9,9 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
-import org.jboss.tools.cdi.core.IParametedType;
-import org.jboss.tools.cdi.internal.core.impl.ParametedType;
-import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.ParametedTypeFactory;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -16,9 +16,9 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -17,11 +17,11 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IScope;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -19,9 +19,9 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.common.java.IParametedType;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -15,9 +15,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
+import org.jboss.tools.common.java.IParametedType;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -19,7 +19,7 @@
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.common.java.IParametedType;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -17,10 +17,10 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
+import org.jboss.tools.common.java.IParametedType;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -19,11 +19,11 @@
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducerField;
import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-06-29 21:12:12 UTC (rev 32464)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-06-29 21:12:50 UTC (rev 32465)
@@ -28,7 +28,6 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -37,6 +36,7 @@
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation;
import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.util.FileUtil;
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32464 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 17:12:12 -0400 (Wed, 29 Jun 2011)
New Revision: 32464
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -33,9 +33,9 @@
import org.jboss.tools.cdi.core.extension.CDIExtensionManager;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
-import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.scanner.lib.ClassPathMonitor;
+import org.jboss.tools.common.java.ParametedTypeFactory;
import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.model.XJob.XRunnable;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -57,6 +57,7 @@
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.java.IJavaMemberReference;
+import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -14,6 +14,8 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.common.el.core.resolver.IVariable;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -15,6 +15,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IType;
+import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.text.INodeReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.core;
import org.jboss.tools.common.java.IJavaSourceReference;
+import org.jboss.tools.common.java.IParametedType;
/**
* Represents a member of bean class.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -13,6 +13,7 @@
import java.util.Set;
import org.jboss.tools.common.java.IJavaMemberReference;
+import org.jboss.tools.common.java.IParametedType;
/**
* Represents a class-based bean.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -12,6 +12,8 @@
import java.util.Set;
+import org.jboss.tools.common.java.IParametedType;
+
/**
* Represents a decorator.
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -12,6 +12,7 @@
import java.util.Set;
+import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * 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.cdi.core;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.IType;
-
-/**
- * Represents a wrapper for IType object which could be parameted.
- * For example if we have some method
- * List<String> getList() {...}
- * then IParametedType for return type of this method will wrap List<> and its signature.
- */
-public interface IParametedType {
-
- /**
- * Returns the corresponding IType of the declaration. May be null.
- *
- * @return the corresponding IType of the declaration.
- */
- IType getType();
-
- /**
- * Returns signature of the declaration.
- *
- * @return signature of the declaration
- */
- public String getSignature();
-
- /**
- * Returns true if the type is a primitive type.
- *
- * @return true if the type is a primitive type
- */
- boolean isPrimitive();
-
- /**
- * Returns the simple name of the type. In case of IType this method will return the short name of the type.
- * If this type is primitive then the method will return the name of the primitive type.
- *
- * @return the simple name of the type.
- */
- String getSimpleName();
-
- /**
- * Returns type parameters
- *
- * @return type parameters
- */
- List<? extends IParametedType> getParameters();
-}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -12,6 +12,7 @@
import java.util.Set;
+import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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.cdi.core;
-
-import org.jboss.tools.common.text.ITextSourceReference;
-
-/**
- * @author Alexey Kazakov
- */
-public interface ITypeDeclaration extends IParametedType, ITextSourceReference {
-
-}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -32,16 +32,18 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.TypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -22,8 +22,10 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBeanMember;
import org.jboss.tools.cdi.core.IClassBean;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.TypeDeclaration;
/**
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -10,13 +10,13 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -18,7 +18,8 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.extension.CDIExtensionManager;
-import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.ParametedTypeFactory;
/**
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -50,7 +50,6 @@
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IObserverMethod;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IProducerMethod;
@@ -65,6 +64,8 @@
import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.scanner.ImplementationCollector;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.INodeReference;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -31,7 +31,6 @@
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
import org.jboss.tools.cdi.core.IObserverMethod;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -39,12 +38,15 @@
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.TypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -18,7 +18,7 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IDecorator;
-import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.common.java.IParametedType;
/**
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -10,13 +10,13 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -14,8 +14,7 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IParametedType;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
+import org.jboss.tools.common.java.IParametedType;
/**
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -10,16 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
-import java.util.HashSet;
import java.util.Set;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -23,8 +23,6 @@
public class JavaAnnotation implements IJavaAnnotation {
IAnnotation annotation;
- protected int startPosition = -1;
- protected int length = 0;
String annotationTypeName;
IType type;
@@ -56,24 +54,24 @@
try {
ISourceRange range = annotation.getSourceRange();
if(range != null) {
- return length = range.getLength();
+ return range.getLength();
}
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
- return length;
+ return 0;
}
public int getStartPosition() {
try {
ISourceRange range = annotation.getSourceRange();
if(range != null) {
- return startPosition = range.getOffset();
+ return range.getOffset();
}
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
- return startPosition;
+ return 0;
}
public IMember getParentMember() {
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -1,385 +0,0 @@
-/*******************************************************************************
- * 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.cdi.internal.core.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IParametedType;
-import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
-
-/**
- *
- * @author Viacheslav Kabanovich
- *
- */
-public class ParametedType implements IParametedType {
- protected ParametedTypeFactory typeFactory = null;
- protected IType type;
- protected String arrayPrefix = "";
- protected String signature;
- protected List<ParametedType> parameterTypes = new ArrayList<ParametedType>();
- protected boolean primitive;
-
- protected boolean isUpper = false;
- protected boolean isLower = false;
- protected boolean isVariable = false;
-
- boolean inheritanceIsBuilt = false;
- protected ParametedType superType = null;
- protected Set<IParametedType> inheritedTypes = new HashSet<IParametedType>();
- Set<IParametedType> allInheritedTypes = null;
-
- public static interface PositionProvider {
- ISourceRange getRange(String superTypeName);
- }
-
- PositionProvider provider = null;
-
- public ParametedType() {}
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.cdi.core.IParametedType#isPrimitive()
- */
- public boolean isPrimitive() {
- return primitive;
- }
-
- public void setPrimitive(boolean primitive) {
- this.primitive = primitive;
- }
-
- public boolean isUpper() {
- return isUpper;
- }
-
- public void setUpper(boolean b) {
- isUpper = b;
- }
-
- public boolean isLower() {
- return isLower;
- }
-
- public void setLower(boolean b) {
- isLower = b;
- }
-
- public boolean isVariable() {
- return isVariable;
- }
-
- public void setVariable(boolean b) {
- isVariable = b;
- }
-
- public ParametedTypeFactory getFactory() {
- return typeFactory;
- }
-
- public void setFactory(ParametedTypeFactory typefactory) {
- this.typeFactory = typefactory;
- }
-
- public IType getType() {
- return type;
- }
-
- public String getArrayPrefix() {
- return arrayPrefix;
- }
-
- public String getSignature() {
- return signature;
- }
-
- public void setType(IType type) {
- this.type = type;
- }
-
- public void setSignature(String signature) {
- this.signature = signature;
- arrayPrefix = "";
- if(signature != null) {
- for (int i = 0; i < signature.length(); i++) {
- if(signature.charAt(i) == '[') arrayPrefix += "["; else break;
- }
- }
- }
-
- public void addParameter(ParametedType p) {
- parameterTypes.add(p);
- }
-
- public List<? extends IParametedType> getParameters() {
- return parameterTypes;
- }
-
- public void setPositionProvider(PositionProvider p) {
- provider = p;
- }
-
- public boolean equals(Object object) {
- if(!(object instanceof ParametedType)) return false;
- ParametedType other = (ParametedType)object;
- if(signature != null && signature.equals(other.signature)) {
- return true;
- }
- if(type == null || other.type == null || !type.getFullyQualifiedName().equals(other.type.getFullyQualifiedName())) {
- return false;
- }
- if(parameterTypes.size() != other.parameterTypes.size()) {
- return false;
- }
- for (int i = 0; i < parameterTypes.size(); i++) {
- if(!parameterTypes.get(i).equals(other.parameterTypes.get(i))) {
- return false;
- }
- }
- if(!arrayPrefix.equals(other.arrayPrefix)) {
- return false;
- }
-
- return true;
- }
-
- void buildInheritance() {
- if(type == null) return;
- Set<IParametedType> inheritedTypes = new HashSet<IParametedType>();
- try {
- if(!type.isInterface() && !type.isAnnotation()) {
- String sc = type.getSuperclassTypeSignature();
- boolean objectArray = false;
- if(sc != null) {
- try {
- sc = resolveParameters(sc);
- } catch (Exception e) {
- CDICorePlugin.getDefault().logError(e);
- }
- } else if(!"java.lang.Object".equals(type.getFullyQualifiedName())) {
- sc = ParametedTypeFactory.OBJECT;
- } else if("java.lang.Object".equals(type.getFullyQualifiedName()) && arrayPrefix.length() > 0) {
- objectArray = true;
- sc = ParametedTypeFactory.OBJECT;
- }
- if(!objectArray && arrayPrefix.length() > 0) {
- sc = arrayPrefix + sc;
- }
-
- superType = getFactory().getParametedType(type, sc);
- if(superType != null) {
- if(provider != null) {
- String scn = type.getSuperclassName();
- if(scn != null && provider.getRange(scn) != null) {
- ISourceRange r = provider.getRange(scn);
- superType = new TypeDeclaration(superType, type.getResource(), r.getOffset(), r.getLength());
- }
-
- }
- inheritedTypes.add(superType);
- }
- }
- String[] is = type.getSuperInterfaceTypeSignatures();
- if(is != null) for (int i = 0; i < is.length; i++) {
- String p = resolveParameters(is[i]);
- if(arrayPrefix.length() > 0) p = arrayPrefix + p;
- ParametedType t = getFactory().getParametedType(type, p);
- if(t != null) {
- if(provider != null) {
- String scn = type.getSuperInterfaceNames()[i];
- if(scn != null && provider.getRange(scn) != null) {
- ISourceRange r = provider.getRange(scn);
- t = new TypeDeclaration(t, type.getResource(), r.getOffset(), r.getLength());
- }
-
- }
- inheritedTypes.add(t);
- }
- }
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- this.inheritedTypes = inheritedTypes;
- inheritanceIsBuilt = true;
- }
-
- public ParametedType getSuperType() {
- if(!inheritanceIsBuilt) {
- buildInheritance();
- }
- return superType;
- }
-
- public Set<IParametedType> getInheritedTypes() {
- if(!inheritanceIsBuilt) {
- buildInheritance();
- }
- return inheritedTypes;
- }
-
- public String resolveParameters(String typeSignature) {
- if(typeSignature == null) {
- return typeSignature;
- }
- int i = typeSignature.indexOf('<');
- if(i < 0) {
- if(( typeSignature.startsWith("T") || typeSignature.startsWith("Q") || typeSignature.startsWith("L")) && typeSignature.endsWith(";")) {
- String param = typeSignature.substring(1, typeSignature.length() - 1);
- String s = findParameterSignature(param);
- return s == null ? typeSignature : s;
- }
- return typeSignature;
- }
- int j = typeSignature.lastIndexOf('>');
- if(j < i) {
- return typeSignature;
- }
- boolean replaced = false;
- StringBuffer newParams = new StringBuffer();
- String[] ps = Signature.getTypeArguments(typeSignature);
- for (String param: ps) {
- String newParam = resolveParameters( param);
- if(!param.equals(newParam)) replaced = true;
- newParams.append(newParam);
- }
- if(replaced) {
- typeSignature = typeSignature.substring(0, i) + '<' + newParams.toString() + '>' + ';';
- }
- return typeSignature;
- }
-
- public String findParameterSignature(String paramName) {
- if(type == null) {
- return null;
- }
- ITypeParameter[] ps = null;
- try {
- ps = type.getTypeParameters();
- } catch (JavaModelException e) {
- return null;
- }
- if(ps != null) for (int i = 0; i < ps.length; i++) {
- if(ps[i].getElementName().equals(paramName)) {
- if(parameterTypes.size() > i) {
- ParametedType p = parameterTypes.get(i);
- return p.getSignature();
- }
- }
- }
- return null;
- }
-
- public Set<IParametedType> getAllTypes() {
- if(allInheritedTypes == null) {
- allInheritedTypes = buildAllTypes(new HashSet<String>(), this, new HashSet<IParametedType>());
- }
- return allInheritedTypes;
- }
-
- Set<IParametedType> buildAllTypes(Set<String> processed, ParametedType p, Set<IParametedType> types) {
- IType t = p.getType();
- if(t != null) {
- String key = p.getArrayPrefix() + t.getFullyQualifiedName();
- if(!processed.contains(key)) {
- processed.add(key);
- types.add(p);
- Set<IParametedType> ts = p.getInheritedTypes();
- if(ts != null) for (IParametedType pp: ts) {
- buildAllTypes(processed, (ParametedType)pp, types);
- }
- }
- }
- return types;
- }
-
- public String toString() {
- return signature + ":" + super.toString();
- }
-
- public boolean isAssignableTo(ParametedType other, boolean checkInheritance) {
- if(equals(other)) return true;
- if(this.type == null) return false;
- if(other.isVariable && other.type == null) return true;
- if(this.type.equals(other.type)) {
- if(areTypeParametersAssignableTo(other)) return true;
- }
- if(checkInheritance) {
- for (IParametedType t: getInheritedTypes()) {
- if(((ParametedType)t).isAssignableTo(other, false)) return true;
- }
- }
- return false;
- }
-
- boolean areTypeParametersAssignableTo(ParametedType other) {
- if(other.parameterTypes.size() == 0) return true;
- if(this.parameterTypes.size() != other.parameterTypes.size()) return false;
- for (int i = 0; i < parameterTypes.size(); i++) {
- ParametedType p1 = parameterTypes.get(i);
- ParametedType p2 = other.parameterTypes.get(i);
- if(p1.isLower() || p1.isUpper()) return false;
- if(p1.isVariable()) {
- if(p2.isVariable()) {
- if(p2.isAssignableTo(p1, true)) continue;
- } else if(p2.isLower()) {
- if(p2.isAssignableTo(p1, true)) continue;
- } else if(p2.isUpper()) {
- if(p2.isAssignableTo(p1, true)) continue;
- if(p1.isAssignableTo(p2, true)) continue;
- } else {
- if(p2.isAssignableTo(p1, true)) continue;
- }
- } else {
- if(p2.isLower()) {
- if(p2.isAssignableTo(p1, true)) continue;
- } else {
- if(p1.isAssignableTo(p2, true)) continue;
- }
- }
-
- return false;
- }
- return true;
- }
-
- static Map<String, String> primitives = new HashMap<String, String>();
- static {
- primitives.put("Integer", "int");
- primitives.put("Short", "short");
- primitives.put("Long", "long");
- primitives.put("Character", "char");
- primitives.put("Float", "float");
- primitives.put("Double", "double");
- primitives.put("Boolean", "boolean");
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.cdi.core.IParametedType#getSimpleName()
- */
- public String getSimpleName() {
- if(getSignature()!=null) {
- return isPrimitive()?primitives.get(Signature.getSignatureSimpleName(getSignature())):Signature.getSignatureSimpleName(getSignature());
- }
- return "";
- }
-}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -10,11 +10,11 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.IClassBean;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition;
+import org.jboss.tools.common.java.IParametedType;
public class Parameter extends BeanMember implements IParameter {
BeanMethod beanMethod;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
-
import java.util.HashSet;
import java.util.Set;
@@ -19,13 +18,14 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducerField;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
+import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.text.ITextSourceReference;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
-
import java.util.HashSet;
import java.util.Set;
@@ -18,16 +17,17 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
+import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.util.BeanUtil;
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * 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.cdi.internal.core.impl;
-
-import org.eclipse.core.resources.IResource;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
-
-/**
- *
- * @author Viacheslav Kabanovich
- *
- */
-public class TypeDeclaration extends ParametedType implements ITypeDeclaration {
- IResource resource;
- int length;
- int startPosition;
-
- public TypeDeclaration(ParametedType type, IResource resource, int startPosition, int length) {
- this.setFactory(type.getFactory());
- this.type = type.getType();
- arrayPrefix = type.arrayPrefix;
- this.resource = resource;
- this.length = length;
- this.startPosition = startPosition;
-
- signature = type.signature;
- parameterTypes = type.parameterTypes;
-
- allInheritedTypes = type.allInheritedTypes;
- inheritanceIsBuilt = type.inheritanceIsBuilt;
- inheritedTypes = type.inheritedTypes;
- superType = type.superType;
- primitive = type.primitive;
-
- isLower = type.isLower;
- isUpper = type.isUpper;
- isVariable = type.isVariable;
- }
-
- public int getLength() {
- return length;
- }
-
- public int getStartPosition() {
- return startPosition;
- }
-
- public IResource getResource() {
- return resource;
- }
-}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -21,9 +21,9 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.SourceRange;
import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
-import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.util.FileUtil;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -384,6 +384,14 @@
workingCopy = null;
}
+ public void dropWorkingCopy() {
+ if(original != null) {
+ original.dropWorkingCopy();
+ } else {
+ workingCopy = null;
+ }
+ }
+
public AnnotationDefinition getAnnotation(IType type) {
String name = type.getFullyQualifiedName();
AnnotationDefinition result = annotations.get(name);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -12,7 +12,7 @@
import org.eclipse.jdt.core.IField;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
+import org.jboss.tools.common.java.ITypeDeclaration;
/**
*
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * 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.cdi.internal.core.impl.definition;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.internal.core.impl.ParametedType;
-import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration;
-import org.jboss.tools.common.model.util.EclipseJavaUtil;
-
-public class ParametedTypeFactory {
- // I S J C F D Z
- static HashMap<String,String> primitives = new HashMap<String, String>();
- static {
- primitives.put("I", "Ljava.lang.Integer;");
- primitives.put("S", "Ljava.lang.Short;");
- primitives.put("J", "Ljava.lang.Long;");
- primitives.put("C", "Ljava.lang.Character;");
- primitives.put("F", "Ljava.lang.Float;");
- primitives.put("D", "Ljava.lang.Double;");
- primitives.put("Z", "Ljava.lang.Boolean;");
- }
- //unresolved Object signature
- public static String OBJECT = "QObject;";
- Map<String, ParametedType> cache = new HashMap<String, ParametedType>();
-
- public ParametedType newParametedType(IType type) {
- ParametedType parametedType = new ParametedType();
- if(type != null && !type.isBinary()) {
- ISourceRange r = null;
- try {
- r = type.getNameRange();
- } catch (CoreException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- if(r != null) {
- parametedType = new TypeDeclaration(parametedType, type.getResource(), r.getOffset(), r.getLength());
- }
- }
- parametedType.setFactory(this);
- parametedType.setType(type);
- if(type != null) parametedType.setSignature("L" + type.getFullyQualifiedName() + ";");
- String[] ps = null;
- try {
- ps = type.getTypeParameterSignatures();
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- if(ps != null && ps.length > 0) {
- for (int i = 0; i < ps.length; i++) {
- try {
- ParametedType p = getParametedTypeForParameter(type, ps[i], null);
- if(p != null) parametedType.addParameter(p);
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- } catch (Exception ee) {
- CDICorePlugin.getDefault().logError(ee);
- }
-
- }
- }
- return parametedType;
- }
-
- public ParametedType getParametedType(IMember context, String typeSignature) throws JavaModelException {
- if(typeSignature == null) return null;
-
- IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType();
-
- String key = context == null || context.isBinary() || OBJECT.equals(typeSignature) ? typeSignature : contextType.getFullyQualifiedName() + "+" + typeSignature;
- if(cache.containsKey(key)) return cache.get(key);
- ParametedType result = new ParametedType();
- result.setFactory(this);
- result.setSignature(typeSignature);
-
- typeSignature = typeSignature.substring(result.getArrayPrefix().length());
-
- if(primitives.containsKey(typeSignature)) {
- typeSignature = primitives.get(typeSignature);
- result.setSignature(result.getArrayPrefix() + typeSignature);
- result.setPrimitive(true);
- } else if(typeSignature.startsWith("+")) {
- typeSignature = typeSignature.substring(1);
- result.setUpper(true);
- } else if(typeSignature.startsWith("-")) {
- typeSignature = typeSignature.substring(1);
- result.setLower(true);
- }
-
- int startToken = typeSignature.indexOf('<');
- if(startToken < 0) {
- String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeSignature);
- if(resovedTypeName == null) return null;
- if(!context.isBinary()) {
- StringBuffer ns = new StringBuffer();
- ns.append(result.getArrayPrefix());
- if(result.isLower()) ns.append('-');
- if(result.isUpper()) ns.append('+');
- ns.append('L').append(resovedTypeName).append(";");
- result.setSignature(ns.toString());
- }
- IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName);
- if(type != null) {
- result.setType(type);
- cache.put(key, result);
- return result;
- }
- if(context instanceof IMethod) {
- String[] ps = ((IMethod)context).getTypeParameterSignatures();
- for (int i = 0; i < ps.length; i++) {
- ParametedType st = getParametedTypeForParameter(context, ps[i], result);
- if(st != null) {
- if(st.getSignature().indexOf(':') >= 0) {
- CDICorePlugin.getDefault().logWarning("Wrong signature=" + st.getSignature());
- }
- return st;
- }
- }
- }
- String[] ps = contextType.getTypeParameterSignatures();
- for (int i = 0; i < ps.length; i++) {
- ParametedType st = getParametedTypeForParameter(contextType, ps[i], result);
- if(st != null) return st;
- }
- } else {
- int endToken = typeSignature.lastIndexOf('>');
- if(endToken < startToken) return null;
- String typeName = typeSignature.substring(0, startToken) + typeSignature.substring(endToken + 1);
- String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeName);
- if(resovedTypeName == null) return null;
- IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName);
- if(type != null) {
- result.setType(type);
- cache.put(key, result);
- StringBuffer newParams = new StringBuffer();
- String[] paramSignatures = null;
- try {
- paramSignatures = Signature.getTypeArguments(typeSignature);
- } catch (Exception e) {
- CDICorePlugin.getDefault().logError(e);
- }
- if(paramSignatures != null) for (String paramSignature: paramSignatures) {
- ParametedType param = getParametedType(context, paramSignature);
- if(param == null) {
- param = new ParametedType();
- param.setSignature(paramSignature);
- }
- result.addParameter(param);
- newParams.append(param.getSignature());
- }
- if(!context.isBinary()) {
- StringBuffer ns = new StringBuffer();
- ns.append(result.getArrayPrefix());
- if(result.isLower()) ns.append('-');
- if(result.isUpper()) ns.append('+');
- ns.append('L').append(resovedTypeName).append('<').append(newParams).append(">;");
- result.setSignature(ns.toString());
- }
- return result;
- }
- }
- return null;
- }
-
- public ParametedType getParametedTypeForParameter(IMember context, String typeParameterSignature, ParametedType result) throws JavaModelException {
- IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType();
- String key = context == null ? typeParameterSignature : contextType.getFullyQualifiedName() + "+" + typeParameterSignature;
-
- String t = Signature.getTypeVariable(typeParameterSignature);
- String[] bounds = Signature.getTypeParameterBounds(typeParameterSignature);
-
- t = "L" + t + ";";
- if(result == null || t.equals(result.getSignature())) {
- String sts = bounds.length > 0 ? bounds[0] : "";
- if(sts.length() > 0) {
- ParametedType st = getParametedType(contextType, sts);
- if(st != null) {
- result = new TypeDeclaration(st, context.getResource(), 0, 0);
- }
- } else if(result != null) {
- result.setSignature(t);
- }
- if(result == null) {
- result = new ParametedType();
- result.setFactory(this);
- result.setSignature(t);
- }
- result.setVariable(true);
- cache.put(key, result);
- return result;
- }
- return null;
- }
-
- public void clean() {
- cache.clear();
- }
-}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -17,8 +17,8 @@
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
-import org.jboss.tools.cdi.internal.core.impl.ParametedType;
-import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.TypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
public class ParameterDefinition extends BeanMemberDefinition {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -24,7 +24,7 @@
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedMemberFeature;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
-import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.common.java.ParametedType;
/**
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -18,8 +18,8 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.java.IParametedType;
public class ImplementationCollector {
List<TypeDefinition> typeDefinitions;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-29 21:10:24 UTC (rev 32463)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-29 21:12:12 UTC (rev 32464)
@@ -68,7 +68,6 @@
import org.jboss.tools.cdi.core.IInterceptorBinded;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
-import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IProducerField;
@@ -81,13 +80,14 @@
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
import org.jboss.tools.cdi.core.IStereotyped;
-import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.cdi.core.extension.feature.IValidatorFeature;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
-import org.jboss.tools.cdi.internal.core.impl.ParametedType;
import org.jboss.tools.cdi.internal.core.impl.SessionBean;
import org.jboss.tools.cdi.internal.core.impl.definition.Dependencies;
+import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ITypeDeclaration;
+import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32463 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 17:10:24 -0400 (Wed, 29 Jun 2011)
New Revision: 32463
Added:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ITypeDeclaration.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/TypeDeclaration.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java 2011-06-29 21:10:24 UTC (rev 32463)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * 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.common.java;
+
+import java.util.List;
+
+import org.eclipse.jdt.core.IType;
+
+/**
+ * Represents a wrapper for IType object which could be parameted.
+ * For example if we have some method
+ * List<String> getList() {...}
+ * then IParametedType for return type of this method will wrap List<> and its signature.
+ */
+public interface IParametedType {
+
+ /**
+ * Returns the corresponding IType of the declaration. May be null.
+ *
+ * @return the corresponding IType of the declaration.
+ */
+ IType getType();
+
+ /**
+ * Returns signature of the declaration.
+ *
+ * @return signature of the declaration
+ */
+ public String getSignature();
+
+ /**
+ * Returns true if the type is a primitive type.
+ *
+ * @return true if the type is a primitive type
+ */
+ boolean isPrimitive();
+
+ /**
+ * Returns the simple name of the type. In case of IType this method will return the short name of the type.
+ * If this type is primitive then the method will return the name of the primitive type.
+ *
+ * @return the simple name of the type.
+ */
+ String getSimpleName();
+
+ /**
+ * Returns type parameters
+ *
+ * @return type parameters
+ */
+ List<? extends IParametedType> getParameters();
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ITypeDeclaration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ITypeDeclaration.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ITypeDeclaration.java 2011-06-29 21:10:24 UTC (rev 32463)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.common.java;
+
+import org.jboss.tools.common.text.ITextSourceReference;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface ITypeDeclaration extends IParametedType, ITextSourceReference {
+
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ITypeDeclaration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-06-29 21:10:24 UTC (rev 32463)
@@ -0,0 +1,383 @@
+/*******************************************************************************
+ * 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.common.java;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.ITypeParameter;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.Signature;
+import org.jboss.tools.common.CommonPlugin;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ParametedType implements IParametedType {
+ protected ParametedTypeFactory typeFactory = null;
+ protected IType type;
+ protected String arrayPrefix = "";
+ protected String signature;
+ protected List<ParametedType> parameterTypes = new ArrayList<ParametedType>();
+ protected boolean primitive;
+
+ protected boolean isUpper = false;
+ protected boolean isLower = false;
+ protected boolean isVariable = false;
+
+ boolean inheritanceIsBuilt = false;
+ protected ParametedType superType = null;
+ protected Set<IParametedType> inheritedTypes = new HashSet<IParametedType>();
+ Set<IParametedType> allInheritedTypes = null;
+
+ public static interface PositionProvider {
+ ISourceRange getRange(String superTypeName);
+ }
+
+ PositionProvider provider = null;
+
+ public ParametedType() {}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IParametedType#isPrimitive()
+ */
+ public boolean isPrimitive() {
+ return primitive;
+ }
+
+ public void setPrimitive(boolean primitive) {
+ this.primitive = primitive;
+ }
+
+ public boolean isUpper() {
+ return isUpper;
+ }
+
+ public void setUpper(boolean b) {
+ isUpper = b;
+ }
+
+ public boolean isLower() {
+ return isLower;
+ }
+
+ public void setLower(boolean b) {
+ isLower = b;
+ }
+
+ public boolean isVariable() {
+ return isVariable;
+ }
+
+ public void setVariable(boolean b) {
+ isVariable = b;
+ }
+
+ public ParametedTypeFactory getFactory() {
+ return typeFactory;
+ }
+
+ public void setFactory(ParametedTypeFactory typefactory) {
+ this.typeFactory = typefactory;
+ }
+
+ public IType getType() {
+ return type;
+ }
+
+ public String getArrayPrefix() {
+ return arrayPrefix;
+ }
+
+ public String getSignature() {
+ return signature;
+ }
+
+ public void setType(IType type) {
+ this.type = type;
+ }
+
+ public void setSignature(String signature) {
+ this.signature = signature;
+ arrayPrefix = "";
+ if(signature != null) {
+ for (int i = 0; i < signature.length(); i++) {
+ if(signature.charAt(i) == '[') arrayPrefix += "["; else break;
+ }
+ }
+ }
+
+ public void addParameter(ParametedType p) {
+ parameterTypes.add(p);
+ }
+
+ public List<? extends IParametedType> getParameters() {
+ return parameterTypes;
+ }
+
+ public void setPositionProvider(PositionProvider p) {
+ provider = p;
+ }
+
+ public boolean equals(Object object) {
+ if(!(object instanceof ParametedType)) return false;
+ ParametedType other = (ParametedType)object;
+ if(signature != null && signature.equals(other.signature)) {
+ return true;
+ }
+ if(type == null || other.type == null || !type.getFullyQualifiedName().equals(other.type.getFullyQualifiedName())) {
+ return false;
+ }
+ if(parameterTypes.size() != other.parameterTypes.size()) {
+ return false;
+ }
+ for (int i = 0; i < parameterTypes.size(); i++) {
+ if(!parameterTypes.get(i).equals(other.parameterTypes.get(i))) {
+ return false;
+ }
+ }
+ if(!arrayPrefix.equals(other.arrayPrefix)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ void buildInheritance() {
+ if(type == null) return;
+ Set<IParametedType> inheritedTypes = new HashSet<IParametedType>();
+ try {
+ if(!type.isInterface() && !type.isAnnotation()) {
+ String sc = type.getSuperclassTypeSignature();
+ boolean objectArray = false;
+ if(sc != null) {
+ try {
+ sc = resolveParameters(sc);
+ } catch (Exception e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ } else if(!"java.lang.Object".equals(type.getFullyQualifiedName())) {
+ sc = ParametedTypeFactory.OBJECT;
+ } else if("java.lang.Object".equals(type.getFullyQualifiedName()) && arrayPrefix.length() > 0) {
+ objectArray = true;
+ sc = ParametedTypeFactory.OBJECT;
+ }
+ if(!objectArray && arrayPrefix.length() > 0) {
+ sc = arrayPrefix + sc;
+ }
+
+ superType = getFactory().getParametedType(type, sc);
+ if(superType != null) {
+ if(provider != null) {
+ String scn = type.getSuperclassName();
+ if(scn != null && provider.getRange(scn) != null) {
+ ISourceRange r = provider.getRange(scn);
+ superType = new TypeDeclaration(superType, type.getResource(), r.getOffset(), r.getLength());
+ }
+
+ }
+ inheritedTypes.add(superType);
+ }
+ }
+ String[] is = type.getSuperInterfaceTypeSignatures();
+ if(is != null) for (int i = 0; i < is.length; i++) {
+ String p = resolveParameters(is[i]);
+ if(arrayPrefix.length() > 0) p = arrayPrefix + p;
+ ParametedType t = getFactory().getParametedType(type, p);
+ if(t != null) {
+ if(provider != null) {
+ String scn = type.getSuperInterfaceNames()[i];
+ if(scn != null && provider.getRange(scn) != null) {
+ ISourceRange r = provider.getRange(scn);
+ t = new TypeDeclaration(t, type.getResource(), r.getOffset(), r.getLength());
+ }
+
+ }
+ inheritedTypes.add(t);
+ }
+ }
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ this.inheritedTypes = inheritedTypes;
+ inheritanceIsBuilt = true;
+ }
+
+ public ParametedType getSuperType() {
+ if(!inheritanceIsBuilt) {
+ buildInheritance();
+ }
+ return superType;
+ }
+
+ public Set<IParametedType> getInheritedTypes() {
+ if(!inheritanceIsBuilt) {
+ buildInheritance();
+ }
+ return inheritedTypes;
+ }
+
+ public String resolveParameters(String typeSignature) {
+ if(typeSignature == null) {
+ return typeSignature;
+ }
+ int i = typeSignature.indexOf('<');
+ if(i < 0) {
+ if(( typeSignature.startsWith("T") || typeSignature.startsWith("Q") || typeSignature.startsWith("L")) && typeSignature.endsWith(";")) {
+ String param = typeSignature.substring(1, typeSignature.length() - 1);
+ String s = findParameterSignature(param);
+ return s == null ? typeSignature : s;
+ }
+ return typeSignature;
+ }
+ int j = typeSignature.lastIndexOf('>');
+ if(j < i) {
+ return typeSignature;
+ }
+ boolean replaced = false;
+ StringBuffer newParams = new StringBuffer();
+ String[] ps = Signature.getTypeArguments(typeSignature);
+ for (String param: ps) {
+ String newParam = resolveParameters( param);
+ if(!param.equals(newParam)) replaced = true;
+ newParams.append(newParam);
+ }
+ if(replaced) {
+ typeSignature = typeSignature.substring(0, i) + '<' + newParams.toString() + '>' + ';';
+ }
+ return typeSignature;
+ }
+
+ public String findParameterSignature(String paramName) {
+ if(type == null) {
+ return null;
+ }
+ ITypeParameter[] ps = null;
+ try {
+ ps = type.getTypeParameters();
+ } catch (JavaModelException e) {
+ return null;
+ }
+ if(ps != null) for (int i = 0; i < ps.length; i++) {
+ if(ps[i].getElementName().equals(paramName)) {
+ if(parameterTypes.size() > i) {
+ ParametedType p = parameterTypes.get(i);
+ return p.getSignature();
+ }
+ }
+ }
+ return null;
+ }
+
+ public Set<IParametedType> getAllTypes() {
+ if(allInheritedTypes == null) {
+ allInheritedTypes = buildAllTypes(new HashSet<String>(), this, new HashSet<IParametedType>());
+ }
+ return allInheritedTypes;
+ }
+
+ Set<IParametedType> buildAllTypes(Set<String> processed, ParametedType p, Set<IParametedType> types) {
+ IType t = p.getType();
+ if(t != null) {
+ String key = p.getArrayPrefix() + t.getFullyQualifiedName();
+ if(!processed.contains(key)) {
+ processed.add(key);
+ types.add(p);
+ Set<IParametedType> ts = p.getInheritedTypes();
+ if(ts != null) for (IParametedType pp: ts) {
+ buildAllTypes(processed, (ParametedType)pp, types);
+ }
+ }
+ }
+ return types;
+ }
+
+ public String toString() {
+ return signature + ":" + super.toString();
+ }
+
+ public boolean isAssignableTo(ParametedType other, boolean checkInheritance) {
+ if(equals(other)) return true;
+ if(this.type == null) return false;
+ if(other.isVariable && other.type == null) return true;
+ if(this.type.equals(other.type)) {
+ if(areTypeParametersAssignableTo(other)) return true;
+ }
+ if(checkInheritance) {
+ for (IParametedType t: getInheritedTypes()) {
+ if(((ParametedType)t).isAssignableTo(other, false)) return true;
+ }
+ }
+ return false;
+ }
+
+ boolean areTypeParametersAssignableTo(ParametedType other) {
+ if(other.parameterTypes.size() == 0) return true;
+ if(this.parameterTypes.size() != other.parameterTypes.size()) return false;
+ for (int i = 0; i < parameterTypes.size(); i++) {
+ ParametedType p1 = parameterTypes.get(i);
+ ParametedType p2 = other.parameterTypes.get(i);
+ if(p1.isLower() || p1.isUpper()) return false;
+ if(p1.isVariable()) {
+ if(p2.isVariable()) {
+ if(p2.isAssignableTo(p1, true)) continue;
+ } else if(p2.isLower()) {
+ if(p2.isAssignableTo(p1, true)) continue;
+ } else if(p2.isUpper()) {
+ if(p2.isAssignableTo(p1, true)) continue;
+ if(p1.isAssignableTo(p2, true)) continue;
+ } else {
+ if(p2.isAssignableTo(p1, true)) continue;
+ }
+ } else {
+ if(p2.isLower()) {
+ if(p2.isAssignableTo(p1, true)) continue;
+ } else {
+ if(p1.isAssignableTo(p2, true)) continue;
+ }
+ }
+
+ return false;
+ }
+ return true;
+ }
+
+ static Map<String, String> primitives = new HashMap<String, String>();
+ static {
+ primitives.put("Integer", "int");
+ primitives.put("Short", "short");
+ primitives.put("Long", "long");
+ primitives.put("Character", "char");
+ primitives.put("Float", "float");
+ primitives.put("Double", "double");
+ primitives.put("Boolean", "boolean");
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IParametedType#getSimpleName()
+ */
+ public String getSimpleName() {
+ if(getSignature()!=null) {
+ return isPrimitive()?primitives.get(Signature.getSignatureSimpleName(getSignature())):Signature.getSignatureSimpleName(getSignature());
+ }
+ return "";
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java 2011-06-29 21:10:24 UTC (rev 32463)
@@ -0,0 +1,214 @@
+/*******************************************************************************
+ * 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.common.java;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.Signature;
+import org.jboss.tools.common.CommonPlugin;
+import org.jboss.tools.common.util.EclipseJavaUtil;
+
+public class ParametedTypeFactory {
+ // I S J C F D Z
+ static HashMap<String,String> primitives = new HashMap<String, String>();
+ static {
+ primitives.put("I", "Ljava.lang.Integer;");
+ primitives.put("S", "Ljava.lang.Short;");
+ primitives.put("J", "Ljava.lang.Long;");
+ primitives.put("C", "Ljava.lang.Character;");
+ primitives.put("F", "Ljava.lang.Float;");
+ primitives.put("D", "Ljava.lang.Double;");
+ primitives.put("Z", "Ljava.lang.Boolean;");
+ }
+ //unresolved Object signature
+ public static String OBJECT = "QObject;";
+ Map<String, ParametedType> cache = new HashMap<String, ParametedType>();
+
+ public ParametedType newParametedType(IType type) {
+ ParametedType parametedType = new ParametedType();
+ if(type != null && !type.isBinary()) {
+ ISourceRange r = null;
+ try {
+ r = type.getNameRange();
+ } catch (CoreException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ if(r != null) {
+ parametedType = new TypeDeclaration(parametedType, type.getResource(), r.getOffset(), r.getLength());
+ }
+ }
+ parametedType.setFactory(this);
+ parametedType.setType(type);
+ if(type != null) parametedType.setSignature("L" + type.getFullyQualifiedName() + ";");
+ String[] ps = null;
+ try {
+ ps = type.getTypeParameterSignatures();
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ if(ps != null && ps.length > 0) {
+ for (int i = 0; i < ps.length; i++) {
+ try {
+ ParametedType p = getParametedTypeForParameter(type, ps[i], null);
+ if(p != null) parametedType.addParameter(p);
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ } catch (Exception ee) {
+ CommonPlugin.getDefault().logError(ee);
+ }
+
+ }
+ }
+ return parametedType;
+ }
+
+ public ParametedType getParametedType(IMember context, String typeSignature) throws JavaModelException {
+ if(typeSignature == null) return null;
+
+ IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType();
+
+ String key = context == null || context.isBinary() || OBJECT.equals(typeSignature) ? typeSignature : contextType.getFullyQualifiedName() + "+" + typeSignature;
+ if(cache.containsKey(key)) return cache.get(key);
+ ParametedType result = new ParametedType();
+ result.setFactory(this);
+ result.setSignature(typeSignature);
+
+ typeSignature = typeSignature.substring(result.getArrayPrefix().length());
+
+ if(primitives.containsKey(typeSignature)) {
+ typeSignature = primitives.get(typeSignature);
+ result.setSignature(result.getArrayPrefix() + typeSignature);
+ result.setPrimitive(true);
+ } else if(typeSignature.startsWith("+")) {
+ typeSignature = typeSignature.substring(1);
+ result.setUpper(true);
+ } else if(typeSignature.startsWith("-")) {
+ typeSignature = typeSignature.substring(1);
+ result.setLower(true);
+ }
+
+ int startToken = typeSignature.indexOf('<');
+ if(startToken < 0) {
+ String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeSignature);
+ if(resovedTypeName == null) return null;
+ if(!context.isBinary()) {
+ StringBuffer ns = new StringBuffer();
+ ns.append(result.getArrayPrefix());
+ if(result.isLower()) ns.append('-');
+ if(result.isUpper()) ns.append('+');
+ ns.append('L').append(resovedTypeName).append(";");
+ result.setSignature(ns.toString());
+ }
+ IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName);
+ if(type != null) {
+ result.setType(type);
+ cache.put(key, result);
+ return result;
+ }
+ if(context instanceof IMethod) {
+ String[] ps = ((IMethod)context).getTypeParameterSignatures();
+ for (int i = 0; i < ps.length; i++) {
+ ParametedType st = getParametedTypeForParameter(context, ps[i], result);
+ if(st != null) {
+ if(st.getSignature().indexOf(':') >= 0) {
+ CommonPlugin.getDefault().logWarning("Wrong signature=" + st.getSignature());
+ }
+ return st;
+ }
+ }
+ }
+ String[] ps = contextType.getTypeParameterSignatures();
+ for (int i = 0; i < ps.length; i++) {
+ ParametedType st = getParametedTypeForParameter(contextType, ps[i], result);
+ if(st != null) return st;
+ }
+ } else {
+ int endToken = typeSignature.lastIndexOf('>');
+ if(endToken < startToken) return null;
+ String typeName = typeSignature.substring(0, startToken) + typeSignature.substring(endToken + 1);
+ String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeName);
+ if(resovedTypeName == null) return null;
+ IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName);
+ if(type != null) {
+ result.setType(type);
+ cache.put(key, result);
+ StringBuffer newParams = new StringBuffer();
+ String[] paramSignatures = null;
+ try {
+ paramSignatures = Signature.getTypeArguments(typeSignature);
+ } catch (Exception e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ if(paramSignatures != null) for (String paramSignature: paramSignatures) {
+ ParametedType param = getParametedType(context, paramSignature);
+ if(param == null) {
+ param = new ParametedType();
+ param.setSignature(paramSignature);
+ }
+ result.addParameter(param);
+ newParams.append(param.getSignature());
+ }
+ if(!context.isBinary()) {
+ StringBuffer ns = new StringBuffer();
+ ns.append(result.getArrayPrefix());
+ if(result.isLower()) ns.append('-');
+ if(result.isUpper()) ns.append('+');
+ ns.append('L').append(resovedTypeName).append('<').append(newParams).append(">;");
+ result.setSignature(ns.toString());
+ }
+ return result;
+ }
+ }
+ return null;
+ }
+
+ public ParametedType getParametedTypeForParameter(IMember context, String typeParameterSignature, ParametedType result) throws JavaModelException {
+ IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType();
+ String key = context == null ? typeParameterSignature : contextType.getFullyQualifiedName() + "+" + typeParameterSignature;
+
+ String t = Signature.getTypeVariable(typeParameterSignature);
+ String[] bounds = Signature.getTypeParameterBounds(typeParameterSignature);
+
+ t = "L" + t + ";";
+ if(result == null || t.equals(result.getSignature())) {
+ String sts = bounds.length > 0 ? bounds[0] : "";
+ if(sts.length() > 0) {
+ ParametedType st = getParametedType(contextType, sts);
+ if(st != null) {
+ result = new TypeDeclaration(st, context.getResource(), 0, 0);
+ }
+ } else if(result != null) {
+ result.setSignature(t);
+ }
+ if(result == null) {
+ result = new ParametedType();
+ result.setFactory(this);
+ result.setSignature(t);
+ }
+ result.setVariable(true);
+ cache.put(key, result);
+ return result;
+ }
+ return null;
+ }
+
+ public void clean() {
+ cache.clear();
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/TypeDeclaration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/TypeDeclaration.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/TypeDeclaration.java 2011-06-29 21:10:24 UTC (rev 32463)
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * 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.common.java;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class TypeDeclaration extends ParametedType implements ITypeDeclaration {
+ IResource resource;
+ int length;
+ int startPosition;
+
+ public TypeDeclaration(ParametedType type, IResource resource, int startPosition, int length) {
+ this.setFactory(type.getFactory());
+ this.type = type.getType();
+ arrayPrefix = type.arrayPrefix;
+ this.resource = resource;
+ this.length = length;
+ this.startPosition = startPosition;
+
+ signature = type.signature;
+ parameterTypes = type.parameterTypes;
+
+ allInheritedTypes = type.allInheritedTypes;
+ inheritanceIsBuilt = type.inheritanceIsBuilt;
+ inheritedTypes = type.inheritedTypes;
+ superType = type.superType;
+ primitive = type.primitive;
+
+ isLower = type.isLower;
+ isUpper = type.isUpper;
+ isVariable = type.isVariable;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ public int getStartPosition() {
+ return startPosition;
+ }
+
+ public IResource getResource() {
+ return resource;
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/TypeDeclaration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32462 - in trunk/forge: plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-29 17:02:18 -0400 (Wed, 29 Jun 2011)
New Revision: 32462
Added:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializer.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java
Removed:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java
Log:
rename
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml 2011-06-29 20:57:28 UTC (rev 32461)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml 2011-06-29 21:02:18 UTC (rev 32462)
@@ -4,7 +4,7 @@
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
- class="org.jboss.tools.forge.core.preferences.ForgePreferenceInitializer">
+ class="org.jboss.tools.forge.core.preferences.ForgePreferencesInitializer">
</initializer>
</extension>
Deleted: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java 2011-06-29 20:57:28 UTC (rev 32461)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java 2011-06-29 21:02:18 UTC (rev 32462)
@@ -1,22 +0,0 @@
-package org.jboss.tools.forge.core.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.jboss.tools.forge.core.ForgeCorePlugin;
-
-public class ForgePreferenceInitializer extends AbstractPreferenceInitializer {
-
- static final String INITIAL_RUNTIMES_PREFERENCE =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
- "<forgeRuntimes default=\"embedded\">" +
- " <runtime name=\"embedded\" type=\"embedded\"/>" +
- "</forgeRuntimes>";
-
- @Override
- public void initializeDefaultPreferences() {
- IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
- preferences.put(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, INITIAL_RUNTIMES_PREFERENCE);
- }
-
-}
Copied: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializer.java (from rev 32461, trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializer.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializer.java 2011-06-29 21:02:18 UTC (rev 32462)
@@ -0,0 +1,22 @@
+package org.jboss.tools.forge.core.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.jboss.tools.forge.core.ForgeCorePlugin;
+
+public class ForgePreferencesInitializer extends AbstractPreferenceInitializer {
+
+ static final String INITIAL_RUNTIMES_PREFERENCE =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+ "<forgeRuntimes default=\"embedded\">" +
+ " <runtime name=\"embedded\" type=\"embedded\"/>" +
+ "</forgeRuntimes>";
+
+ @Override
+ public void initializeDefaultPreferences() {
+ IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
+ preferences.put(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, INITIAL_RUNTIMES_PREFERENCE);
+ }
+
+}
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java 2011-06-29 20:57:28 UTC (rev 32461)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java 2011-06-29 21:02:18 UTC (rev 32462)
@@ -55,7 +55,7 @@
private String getForgeRuntimesPreference() {
return getForgeCorePreferences().get(
PREF_FORGE_RUNTIMES,
- ForgePreferenceInitializer.INITIAL_RUNTIMES_PREFERENCE);
+ ForgePreferencesInitializer.INITIAL_RUNTIMES_PREFERENCE);
}
private void initializeRuntimes() {
Deleted: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java 2011-06-29 20:57:28 UTC (rev 32461)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java 2011-06-29 21:02:18 UTC (rev 32462)
@@ -1,23 +0,0 @@
-package org.jboss.tools.forge.core.preferences;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.jboss.tools.forge.core.ForgeCorePlugin;
-import org.junit.Test;
-
-public class ForgePreferenceInitializerTest {
-
- @Test
- public void testInitializeDefaultPreferences() {
- IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
- assertNull(preferences.get(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, null));
- new ForgePreferenceInitializer().initializeDefaultPreferences();
- assertEquals(
- ForgePreferenceInitializer.INITIAL_RUNTIMES_PREFERENCE,
- preferences.get(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, null));
- }
-
-}
Copied: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java (from rev 32461, trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java)
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java (rev 0)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferencesInitializerTest.java 2011-06-29 21:02:18 UTC (rev 32462)
@@ -0,0 +1,23 @@
+package org.jboss.tools.forge.core.preferences;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.jboss.tools.forge.core.ForgeCorePlugin;
+import org.junit.Test;
+
+public class ForgePreferencesInitializerTest {
+
+ @Test
+ public void testInitializeDefaultPreferences() {
+ IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
+ assertNull(preferences.get(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, null));
+ new ForgePreferencesInitializer().initializeDefaultPreferences();
+ assertEquals(
+ ForgePreferencesInitializer.INITIAL_RUNTIMES_PREFERENCE,
+ preferences.get(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, null));
+ }
+
+}
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32461 - in trunk/forge: tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-29 16:57:28 -0400 (Wed, 29 Jun 2011)
New Revision: 32461
Added:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferencesTest.java
Removed:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java
Log:
rename 'installation' into 'runtime'
Deleted: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 20:35:01 UTC (rev 32460)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 20:57:28 UTC (rev 32461)
@@ -1,192 +0,0 @@
-package org.jboss.tools.forge.core.preferences;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.jboss.tools.forge.core.ForgeCorePlugin;
-import org.jboss.tools.forge.core.process.ForgeEmbeddedRuntime;
-import org.jboss.tools.forge.core.process.ForgeRuntime;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-public class ForgeInstallations {
-
- static final String PREF_FORGE_INSTALLATIONS = "org.jboss.tools.forge.core.installations";
-
- public static final ForgeInstallations INSTANCE = new ForgeInstallations();
-
- List<ForgeRuntime> installations = null;
- ForgeRuntime defaultInstallation = null;
-
- private ForgeInstallations() {}
-
- public ForgeRuntime[] getInstallations() {
- if (installations == null) {
- initializeInstallations();
- }
- return (ForgeRuntime[])installations.toArray(new ForgeRuntime[installations.size()]);
- }
-
- public ForgeRuntime getDefault() {
- if (defaultInstallation == null) {
- initializeInstallations();
- }
- return defaultInstallation;
- }
-
- private IEclipsePreferences getForgeCorePreferences() {
- return InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
- }
-
- private String getForgeInstallationsPreference() {
- return getForgeCorePreferences().get(
- PREF_FORGE_INSTALLATIONS,
- ForgePreferenceInitializer.INITIAL_INSTALLATIONS_PREFERENCE);
- }
-
- private void initializeInstallations() {
- initializeFromXml(getForgeInstallationsPreference());
- }
-
- private void initializeFromXml(String xml) {
- DocumentBuilder documentBuilder = newDocumentBuilder();
- if (documentBuilder == null) return;
- InputStream inputStream = createInputStream(xml);
- if (inputStream == null) return;
- installations = new ArrayList<ForgeRuntime>();
- Document document = parseInstallations(documentBuilder, inputStream);
- Element installationsElement = document.getDocumentElement();
- String defaultInstallationName = installationsElement.getAttribute("default");
- NodeList nodeList = installationsElement.getChildNodes();
- for (int i = 0; i < nodeList.getLength(); i++) {
- Node node = nodeList.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE) {
- Element element = (Element)node;
- String type = element.getAttribute("type");
- ForgeRuntime runtime = null;
- if ("embedded".equals(type)) {
- runtime = ForgeEmbeddedRuntime.INSTANCE;
- }
- if (runtime == null) continue;
- installations.add(runtime);
- if (defaultInstallationName.equals(runtime.getName())) {
- defaultInstallation = runtime;
- }
- }
- }
- }
-
- private Document parseInstallations(DocumentBuilder documentBuilder, InputStream inputStream) {
- Document result = null;
- try {
- result = documentBuilder.parse(inputStream);
- } catch (SAXException e) {
- ForgeCorePlugin.log(e);
- } catch (IOException e) {
- ForgeCorePlugin.log(e);
- }
- return result;
- }
-
- private InputStream createInputStream(String string) {
- InputStream result = null;
- try {
- result = new BufferedInputStream(new ByteArrayInputStream(string.getBytes("UTF8")));
- } catch (UnsupportedEncodingException e) {
- ForgeCorePlugin.log(e);
- }
- return result;
- }
-
- private DocumentBuilder newDocumentBuilder() {
- try {
- return DocumentBuilderFactory.newInstance().newDocumentBuilder();
- } catch (ParserConfigurationException e) {
- ForgeCorePlugin.log(e);
- return null;
- }
- }
-
-// private static Document createEmptyDocument() {
-// DocumentBuilder documentBuilder = newDocumentBuilder();
-// if (documentBuilder == null) {
-// return null;
-// } else {
-// return documentBuilder.newDocument();
-// }
-// }
-//
-// private static String serializeDocument(Document doc) throws TransformerException, IOException {
-// ByteArrayOutputStream s = new ByteArrayOutputStream();
-// TransformerFactory factory = TransformerFactory.newInstance();
-// Transformer transformer = factory.newTransformer();
-// transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-// transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-// DOMSource source = new DOMSource(doc);
-// StreamResult outputTarget = new StreamResult(s);
-// transformer.transform(source, outputTarget);
-// return s.toString("UTF8");
-// }
-//
-// private static void createInitialInstallations() {
-// try {
-// File file = FileLocator.getBundleFile(ForgeUIPlugin.getDefault().getBundle());
-// defaultInstallation = new ForgeInstallation("embedded", file.getAbsolutePath());
-// installations = new ArrayList<ForgeInstallation>();
-// installations.add(defaultInstallation);
-// saveInstallations();
-// } catch (IOException e) {
-// ForgeUIPlugin.log(e);
-// }
-// }
-//
-// public static void setInstallations(ForgeInstallation[] installs, ForgeInstallation defaultInstall) {
-// installations.clear();
-// for (ForgeInstallation install : installs) {
-// installations.add(install);
-// }
-// defaultInstallation = defaultInstall;
-// saveInstallations();
-// }
-//
-// private static void saveInstallations() {
-// try {
-// String xml = serializeDocument(createInstallationsDocument());
-// ForgeUIPlugin.getDefault().getPreferenceStore().setValue(PREF_FORGE_INSTALLATIONS, xml);
-// } catch (IOException e) {
-// ForgeUIPlugin.log(e);
-// } catch (TransformerException e) {
-// ForgeUIPlugin.log(e);
-// }
-// }
-//
-// private static Document createInstallationsDocument() {
-// Document document = createEmptyDocument();
-// if (document == null) return null;
-// Element main = document.createElement("forgeInstallations");
-// document.appendChild(main);
-// for (ForgeInstallation installation : installations) {
-// Element element = document.createElement("installation");
-// element.setAttribute("name", installation.getName());
-// element.setAttribute("location", installation.getLocation());
-// main.appendChild(element);
-// }
-// main.setAttribute("default", defaultInstallation.getName());
-// return document;
-// }
-
-}
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java 2011-06-29 20:35:01 UTC (rev 32460)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java 2011-06-29 20:57:28 UTC (rev 32461)
@@ -7,16 +7,16 @@
public class ForgePreferenceInitializer extends AbstractPreferenceInitializer {
- static final String INITIAL_INSTALLATIONS_PREFERENCE =
+ static final String INITIAL_RUNTIMES_PREFERENCE =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
- "<forgeInstallations default=\"embedded\">" +
- " <installation name=\"embedded\" type=\"embedded\"/>" +
- "</forgeInstallations>";
+ "<forgeRuntimes default=\"embedded\">" +
+ " <runtime name=\"embedded\" type=\"embedded\"/>" +
+ "</forgeRuntimes>";
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
- preferences.put(ForgeInstallations.PREF_FORGE_INSTALLATIONS, INITIAL_INSTALLATIONS_PREFERENCE);
+ preferences.put(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, INITIAL_RUNTIMES_PREFERENCE);
}
}
Copied: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java (from rev 32460, trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferences.java 2011-06-29 20:57:28 UTC (rev 32461)
@@ -0,0 +1,192 @@
+package org.jboss.tools.forge.core.preferences;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.jboss.tools.forge.core.ForgeCorePlugin;
+import org.jboss.tools.forge.core.process.ForgeEmbeddedRuntime;
+import org.jboss.tools.forge.core.process.ForgeRuntime;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class ForgeRuntimesPreferences {
+
+ static final String PREF_FORGE_RUNTIMES = "org.jboss.tools.forge.core.runtimes";
+
+ public static final ForgeRuntimesPreferences INSTANCE = new ForgeRuntimesPreferences();
+
+ List<ForgeRuntime> runtimes = null;
+ ForgeRuntime defaultRuntime = null;
+
+ private ForgeRuntimesPreferences() {}
+
+ public ForgeRuntime[] getRuntimes() {
+ if (runtimes == null) {
+ initializeRuntimes();
+ }
+ return (ForgeRuntime[])runtimes.toArray(new ForgeRuntime[runtimes.size()]);
+ }
+
+ public ForgeRuntime getDefault() {
+ if (defaultRuntime == null) {
+ initializeRuntimes();
+ }
+ return defaultRuntime;
+ }
+
+ private IEclipsePreferences getForgeCorePreferences() {
+ return InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
+ }
+
+ private String getForgeRuntimesPreference() {
+ return getForgeCorePreferences().get(
+ PREF_FORGE_RUNTIMES,
+ ForgePreferenceInitializer.INITIAL_RUNTIMES_PREFERENCE);
+ }
+
+ private void initializeRuntimes() {
+ initializeFromXml(getForgeRuntimesPreference());
+ }
+
+ private void initializeFromXml(String xml) {
+ DocumentBuilder documentBuilder = newDocumentBuilder();
+ if (documentBuilder == null) return;
+ InputStream inputStream = createInputStream(xml);
+ if (inputStream == null) return;
+ runtimes = new ArrayList<ForgeRuntime>();
+ Document document = parseRuntimes(documentBuilder, inputStream);
+ Element runtimeElement = document.getDocumentElement();
+ String defaultRuntimeName = runtimeElement.getAttribute("default");
+ NodeList nodeList = runtimeElement.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if (node.getNodeType() == Node.ELEMENT_NODE) {
+ Element element = (Element)node;
+ String type = element.getAttribute("type");
+ ForgeRuntime runtime = null;
+ if ("embedded".equals(type)) {
+ runtime = ForgeEmbeddedRuntime.INSTANCE;
+ }
+ if (runtime == null) continue;
+ runtimes.add(runtime);
+ if (defaultRuntimeName.equals(runtime.getName())) {
+ defaultRuntime = runtime;
+ }
+ }
+ }
+ }
+
+ private Document parseRuntimes(DocumentBuilder documentBuilder, InputStream inputStream) {
+ Document result = null;
+ try {
+ result = documentBuilder.parse(inputStream);
+ } catch (SAXException e) {
+ ForgeCorePlugin.log(e);
+ } catch (IOException e) {
+ ForgeCorePlugin.log(e);
+ }
+ return result;
+ }
+
+ private InputStream createInputStream(String string) {
+ InputStream result = null;
+ try {
+ result = new BufferedInputStream(new ByteArrayInputStream(string.getBytes("UTF8")));
+ } catch (UnsupportedEncodingException e) {
+ ForgeCorePlugin.log(e);
+ }
+ return result;
+ }
+
+ private DocumentBuilder newDocumentBuilder() {
+ try {
+ return DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ ForgeCorePlugin.log(e);
+ return null;
+ }
+ }
+
+// private static Document createEmptyDocument() {
+// DocumentBuilder documentBuilder = newDocumentBuilder();
+// if (documentBuilder == null) {
+// return null;
+// } else {
+// return documentBuilder.newDocument();
+// }
+// }
+//
+// private static String serializeDocument(Document doc) throws TransformerException, IOException {
+// ByteArrayOutputStream s = new ByteArrayOutputStream();
+// TransformerFactory factory = TransformerFactory.newInstance();
+// Transformer transformer = factory.newTransformer();
+// transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+// transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+// DOMSource source = new DOMSource(doc);
+// StreamResult outputTarget = new StreamResult(s);
+// transformer.transform(source, outputTarget);
+// return s.toString("UTF8");
+// }
+//
+// private static void createInitialInstallations() {
+// try {
+// File file = FileLocator.getBundleFile(ForgeUIPlugin.getDefault().getBundle());
+// defaultInstallation = new ForgeInstallation("embedded", file.getAbsolutePath());
+// installations = new ArrayList<ForgeInstallation>();
+// installations.add(defaultInstallation);
+// saveInstallations();
+// } catch (IOException e) {
+// ForgeUIPlugin.log(e);
+// }
+// }
+//
+// public static void setInstallations(ForgeInstallation[] installs, ForgeInstallation defaultInstall) {
+// installations.clear();
+// for (ForgeInstallation install : installs) {
+// installations.add(install);
+// }
+// defaultInstallation = defaultInstall;
+// saveInstallations();
+// }
+//
+// private static void saveInstallations() {
+// try {
+// String xml = serializeDocument(createInstallationsDocument());
+// ForgeUIPlugin.getDefault().getPreferenceStore().setValue(PREF_FORGE_INSTALLATIONS, xml);
+// } catch (IOException e) {
+// ForgeUIPlugin.log(e);
+// } catch (TransformerException e) {
+// ForgeUIPlugin.log(e);
+// }
+// }
+//
+// private static Document createInstallationsDocument() {
+// Document document = createEmptyDocument();
+// if (document == null) return null;
+// Element main = document.createElement("forgeInstallations");
+// document.appendChild(main);
+// for (ForgeInstallation installation : installations) {
+// Element element = document.createElement("installation");
+// element.setAttribute("name", installation.getName());
+// element.setAttribute("location", installation.getLocation());
+// main.appendChild(element);
+// }
+// main.setAttribute("default", defaultInstallation.getName());
+// return document;
+// }
+
+}
Deleted: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java 2011-06-29 20:35:01 UTC (rev 32460)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java 2011-06-29 20:57:28 UTC (rev 32461)
@@ -1,53 +0,0 @@
-package org.jboss.tools.forge.core.preferences;
-
-import static org.junit.Assert.assertEquals;
-
-import org.jboss.tools.forge.core.process.ForgeEmbeddedRuntime;
-import org.junit.Test;
-
-public class ForgeInstallationsTest {
-
- private static final String ALTERNATIVE_FORGE_INSTALLATIONS =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
- "<forgeInstallations default=\"foo\">" +
- " <installation name=\"embedded\" type=\"embedded\"/>" +
- " <installation name=\"foo\" location=\"foofoo\" type=\"external\"/>" +
- " <installation name=\"bar\" location=\"barbar\" type=\"external\"/>" +
- "</forgeInstallations>";
-
- @Test
- public void testGetDefaultInitialCase() {
- assertEquals(ForgeEmbeddedRuntime.INSTANCE, ForgeInstallations.INSTANCE.getDefault());
- }
-
- @Test
- public void testGetInstallationsInitialCase() {
- assertEquals(1, ForgeInstallations.INSTANCE.getInstallations().length);
- }
-
-// @Test
-// public void testGetDefaultAlternativeCase() {
-// ForgeInstallations.INSTANCE.defaultInstallation = null;
-// InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID).put(
-// ForgeInstallations.PREF_FORGE_INSTALLATIONS,
-// ALTERNATIVE_FORGE_INSTALLATIONS);
-// ForgeRuntime runtime = ForgeInstallations.INSTANCE.getDefault();
-// assertNotNull(ForgeInstallations.INSTANCE.defaultInstallation);
-// assertEquals("foo", runtime.getName());
-// }
-//
-// @Test
-// public void testGetInstallationsAlternativeCase() {
-// ForgeInstallations.INSTANCE.installations = null;
-// InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID).put(
-// ForgeInstallations.PREF_FORGE_INSTALLATIONS,
-// ALTERNATIVE_FORGE_INSTALLATIONS);
-// ForgeRuntime[] runtimes = ForgeInstallations.INSTANCE.getInstallations();
-// assertNotNull(ForgeInstallations.INSTANCE.installations);
-// assertEquals(3, runtimes.length);
-// }
-
-
-
-
-}
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java 2011-06-29 20:35:01 UTC (rev 32460)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java 2011-06-29 20:57:28 UTC (rev 32461)
@@ -13,11 +13,11 @@
@Test
public void testInitializeDefaultPreferences() {
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
- assertNull(preferences.get(ForgeInstallations.PREF_FORGE_INSTALLATIONS, null));
+ assertNull(preferences.get(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, null));
new ForgePreferenceInitializer().initializeDefaultPreferences();
assertEquals(
- ForgePreferenceInitializer.INITIAL_INSTALLATIONS_PREFERENCE,
- preferences.get(ForgeInstallations.PREF_FORGE_INSTALLATIONS, null));
+ ForgePreferenceInitializer.INITIAL_RUNTIMES_PREFERENCE,
+ preferences.get(ForgeRuntimesPreferences.PREF_FORGE_RUNTIMES, null));
}
}
Copied: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferencesTest.java (from rev 32460, trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java)
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferencesTest.java (rev 0)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeRuntimesPreferencesTest.java 2011-06-29 20:57:28 UTC (rev 32461)
@@ -0,0 +1,53 @@
+package org.jboss.tools.forge.core.preferences;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jboss.tools.forge.core.process.ForgeEmbeddedRuntime;
+import org.junit.Test;
+
+public class ForgeRuntimesPreferencesTest {
+
+ private static final String ALTERNATIVE_FORGE_RUNTIMES =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+ "<forgeRuntimes default=\"foo\">" +
+ " <runtime name=\"embedded\" type=\"embedded\"/>" +
+ " <runtime name=\"foo\" location=\"foofoo\" type=\"external\"/>" +
+ " <runtime name=\"bar\" location=\"barbar\" type=\"external\"/>" +
+ "</forgeInstallations>";
+
+ @Test
+ public void testGetDefaultInitialCase() {
+ assertEquals(ForgeEmbeddedRuntime.INSTANCE, ForgeRuntimesPreferences.INSTANCE.getDefault());
+ }
+
+ @Test
+ public void testGetRuntimesInitialCase() {
+ assertEquals(1, ForgeRuntimesPreferences.INSTANCE.getRuntimes().length);
+ }
+
+// @Test
+// public void testGetDefaultAlternativeCase() {
+// ForgeInstallations.INSTANCE.defaultInstallation = null;
+// InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID).put(
+// ForgeInstallations.PREF_FORGE_INSTALLATIONS,
+// ALTERNATIVE_FORGE_INSTALLATIONS);
+// ForgeRuntime runtime = ForgeInstallations.INSTANCE.getDefault();
+// assertNotNull(ForgeInstallations.INSTANCE.defaultInstallation);
+// assertEquals("foo", runtime.getName());
+// }
+//
+// @Test
+// public void testGetInstallationsAlternativeCase() {
+// ForgeInstallations.INSTANCE.installations = null;
+// InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID).put(
+// ForgeInstallations.PREF_FORGE_INSTALLATIONS,
+// ALTERNATIVE_FORGE_INSTALLATIONS);
+// ForgeRuntime[] runtimes = ForgeInstallations.INSTANCE.getInstallations();
+// assertNotNull(ForgeInstallations.INSTANCE.installations);
+// assertEquals(3, runtimes.length);
+// }
+
+
+
+
+}
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32460 - in trunk/forge: tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-29 16:35:01 -0400 (Wed, 29 Jun 2011)
New Revision: 32460
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java
Log:
initial ForgeInstallations implementation and test
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 20:10:29 UTC (rev 32459)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 20:35:01 UTC (rev 32460)
@@ -1,111 +1,126 @@
package org.jboss.tools.forge.core.preferences;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.jboss.tools.forge.core.ForgeCorePlugin;
import org.jboss.tools.forge.core.process.ForgeEmbeddedRuntime;
import org.jboss.tools.forge.core.process.ForgeRuntime;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
public class ForgeInstallations {
static final String PREF_FORGE_INSTALLATIONS = "org.jboss.tools.forge.core.installations";
-// private static List<ForgeRuntime> installations = null;
- private static ForgeRuntime DEFAULT_INSTALLATION = null;
+ public static final ForgeInstallations INSTANCE = new ForgeInstallations();
-// public static ForgeRuntime[] getInstallations() {
-// if (installations == null) {
-// initializeInstallations();
-// }
-// return (ForgeRuntime[])installations.toArray(new ForgeRuntime[installations.size()]);
-// }
+ List<ForgeRuntime> installations = null;
+ ForgeRuntime defaultInstallation = null;
- public static ForgeRuntime getDefault() {
- if (DEFAULT_INSTALLATION == null) {
+ private ForgeInstallations() {}
+
+ public ForgeRuntime[] getInstallations() {
+ if (installations == null) {
initializeInstallations();
}
- return DEFAULT_INSTALLATION;
+ return (ForgeRuntime[])installations.toArray(new ForgeRuntime[installations.size()]);
}
-// private static IEclipsePreferences getForgeCorePreferences() {
-// return InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
-// }
+ public ForgeRuntime getDefault() {
+ if (defaultInstallation == null) {
+ initializeInstallations();
+ }
+ return defaultInstallation;
+ }
-// private static void initializeInstallations() {
-// initializeEmbeddedRuntime();
-// }
+ private IEclipsePreferences getForgeCorePreferences() {
+ return InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
+ }
-// private static void initializeEmbeddedRuntime() {
-
-// }
+ private String getForgeInstallationsPreference() {
+ return getForgeCorePreferences().get(
+ PREF_FORGE_INSTALLATIONS,
+ ForgePreferenceInitializer.INITIAL_INSTALLATIONS_PREFERENCE);
+ }
- private static void initializeInstallations() {
- DEFAULT_INSTALLATION = ForgeEmbeddedRuntime.INSTANCE;
+ private void initializeInstallations() {
+ initializeFromXml(getForgeInstallationsPreference());
}
-// private static void initializeInstallations() {
-// String installPrefsXml = getForgeCorePreferences().get(PREF_FORGE_INSTALLATIONS, null);
-// if (installPrefsXml == null || "".equals(installPrefsXml)) {
-// createInitialInstallations();
-// installPrefsXml = getForgeCorePreferences().get(PREF_FORGE_INSTALLATIONS, null);
-// }
-// initializeFromXml(installPrefsXml);
-// }
-//
-// private static void initializeFromXml(String installPrefsXml) {
-// if (installPrefsXml == null) return;
-// DocumentBuilder documentBuilder = newDocumentBuilder();
-// if (documentBuilder == null) return;
-// InputStream inputStream = createInputStream(installPrefsXml);
-// if (inputStream == null) return;
-// installations = new ArrayList<ForgeRuntime>();
-// Document document = parseInstallations(documentBuilder, inputStream);
-// Element installationsElement = document.getDocumentElement();
-// String defaultInstallationName = installationsElement.getAttribute("default");
-// NodeList nodeList = installationsElement.getChildNodes();
-// for (int i = 0; i < nodeList.getLength(); i++) {
-// Node node = nodeList.item(i);
-// if (node.getNodeType() == Node.ELEMENT_NODE) {
-// Element element = (Element)node;
-// String name = element.getAttribute("name");
-// String location = element.getAttribute("location");
-// ForgeRuntime newInstallation = new ForgeRuntime(name, location);
-// installations.add(newInstallation);
-// if (name.equals(defaultInstallationName)) {
-// defaultInstallation = newInstallation;
-// }
-// }
-// }
-// }
-//
-// private static Document parseInstallations(DocumentBuilder documentBuilder, InputStream inputStream) {
-// Document result = null;
-// try {
-// result = documentBuilder.parse(inputStream);
-// } catch (SAXException e) {
-// ForgeUIPlugin.log(e);
-// } catch (IOException e) {
-// ForgeUIPlugin.log(e);
-// }
-// return result;
-// }
-//
-// private static InputStream createInputStream(String string) {
-// InputStream result = null;
-// try {
-// result = new BufferedInputStream(new ByteArrayInputStream(string.getBytes("UTF8")));
-// } catch (UnsupportedEncodingException e) {
-// ForgeUIPlugin.log(e);
-// }
-// return result;
-// }
-//
-// private static DocumentBuilder newDocumentBuilder() {
-// try {
-// return DocumentBuilderFactory.newInstance().newDocumentBuilder();
-// } catch (ParserConfigurationException e) {
-// ForgeUIPlugin.log(e);
-// return null;
-// }
-// }
-//
+ private void initializeFromXml(String xml) {
+ DocumentBuilder documentBuilder = newDocumentBuilder();
+ if (documentBuilder == null) return;
+ InputStream inputStream = createInputStream(xml);
+ if (inputStream == null) return;
+ installations = new ArrayList<ForgeRuntime>();
+ Document document = parseInstallations(documentBuilder, inputStream);
+ Element installationsElement = document.getDocumentElement();
+ String defaultInstallationName = installationsElement.getAttribute("default");
+ NodeList nodeList = installationsElement.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if (node.getNodeType() == Node.ELEMENT_NODE) {
+ Element element = (Element)node;
+ String type = element.getAttribute("type");
+ ForgeRuntime runtime = null;
+ if ("embedded".equals(type)) {
+ runtime = ForgeEmbeddedRuntime.INSTANCE;
+ }
+ if (runtime == null) continue;
+ installations.add(runtime);
+ if (defaultInstallationName.equals(runtime.getName())) {
+ defaultInstallation = runtime;
+ }
+ }
+ }
+ }
+
+ private Document parseInstallations(DocumentBuilder documentBuilder, InputStream inputStream) {
+ Document result = null;
+ try {
+ result = documentBuilder.parse(inputStream);
+ } catch (SAXException e) {
+ ForgeCorePlugin.log(e);
+ } catch (IOException e) {
+ ForgeCorePlugin.log(e);
+ }
+ return result;
+ }
+
+ private InputStream createInputStream(String string) {
+ InputStream result = null;
+ try {
+ result = new BufferedInputStream(new ByteArrayInputStream(string.getBytes("UTF8")));
+ } catch (UnsupportedEncodingException e) {
+ ForgeCorePlugin.log(e);
+ }
+ return result;
+ }
+
+ private DocumentBuilder newDocumentBuilder() {
+ try {
+ return DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ ForgeCorePlugin.log(e);
+ return null;
+ }
+ }
+
// private static Document createEmptyDocument() {
// DocumentBuilder documentBuilder = newDocumentBuilder();
// if (documentBuilder == null) {
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java 2011-06-29 20:10:29 UTC (rev 32459)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java 2011-06-29 20:35:01 UTC (rev 32460)
@@ -10,7 +10,7 @@
static final String INITIAL_INSTALLATIONS_PREFERENCE =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
"<forgeInstallations default=\"embedded\">" +
- " <installation name=\"embedded\"/>" +
+ " <installation name=\"embedded\" type=\"embedded\"/>" +
"</forgeInstallations>";
@Override
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java 2011-06-29 20:10:29 UTC (rev 32459)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java 2011-06-29 20:35:01 UTC (rev 32460)
@@ -7,9 +7,47 @@
public class ForgeInstallationsTest {
+ private static final String ALTERNATIVE_FORGE_INSTALLATIONS =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+ "<forgeInstallations default=\"foo\">" +
+ " <installation name=\"embedded\" type=\"embedded\"/>" +
+ " <installation name=\"foo\" location=\"foofoo\" type=\"external\"/>" +
+ " <installation name=\"bar\" location=\"barbar\" type=\"external\"/>" +
+ "</forgeInstallations>";
+
@Test
- public void testGetDefault() {
- assertEquals(ForgeEmbeddedRuntime.INSTANCE, ForgeInstallations.getDefault());
+ public void testGetDefaultInitialCase() {
+ assertEquals(ForgeEmbeddedRuntime.INSTANCE, ForgeInstallations.INSTANCE.getDefault());
}
+ @Test
+ public void testGetInstallationsInitialCase() {
+ assertEquals(1, ForgeInstallations.INSTANCE.getInstallations().length);
+ }
+
+// @Test
+// public void testGetDefaultAlternativeCase() {
+// ForgeInstallations.INSTANCE.defaultInstallation = null;
+// InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID).put(
+// ForgeInstallations.PREF_FORGE_INSTALLATIONS,
+// ALTERNATIVE_FORGE_INSTALLATIONS);
+// ForgeRuntime runtime = ForgeInstallations.INSTANCE.getDefault();
+// assertNotNull(ForgeInstallations.INSTANCE.defaultInstallation);
+// assertEquals("foo", runtime.getName());
+// }
+//
+// @Test
+// public void testGetInstallationsAlternativeCase() {
+// ForgeInstallations.INSTANCE.installations = null;
+// InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID).put(
+// ForgeInstallations.PREF_FORGE_INSTALLATIONS,
+// ALTERNATIVE_FORGE_INSTALLATIONS);
+// ForgeRuntime[] runtimes = ForgeInstallations.INSTANCE.getInstallations();
+// assertNotNull(ForgeInstallations.INSTANCE.installations);
+// assertEquals(3, runtimes.length);
+// }
+
+
+
+
}
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32459 - in trunk/forge: tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-29 16:10:29 -0400 (Wed, 29 Jun 2011)
New Revision: 32459
Added:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java
Log:
implementation of ForgeExternalRuntime
Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java 2011-06-29 20:10:29 UTC (rev 32459)
@@ -0,0 +1,22 @@
+package org.jboss.tools.forge.core.process;
+
+public class ForgeExternalRuntime implements ForgeRuntime {
+
+ private String name, location;
+
+ public ForgeExternalRuntime(String name, String location) {
+ this.name = name;
+ this.location = location;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getLocation() {
+ return location;
+ }
+
+}
Added: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java (rev 0)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java 2011-06-29 20:10:29 UTC (rev 32459)
@@ -0,0 +1,16 @@
+package org.jboss.tools.forge.core.process;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ForgeExternalRuntimeTest {
+
+ @Test
+ public void test() {
+ ForgeExternalRuntime runtime = new ForgeExternalRuntime("foo", "bar");
+ assertEquals("foo", runtime.getName());
+ assertEquals("bar", runtime.getLocation());
+ }
+
+}
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32458 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-29 15:21:38 -0400 (Wed, 29 Jun 2011)
New Revision: 32458
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml
Log:
Removed unnecessary "declaration" attributes
https://issues.jboss.org/browse/JBIDE-9262
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml 2011-06-29 19:01:27 UTC (rev 32457)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml 2011-06-29 19:21:38 UTC (rev 32458)
@@ -2799,278 +2799,278 @@
SCOPE="project" URI="http://richfaces.org/rich" add_taglib="true"
library-version="" model-entity="SharableGroupHTML">
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeModelAdaptor&gt;</code><br><code>&lt;/rich:treeModelAdaptor&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, leaf, nodes, rendered, rowKeyConverter</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeModelAdaptor&gt;</code><br><code>&lt;/rich:treeModelAdaptor&gt;</code><br><b>Attributes:</b><br><code>binding, id, leaf, nodes, rendered, rowKeyConverter</code>"
ENDTEXT="</treeModelAdaptor>" ICON="" NAME="treeModelAdaptor"
REFORMAT="yes" SCOPE="project" STARTTEXT="<treeModelAdaptor>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:toolbar&gt;</code><br><code>&lt;/rich:toolbar&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, height, id, itemClass, itemSeparator, itemStyle, onitemclick, onitemdblclick, onitemkeydown, onitemkeypress, onitemkeyup, onitemmousedown, onitemmousemove, onitemmouseout, onitemmouseover, onitemmouseup, rendered, style, styleClass, title, width</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:toolbar&gt;</code><br><code>&lt;/rich:toolbar&gt;</code><br><b>Attributes:</b><br><code>binding, height, id, itemClass, itemSeparator, itemStyle, onitemclick, onitemdblclick, onitemkeydown, onitemkeypress, onitemkeyup, onitemmousedown, onitemmousemove, onitemmouseout, onitemmouseover, onitemmouseup, rendered, style, styleClass, title, width</code>"
ENDTEXT="</toolbar>" ICON="" NAME="toolbar" REFORMAT="yes"
SCOPE="project" STARTTEXT="<toolbar>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tab&gt;</code><br><code>&lt;/rich:tab&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionListener, binding, bypassUpdates, contentClass, data, dir, disabled, execute, header, headerActiveClass, headerClass, headerDisabledClass, headerInactiveClass, headerStyle, id, immediate, lang, limitRender, name, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onenter, onheaderclick, onheaderdblclick, onheadermousedown, onheadermousemove, onheadermouseup, onleave, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, render, rendered, status, style, styleClass, switchType, title, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tab&gt;</code><br><code>&lt;/rich:tab&gt;</code><br><b>Attributes:</b><br><code>action, actionListener, binding, bypassUpdates, contentClass, data, dir, disabled, execute, header, headerActiveClass, headerClass, headerDisabledClass, headerInactiveClass, headerStyle, id, immediate, lang, limitRender, name, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onenter, onheaderclick, onheaderdblclick, onheadermousedown, onheadermousemove, onheadermouseup, onleave, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, render, rendered, status, style, styleClass, switchType, title, value</code>"
ENDTEXT="</tab>" ICON="" NAME="tab" REFORMAT="yes" SCOPE="project"
STARTTEXT="<tab>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inplaceInput&gt;</code><br><code>&lt;/rich:inplaceInput&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, changedStateClass, converter, converterMessage, defaultLabel, disabled, disabledStateClass, editClass, editEvent, editStateClass, id, immediate, inputWidth, noneClass, onblur, onchange, onclick, ondblclick, onfocus, oninputclick, oninputdblclick, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmouseover, oninputmouseup, oninputselect, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, readyStateClass, rendered, required, requiredMessage, saveOnBlur, showControls, style, styleClass, tabindex, title, validator, validatorMessage, value, valueChangeListener</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inplaceInput&gt;</code><br><code>&lt;/rich:inplaceInput&gt;</code><br><b>Attributes:</b><br><code>binding, changedStateClass, converter, converterMessage, defaultLabel, disabled, disabledStateClass, editClass, editEvent, editStateClass, id, immediate, inputWidth, noneClass, onblur, onchange, onclick, ondblclick, onfocus, oninputclick, oninputdblclick, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmouseover, oninputmouseup, oninputselect, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, readyStateClass, rendered, required, requiredMessage, saveOnBlur, showControls, style, styleClass, tabindex, title, validator, validatorMessage, value, valueChangeListener</code>"
ENDTEXT="</inplaceInput>" ICON="" NAME="inplaceInput" REFORMAT="yes"
SCOPE="project" STARTTEXT="<inplaceInput>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelMenuGroup&gt;</code><br><code>&lt;/rich:panelMenuGroup&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionListener, binding, bypassUpdates, changeExpandListener, collapseEvent, data, disabled, disabledClass, execute, expandEvent, expanded, hoverClass, id, immediate, label, leftCollapsedIcon, leftDisabledIcon, leftExpandedIcon, leftIconClass, limitRender, mode, name, onbeforecollapse, onbeforedomupdate, onbeforeexpand, onbeforeselect, onbeforeswitch, onbegin, onclick, oncollapse, oncomplete, ondblclick, onexpand, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, onswitch, onunselect, render, rendered, rightCollapsedIcon, rightDisabledIcon, rightExpandedIcon, rightIconClass, selectable, status, style, styleClass, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelMenuGroup&gt;</code><br><code>&lt;/rich:panelMenuGroup&gt;</code><br><b>Attributes:</b><br><code>action, actionListener, binding, bypassUpdates, changeExpandListener, collapseEvent, data, disabled, disabledClass, execute, expandEvent, expanded, hoverClass, id, immediate, label, leftCollapsedIcon, leftDisabledIcon, leftExpandedIcon, leftIconClass, limitRender, mode, name, onbeforecollapse, onbeforedomupdate, onbeforeexpand, onbeforeselect, onbeforeswitch, onbegin, onclick, oncollapse, oncomplete, ondblclick, onexpand, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, onswitch, onunselect, render, rendered, rightCollapsedIcon, rightDisabledIcon, rightExpandedIcon, rightIconClass, selectable, status, style, styleClass, value</code>"
ENDTEXT="</panelMenuGroup>" ICON="" NAME="panelMenuGroup"
REFORMAT="yes" SCOPE="project" STARTTEXT="<panelMenuGroup>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tree&gt;</code><br><code>&lt;/rich:tree&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, data, dir, execute, handleClass, iconClass, iconCollapsed, iconExpanded, iconLeaf, id, immediate, keepSaved, labelClass, lang, limitRender, nodeClass, nodeType, onbeforedomupdate, onbeforenodetoggle, onbeforeselectionchange, onbegin, onclick, oncomplete, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onnodetoggle, onselectionchange, render, rendered, rowKeyConverter, rowKeyVar, selection, selectionChangeListener, selectionType, stateVar, status, style, styleClass, title, toggleListener, toggleNodeEvent, toggleType, value, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tree&gt;</code><br><code>&lt;/rich:tree&gt;</code><br><b>Attributes:</b><br><code>binding, data, dir, execute, handleClass, iconClass, iconCollapsed, iconExpanded, iconLeaf, id, immediate, keepSaved, labelClass, lang, limitRender, nodeClass, nodeType, onbeforedomupdate, onbeforenodetoggle, onbeforeselectionchange, onbegin, onclick, oncomplete, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onnodetoggle, onselectionchange, render, rendered, rowKeyConverter, rowKeyVar, selection, selectionChangeListener, selectionType, stateVar, status, style, styleClass, title, toggleListener, toggleNodeEvent, toggleType, value, var</code>"
ENDTEXT="</tree>" ICON="" NAME="tree" REFORMAT="yes" SCOPE="project"
STARTTEXT="<tree>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:extendedDataTable&gt;</code><br><code>&lt;/rich:extendedDataTable&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, columnClasses, filterVar, first, footerClass, frozenColumns, headerClass, id, iterationStatusVar, keepSaved, noDataLabel, onbeforeselectionchange, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, onselectionchange, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, selection, selectionMode, sortMode, sortPriority, stateVar, style, styleClass, value, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:extendedDataTable&gt;</code><br><code>&lt;/rich:extendedDataTable&gt;</code><br><b>Attributes:</b><br><code>binding, columnClasses, filterVar, first, footerClass, frozenColumns, headerClass, id, iterationStatusVar, keepSaved, noDataLabel, onbeforeselectionchange, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, onselectionchange, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, selection, selectionMode, sortMode, sortPriority, stateVar, style, styleClass, value, var</code>"
ENDTEXT="</extendedDataTable>" ICON="" NAME="extendedDataTable"
REFORMAT="yes" SCOPE="project" STARTTEXT="<extendedDataTable>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dragSource&gt;</code><br><code>&lt;/rich:dragSource&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, dragIndicator, dragValue, id, rendered, type</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dragSource&gt;</code><br><code>&lt;/rich:dragSource&gt;</code><br><b>Attributes:</b><br><code>binding, dragIndicator, dragValue, id, rendered, type</code>"
ENDTEXT="</dragSource>" ICON="" NAME="dragSource" REFORMAT="yes"
SCOPE="project" STARTTEXT="<dragSource>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeToggleListener&gt;</code><br><code>&lt;/rich:treeToggleListener&gt;</code><br><b>Attributes:</b><br><code>declaration, for, binding, listener, type</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeToggleListener&gt;</code><br><code>&lt;/rich:treeToggleListener&gt;</code><br><b>Attributes:</b><br><code>for, binding, listener, type</code>"
ENDTEXT="</treeToggleListener>" ICON="" NAME="treeToggleListener"
REFORMAT="yes" SCOPE="project" STARTTEXT="<treeToggleListener>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeModelRecursiveAdaptor&gt;</code><br><code>&lt;/rich:treeModelRecursiveAdaptor&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, leaf, nodes, rendered, roots, rowKeyConverter</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeModelRecursiveAdaptor&gt;</code><br><code>&lt;/rich:treeModelRecursiveAdaptor&gt;</code><br><b>Attributes:</b><br><code>binding, id, leaf, nodes, rendered, roots, rowKeyConverter</code>"
ENDTEXT="</treeModelRecursiveAdaptor>" ICON=""
NAME="treeModelRecursiveAdaptor" REFORMAT="yes" SCOPE="project"
STARTTEXT="<treeModelRecursiveAdaptor>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelMenu&gt;</code><br><code>&lt;/rich:panelMenu&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, bubbleSelection, collapseEvent, converter, disabled, expandEvent, expandSingle, groupClass, groupCollapsedLeftIcon, groupCollapsedRightIcon, groupDisabledClass, groupDisabledLeftIcon, groupDisabledRightIcon, groupExpandedLeftIcon, groupExpandedRightIcon, groupMode, id, immediate, itemChangeListener, itemClass, itemDisabledClass, itemDisabledLeftIcon, itemDisabledRightIcon, itemLeftIcon, itemMode, itemRightIcon, onclick, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, topGroupClass, topGroupCollapsedLeftIcon, topGroupCollapsedRightIcon, topGroupDisabledClass, topGroupDisabledLeftIcon, topGroupDisabledRightIcon, topGroupExpandedLeftIcon, topGroupExpandedRightIcon, topItemClass, topItemDisabledClass, topIte!
mDisabledLeftIcon, topItemDisabledRightIcon, topItemLeftIcon, topItemRightIcon, value, width</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelMenu&gt;</code><br><code>&lt;/rich:panelMenu&gt;</code><br><b>Attributes:</b><br><code>binding, bubbleSelection, collapseEvent, converter, disabled, expandEvent, expandSingle, groupClass, groupCollapsedLeftIcon, groupCollapsedRightIcon, groupDisabledClass, groupDisabledLeftIcon, groupDisabledRightIcon, groupExpandedLeftIcon, groupExpandedRightIcon, groupMode, id, immediate, itemChangeListener, itemClass, itemDisabledClass, itemDisabledLeftIcon, itemDisabledRightIcon, itemLeftIcon, itemMode, itemRightIcon, onclick, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, topGroupClass, topGroupCollapsedLeftIcon, topGroupCollapsedRightIcon, topGroupDisabledClass, topGroupDisabledLeftIcon, topGroupDisabledRightIcon, topGroupExpandedLeftIcon, topGroupExpandedRightIcon, topItemClass, topItemDisabledClass, topItemDisabledLeft!
Icon, topItemDisabledRightIcon, topItemLeftIcon, topItemRightIcon, value, width</code>"
ENDTEXT="</panelMenu>" ICON="" NAME="panelMenu" REFORMAT="yes"
SCOPE="project" STARTTEXT="<panelMenu>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:accordion&gt;</code><br><code>&lt;/rich:accordion&gt;</code><br><b>Attributes:</b><br><code>declaration, activeItem, binding, converter, cycledSwitching, dir, height, id, immediate, itemActiveHeaderClass, itemActiveLeftIcon, itemActiveRightIcon, itemChangeListener, itemContentClass, itemDisabledHeaderClass, itemDisabledLeftIcon, itemDisabledRightIcon, itemHeaderClass, itemInactiveHeaderClass, itemInactiveLeftIcon, itemInactiveRightIcon, lang, onbeforeitemchange, onclick, ondblclick, onitemchange, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, title, width</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:accordion&gt;</code><br><code>&lt;/rich:accordion&gt;</code><br><b>Attributes:</b><br><code>activeItem, binding, converter, cycledSwitching, dir, height, id, immediate, itemActiveHeaderClass, itemActiveLeftIcon, itemActiveRightIcon, itemChangeListener, itemContentClass, itemDisabledHeaderClass, itemDisabledLeftIcon, itemDisabledRightIcon, itemHeaderClass, itemInactiveHeaderClass, itemInactiveLeftIcon, itemInactiveRightIcon, lang, onbeforeitemchange, onclick, ondblclick, onitemchange, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, title, width</code>"
ENDTEXT="</accordion>" ICON="" NAME="accordion" REFORMAT="yes"
SCOPE="project" STARTTEXT="<accordion>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:columnGroup&gt;</code><br><code>&lt;/rich:columnGroup&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:columnGroup&gt;</code><br><code>&lt;/rich:columnGroup&gt;</code><br><b>Attributes:</b><br><code>binding, id, rendered</code>"
ENDTEXT="</columnGroup>" ICON="" NAME="columnGroup" REFORMAT="yes"
SCOPE="project" STARTTEXT="<columnGroup>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:menuItem&gt;</code><br><code>&lt;/rich:menuItem&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionListener, binding, bypassUpdates, data, dir, disabled, execute, icon, iconDisabled, id, immediate, label, lang, limitRender, mode, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, render, rendered, status, style, styleClass, title</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:menuItem&gt;</code><br><code>&lt;/rich:menuItem&gt;</code><br><b>Attributes:</b><br><code>action, actionListener, binding, bypassUpdates, data, dir, disabled, execute, icon, iconDisabled, id, immediate, label, lang, limitRender, mode, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, render, rendered, status, style, styleClass, title</code>"
ENDTEXT="</menuItem>" ICON="" NAME="menuItem" REFORMAT="yes"
SCOPE="project" STARTTEXT="<menuItem>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:fileUpload&gt;</code><br><code>&lt;/rich:fileUpload&gt;</code><br><b>Attributes:</b><br><code>declaration, acceptedTypes, addLabel, binding, clearAllLabel, clearLabel, data, deleteLabel, dir, disabled, doneLabel, execute, fileUploadListener, id, lang, limitRender, noDuplicate, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onfilesubmit, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onuploadcomplete, render, rendered, serverErrorLabel, sizeExceededLabel, status, style, styleClass, title, uploadLabel</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:fileUpload&gt;</code><br><code>&lt;/rich:fileUpload&gt;</code><br><b>Attributes:</b><br><code>acceptedTypes, addLabel, binding, clearAllLabel, clearLabel, data, deleteLabel, dir, disabled, doneLabel, execute, fileUploadListener, id, lang, limitRender, noDuplicate, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onfilesubmit, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onuploadcomplete, render, rendered, serverErrorLabel, sizeExceededLabel, status, style, styleClass, title, uploadLabel</code>"
ENDTEXT="</fileUpload>" ICON="" NAME="fileUpload" REFORMAT="yes"
SCOPE="project" STARTTEXT="<fileUpload>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:select&gt;</code><br><code>&lt;/rich:select&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, converter, converterMessage, defaultLabel, disabled, enableManualInput, id, immediate, itemClass, listClass, listHeight, listWidth, maxListHeight, minListHeight, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onlistclick, onlistdblclick, onlistkeydown, onlistkeypress, onlistkeyup, onlistmousedown, onlistmousemove, onlistmouseout, onlistmouseover, onlistmouseup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselectitem, rendered, required, requiredMessage, selectFirst, selectItemClass, showButton, validator, validatorMessage, value, valueChangeListener</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:select&gt;</code><br><code>&lt;/rich:select&gt;</code><br><b>Attributes:</b><br><code>binding, converter, converterMessage, defaultLabel, disabled, enableManualInput, id, immediate, itemClass, listClass, listHeight, listWidth, maxListHeight, minListHeight, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onlistclick, onlistdblclick, onlistkeydown, onlistkeypress, onlistkeyup, onlistmousedown, onlistmousemove, onlistmouseout, onlistmouseover, onlistmouseup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselectitem, rendered, required, requiredMessage, selectFirst, selectItemClass, showButton, validator, validatorMessage, value, valueChangeListener</code>"
ENDTEXT="</select>" ICON="" NAME="select" REFORMAT="yes" SCOPE="project"
STARTTEXT="<select>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:togglePanelItem&gt;</code><br><code>&lt;/rich:togglePanelItem&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, converter, dir, id, lang, name, onclick, ondblclick, onenter, onleave, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, title, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:togglePanelItem&gt;</code><br><code>&lt;/rich:togglePanelItem&gt;</code><br><b>Attributes:</b><br><code>binding, converter, dir, id, lang, name, onclick, ondblclick, onenter, onleave, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, title, value</code>"
ENDTEXT="</togglePanelItem>" ICON="" NAME="togglePanelItem"
REFORMAT="yes" SCOPE="project" STARTTEXT="<togglePanelItem>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inputNumberSpinner&gt;</code><br><code>&lt;/rich:inputNumberSpinner&gt;</code><br><b>Attributes:</b><br><code>declaration, accesskey, binding, converter, converterMessage, cycled, dir, disabled, enableManualInput, id, immediate, inputClass, inputSize, label, lang, maxValue, minValue, onblur, onchange, onclick, ondblclick, ondownclick, onfocus, oninputclick, oninputdblclick, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmouseover, oninputmouseup, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, onupclick, readonly, rendered, required, requiredMessage, step, style, styleClass, tabindex, title, validator, validatorMessage, value, valueChangeListener</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inputNumberSpinner&gt;</code><br><code>&lt;/rich:inputNumberSpinner&gt;</code><br><b>Attributes:</b><br><code>accesskey, binding, converter, converterMessage, cycled, dir, disabled, enableManualInput, id, immediate, inputClass, inputSize, label, lang, maxValue, minValue, onblur, onchange, onclick, ondblclick, ondownclick, onfocus, oninputclick, oninputdblclick, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmouseover, oninputmouseup, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, onupclick, readonly, rendered, required, requiredMessage, step, style, styleClass, tabindex, title, validator, validatorMessage, value, valueChangeListener</code>"
ENDTEXT="</inputNumberSpinner>" ICON="" NAME="inputNumberSpinner"
REFORMAT="yes" SCOPE="project" STARTTEXT="<inputNumberSpinner>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dropDownMenu&gt;</code><br><code>&lt;/rich:dropDownMenu&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, dir, direction, disabled, hideDelay, horizontalOffset, id, jointPoint, lang, mode, onclick, ondblclick, ongrouphide, ongroupshow, onhide, onitemclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onshow, popupWidth, rendered, showDelay, showEvent, style, styleClass, title, verticalOffset</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dropDownMenu&gt;</code><br><code>&lt;/rich:dropDownMenu&gt;</code><br><b>Attributes:</b><br><code>binding, dir, direction, disabled, hideDelay, horizontalOffset, id, jointPoint, lang, mode, onclick, ondblclick, ongrouphide, ongroupshow, onhide, onitemclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onshow, popupWidth, rendered, showDelay, showEvent, style, styleClass, title, verticalOffset</code>"
ENDTEXT="</dropDownMenu>" ICON="" NAME="dropDownMenu" REFORMAT="yes"
SCOPE="project" STARTTEXT="<dropDownMenu>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dataScroller&gt;</code><br><code>&lt;/rich:dataScroller&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, boundaryControls, fastControls, fastStep, for, id, lastPageMode, maxPages, page, renderIfSinglePage, rendered, stepControls</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dataScroller&gt;</code><br><code>&lt;/rich:dataScroller&gt;</code><br><b>Attributes:</b><br><code>binding, boundaryControls, fastControls, fastStep, for, id, lastPageMode, maxPages, page, renderIfSinglePage, rendered, stepControls</code>"
ENDTEXT="</dataScroller>" ICON="" NAME="dataScroller" REFORMAT="yes"
SCOPE="project" STARTTEXT="<dataScroller>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:itemChangeListener&gt;</code><br><code>&lt;/rich:itemChangeListener&gt;</code><br><b>Attributes:</b><br><code>declaration, for, binding, listener, type</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:itemChangeListener&gt;</code><br><code>&lt;/rich:itemChangeListener&gt;</code><br><b>Attributes:</b><br><code>for, binding, listener, type</code>"
ENDTEXT="</itemChangeListener>" ICON="" NAME="itemChangeListener"
REFORMAT="yes" SCOPE="project" STARTTEXT="<itemChangeListener>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeSelectionChangeListener&gt;</code><br><code>&lt;/rich:treeSelectionChangeListener&gt;</code><br><b>Attributes:</b><br><code>declaration, for, binding, listener, type</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeSelectionChangeListener&gt;</code><br><code>&lt;/rich:treeSelectionChangeListener&gt;</code><br><b>Attributes:</b><br><code>for, binding, listener, type</code>"
ENDTEXT="</treeSelectionChangeListener>" ICON=""
NAME="treeSelectionChangeListener" REFORMAT="yes" SCOPE="project"
STARTTEXT="<treeSelectionChangeListener>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:popupPanel&gt;</code><br><code>&lt;/rich:popupPanel&gt;</code><br><b>Attributes:</b><br><code>declaration, autosized, binding, controlsClass, domElementAttachment, followByScroll, header, headerClass, height, id, keepVisualState, left, maxHeight, maxWidth, minHeight, minWidth, modal, moveable, onbeforehide, onbeforeshow, onhide, onmaskclick, onmaskcontextmenu, onmaskdblclick, onmaskmousedown, onmaskmousemove, onmaskmouseout, onmaskmouseover, onmaskmouseup, onmove, onresize, onshow, overlapEmbedObjects, rendered, resizeable, shadowDepth, shadowOpacity, show, style, styleClass, top, trimOverlayedElements, visualOptions, width, zindex</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:popupPanel&gt;</code><br><code>&lt;/rich:popupPanel&gt;</code><br><b>Attributes:</b><br><code>autosized, binding, controlsClass, domElementAttachment, followByScroll, header, headerClass, height, id, keepVisualState, left, maxHeight, maxWidth, minHeight, minWidth, modal, moveable, onbeforehide, onbeforeshow, onhide, onmaskclick, onmaskcontextmenu, onmaskdblclick, onmaskmousedown, onmaskmousemove, onmaskmouseout, onmaskmouseover, onmaskmouseup, onmove, onresize, onshow, overlapEmbedObjects, rendered, resizeable, shadowDepth, shadowOpacity, show, style, styleClass, top, trimOverlayedElements, visualOptions, width, zindex</code>"
ENDTEXT="</popupPanel>" ICON="" NAME="popupPanel" REFORMAT="yes"
SCOPE="project" STARTTEXT="<popupPanel>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:componentControl&gt;</code><br><code>&lt;/rich:componentControl&gt;</code><br><b>Attributes:</b><br><code>declaration, onbeforeoperation, operation, selector, target</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:componentControl&gt;</code><br><code>&lt;/rich:componentControl&gt;</code><br><b>Attributes:</b><br><code>onbeforeoperation, operation, selector, target</code>"
ENDTEXT="</componentControl>" ICON="" NAME="componentControl"
REFORMAT="yes" SCOPE="project" STARTTEXT="<componentControl>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:toolbarGroup&gt;</code><br><code>&lt;/rich:toolbarGroup&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, itemClass, itemSeparator, itemStyle, location, onitemclick, onitemdblclick, onitemkeydown, onitemkeypress, onitemkeyup, onitemmousedown, onitemmousemove, onitemmouseout, onitemmouseover, onitemmouseup, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:toolbarGroup&gt;</code><br><code>&lt;/rich:toolbarGroup&gt;</code><br><b>Attributes:</b><br><code>binding, id, itemClass, itemSeparator, itemStyle, location, onitemclick, onitemdblclick, onitemkeydown, onitemkeypress, onitemkeyup, onitemmousedown, onitemmousemove, onitemmouseout, onitemmouseover, onitemmouseup, rendered</code>"
ENDTEXT="</toolbarGroup>" ICON="" NAME="toolbarGroup" REFORMAT="yes"
SCOPE="project" STARTTEXT="<toolbarGroup>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dragIndicator&gt;</code><br><code>&lt;/rich:dragIndicator&gt;</code><br><b>Attributes:</b><br><code>declaration, acceptClass, binding, draggingClass, id, rejectClass, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dragIndicator&gt;</code><br><code>&lt;/rich:dragIndicator&gt;</code><br><b>Attributes:</b><br><code>acceptClass, binding, draggingClass, id, rejectClass, rendered</code>"
ENDTEXT="</dragIndicator>" ICON="" NAME="dragIndicator"
REFORMAT="yes" SCOPE="project" STARTTEXT="<dragIndicator>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:column&gt;</code><br><code>&lt;/rich:column&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, breakRowBefore, colspan, comparator, filter, filterExpression, filterValue, footerClass, headerClass, id, rendered, rowspan, sortBy, sortOrder, style, styleClass, width</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:column&gt;</code><br><code>&lt;/rich:column&gt;</code><br><b>Attributes:</b><br><code>binding, breakRowBefore, colspan, comparator, filter, filterExpression, filterValue, footerClass, headerClass, id, rendered, rowspan, sortBy, sortOrder, style, styleClass, width</code>"
ENDTEXT="</column>" ICON="" NAME="column" REFORMAT="yes" SCOPE="project"
STARTTEXT="<column>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:jQuery&gt;</code><br><code>&lt;/rich:jQuery&gt;</code><br><b>Attributes:</b><br><code>declaration, attachType, binding, event, id, name, query, rendered, selector, timing</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:jQuery&gt;</code><br><code>&lt;/rich:jQuery&gt;</code><br><b>Attributes:</b><br><code>attachType, binding, event, id, name, query, rendered, selector, timing</code>"
ENDTEXT="</jQuery>" ICON="" NAME="jQuery" REFORMAT="yes" SCOPE="project"
STARTTEXT="<jQuery>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tabPanel&gt;</code><br><code>&lt;/rich:tabPanel&gt;</code><br><b>Attributes:</b><br><code>declaration, activeItem, binding, converter, cycledSwitching, dir, headerAlignment, headerPosition, id, immediate, itemChangeListener, lang, onbeforeitemchange, onclick, ondblclick, onitemchange, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, tabActiveHeaderClass, tabContentClass, tabDisabledHeaderClass, tabHeaderClass, tabInactiveHeaderClass, title</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tabPanel&gt;</code><br><code>&lt;/rich:tabPanel&gt;</code><br><b>Attributes:</b><br><code>activeItem, binding, converter, cycledSwitching, dir, headerAlignment, headerPosition, id, immediate, itemChangeListener, lang, onbeforeitemchange, onclick, ondblclick, onitemchange, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, tabActiveHeaderClass, tabContentClass, tabDisabledHeaderClass, tabHeaderClass, tabInactiveHeaderClass, title</code>"
ENDTEXT="</tabPanel>" ICON="" NAME="tabPanel" REFORMAT="yes"
SCOPE="project" STARTTEXT="<tabPanel>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panel&gt;</code><br><code>&lt;/rich:panel&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, bodyClass, header, headerClass, id, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, title</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panel&gt;</code><br><code>&lt;/rich:panel&gt;</code><br><b>Attributes:</b><br><code>binding, bodyClass, header, headerClass, id, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, title</code>"
ENDTEXT="</panel>" ICON="" NAME="panel" REFORMAT="yes" SCOPE="project"
STARTTEXT="<panel>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:collapsiblePanel&gt;</code><br><code>&lt;/rich:collapsiblePanel&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, bodyClass, converter, dir, expanded, header, headerClass, id, immediate, lang, leftCollapsedIcon, leftExpandedIcon, onbeforeswitch, onclick, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onswitch, rendered, rightCollapsedIcon, rightExpandedIcon, style, styleClass, switchType, title, toggleListener, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:collapsiblePanel&gt;</code><br><code>&lt;/rich:collapsiblePanel&gt;</code><br><b>Attributes:</b><br><code>binding, bodyClass, converter, dir, expanded, header, headerClass, id, immediate, lang, leftCollapsedIcon, leftExpandedIcon, onbeforeswitch, onclick, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onswitch, rendered, rightCollapsedIcon, rightExpandedIcon, style, styleClass, switchType, title, toggleListener, value</code>"
ENDTEXT="</collapsiblePanel>" ICON="" NAME="collapsiblePanel"
REFORMAT="yes" SCOPE="project" STARTTEXT="<collapsiblePanel>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:menuSeparator&gt;</code><br><code>&lt;/rich:menuSeparator&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:menuSeparator&gt;</code><br><code>&lt;/rich:menuSeparator&gt;</code><br><b>Attributes:</b><br><code>binding, id, rendered</code>"
ENDTEXT="</menuSeparator>" ICON="" NAME="menuSeparator"
REFORMAT="yes" SCOPE="project" STARTTEXT="<menuSeparator>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:validator&gt;</code><br><code>&lt;/rich:validator&gt;</code><br><b>Attributes:</b><br><code>declaration, data, disabled, immediate, onbeforedomupdate, onbeforesubmit, onbegin, oncomplete, onerror, queueId, status</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:validator&gt;</code><br><code>&lt;/rich:validator&gt;</code><br><b>Attributes:</b><br><code>data, disabled, immediate, onbeforedomupdate, onbeforesubmit, onbegin, oncomplete, onerror, queueId, status</code>"
ENDTEXT="</validator>" ICON="" NAME="validator" REFORMAT="yes"
SCOPE="project" STARTTEXT="<validator>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:accordionItem&gt;</code><br><code>&lt;/rich:accordionItem&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, contentClass, converter, dir, disabled, header, headerActiveClass, headerClass, headerDisabledClass, headerInactiveClass, headerStyle, id, lang, leftActiveIcon, leftDisabledIcon, leftInactiveIcon, name, onclick, ondblclick, onenter, onheaderclick, onheaderdblclick, onheadermousedown, onheadermousemove, onheadermouseup, onleave, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, rightActiveIcon, rightDisabledIcon, rightInactiveIcon, style, styleClass, switchType, title, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:accordionItem&gt;</code><br><code>&lt;/rich:accordionItem&gt;</code><br><b>Attributes:</b><br><code>binding, contentClass, converter, dir, disabled, header, headerActiveClass, headerClass, headerDisabledClass, headerInactiveClass, headerStyle, id, lang, leftActiveIcon, leftDisabledIcon, leftInactiveIcon, name, onclick, ondblclick, onenter, onheaderclick, onheaderdblclick, onheadermousedown, onheadermousemove, onheadermouseup, onleave, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, rightActiveIcon, rightDisabledIcon, rightInactiveIcon, style, styleClass, switchType, title, value</code>"
ENDTEXT="</accordionItem>" ICON="" NAME="accordionItem"
REFORMAT="yes" SCOPE="project" STARTTEXT="<accordionItem>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:messages&gt;</code><br><code>&lt;/rich:messages&gt;</code><br><b>Attributes:</b><br><code>declaration, ajaxRendered, attributes, binding, childCount, children, dir, facets, family, for, globalOnly, id, keepTransient, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, parent, rendered, rendererType, rendersChildren, showDetail, showSummary, style, styleClass, title</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:messages&gt;</code><br><code>&lt;/rich:messages&gt;</code><br><b>Attributes:</b><br><code>ajaxRendered, attributes, binding, childCount, children, dir, facets, family, for, globalOnly, id, keepTransient, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, parent, rendered, rendererType, rendersChildren, showDetail, showSummary, style, styleClass, title</code>"
ENDTEXT="</messages>" ICON="" NAME="messages" REFORMAT="yes"
SCOPE="project" STARTTEXT="<messages>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:collapsibleSubTableToggler&gt;</code><br><code>&lt;/rich:collapsibleSubTableToggler&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, collapsedIcon, collapsedLabel, event, expandedIcon, expandedLabel, for, id, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:collapsibleSubTableToggler&gt;</code><br><code>&lt;/rich:collapsibleSubTableToggler&gt;</code><br><b>Attributes:</b><br><code>binding, collapsedIcon, collapsedLabel, event, expandedIcon, expandedLabel, for, id, rendered</code>"
ENDTEXT="</collapsibleSubTableToggler>" ICON=""
NAME="collapsibleSubTableToggler" REFORMAT="yes" SCOPE="project"
STARTTEXT="<collapsibleSubTableToggler>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:togglePanel&gt;</code><br><code>&lt;/rich:togglePanel&gt;</code><br><b>Attributes:</b><br><code>declaration, activeItem, binding, converter, cycledSwitching, dir, id, immediate, itemChangeListener, lang, onbeforeitemchange, onclick, ondblclick, onitemchange, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, title</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:togglePanel&gt;</code><br><code>&lt;/rich:togglePanel&gt;</code><br><b>Attributes:</b><br><code>activeItem, binding, converter, cycledSwitching, dir, id, immediate, itemChangeListener, lang, onbeforeitemchange, onclick, ondblclick, onitemchange, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, switchType, title</code>"
ENDTEXT="</togglePanel>" ICON="" NAME="togglePanel" REFORMAT="yes"
SCOPE="project" STARTTEXT="<togglePanel>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelMenuItem&gt;</code><br><code>&lt;/rich:panelMenuItem&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionListener, binding, bypassUpdates, data, disabled, disabledClass, execute, id, immediate, label, leftDisabledIcon, leftIcon, leftIconClass, limitRender, mode, name, onbeforedomupdate, onbeforeselect, onbegin, onclick, oncomplete, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, onunselect, render, rendered, rightDisabledIcon, rightIcon, rightIconClass, selectable, status, style, styleClass, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelMenuItem&gt;</code><br><code>&lt;/rich:panelMenuItem&gt;</code><br><b>Attributes:</b><br><code>action, actionListener, binding, bypassUpdates, data, disabled, disabledClass, execute, id, immediate, label, leftDisabledIcon, leftIcon, leftIconClass, limitRender, mode, name, onbeforedomupdate, onbeforeselect, onbegin, onclick, oncomplete, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, onunselect, render, rendered, rightDisabledIcon, rightIcon, rightIconClass, selectable, status, style, styleClass, value</code>"
ENDTEXT="</panelMenuItem>" ICON="" NAME="panelMenuItem"
REFORMAT="yes" SCOPE="project" STARTTEXT="<panelMenuItem>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:progressBar&gt;</code><br><code>&lt;/rich:progressBar&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, data, enabled, finishClass, id, initialClass, interval, label, maxValue, minValue, mode, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onfinish, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, progressClass, remainingClass, rendered, style, styleClass, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:progressBar&gt;</code><br><code>&lt;/rich:progressBar&gt;</code><br><b>Attributes:</b><br><code>binding, data, enabled, finishClass, id, initialClass, interval, label, maxValue, minValue, mode, onbeforedomupdate, onbegin, onclick, oncomplete, ondblclick, onfinish, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, progressClass, remainingClass, rendered, style, styleClass, value</code>"
ENDTEXT="</progressBar>" ICON="" NAME="progressBar" REFORMAT="yes"
SCOPE="project" STARTTEXT="<progressBar>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inplaceSelect&gt;</code><br><code>&lt;/rich:inplaceSelect&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, changedStateClass, converter, converterMessage, defaultLabel, disabled, disabledStateClass, editClass, editEvent, editStateClass, id, immediate, inputWidth, itemClass, listClass, listHeight, listWidth, noneClass, onblur, onchange, onclick, ondblclick, onfocus, oninputclick, oninputdblclick, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmouseover, oninputmouseup, oninputselect, onkeydown, onkeypress, onkeyup, onlistclick, onlistdblclick, onlistkeydown, onlistkeypress, onlistkeyup, onlistmousedown, onlistmousemove, onlistmouseout, onlistmouseover, onlistmouseup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselectitem, openOnEdit, readyStateClass, rendered, required, require!
dMessage, saveOnBlur, saveOnSelect, selectItemClass, showControls, style, styleClass, tabindex, title, validator, validatorMessage, value, valueChangeListener</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inplaceSelect&gt;</code><br><code>&lt;/rich:inplaceSelect&gt;</code><br><b>Attributes:</b><br><code>binding, changedStateClass, converter, converterMessage, defaultLabel, disabled, disabledStateClass, editClass, editEvent, editStateClass, id, immediate, inputWidth, itemClass, listClass, listHeight, listWidth, noneClass, onblur, onchange, onclick, ondblclick, onfocus, oninputclick, oninputdblclick, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmouseover, oninputmouseup, oninputselect, onkeydown, onkeypress, onkeyup, onlistclick, onlistdblclick, onlistkeydown, onlistkeypress, onlistkeyup, onlistmousedown, onlistmousemove, onlistmouseout, onlistmouseover, onlistmouseup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselectitem, openOnEdit, readyStateClass, rendered, required, requiredMessage, sav!
eOnBlur, saveOnSelect, selectItemClass, showControls, style, styleClass, tabindex, title, validator, validatorMessage, value, valueChangeListener</code>"
ENDTEXT="</inplaceSelect>" ICON="" NAME="inplaceSelect"
REFORMAT="yes" SCOPE="project" STARTTEXT="<inplaceSelect>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inputNumberSlider&gt;</code><br><code>&lt;/rich:inputNumberSlider&gt;</code><br><b>Attributes:</b><br><code>declaration, accesskey, binding, converter, converterMessage, decreaseClass, decreaseSelectedClass, delay, dir, disabled, enableManualInput, handleClass, handleSelectedClass, id, immediate, increaseClass, increaseSelectedClass, inputClass, inputPosition, inputSize, label, lang, maxValue, maxlength, minValue, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, rendered, required, requiredMessage, showArrows, showBoundaryValues, showInput, showTooltip, step, style, styleClass, tabindex, title, tooltipClass, trackClass, validator, validatorMessage, value, valueChangeListener</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inputNumberSlider&gt;</code><br><code>&lt;/rich:inputNumberSlider&gt;</code><br><b>Attributes:</b><br><code>accesskey, binding, converter, converterMessage, decreaseClass, decreaseSelectedClass, delay, dir, disabled, enableManualInput, handleClass, handleSelectedClass, id, immediate, increaseClass, increaseSelectedClass, inputClass, inputPosition, inputSize, label, lang, maxValue, maxlength, minValue, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, rendered, required, requiredMessage, showArrows, showBoundaryValues, showInput, showTooltip, step, style, styleClass, tabindex, title, tooltipClass, trackClass, validator, validatorMessage, value, valueChangeListener</code>"
ENDTEXT="</inputNumberSlider>" ICON="" NAME="inputNumberSlider"
REFORMAT="yes" SCOPE="project" STARTTEXT="<inputNumberSlider>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dropTarget&gt;</code><br><code>&lt;/rich:dropTarget&gt;</code><br><b>Attributes:</b><br><code>declaration, acceptedTypes, binding, bypassUpdates, data, dropValue, execute, id, immediate, limitRender, onbeforedomupdate, onbegin, oncomplete, rendered, status</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dropTarget&gt;</code><br><code>&lt;/rich:dropTarget&gt;</code><br><b>Attributes:</b><br><code>acceptedTypes, binding, bypassUpdates, data, dropValue, execute, id, immediate, limitRender, onbeforedomupdate, onbegin, oncomplete, rendered, status</code>"
ENDTEXT="</dropTarget>" ICON="" NAME="dropTarget" REFORMAT="yes"
SCOPE="project" STARTTEXT="<dropTarget>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:collapsibleSubTable&gt;</code><br><code>&lt;/rich:collapsibleSubTable&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, columnClasses, expandMode, expanded, filterVar, first, footerClass, headerClass, id, iterationStatusVar, keepSaved, noDataLabel, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, sortMode, sortPriority, stateVar, style, value, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:collapsibleSubTable&gt;</code><br><code>&lt;/rich:collapsibleSubTable&gt;</code><br><b>Attributes:</b><br><code>binding, columnClasses, expandMode, expanded, filterVar, first, footerClass, headerClass, id, iterationStatusVar, keepSaved, noDataLabel, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, sortMode, sortPriority, stateVar, style, value, var</code>"
ENDTEXT="</collapsibleSubTable>" ICON="" NAME="collapsibleSubTable"
REFORMAT="yes" SCOPE="project" STARTTEXT="<collapsibleSubTable>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:menuGroup&gt;</code><br><code>&lt;/rich:menuGroup&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, converter, dir, direction, disabled, horizontalOffset, icon, iconDisabled, id, jointPoint, label, lang, onclick, ondblclick, onhide, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onshow, rendered, style, styleClass, title, verticalOffset</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:menuGroup&gt;</code><br><code>&lt;/rich:menuGroup&gt;</code><br><b>Attributes:</b><br><code>binding, converter, dir, direction, disabled, horizontalOffset, icon, iconDisabled, id, jointPoint, label, lang, onclick, ondblclick, onhide, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onshow, rendered, style, styleClass, title, verticalOffset</code>"
ENDTEXT="</menuGroup>" ICON="" NAME="menuGroup" REFORMAT="yes"
SCOPE="project" STARTTEXT="<menuGroup>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:calendar&gt;</code><br><code>&lt;/rich:calendar&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, boundaryDatesMode, buttonClass, buttonDisabledIcon, buttonIcon, buttonLabel, converter, converterMessage, currentDate, dataModel, datePattern, dayClassFunction, dayDisableFunction, defaultLabel, defaultTime, direction, disabled, enableManualInput, firstWeekDay, hidePopupOnScroll, horizontalOffset, id, immediate, inputClass, inputSize, inputStyle, jointPoint, locale, minDaysInFirstWeek, mode, monthLabels, monthLabelsShort, onbeforecurrentdateselect, onbeforedateselect, onbeforetimeselect, onchange, onclean, oncomplete, oncurrentdateselect, ondatemouseout, ondatemouseover, ondateselect, onhide, oninputblur, oninputchange, oninputclick, oninputdblclick, oninputfocus, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseou!
t, oninputmouseover, oninputmouseup, oninputselect, onshow, ontimeselect, popup, preloadDateRangeBegin, preloadDateRangeEnd, rendered, required, requiredMessage, resetTimeOnDateSelect, showApplyButton, showFooter, showHeader, showInput, showWeekDaysBar, showWeeksBar, style, tabindex, timeZone, todayControlMode, validator, validatorMessage, value, valueChangeListener, verticalOffset, weekDayLabels, weekDayLabelsShort, zindex</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:calendar&gt;</code><br><code>&lt;/rich:calendar&gt;</code><br><b>Attributes:</b><br><code>binding, boundaryDatesMode, buttonClass, buttonDisabledIcon, buttonIcon, buttonLabel, converter, converterMessage, currentDate, dataModel, datePattern, dayClassFunction, dayDisableFunction, defaultLabel, defaultTime, direction, disabled, enableManualInput, firstWeekDay, hidePopupOnScroll, horizontalOffset, id, immediate, inputClass, inputSize, inputStyle, jointPoint, locale, minDaysInFirstWeek, mode, monthLabels, monthLabelsShort, onbeforecurrentdateselect, onbeforedateselect, onbeforetimeselect, onchange, onclean, oncomplete, oncurrentdateselect, ondatemouseout, ondatemouseover, ondateselect, onhide, oninputblur, oninputchange, oninputclick, oninputdblclick, oninputfocus, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmou!
seover, oninputmouseup, oninputselect, onshow, ontimeselect, popup, preloadDateRangeBegin, preloadDateRangeEnd, rendered, required, requiredMessage, resetTimeOnDateSelect, showApplyButton, showFooter, showHeader, showInput, showWeekDaysBar, showWeeksBar, style, tabindex, timeZone, todayControlMode, validator, validatorMessage, value, valueChangeListener, verticalOffset, weekDayLabels, weekDayLabelsShort, zindex</code>"
ENDTEXT="</calendar>" ICON="" NAME="calendar" REFORMAT="yes"
SCOPE="project" STARTTEXT="<calendar>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dataTable&gt;</code><br><code>&lt;/rich:dataTable&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, captionClass, columnClasses, filterVar, first, footerClass, headerClass, id, iterationStatusVar, keepSaved, noDataLabel, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, sortMode, sortPriority, stateVar, style, styleClass, value, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dataTable&gt;</code><br><code>&lt;/rich:dataTable&gt;</code><br><b>Attributes:</b><br><code>binding, captionClass, columnClasses, filterVar, first, footerClass, headerClass, id, iterationStatusVar, keepSaved, noDataLabel, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, sortMode, sortPriority, stateVar, style, styleClass, value, var</code>"
ENDTEXT="</dataTable>" ICON="" NAME="dataTable" REFORMAT="yes"
SCOPE="project" STARTTEXT="<dataTable>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:toggleControl&gt;</code><br><code>&lt;/rich:toggleControl&gt;</code><br><b>Attributes:</b><br><code>declaration, disableDefault, event, targetItem, targetPanel</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:toggleControl&gt;</code><br><code>&lt;/rich:toggleControl&gt;</code><br><b>Attributes:</b><br><code>disableDefault, event, targetItem, targetPanel</code>"
ENDTEXT="</toggleControl>" ICON="" NAME="toggleControl"
REFORMAT="yes" SCOPE="project" STARTTEXT="<toggleControl>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:list&gt;</code><br><code>&lt;/rich:list&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, dir, first, id, iterationStatusVar, keepSaved, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, stateVar, style, styleClass, title, type, value, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:list&gt;</code><br><code>&lt;/rich:list&gt;</code><br><b>Attributes:</b><br><code>binding, dir, first, id, iterationStatusVar, keepSaved, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onrowclick, onrowdblclick, onrowkeydown, onrowkeypress, onrowkeyup, onrowmousedown, onrowmousemove, onrowmouseout, onrowmouseover, onrowmouseup, rendered, rowClass, rowClasses, rowKeyConverter, rowKeyVar, rows, stateVar, style, styleClass, title, type, value, var</code>"
ENDTEXT="</list>" ICON="" NAME="list" REFORMAT="yes" SCOPE="project"
STARTTEXT="<list>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:autocomplete&gt;</code><br><code>&lt;/rich:autocomplete&gt;</code><br><b>Attributes:</b><br><code>declaration, autocompleteList, autocompleteMethod, autofill, binding, clientFilterFunction, converter, converterMessage, disabled, fetchValue, filterFunction, id, immediate, inputClass, layout, minChars, mode, onbeforedomupdate, onbegin, onblur, onchange, onclick, oncomplete, ondblclick, onerror, onfocus, onkeydown, onkeypress, onkeyup, onlistclick, onlistdblclick, onlistkeydown, onlistkeypress, onlistkeyup, onlistmousedown, onlistmousemove, onlistmouseout, onlistmouseover, onlistmouseup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselectitem, popupClass, rendered, required, requiredMessage, selectFirst, selectedItemClass, showButton, tokens, validator, validatorMessage, value, valueChangeListener, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:autocomplete&gt;</code><br><code>&lt;/rich:autocomplete&gt;</code><br><b>Attributes:</b><br><code>autocompleteList, autocompleteMethod, autofill, binding, clientFilterFunction, converter, converterMessage, disabled, fetchValue, filterFunction, id, immediate, inputClass, layout, minChars, mode, onbeforedomupdate, onbegin, onblur, onchange, onclick, oncomplete, ondblclick, onerror, onfocus, onkeydown, onkeypress, onkeyup, onlistclick, onlistdblclick, onlistkeydown, onlistkeypress, onlistkeyup, onlistmousedown, onlistmousemove, onlistmouseout, onlistmouseover, onlistmouseup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselectitem, popupClass, rendered, required, requiredMessage, selectFirst, selectedItemClass, showButton, tokens, validator, validatorMessage, value, valueChangeListener, var</code>"
ENDTEXT="</autocomplete>" ICON="" NAME="autocomplete" REFORMAT="yes"
SCOPE="project" STARTTEXT="<autocomplete>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelToggleListener&gt;</code><br><code>&lt;/rich:panelToggleListener&gt;</code><br><b>Attributes:</b><br><code>declaration, for, binding, listener, type</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:panelToggleListener&gt;</code><br><code>&lt;/rich:panelToggleListener&gt;</code><br><b>Attributes:</b><br><code>for, binding, listener, type</code>"
ENDTEXT="</panelToggleListener>" ICON="" NAME="panelToggleListener"
REFORMAT="yes" SCOPE="project" STARTTEXT="<panelToggleListener>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:graphValidator&gt;</code><br><code>&lt;/rich:graphValidator&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, groups, id, rendered, summary, type, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:graphValidator&gt;</code><br><code>&lt;/rich:graphValidator&gt;</code><br><b>Attributes:</b><br><code>binding, groups, id, rendered, summary, type, value</code>"
ENDTEXT="</graphValidator>" ICON="" NAME="graphValidator"
REFORMAT="yes" SCOPE="project" STARTTEXT="<graphValidator>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:message&gt;</code><br><code>&lt;/rich:message&gt;</code><br><b>Attributes:</b><br><code>declaration, ajaxRendered, attributes, binding, childCount, children, dir, facets, family, for, id, keepTransient, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, parent, rendered, rendererType, rendersChildren, showDetail, showSummary, style, styleClass, title</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:message&gt;</code><br><code>&lt;/rich:message&gt;</code><br><b>Attributes:</b><br><code>ajaxRendered, attributes, binding, childCount, children, dir, facets, family, for, id, keepTransient, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, parent, rendered, rendererType, rendersChildren, showDetail, showSummary, style, styleClass, title</code>"
ENDTEXT="</message>" ICON="" NAME="message" REFORMAT="yes"
SCOPE="project" STARTTEXT="<message>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:hashParam&gt;</code><br><code>&lt;/rich:hashParam&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, name, rendered, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:hashParam&gt;</code><br><code>&lt;/rich:hashParam&gt;</code><br><b>Attributes:</b><br><code>binding, id, name, rendered, value</code>"
ENDTEXT="</hashParam>" ICON="" NAME="hashParam" REFORMAT="yes"
SCOPE="project" STARTTEXT="<hashParam>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dataGrid&gt;</code><br><code>&lt;/rich:dataGrid&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, columns, elements, first, id, iterationStatusVar, keepSaved, rendered, rowKeyConverter, rowKeyVar, stateVar, style, styleClass, title, value, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:dataGrid&gt;</code><br><code>&lt;/rich:dataGrid&gt;</code><br><b>Attributes:</b><br><code>binding, columns, elements, first, id, iterationStatusVar, keepSaved, rendered, rowKeyConverter, rowKeyVar, stateVar, style, styleClass, title, value, var</code>"
ENDTEXT="</dataGrid>" ICON="" NAME="dataGrid" REFORMAT="yes"
SCOPE="project" STARTTEXT="<dataGrid>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeNode&gt;</code><br><code>&lt;/rich:treeNode&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, dir, expanded, handleClass, iconClass, iconCollapsed, iconExpanded, iconLeaf, id, immediate, labelClass, lang, onbeforetoggle, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, ontoggle, rendered, style, styleClass, title, toggleListener, type</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeNode&gt;</code><br><code>&lt;/rich:treeNode&gt;</code><br><b>Attributes:</b><br><code>binding, dir, expanded, handleClass, iconClass, iconCollapsed, iconExpanded, iconLeaf, id, immediate, labelClass, lang, onbeforetoggle, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, ontoggle, rendered, style, styleClass, title, toggleListener, type</code>"
ENDTEXT="</treeNode>" ICON="" NAME="treeNode" REFORMAT="yes"
SCOPE="project" STARTTEXT="<treeNode>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tooltip&gt;</code><br><code>&lt;/rich:tooltip&gt;</code><br><b>Attributes:</b><br><code>declaration, attached, binding, converter, data, dir, direction, followMouse, hideDelay, hideEvent, horizontalOffset, id, jointPoint, lang, layout, limitRender, mode, onbeforedomupdate, onbeforehide, onbeforeshow, onbegin, onclick, oncomplete, ondblclick, onhide, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onshow, render, rendered, showDelay, showEvent, status, style, styleClass, title, value, verticalOffset, zindex</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tooltip&gt;</code><br><code>&lt;/rich:tooltip&gt;</code><br><b>Attributes:</b><br><code>attached, binding, converter, data, dir, direction, followMouse, hideDelay, hideEvent, horizontalOffset, id, jointPoint, lang, layout, limitRender, mode, onbeforedomupdate, onbeforehide, onbeforeshow, onbegin, onclick, oncomplete, ondblclick, onhide, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onshow, render, rendered, showDelay, showEvent, status, style, styleClass, title, value, verticalOffset, zindex</code>"
ENDTEXT="</tooltip>" ICON="" NAME="tooltip" REFORMAT="yes"
SCOPE="project" STARTTEXT="<tooltip>" large-icon=""
model-entity="SharableMacroHTML" />
@@ -3486,7 +3486,7 @@
SCOPE="project" URI="http://richfaces.org/a4j" add_taglib="true"
library-version="" model-entity="SharableGroupHTML">
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:region&gt;</code><br><code>&lt;/a4j:region&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:region&gt;</code><br><code>&lt;/a4j:region&gt;</code><br><b>Attributes:</b><br><code>binding, id, rendered</code>"
ENDTEXT="</region>" ICON="" NAME="region" REFORMAT="yes" SCOPE="project"
STARTTEXT="<region>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
@@ -3495,19 +3495,19 @@
REFORMAT="yes" SCOPE="project" STARTTEXT="<actionListener>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:panel&gt;</code><br><code>&lt;/a4j:panel&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:panel&gt;</code><br><code>&lt;/a4j:panel&gt;</code><br><b>Attributes:</b><br><code>binding, id, rendered</code>"
ENDTEXT="</panel>" ICON="" NAME="panel" REFORMAT="yes" SCOPE="project"
STARTTEXT="<panel>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:queue&gt;</code><br><code>&lt;/a4j:queue&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, ignoreDupResponses, name, onbeforedomupdate, oncomplete, onerror, onevent, onrequestdequeue, onrequestqueue, onsubmit, rendered, requestDelay, status, timeout</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:queue&gt;</code><br><code>&lt;/a4j:queue&gt;</code><br><b>Attributes:</b><br><code>binding, id, ignoreDupResponses, name, onbeforedomupdate, oncomplete, onerror, onevent, onrequestdequeue, onrequestqueue, onsubmit, rendered, requestDelay, status, timeout</code>"
ENDTEXT="</queue>" ICON="" NAME="queue" REFORMAT="yes" SCOPE="project"
STARTTEXT="<queue>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:status&gt;</code><br><code>&lt;/a4j:status&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, converter, id, onerror, onstart, onstop, onsuccess, rendered, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:status&gt;</code><br><code>&lt;/a4j:status&gt;</code><br><b>Attributes:</b><br><code>binding, converter, id, onerror, onstart, onstop, onsuccess, rendered, value</code>"
ENDTEXT="</status>" ICON="" NAME="status" REFORMAT="yes" SCOPE="project"
STARTTEXT="<status>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:param&gt;</code><br><code>&lt;/a4j:param&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, name, rendered, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:param&gt;</code><br><code>&lt;/a4j:param&gt;</code><br><b>Attributes:</b><br><code>binding, id, name, rendered, value</code>"
ENDTEXT="</param>" ICON="" NAME="param" REFORMAT="yes" SCOPE="project"
STARTTEXT="<param>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
@@ -3517,48 +3517,48 @@
STARTTEXT="<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>\\n|"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:commandLink&gt;</code><br><code>&lt;/a4j:commandLink&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionExpression, actionListener, binding, id, immediate, limitRender, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:commandLink&gt;</code><br><code>&lt;/a4j:commandLink&gt;</code><br><b>Attributes:</b><br><code>action, actionExpression, actionListener, binding, id, immediate, limitRender, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, value</code>"
ENDTEXT="</commandLink>" ICON="" NAME="commandLink" REFORMAT="yes"
SCOPE="project" STARTTEXT="<commandLink>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:repeat&gt;</code><br><code>&lt;/a4j:repeat&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:repeat&gt;</code><br><code>&lt;/a4j:repeat&gt;</code><br><b>Attributes:</b><br><code>binding, id, rendered</code>"
ENDTEXT="</repeat>" ICON="" NAME="repeat" REFORMAT="yes" SCOPE="project"
STARTTEXT="<repeat>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:commandButton&gt;</code><br><code>&lt;/a4j:commandButton&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionExpression, actionListener, binding, id, immediate, limitRender, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:commandButton&gt;</code><br><code>&lt;/a4j:commandButton&gt;</code><br><b>Attributes:</b><br><code>action, actionExpression, actionListener, binding, id, immediate, limitRender, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, value</code>"
ENDTEXT="</commandButton>" ICON="" NAME="commandButton"
REFORMAT="yes" SCOPE="project" STARTTEXT="<commandButton>"
large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:log&gt;</code><br><code>&lt;/a4j:log&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, level, mode, rendered, style, styleClass</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:log&gt;</code><br><code>&lt;/a4j:log&gt;</code><br><b>Attributes:</b><br><code>binding, id, level, mode, rendered, style, styleClass</code>"
ENDTEXT="</log>" ICON="" NAME="log" REFORMAT="yes" SCOPE="project"
STARTTEXT="<log>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:push&gt;</code><br><code>&lt;/a4j:push&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionExpression, actionListener, binding, enabled, eventProducer, id, immediate, interval, onbeforedomupdate, onbegin, oncomplete, ondataavailable, rendered, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:push&gt;</code><br><code>&lt;/a4j:push&gt;</code><br><b>Attributes:</b><br><code>action, actionExpression, actionListener, binding, enabled, eventProducer, id, immediate, interval, onbeforedomupdate, onbegin, oncomplete, ondataavailable, rendered, value</code>"
ENDTEXT="</push>" ICON="" NAME="push" REFORMAT="yes" SCOPE="project"
STARTTEXT="<push>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:jsFunction&gt;</code><br><code>&lt;/a4j:jsFunction&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionExpression, actionListener, binding, execute, id, immediate, limitRender, onbeforedomupdate, onbegin, oncomplete, render, rendered, status, value, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:jsFunction&gt;</code><br><code>&lt;/a4j:jsFunction&gt;</code><br><b>Attributes:</b><br><code>action, actionExpression, actionListener, binding, execute, id, immediate, limitRender, onbeforedomupdate, onbegin, oncomplete, render, rendered, status, value, </code>"
ENDTEXT="</jsFunction>" ICON="" NAME="jsFunction" REFORMAT="yes"
SCOPE="project" STARTTEXT="<jsFunction>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:popupPanel&gt;</code><br><code>&lt;/a4j:popupPanel&gt;</code><br><b>Attributes:</b><br><code>declaration, autosized, binding, controlsClass, domElementAttachment, followByScroll, header, headerClass, height, id, keepVisualState, left, maxHeight, maxWidth, minHeight, minWidth, modal, moveable, onbeforehide, onbeforeshow, onhide, onmaskclick, onmaskcontextmenu, onmaskdblclick, onmaskmousedown, onmaskmousemove, onmaskmouseout, onmaskmouseover, onmaskmouseup, onmove, onresize, onshow, overlapEmbedObjects, rendered, resizeable, shadowDepth, shadowOpacity, show, top, trimOverlayedElements, visualOptions, width, zIndex</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:popupPanel&gt;</code><br><code>&lt;/a4j:popupPanel&gt;</code><br><b>Attributes:</b><br><code>autosized, binding, controlsClass, domElementAttachment, followByScroll, header, headerClass, height, id, keepVisualState, left, maxHeight, maxWidth, minHeight, minWidth, modal, moveable, onbeforehide, onbeforeshow, onhide, onmaskclick, onmaskcontextmenu, onmaskdblclick, onmaskmousedown, onmaskmousemove, onmaskmouseout, onmaskmouseover, onmaskmouseup, onmove, onresize, onshow, overlapEmbedObjects, rendered, resizeable, shadowDepth, shadowOpacity, show, top, trimOverlayedElements, visualOptions, width, zIndex</code>"
ENDTEXT="</popupPanel>" ICON="" NAME="popupPanel" REFORMAT="yes"
SCOPE="project" STARTTEXT="<popupPanel>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:mediaOutput&gt;</code><br><code>&lt;/a4j:mediaOutput&gt;</code><br><b>Attributes:</b><br><code>declaration, accesskey, align, archive, binding, border, cacheable, charset, classid, codebase, codetype, converter, coords, createContent, declare, dir, element, expires, hreflang, hspace, id, ismap, lang, lastModified, mimeType, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rendered, rev, shape, standby, style, styleClass, tabindex, target, title, type, uriAttribute, usemap, value, vspace</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:mediaOutput&gt;</code><br><code>&lt;/a4j:mediaOutput&gt;</code><br><b>Attributes:</b><br><code>accesskey, align, archive, binding, border, cacheable, charset, classid, codebase, codetype, converter, coords, createContent, declare, dir, element, expires, hreflang, hspace, id, ismap, lang, lastModified, mimeType, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rendered, rev, shape, standby, style, styleClass, tabindex, target, title, type, uriAttribute, usemap, value, vspace</code>"
ENDTEXT="</mediaOutput>" ICON="" NAME="mediaOutput" REFORMAT="yes"
SCOPE="project" STARTTEXT="<mediaOutput>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:poll&gt;</code><br><code>&lt;/a4j:poll&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionExpression, actionListener, binding, enabled, id, immediate, interval, onbeforedomupdate, onbegin, oncomplete, ontimer, rendered, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:poll&gt;</code><br><code>&lt;/a4j:poll&gt;</code><br><b>Attributes:</b><br><code>action, actionExpression, actionListener, binding, enabled, id, immediate, interval, onbeforedomupdate, onbegin, oncomplete, ontimer, rendered, value</code>"
ENDTEXT="</poll>" ICON="" NAME="poll" REFORMAT="yes" SCOPE="project"
STARTTEXT="<poll>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:progressBar&gt;</code><br><code>&lt;/a4j:progressBar&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, completeClass, data, enabled, finishClass, focus, id, initialClass, interval, label, maxValue, minValue, mode, onbeforedomupdate, onclick, oncomplete, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onsubmit, parameters, reRenderAfterComplete, remainClass, rendered, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:progressBar&gt;</code><br><code>&lt;/a4j:progressBar&gt;</code><br><b>Attributes:</b><br><code>binding, completeClass, data, enabled, finishClass, focus, id, initialClass, interval, label, maxValue, minValue, mode, onbeforedomupdate, onclick, oncomplete, ondblclick, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onsubmit, parameters, reRenderAfterComplete, remainClass, rendered, value</code>"
ENDTEXT="</progressBar>" ICON="" NAME="progressBar" REFORMAT="yes"
SCOPE="project" STARTTEXT="<progressBar>" large-icon=""
model-entity="SharableMacroHTML" />
@@ -3567,12 +3567,12 @@
ENDTEXT="</ajax>" ICON="" NAME="ajax" REFORMAT="yes" SCOPE="project"
STARTTEXT="<ajax>" large-icon="" model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:outputPanel&gt;</code><br><code>&lt;/a4j:outputPanel&gt;</code><br><b>Attributes:</b><br><code>declaration, ajaxRendered, binding, dir, id, keepTransient, lang, layout, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, title</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:outputPanel&gt;</code><br><code>&lt;/a4j:outputPanel&gt;</code><br><b>Attributes:</b><br><code>ajaxRendered, binding, dir, id, keepTransient, lang, layout, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styleClass, title</code>"
ENDTEXT="</outputPanel>" ICON="" NAME="outputPanel" REFORMAT="yes"
SCOPE="project" STARTTEXT="<outputPanel>" large-icon=""
model-entity="SharableMacroHTML" />
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:attachQueue&gt;</code><br><code>&lt;/a4j:attachQueue&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, ignoreDupResponses, name, onrequestdequeue, onrequestqueue, rendered, requestDelay, requestGroupingId, timeout</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;a4j:attachQueue&gt;</code><br><code>&lt;/a4j:attachQueue&gt;</code><br><b>Attributes:</b><br><code>binding, id, ignoreDupResponses, name, onrequestdequeue, onrequestqueue, rendered, requestDelay, requestGroupingId, timeout</code>"
ENDTEXT="</attachQueue>" ICON="" NAME="attachQueue" REFORMAT="yes"
SCOPE="project" STARTTEXT="<attachQueue>" large-icon=""
model-entity="SharableMacroHTML" />
@@ -4266,11 +4266,11 @@
URI="http://java.sun.com/jsf/html" add_taglib="true"
library-version="" model-entity="SharableGroupHTML">
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:body&gt;</code><br><code>&lt;/h:body&gt;</code><br><b>Attributes:</b><br><code>declaration, dir, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onload, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onunload, style, styleClass, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:body&gt;</code><br><code>&lt;/h:body&gt;</code><br><b>Attributes:</b><br><code>dir, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onload, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onunload, style, styleClass, title, binding</code>"
ENDTEXT="</body>" ICON="" NAME="body" REFORMAT="yes"
SCOPE="project" STARTTEXT="<body>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputLabel&gt;</code><br><code>&lt;/h:outputLabel&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, id, rendered, value, accesskey, dir, escape, for, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputLabel&gt;</code><br><code>&lt;/h:outputLabel&gt;</code><br><b>Attributes:</b><br><code>converter, id, rendered, value, accesskey, dir, escape, for, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</outputLabel>" ICON="%Icons%/JSF Core/write"
NAME="outputLabel" REFORMAT="yes" SCOPE="project"
STARTTEXT="<outputLabel>" large-icon="" model-entity="SharableMacroHTML"/>
@@ -4281,142 +4281,142 @@
STARTTEXT="<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>\\n|"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputHidden&gt;</code><br><code>&lt;/h:inputHidden&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputHidden&gt;</code><br><code>&lt;/h:inputHidden&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, binding</code>"
ENDTEXT="</inputHidden>" ICON="%Icons%/Struts HTML/hidden"
NAME="inputHidden" REFORMAT="yes" SCOPE="project"
STARTTEXT="<inputHidden>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:link&gt;</code><br><code>&lt;/h:link&gt;</code><br><b>Attributes:</b><br><code>declaration, id, includeViewParams, outcome, rendered, value, accesskey, charset, coords, dir, disabled, fragment, hreflang, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rev, shape, style, styleClass, tabindex, target, title, type, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:link&gt;</code><br><code>&lt;/h:link&gt;</code><br><b>Attributes:</b><br><code>id, includeViewParams, outcome, rendered, value, accesskey, charset, coords, dir, disabled, fragment, hreflang, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rev, shape, style, styleClass, tabindex, target, title, type, binding</code>"
ENDTEXT="</link>" ICON="%Icons%/Struts HTML/link" NAME="link"
REFORMAT="yes" SCOPE="project" STARTTEXT="<link>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:graphicImage&gt;</code><br><code>&lt;/h:graphicImage&gt;</code><br><b>Attributes:</b><br><code>declaration, id, rendered, url, value, alt, dir, height, ismap, lang, library, longdesc, name, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, style, styleClass, title, usemap, width, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:graphicImage&gt;</code><br><code>&lt;/h:graphicImage&gt;</code><br><b>Attributes:</b><br><code>id, rendered, url, value, alt, dir, height, ismap, lang, library, longdesc, name, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, style, styleClass, title, usemap, width, binding</code>"
ENDTEXT="</graphicImage>" ICON="%Icons%/Struts HTML/img"
NAME="graphicImage" REFORMAT="yes" SCOPE="project"
STARTTEXT="<graphicImage>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectOneListbox&gt;</code><br><code>&lt;/h:selectOneListbox&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, size, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectOneListbox&gt;</code><br><code>&lt;/h:selectOneListbox&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, size, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</selectOneListbox>" ICON="%Icons%/Struts HTML/select"
NAME="selectOneListbox" REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectOneListbox>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:commandLink&gt;</code><br><code>&lt;/h:commandLink&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionListener, id, immediate, rendered, value, accesskey, charset, coords, dir, disabled, hreflang, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rev, shape, style, styleClass, tabindex, target, title, type, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:commandLink&gt;</code><br><code>&lt;/h:commandLink&gt;</code><br><b>Attributes:</b><br><code>action, actionListener, id, immediate, rendered, value, accesskey, charset, coords, dir, disabled, hreflang, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rev, shape, style, styleClass, tabindex, target, title, type, binding</code>"
ENDTEXT="</commandLink>" ICON="%Icons%/Struts HTML/link"
NAME="commandLink" REFORMAT="yes" SCOPE="project"
STARTTEXT="<commandLink>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputTextarea&gt;</code><br><code>&lt;/h:inputTextarea&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, cols, dir, disabled, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, rows, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputTextarea&gt;</code><br><code>&lt;/h:inputTextarea&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, cols, dir, disabled, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, rows, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</inputTextarea>" ICON="%Icons%/Struts HTML/textarea"
NAME="inputTextarea" REFORMAT="yes" SCOPE="project"
STARTTEXT="<inputTextarea>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:commandButton&gt;</code><br><code>&lt;/h:commandButton&gt;</code><br><b>Attributes:</b><br><code>declaration, action, actionListener, id, immediate, rendered, value, accesskey, alt, dir, disabled, image, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, type, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:commandButton&gt;</code><br><code>&lt;/h:commandButton&gt;</code><br><b>Attributes:</b><br><code>action, actionListener, id, immediate, rendered, value, accesskey, alt, dir, disabled, image, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, type, binding</code>"
ENDTEXT="</commandButton>" ICON="%Icons%/Struts HTML/button"
NAME="commandButton" REFORMAT="yes" SCOPE="project"
STARTTEXT="<commandButton>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:messages&gt;</code><br><code>&lt;/h:messages&gt;</code><br><b>Attributes:</b><br><code>declaration, for, globalOnly, id, rendered, showDetail, showSummary, dir, errorClass, errorStyle, fatalClass, fatalStyle, infoClass, infoStyle, lang, layout, style, styleClass, title, tooltip, warnClass, warnStyle, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:messages&gt;</code><br><code>&lt;/h:messages&gt;</code><br><b>Attributes:</b><br><code>for, globalOnly, id, rendered, showDetail, showSummary, dir, errorClass, errorStyle, fatalClass, fatalStyle, infoClass, infoStyle, lang, layout, style, styleClass, title, tooltip, warnClass, warnStyle, binding</code>"
ENDTEXT="</messages>" ICON="%Icons%/Struts Logic/messages"
NAME="messages" REFORMAT="yes" SCOPE="project"
STARTTEXT="<messages>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectBooleanCheckbox&gt;</code><br><code>&lt;/h:selectBooleanCheckbox&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, dir, disabled, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectBooleanCheckbox&gt;</code><br><code>&lt;/h:selectBooleanCheckbox&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, dir, disabled, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</selectBooleanCheckbox>"
ICON="%Icons%/Struts HTML/checkbox" NAME="selectBooleanCheckbox"
REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectBooleanCheckbox>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectManyMenu&gt;</code><br><code>&lt;/h:selectManyMenu&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, collectionType, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectManyMenu&gt;</code><br><code>&lt;/h:selectManyMenu&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, collectionType, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</selectManyMenu>" ICON="%Icons%/Struts HTML/select"
NAME="selectManyMenu" REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectManyMenu>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputText&gt;</code><br><code>&lt;/h:outputText&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, id, rendered, value, dir, escape, lang, style, styleClass, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputText&gt;</code><br><code>&lt;/h:outputText&gt;</code><br><b>Attributes:</b><br><code>converter, id, rendered, value, dir, escape, lang, style, styleClass, title, binding</code>"
ENDTEXT="</outputText>" ICON="%Icons%/JSF Core/write"
NAME="outputText" REFORMAT="yes" SCOPE="project"
STARTTEXT="<outputText>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:button&gt;</code><br><code>&lt;/h:button&gt;</code><br><b>Attributes:</b><br><code>declaration, id, includeViewParams, outcome, rendered, value, accesskey, alt, dir, fragment, image, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:button&gt;</code><br><code>&lt;/h:button&gt;</code><br><b>Attributes:</b><br><code>id, includeViewParams, outcome, rendered, value, accesskey, alt, dir, fragment, image, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</button>" ICON="" NAME="button" REFORMAT="yes"
SCOPE="project" STARTTEXT="<button>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputScript&gt;</code><br><code>&lt;/h:outputScript&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, id, rendered, value, library, name, target, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputScript&gt;</code><br><code>&lt;/h:outputScript&gt;</code><br><b>Attributes:</b><br><code>converter, id, rendered, value, library, name, target, binding</code>"
ENDTEXT="</outputScript>" ICON="" NAME="outputScript"
REFORMAT="yes" SCOPE="project" STARTTEXT="<outputScript>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputSecret&gt;</code><br><code>&lt;/h:inputSecret&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, alt, autocomplete, dir, disabled, label, lang, maxlength, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, redisplay, size, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputSecret&gt;</code><br><code>&lt;/h:inputSecret&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, alt, autocomplete, dir, disabled, label, lang, maxlength, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, redisplay, size, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</inputSecret>" ICON="%Icons%/Struts HTML/password"
NAME="inputSecret" REFORMAT="yes" SCOPE="project"
STARTTEXT="<inputSecret>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:head&gt;</code><br><code>&lt;/h:head&gt;</code><br><b>Attributes:</b><br><code>declaration, dir, lang, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:head&gt;</code><br><code>&lt;/h:head&gt;</code><br><b>Attributes:</b><br><code>dir, lang, binding</code>"
ENDTEXT="</head>" ICON="" NAME="head" REFORMAT="yes"
SCOPE="project" STARTTEXT="<head>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectOneRadio&gt;</code><br><code>&lt;/h:selectOneRadio&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, border, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, layout, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectOneRadio&gt;</code><br><code>&lt;/h:selectOneRadio&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, border, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, layout, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</selectOneRadio>" ICON="%Icons%/Struts HTML/radio"
NAME="selectOneRadio" REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectOneRadio>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:dataTable&gt;</code><br><code>&lt;/h:dataTable&gt;</code><br><b>Attributes:</b><br><code>declaration, first, id, rendered, rows, value, var, bgcolor, bodyrows, border, captionClass, captionStyle, cellpadding, cellspacing, columnClasses, dir, footerClass, frame, headerClass, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rowClasses, rules, style, styleClass, summary, title, width, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:dataTable&gt;</code><br><code>&lt;/h:dataTable&gt;</code><br><b>Attributes:</b><br><code>first, id, rendered, rows, value, var, bgcolor, bodyrows, border, captionClass, captionStyle, cellpadding, cellspacing, columnClasses, dir, footerClass, frame, headerClass, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rowClasses, rules, style, styleClass, summary, title, width, binding</code>"
ENDTEXT="</dataTable>" ICON="%Icons%/Tables/table"
NAME="dataTable" REFORMAT="yes" SCOPE="project"
STARTTEXT="<dataTable>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:panelGrid&gt;</code><br><code>&lt;/h:panelGrid&gt;</code><br><b>Attributes:</b><br><code>declaration, id, rendered, bgcolor, bodyrows, border, captionClass, captionStyle, cellpadding, cellspacing, columnClasses, columns, dir, footerClass, frame, headerClass, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rowClasses, rules, style, styleClass, summary, title, width, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:panelGrid&gt;</code><br><code>&lt;/h:panelGrid&gt;</code><br><b>Attributes:</b><br><code>id, rendered, bgcolor, bodyrows, border, captionClass, captionStyle, cellpadding, cellspacing, columnClasses, columns, dir, footerClass, frame, headerClass, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rowClasses, rules, style, styleClass, summary, title, width, binding</code>"
ENDTEXT="</panelGrid>" ICON="%Icons%/Tables/table"
NAME="panelGrid" REFORMAT="yes" SCOPE="project"
STARTTEXT="<panelGrid>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:form&gt;</code><br><code>&lt;/h:form&gt;</code><br><b>Attributes:</b><br><code>declaration, id, prependId, rendered, accept, acceptcharset, dir, enctype, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onreset, onsubmit, style, styleClass, target, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:form&gt;</code><br><code>&lt;/h:form&gt;</code><br><b>Attributes:</b><br><code>id, prependId, rendered, accept, acceptcharset, dir, enctype, lang, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onreset, onsubmit, style, styleClass, target, title, binding</code>"
ENDTEXT="</form>" ICON="%Icons%/Struts HTML/form" NAME="form"
REFORMAT="yes" SCOPE="project" STARTTEXT="<form>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputStylesheet&gt;</code><br><code>&lt;/h:outputStylesheet&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, id, rendered, value, library, name, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputStylesheet&gt;</code><br><code>&lt;/h:outputStylesheet&gt;</code><br><b>Attributes:</b><br><code>converter, id, rendered, value, library, name, binding</code>"
ENDTEXT="</outputStylesheet>" ICON="" NAME="outputStylesheet"
REFORMAT="yes" SCOPE="project" STARTTEXT="<outputStylesheet>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputFormat&gt;</code><br><code>&lt;/h:outputFormat&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, id, rendered, value, dir, escape, lang, style, styleClass, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputFormat&gt;</code><br><code>&lt;/h:outputFormat&gt;</code><br><b>Attributes:</b><br><code>converter, id, rendered, value, dir, escape, lang, style, styleClass, title, binding</code>"
ENDTEXT="</outputFormat>" ICON="" NAME="outputFormat"
REFORMAT="yes" SCOPE="project" STARTTEXT="<outputFormat>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectOneMenu&gt;</code><br><code>&lt;/h:selectOneMenu&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectOneMenu&gt;</code><br><code>&lt;/h:selectOneMenu&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</selectOneMenu>" ICON="%Icons%/Struts HTML/select"
NAME="selectOneMenu" REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectOneMenu>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:message&gt;</code><br><code>&lt;/h:message&gt;</code><br><b>Attributes:</b><br><code>declaration, id, rendered, showDetail, showSummary, dir, errorClass, errorStyle, fatalClass, fatalStyle, infoClass, infoStyle, lang, style, styleClass, title, tooltip, warnClass, warnStyle, binding, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:message&gt;</code><br><code>&lt;/h:message&gt;</code><br><b>Attributes:</b><br><code>id, rendered, showDetail, showSummary, dir, errorClass, errorStyle, fatalClass, fatalStyle, infoClass, infoStyle, lang, style, styleClass, title, tooltip, warnClass, warnStyle, binding, </code>"
ENDTEXT="</message>" ICON="%Icons%/Struts Logic/messages"
NAME="message" REFORMAT="yes" SCOPE="project"
STARTTEXT="<message>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputText&gt;</code><br><code>&lt;/h:inputText&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, alt, autocomplete, dir, disabled, label, lang, maxlength, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, size, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:inputText&gt;</code><br><code>&lt;/h:inputText&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, alt, autocomplete, dir, disabled, label, lang, maxlength, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, size, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</inputText>" ICON="%Icons%/Struts HTML/text"
NAME="inputText" REFORMAT="yes" SCOPE="project"
STARTTEXT="<inputText>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:column&gt;</code><br><code>&lt;/h:column&gt;</code><br><b>Attributes:</b><br><code>declaration, rendered, binding, id, footerClass, headerClass, rowHeader</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:column&gt;</code><br><code>&lt;/h:column&gt;</code><br><b>Attributes:</b><br><code>rendered, binding, id, footerClass, headerClass, rowHeader</code>"
ENDTEXT="</column>" ICON="" NAME="column" REFORMAT="yes"
SCOPE="project" STARTTEXT="<column>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:panelGroup&gt;</code><br><code>&lt;/h:panelGroup&gt;</code><br><b>Attributes:</b><br><code>declaration, id, rendered, layout, style, styleClass, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:panelGroup&gt;</code><br><code>&lt;/h:panelGroup&gt;</code><br><b>Attributes:</b><br><code>id, rendered, layout, style, styleClass, binding</code>"
ENDTEXT="</panelGroup>" ICON="" NAME="panelGroup" REFORMAT="yes"
SCOPE="project" STARTTEXT="<panelGroup>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectManyListbox&gt;</code><br><code>&lt;/h:selectManyListbox&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, collectionType, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, size, style, styleClass, tabindex, title, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectManyListbox&gt;</code><br><code>&lt;/h:selectManyListbox&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, collectionType, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, size, style, styleClass, tabindex, title, binding</code>"
ENDTEXT="</selectManyListbox>" ICON="%Icons%/Struts HTML/select"
NAME="selectManyListbox" REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectManyListbox>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputLink&gt;</code><br><code>&lt;/h:outputLink&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, id, rendered, value, accesskey, charset, coords, dir, disabled, hreflang, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rev, shape, style, styleClass, tabindex, target, title, type, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:outputLink&gt;</code><br><code>&lt;/h:outputLink&gt;</code><br><b>Attributes:</b><br><code>converter, id, rendered, value, accesskey, charset, coords, dir, disabled, hreflang, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel, rev, shape, style, styleClass, tabindex, target, title, type, binding</code>"
ENDTEXT="</outputLink>" ICON="%Icons%/Common/a"
NAME="outputLink" REFORMAT="yes" SCOPE="project"
STARTTEXT="<outputLink>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectManyCheckbox&gt;</code><br><code>&lt;/h:selectManyCheckbox&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, border, collectionType, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, layout, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, selectedClass, style, styleClass, tabindex, title, unselectedClass, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;h:selectManyCheckbox&gt;</code><br><code>&lt;/h:selectManyCheckbox&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, immediate, rendered, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, accesskey, border, collectionType, dir, disabled, disabledClass, enabledClass, hideNoSelectionOption, label, lang, layout, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, selectedClass, style, styleClass, tabindex, title, unselectedClass, binding</code>"
ENDTEXT="</selectManyCheckbox>"
ICON="%Icons%/Struts HTML/multibox" NAME="selectManyCheckbox"
REFORMAT="yes" SCOPE="project" STARTTEXT="<selectManyCheckbox>"
@@ -4426,87 +4426,87 @@
SCOPE="project" URI="http://java.sun.com/jsf/core" add_taglib="true"
library-version="" model-entity="SharableGroupHTML">
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:actionListener&gt;</code><br><code>&lt;/f:actionListener&gt;</code><br><b>Attributes:</b><br><code>declaration, type, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:actionListener&gt;</code><br><code>&lt;/f:actionListener&gt;</code><br><b>Attributes:</b><br><code>type, binding, for</code>"
ENDTEXT="</actionListener>" ICON="" NAME="actionListener"
REFORMAT="yes" SCOPE="project" STARTTEXT="<actionListener>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:selectItem&gt;</code><br><code>&lt;/f:selectItem&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, itemDescription, itemDisabled, itemLabel, escapeItem, itemValue, value, noSelectionOption</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:selectItem&gt;</code><br><code>&lt;/f:selectItem&gt;</code><br><b>Attributes:</b><br><code>binding, id, itemDescription, itemDisabled, itemLabel, escapeItem, itemValue, value, noSelectionOption</code>"
ENDTEXT="</selectItem>" ICON="%Icons%/Struts HTML/option"
NAME="selectItem" REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectItem>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:facet&gt;</code><br><code>&lt;/f:facet&gt;</code><br><b>Attributes:</b><br><code>declaration, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:facet&gt;</code><br><code>&lt;/f:facet&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</facet>" ICON="" NAME="facet" REFORMAT="yes"
SCOPE="project" STARTTEXT="<facet>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateLongRange&gt;</code><br><code>&lt;/f:validateLongRange&gt;</code><br><b>Attributes:</b><br><code>declaration, disabled, maximum, minimum, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateLongRange&gt;</code><br><code>&lt;/f:validateLongRange&gt;</code><br><b>Attributes:</b><br><code>disabled, maximum, minimum, binding, for</code>"
ENDTEXT="</validateLongRange>" ICON="%Icons%/JSF Core/validator"
NAME="validateLongRange" REFORMAT="yes" SCOPE="project"
STARTTEXT="<validateLongRange>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:param&gt;</code><br><code>&lt;/f:param&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, name, value, disable</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:param&gt;</code><br><code>&lt;/f:param&gt;</code><br><b>Attributes:</b><br><code>binding, id, name, value, disable</code>"
ENDTEXT="</param>" ICON="%Icons%/Struts Bean/parameter"
NAME="param" REFORMAT="yes" SCOPE="project" STARTTEXT="<param>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:setPropertyActionListener&gt;</code><br><code>&lt;/f:setPropertyActionListener&gt;</code><br><b>Attributes:</b><br><code>declaration, for, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:setPropertyActionListener&gt;</code><br><code>&lt;/f:setPropertyActionListener&gt;</code><br><b>Attributes:</b><br><code>for, </code>"
ENDTEXT="</setPropertyActionListener>" ICON=""
NAME="setPropertyActionListener" REFORMAT="yes" SCOPE="project"
STARTTEXT="<setPropertyActionListener>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateRequired&gt;</code><br><code>&lt;/f:validateRequired&gt;</code><br><b>Attributes:</b><br><code>declaration, disabled, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateRequired&gt;</code><br><code>&lt;/f:validateRequired&gt;</code><br><b>Attributes:</b><br><code>disabled, binding, for</code>"
ENDTEXT="</validateRequired>" ICON="%Icons%/JSF Core/validator"
NAME="validateRequired" REFORMAT="yes" SCOPE="project"
STARTTEXT="<validateRequired>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validator&gt;</code><br><code>&lt;/f:validator&gt;</code><br><b>Attributes:</b><br><code>declaration, disabled, validatorId, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validator&gt;</code><br><code>&lt;/f:validator&gt;</code><br><b>Attributes:</b><br><code>disabled, validatorId, binding, for</code>"
ENDTEXT="</validator>" ICON="%Icons%/JSF Core/validator"
NAME="validator" REFORMAT="yes" SCOPE="project"
STARTTEXT="<validator>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:attribute&gt;</code><br><code>&lt;/f:attribute&gt;</code><br><b>Attributes:</b><br><code>declaration, name, value</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:attribute&gt;</code><br><code>&lt;/f:attribute&gt;</code><br><b>Attributes:</b><br><code>name, value</code>"
ENDTEXT="</attribute>" ICON="%Icons%/jstl/attr" NAME="attribute"
REFORMAT="yes" SCOPE="project" STARTTEXT="<attribute>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:viewParam&gt;</code><br><code>&lt;/f:viewParam&gt;</code><br><b>Attributes:</b><br><code>declaration, converter, converterMessage, id, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, maxlength, binding, for, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:viewParam&gt;</code><br><code>&lt;/f:viewParam&gt;</code><br><b>Attributes:</b><br><code>converter, converterMessage, id, required, requiredMessage, validator, validatorMessage, value, valueChangeListener, maxlength, binding, for, </code>"
ENDTEXT="</viewParam>" ICON="" NAME="viewParam" REFORMAT="yes"
SCOPE="project" STARTTEXT="<viewParam>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:valueChangeListener&gt;</code><br><code>&lt;/f:valueChangeListener&gt;</code><br><b>Attributes:</b><br><code>declaration, type, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:valueChangeListener&gt;</code><br><code>&lt;/f:valueChangeListener&gt;</code><br><b>Attributes:</b><br><code>type, binding, for</code>"
ENDTEXT="</valueChangeListener>" ICON=""
NAME="valueChangeListener" REFORMAT="yes" SCOPE="project"
STARTTEXT="<valueChangeListener>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateRegex&gt;</code><br><code>&lt;/f:validateRegex&gt;</code><br><b>Attributes:</b><br><code>declaration, disabled, binding, for, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateRegex&gt;</code><br><code>&lt;/f:validateRegex&gt;</code><br><b>Attributes:</b><br><code>disabled, binding, for, </code>"
ENDTEXT="</validateRegex>" ICON="%Icons%/JSF Core/validator"
NAME="validateRegex" REFORMAT="yes" SCOPE="project"
STARTTEXT="<validateRegex>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:subview&gt;</code><br><code>&lt;/f:subview&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, rendered, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:subview&gt;</code><br><code>&lt;/f:subview&gt;</code><br><b>Attributes:</b><br><code>binding, rendered, </code>"
ENDTEXT="</subview>" ICON="" NAME="subview" REFORMAT="yes"
SCOPE="project" STARTTEXT="<subview>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:event&gt;</code><br><code>&lt;/f:event&gt;</code><br><b>Attributes:</b><br><code>declaration, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:event&gt;</code><br><code>&lt;/f:event&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</event>" ICON="" NAME="event" REFORMAT="yes"
SCOPE="project" STARTTEXT="<event>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:converter&gt;</code><br><code>&lt;/f:converter&gt;</code><br><b>Attributes:</b><br><code>declaration, converterId, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:converter&gt;</code><br><code>&lt;/f:converter&gt;</code><br><b>Attributes:</b><br><code>converterId, binding, for</code>"
ENDTEXT="</converter>" ICON="%Icons%/JSF Core/converter"
NAME="converter" REFORMAT="yes" SCOPE="project"
STARTTEXT="<converter>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:ajax&gt;</code><br><code>&lt;/f:ajax&gt;</code><br><b>Attributes:</b><br><code>declaration, disabled, event, execute, immediate, listener, onevent, onerror, render</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:ajax&gt;</code><br><code>&lt;/f:ajax&gt;</code><br><b>Attributes:</b><br><code>disabled, event, execute, immediate, listener, onevent, onerror, render</code>"
ENDTEXT="</ajax>" ICON="" NAME="ajax" REFORMAT="yes"
SCOPE="project" STARTTEXT="<ajax>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:phaseListener&gt;</code><br><code>&lt;/f:phaseListener&gt;</code><br><b>Attributes:</b><br><code>declaration, type, binding</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:phaseListener&gt;</code><br><code>&lt;/f:phaseListener&gt;</code><br><b>Attributes:</b><br><code>type, binding</code>"
ENDTEXT="</phaseListener>" ICON="" NAME="phaseListener"
REFORMAT="yes" SCOPE="project" STARTTEXT="<phaseListener>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:selectItems&gt;</code><br><code>&lt;/f:selectItems&gt;</code><br><b>Attributes:</b><br><code>declaration, binding, id, value, var, itemValue, itemLabel, itemDescription, itemDisabled, itemLabelEscaped, noSelectionValue</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:selectItems&gt;</code><br><code>&lt;/f:selectItems&gt;</code><br><b>Attributes:</b><br><code>binding, id, value, var, itemValue, itemLabel, itemDescription, itemDisabled, itemLabelEscaped, noSelectionValue</code>"
ENDTEXT="</selectItems>" ICON="%Icons%/Struts HTML/options"
NAME="selectItems" REFORMAT="yes" SCOPE="project"
STARTTEXT="<selectItems>" large-icon="" model-entity="SharableMacroHTML"/>
@@ -4515,27 +4515,27 @@
ENDTEXT="</metadata>" ICON="" NAME="metadata" REFORMAT="yes"
SCOPE="project" STARTTEXT="<metadata>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateLength&gt;</code><br><code>&lt;/f:validateLength&gt;</code><br><b>Attributes:</b><br><code>declaration, disabled, maximum, minimum, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateLength&gt;</code><br><code>&lt;/f:validateLength&gt;</code><br><b>Attributes:</b><br><code>disabled, maximum, minimum, binding, for</code>"
ENDTEXT="</validateLength>" ICON="%Icons%/JSF Core/validator"
NAME="validateLength" REFORMAT="yes" SCOPE="project"
STARTTEXT="<validateLength>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:verbatim&gt;</code><br><code>&lt;/f:verbatim&gt;</code><br><b>Attributes:</b><br><code>declaration, escape, rendered</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:verbatim&gt;</code><br><code>&lt;/f:verbatim&gt;</code><br><b>Attributes:</b><br><code>escape, rendered</code>"
ENDTEXT="</verbatim>" ICON="" NAME="verbatim" REFORMAT="yes"
SCOPE="project" STARTTEXT="<verbatim>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:convertDateTime&gt;</code><br><code>&lt;/f:convertDateTime&gt;</code><br><b>Attributes:</b><br><code>declaration, dateStyle, locale, pattern, timeStyle, timeZone, type, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:convertDateTime&gt;</code><br><code>&lt;/f:convertDateTime&gt;</code><br><b>Attributes:</b><br><code>dateStyle, locale, pattern, timeStyle, timeZone, type, binding, for</code>"
ENDTEXT="</convertDateTime>"
ICON="%Icons%/JSF Core/convertDateTime" NAME="convertDateTime"
REFORMAT="yes" SCOPE="project" STARTTEXT="<convertDateTime>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:convertNumber&gt;</code><br><code>&lt;/f:convertNumber&gt;</code><br><b>Attributes:</b><br><code>declaration, currencyCode, currencySymbol, groupingUsed, integerOnly, locale, maxFractionDigits, maxIntegerDigits, minFractionDigits, minIntegerDigits, pattern, type, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:convertNumber&gt;</code><br><code>&lt;/f:convertNumber&gt;</code><br><b>Attributes:</b><br><code>currencyCode, currencySymbol, groupingUsed, integerOnly, locale, maxFractionDigits, maxIntegerDigits, minFractionDigits, minIntegerDigits, pattern, type, binding, for</code>"
ENDTEXT="</convertNumber>" ICON="%Icons%/JSF Core/convertNumber"
NAME="convertNumber" REFORMAT="yes" SCOPE="project"
STARTTEXT="<convertNumber>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateDoubleRange&gt;</code><br><code>&lt;/f:validateDoubleRange&gt;</code><br><b>Attributes:</b><br><code>declaration, disabled, maximum, minimum, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateDoubleRange&gt;</code><br><code>&lt;/f:validateDoubleRange&gt;</code><br><b>Attributes:</b><br><code>disabled, maximum, minimum, binding, for</code>"
ENDTEXT="</validateDoubleRange>"
ICON="%Icons%/JSF Core/validator" NAME="validateDoubleRange"
REFORMAT="yes" SCOPE="project" STARTTEXT="<validateDoubleRange>"
@@ -4547,17 +4547,17 @@
STARTTEXT="<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>\\n|"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:loadBundle&gt;</code><br><code>&lt;/f:loadBundle&gt;</code><br><b>Attributes:</b><br><code>declaration, basename, </code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:loadBundle&gt;</code><br><code>&lt;/f:loadBundle&gt;</code><br><b>Attributes:</b><br><code>basename, </code>"
ENDTEXT="</loadBundle>" ICON="%Icons%/JSF Core/bundle"
NAME="loadBundle" REFORMAT="yes" SCOPE="project"
STARTTEXT="<loadBundle>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateBean&gt;</code><br><code>&lt;/f:validateBean&gt;</code><br><b>Attributes:</b><br><code>declaration, validationGroups, disabled, binding, for</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:validateBean&gt;</code><br><code>&lt;/f:validateBean&gt;</code><br><b>Attributes:</b><br><code>validationGroups, disabled, binding, for</code>"
ENDTEXT="</validateBean>" ICON="%Icons%/JSF Core/validator"
NAME="validateBean" REFORMAT="yes" SCOPE="project"
STARTTEXT="<validateBean>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:view&gt;</code><br><code>&lt;/f:view&gt;</code><br><b>Attributes:</b><br><code>declaration, locale, renderKitId, contentType, encoding, beforePhase, afterPhase</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;f:view&gt;</code><br><code>&lt;/f:view&gt;</code><br><b>Attributes:</b><br><code>locale, renderKitId, contentType, encoding, beforePhase, afterPhase</code>"
ENDTEXT="</view>" ICON="" NAME="view" REFORMAT="yes"
SCOPE="project" STARTTEXT="<view>" large-icon="" model-entity="SharableMacroHTML"/>
</GroupHTML>
12 years, 10 months
- 1
- 0
JBoss Tools SVN: r32457 - in trunk/forge: plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-29 15:01:27 -0400 (Wed, 29 Jun 2011)
New Revision: 32457
Added:
trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/build.properties
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java
Log:
implemented forge preference initializer
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/build.properties 2011-06-29 17:24:30 UTC (rev 32456)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/build.properties 2011-06-29 19:01:27 UTC (rev 32457)
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.xml
Added: trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/plugin.xml 2011-06-29 19:01:27 UTC (rev 32457)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.core.runtime.preferences">
+ <initializer
+ class="org.jboss.tools.forge.core.preferences.ForgePreferenceInitializer">
+ </initializer>
+ </extension>
+
+</plugin>
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 17:24:30 UTC (rev 32456)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 19:01:27 UTC (rev 32457)
@@ -1,13 +1,14 @@
package org.jboss.tools.forge.core.preferences;
+import org.jboss.tools.forge.core.process.ForgeEmbeddedRuntime;
import org.jboss.tools.forge.core.process.ForgeRuntime;
public class ForgeInstallations {
-// private static final String PREF_FORGE_INSTALLATIONS = "installations";
+ static final String PREF_FORGE_INSTALLATIONS = "org.jboss.tools.forge.core.installations";
// private static List<ForgeRuntime> installations = null;
- private static ForgeRuntime defaultInstallation = null;
+ private static ForgeRuntime DEFAULT_INSTALLATION = null;
// public static ForgeRuntime[] getInstallations() {
// if (installations == null) {
@@ -17,10 +18,10 @@
// }
public static ForgeRuntime getDefault() {
-// if (installations == null) {
-// initializeInstallations();
-// }
- return defaultInstallation;
+ if (DEFAULT_INSTALLATION == null) {
+ initializeInstallations();
+ }
+ return DEFAULT_INSTALLATION;
}
// private static IEclipsePreferences getForgeCorePreferences() {
@@ -35,6 +36,10 @@
// }
+ private static void initializeInstallations() {
+ DEFAULT_INSTALLATION = ForgeEmbeddedRuntime.INSTANCE;
+ }
+
// private static void initializeInstallations() {
// String installPrefsXml = getForgeCorePreferences().get(PREF_FORGE_INSTALLATIONS, null);
// if (installPrefsXml == null || "".equals(installPrefsXml)) {
Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializer.java 2011-06-29 19:01:27 UTC (rev 32457)
@@ -0,0 +1,22 @@
+package org.jboss.tools.forge.core.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.jboss.tools.forge.core.ForgeCorePlugin;
+
+public class ForgePreferenceInitializer extends AbstractPreferenceInitializer {
+
+ static final String INITIAL_INSTALLATIONS_PREFERENCE =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+ "<forgeInstallations default=\"embedded\">" +
+ " <installation name=\"embedded\"/>" +
+ "</forgeInstallations>";
+
+ @Override
+ public void initializeDefaultPreferences() {
+ IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
+ preferences.put(ForgeInstallations.PREF_FORGE_INSTALLATIONS, INITIAL_INSTALLATIONS_PREFERENCE);
+ }
+
+}
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java 2011-06-29 17:24:30 UTC (rev 32456)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgeInstallationsTest.java 2011-06-29 19:01:27 UTC (rev 32457)
@@ -1,34 +1,15 @@
package org.jboss.tools.forge.core.preferences;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.forge.core.process.ForgeRuntime;
+import org.jboss.tools.forge.core.process.ForgeEmbeddedRuntime;
import org.junit.Test;
public class ForgeInstallationsTest {
- private static String defaultForgeLocation = null;
-
- static {
- try {
- defaultForgeLocation = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")).getAbsolutePath();
- } catch (IOException e) {
- // ignore
- }
-
- }
-
@Test
public void testGetDefault() {
- ForgeRuntime forgeRuntime = ForgeInstallations.getDefault();
- assertNotNull(forgeRuntime);
- assertEquals("embedded", forgeRuntime.getName());
- assertEquals(defaultForgeLocation, forgeRuntime.getLocation());
+ assertEquals(ForgeEmbeddedRuntime.INSTANCE, ForgeInstallations.getDefault());
}
-
+
}
Added: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java (rev 0)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/preferences/ForgePreferenceInitializerTest.java 2011-06-29 19:01:27 UTC (rev 32457)
@@ -0,0 +1,23 @@
+package org.jboss.tools.forge.core.preferences;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.jboss.tools.forge.core.ForgeCorePlugin;
+import org.junit.Test;
+
+public class ForgePreferenceInitializerTest {
+
+ @Test
+ public void testInitializeDefaultPreferences() {
+ IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
+ assertNull(preferences.get(ForgeInstallations.PREF_FORGE_INSTALLATIONS, null));
+ new ForgePreferenceInitializer().initializeDefaultPreferences();
+ assertEquals(
+ ForgePreferenceInitializer.INITIAL_INSTALLATIONS_PREFERENCE,
+ preferences.get(ForgeInstallations.PREF_FORGE_INSTALLATIONS, null));
+ }
+
+}
12 years, 10 months
- 1
- 0