January 2010 - jbosstools-commits

JBoss Tools SVN: r19889 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2010-01-22 11:59:41 -0500 (Fri, 22 Jan 2010) New Revision: 19889 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-2795, import path was changed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-01-22 16:42:56 UTC (rev 19888) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-01-22 16:59:41 UTC (rev 19889) @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; @@ -101,12 +102,40 @@ * Add path output and browse button */ final Text pathText = new Text(composite, SWT.BORDER); - pathText.setEditable(false); + pathText.setEditable(true); pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); pathText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { pathString = ((Text)e.getSource()).getText(); - setPageComplete(isPageComplete()); + IPath enteredPath = null; + /* + * Load templates if the path is valid + */ + if ((Path.ROOT.isValidPath(pathString)) + && (enteredPath = Path.fromOSString(pathString)).toFile().exists()) { + /* + * Load tags list from the specified location. + */ + tagsList = VpeTemplateManager.getInstance() + .getAnyTemplates(enteredPath); + /* + * Update table tags list based on the loaded file. + */ + updateTagsTable(); + /* + * Check if the page is complete. + */ + setPageComplete(isPageComplete()); + } else { + /* + * Reset taglist, show empty table + */ + if (tagsList != null) { + tagsList.clear(); + updateTagsTable(); + setPageComplete(isPageComplete()); + } + } } }); @@ -122,18 +151,6 @@ File file = new File(path); pathString = file.toString(); pathText.setText(pathString); - /* - * Load tags list from the specified location. - */ - tagsList = VpeTemplateManager.getInstance().getAnyTemplates(new Path(pathString)); - /* - * Update table tags list based on the loaded file. - */ - updateTagsTable(); - /* - * Check if the page is complete. - */ - setPageComplete(isPageComplete()); } } });

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19888 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-01-22 11:42:56 -0500 (Fri, 22 Jan 2010) New Revision: 19888 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/IParameter.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/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/ParametedType.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 Log: https://jira.jboss.org/jira/browse/JBIDE-3125 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -26,7 +26,7 @@ * * @return the required type of this injection point. */ - IType getType(); + IParametedType getType(); /** * Gets the required qualifiers of the injection point. 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -33,7 +33,7 @@ * * @return the declared type of this parameter. */ - IType getType(); + IParametedType getType(); /** * Returns the name of this parameter. 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -19,6 +19,7 @@ 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.core.ITypeDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory; @@ -63,8 +64,8 @@ setParent(classBean); } - public IType getType() { - return typeDeclaration == null ? null : typeDeclaration.getType(); + public IParametedType getType() { + return typeDeclaration; } public int getLength() { 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -17,12 +17,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.IMemberValuePair; +import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.cdi.core.CDIConstants; @@ -33,6 +36,7 @@ import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IObserverMethod; +import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; @@ -178,10 +182,108 @@ public Set<IBean> getBeans(IInjectionPoint injectionPoints) { Set<IBean> result = new HashSet<IBean>(); - //TODO + IParametedType type = injectionPoints.getType(); + if(type == null) { + return result; + } + + Set<IAnnotationDeclaration> qs = injectionPoints.getQualifierDeclarations(); + + Set<IBean> beans = new HashSet<IBean>(); + synchronized(allBeans) { + beans.addAll(allBeans); + } + for (IBean b: beans) { + Set<IParametedType> types = b.getLegalTypes(); + if(containsType(types, type)) { + try { + Set<IAnnotationDeclaration> qsb = b.getQualifierDeclarations(); + if(areMatchingQualifiers(qsb, qs)) { + result.add(b); + } + } catch (CoreException e) { + + } + } + } + return result; } + public static boolean containsType(Set<IParametedType> types, IParametedType type) { + for (IParametedType t: types) { + if(t.equals(type)) return true; + } + return false; + } + + public static boolean areMatchingQualifiers(Set<IAnnotationDeclaration> beanQualifiers, Set<IAnnotationDeclaration> injectionQualifiers) throws CoreException { + if(beanQualifiers == null || beanQualifiers.isEmpty()) { + if(injectionQualifiers == null || injectionQualifiers.isEmpty()) { + return true; + } + } + + TreeSet<String> injectionKeys = new TreeSet<String>(); + if(injectionQualifiers != null) for (IAnnotationDeclaration d: beanQualifiers) { + injectionKeys.add(getQualifierDeclarationKey(d)); + } + + if(injectionKeys.contains(CDIConstants.ANY_QUALIFIER_TYPE_NAME)) { + return true; + } + if(!injectionKeys.contains(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)) { + injectionKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME); + } + + TreeSet<String> beanKeys = new TreeSet<String>(); + if(beanQualifiers == null || beanQualifiers.isEmpty()) { + beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME); + } else for (IAnnotationDeclaration d: beanQualifiers) { + beanKeys.add(getQualifierDeclarationKey(d)); + } + if(beanKeys.size() == 1 && beanKeys.iterator().next().startsWith(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)) { + beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME); + } + + for(String k: injectionKeys) { + if(!beanKeys.contains(k)) return false; + } + return true; + } + + static String getQualifierDeclarationKey(IAnnotationDeclaration d) throws CoreException { + IType type = d.getType(); + IMethod[] ms = type.getMethods(); + StringBuffer result = new StringBuffer(); + result.append(type.getFullyQualifiedName()); + if(ms != null && ms.length > 0) { + TreeMap<String, String> values = new TreeMap<String, String>(); + IMemberValuePair[] ps = d.getDeclaration().getMemberValuePairs(); + if (ps != null) for (IMemberValuePair p: ps) { + String n = p.getMemberName(); + Object o = p.getValue(); + if(o != null) { + values.put(n, o.toString()); + } + } + for (IMethod m: ms) { + String n = m.getElementName(); + if(values.containsKey(n)) continue; + IMemberValuePair p = m.getDefaultValue(); + n = p.getMemberName(); + Object o = p.getValue(); + if(values.containsKey(n) || o == null) continue; + values.put(n, o.toString()); + } + for (String n: values.keySet()) { + String v = values.get(n); + result.append(';').append(n).append('=').append(v); + } + } + return result.toString(); + } + public Set<IBean> getBeans(IPath path) { Set<IBean> result = new HashSet<IBean>(); Set<IBean> beans = beansByPath.get(path); @@ -408,7 +510,9 @@ StereotypeElement s = new StereotypeElement(); initAnnotationElement(s, d); stereotypes.put(d.getQualifiedName(), s); - stereotypesByPath.put(d.getResource().getFullPath(), s); + if(d.getResource() != null && d.getResource().getFullPath() != null) { + stereotypesByPath.put(d.getResource().getFullPath(), s); + } } else if(d.getKind() == AnnotationDefinition.INTERCEPTOR_BINDING) { InterceptorBindingElement s = new InterceptorBindingElement(); initAnnotationElement(s, d); 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -17,6 +17,7 @@ import java.util.Map; import java.util.Set; +import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IType; @@ -38,6 +39,7 @@ import org.jboss.tools.cdi.core.ITypeDeclaration; 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.ParametedTypeFactory; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; import org.jboss.tools.common.model.project.ext.impl.ValueInfo; import org.jboss.tools.common.text.ITextSourceReference; @@ -225,8 +227,43 @@ } public Set<IParametedType> getLegalTypes() { - // TODO - return null; + Set<IParametedType> result = new HashSet<IParametedType>(); + AnnotationDeclaration d = getDefinition().getTypedAnnotation(); + if(d != null) { + try { + IMemberValuePair[] ps = d.getDeclaration().getMemberValuePairs(); + if(ps != null) for (IMemberValuePair p: ps) { + Object o = p.getValue(); + if(o instanceof Object[]) { + Object[] os = (Object[])o; + for (int i = 0; i < os.length; i++) { + String s = os[i].toString(); + if(!s.endsWith(";")) s = "Q" + s + ";"; + IParametedType t = ParametedTypeFactory.getParametedType(getDefinition().getType(), s); + result.add(t); + } + } + } + } catch (CoreException e) { + //TODO + } + } + IType type = getDefinition().getType(); + if(type != null) { + ParametedType p = new ParametedType(); + p.setType(type); + try { + String[] ps = type.getTypeParameterSignatures(); + //TODO set parameters + p.setSignature(type.getFullyQualifiedName()); + } catch (CoreException e) { + //TODO + } + result.add(p); + } + Set<IParametedType> inh = getDefinition().getInheritedTypes(); + if(inh != null) result.addAll(inh); + return result; } public String getName() { Modified: 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -48,4 +48,14 @@ parameterTypes.add(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; + } + //TODO + return false; + } + } 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -65,8 +65,9 @@ } public Set<IParametedType> getLegalTypes() { - // TODO - return null; + Set<IParametedType> result = new HashSet<IParametedType>(); + if(typeDeclaration != null) result.add(typeDeclaration); + return result; } public String getName() { 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 2010-01-22 16:31:42 UTC (rev 19887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-01-22 16:42:56 UTC (rev 19888) @@ -75,8 +75,9 @@ } public Set<IParametedType> getLegalTypes() { - // TODO Auto-generated method stub - return null; + Set<IParametedType> result = new HashSet<IParametedType>(); + if(typeDeclaration != null) result.add(typeDeclaration); + return result; } public String getName() {

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19887 - trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: elvisisking Date: 2010-01-22 11:31:42 -0500 (Fri, 22 Jan 2010) New Revision: 19887 Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/.project trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml Log: Initial versions of source. Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/.project =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/.project (rev 0) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/.project 2010-01-22 16:31:42 UTC (rev 19887) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.modeshape.rest.test.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties (rev 0) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties 2010-01-22 16:31:42 UTC (rev 19887) @@ -0,0 +1 @@ +bin.includes = feature.xml Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml =================================================================== --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml (rev 0) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml 2010-01-22 16:31:42 UTC (rev 19887) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.modeshape.rest.test.feature" + label="ModeShape Tests Feature" + version="1.0.0" + provider-name="JBoss by RedHat"> + + <description url="http://www.example.com/description"> + [Enter Feature Description here.] + </description> + + <copyright url="http://www.example.com/copyright"> + [Enter Copyright Description here.] + </copyright> + + <license url="http://www.example.com/license"> + [Enter License Description here.] + </license> + + <plugin + id="org.jboss.tools.modeshape.rest.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Property changes on: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19886 - trunk/modeshape/features.

by jbosstools-commits＠lists.jboss.org

Author: elvisisking Date: 2010-01-22 11:30:55 -0500 (Fri, 22 Jan 2010) New Revision: 19886 Added: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/ Log: Share project "org.jboss.tools.modeshape.rest.test.feature" into "https://svn.jboss.org/repos/jbosstools"

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19885 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui: wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-01-22 10:39:55 -0500 (Fri, 22 Jan 2010) New Revision: 19885 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-5330 - update title for wizard pages Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2010-01-22 15:30:50 UTC (rev 19884) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2010-01-22 15:39:55 UTC (rev 19885) @@ -46,7 +46,7 @@ public static String NewHibernateMappingElementsSelectionPage2_description; public static String NewHibernateMappingFilePage_class_name_column; public static String NewHibernateMappingFilePage_file_name_column; - public static String NewHibernateMappingFilePage_hibernate_xml_mapping_file; + public static String NewHibernateMappingFilePage_title; public static String NewHibernateMappingFilePage_project_name_column; public static String NewHibernateMappingFilePage_this_wizard_creates; @@ -55,6 +55,8 @@ public static String NewHibernateMappingFileWizard_look_for_dependent_cu; public static String NewHibernateMappingFileWizard_selection_cant_be_empty; + public static String NewHibernateMappingPreviewPage_title; + public static String EntitiesSource_header; public static String EntitiesSource_description; public static String EntitiesList_header; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2010-01-22 15:30:50 UTC (rev 19884) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2010-01-22 15:39:55 UTC (rev 19885) @@ -51,13 +51,14 @@ NewHibernateMappingElementsSelectionPage2_description=Add classes and packages or wizard will create an empty mapping file NewHibernateMappingFilePage_class_name_column=Class name NewHibernateMappingFilePage_file_name_column=File name -NewHibernateMappingFilePage_hibernate_xml_mapping_file=Hibernate XML Mapping file +NewHibernateMappingFilePage_title=Create Hibernate XML Mapping file(s) NewHibernateMappingFilePage_project_name_column=Project name NewHibernateMappingFilePage_this_wizard_creates=This wizard creates new Hibernate XML Mapping file skeletons NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file=New Hibernate XML Mapping files (hbm.xml) NewHibernateMappingFileWizard_create_empty_xml_mapping_file=Create a new empty XML Mapping files NewHibernateMappingFileWizard_look_for_dependent_cu=Search for dependent compilation units... NewHibernateMappingFileWizard_selection_cant_be_empty=Selection can't be empty +NewHibernateMappingPreviewPage_title=Create Hibernate XML Mapping file(s) EntitiesSource_header=Hibernate: add JPA annotations for classes EntitiesSource_description=Add classes and packages to proceed with Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-22 15:30:50 UTC (rev 19884) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-22 15:39:55 UTC (rev 19885) @@ -129,11 +129,12 @@ addPage(cPage); page2 = new NewHibernateMappingFilePage(false); - page2.setTitle(JdtUiMessages.NewHibernateMappingFilePage_hibernate_xml_mapping_file); + page2.setTitle(JdtUiMessages.NewHibernateMappingFilePage_title); page2.setMessage(JdtUiMessages.NewHibernateMappingFilePage_this_wizard_creates, IMessageProvider.WARNING); addPage(page2); previewPage = new NewHibernateMappingPreviewPage(); + previewPage.setTitle(JdtUiMessages.NewHibernateMappingPreviewPage_title); addPage(previewPage); }

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19884 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext: src/org/jboss/tools/cdi/text/ext and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-01-22 10:30:50 -0500 (Fri, 22 Jan 2010) New Revision: 19884 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java Log: https://jira.jboss.org/jira/browse/JBIDE-3125 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2010-01-22 14:36:31 UTC (rev 19883) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2010-01-22 15:30:50 UTC (rev 19884) @@ -17,6 +17,7 @@ org.eclipse.jdt.core;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", org.jboss.tools.cdi.core;bundle-version="1.0.0", - org.jboss.tools.common;bundle-version="2.0.0" + org.jboss.tools.common;bundle-version="2.0.0", + org.jboss.tools.common.el.core;bundle-version="2.0.0" Bundle-Version: 2.0.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java 2010-01-22 14:36:31 UTC (rev 19883) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java 2010-01-22 15:30:50 UTC (rev 19884) @@ -10,8 +10,78 @@ ******************************************************************************/ package org.jboss.tools.cdi.text.ext; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; public class CDIExtensionsPlugin extends AbstractUIPlugin{ + //The shared instance. + private static CDIExtensionsPlugin plugin; + //Resource bundle. + private ResourceBundle resourceBundle; + + public static final String PLUGIN_ID = "org.jboss.tools.cdi.text.ext"; //$NON-NLS-1$ + + /** + * The constructor. + */ + public CDIExtensionsPlugin() { + plugin = this; + } + + /** + * Returns the shared instance. + */ + public static CDIExtensionsPlugin getDefault() { + return plugin; + } + + /** + * Returns the workspace instance. + */ + public static IWorkspace getWorkspace() { + return ResourcesPlugin.getWorkspace(); + } + + /** + * Returns the string from the plugin's resource bundle, + * or 'key' if not found. + */ + public static String getResourceString(String key) { + ResourceBundle bundle= CDIExtensionsPlugin.getDefault().getResourceBundle(); + try { + return bundle.getString(key); + } catch (MissingResourceException e) { + return key; + } + } + + /** + * Returns the plugin's resource bundle, + */ + public ResourceBundle getResourceBundle() { + return resourceBundle; + } + + static public void log(String msg) { + CDIExtensionsPlugin.getDefault().getLog().log(new Status(Status.INFO, PLUGIN_ID, Status.OK, msg, null)); + } + + public static void log(IStatus status) { + CDIExtensionsPlugin.getDefault().getLog().log(status); + } + public static void log(String message, Exception exception) { + CDIExtensionsPlugin.getDefault().getLog().log(new Status(Status.ERROR, CDIExtensionsPlugin.PLUGIN_ID, Status.OK, message, exception)); + } + static public void log(Exception ex) { + CDIExtensionsPlugin.getDefault().getLog().log(new Status(Status.ERROR, CDIExtensionsPlugin.PLUGIN_ID, Status.OK, "No message", ex)); + } + + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2010-01-22 14:36:31 UTC (rev 19883) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2010-01-22 15:30:50 UTC (rev 19884) @@ -10,26 +10,56 @@ ******************************************************************************/ package org.jboss.tools.cdi.text.ext.hyperlink; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.IRegion; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; public class InjectedPointHyperlink extends AbstractHyperlink{ + IBean bean; + IRegion region; + + public InjectedPointHyperlink(IRegion region, IBean bean){ + this.bean = bean; + this.region = region; + } + @Override protected IRegion doGetHyperlinkRegion(int offset) { - // TODO Auto-generated method stub - return null; + return region; } - @Override protected void doHyperlink(IRegion region) { - // TODO Auto-generated method stub + IEditorPart part = null; + + + if(bean != null && bean.getBeanClass() != null){ + try{ + part = JavaUI.openInEditor(bean.getBeanClass()); + }catch(JavaModelException ex){ + CDIExtensionsPlugin.log(ex); + }catch(PartInitException ex){ + CDIExtensionsPlugin.log(ex); + } + if (part != null) { + JavaUI.revealInEditor(part, (IJavaElement)bean.getBeanClass()); + } + } + if (part == null) + openFileFailed(); } @Override public String getHyperlinkText() { - // TODO Auto-generated method stub + if(bean != null) + return bean.getName(); return null; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-01-22 14:36:31 UTC (rev 19883) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-01-22 15:30:50 UTC (rev 19884) @@ -11,15 +11,18 @@ package org.jboss.tools.cdi.text.ext.hyperlink; import java.util.ArrayList; +import java.util.List; import java.util.Set; +import java.util.TreeSet; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.IAnnotatable; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.ICodeAssist; +import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IMemberValuePair; +import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; @@ -33,6 +36,11 @@ import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +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.IInjectionPointMethod; public class InjectedPointHyperlinkDetector extends AbstractHyperlinkDetector{ @@ -69,8 +77,19 @@ if(file == null) return null; - CDICoreNature cdiProject = CDICorePlugin.getCDI(file.getProject(), false); - Set<IBean> beans = cdiProject.getDelegate().getBeans(file.getFullPath()); + CDICoreNature cdiNature = CDICorePlugin.getCDI(file.getProject(), false); + + if(cdiNature == null) + return null; + + ICDIProject cdiProject = cdiNature.getDelegate(); + + if(cdiProject == null) + return null; + + Set<IBean> beans = cdiProject.getBeans(file.getFullPath()); + + System.out.println("beans - "+beans.size()); int[] range = new int[]{wordRegion.getOffset(), wordRegion.getOffset() + wordRegion.getLength()}; @@ -81,34 +100,26 @@ if (elements == null) return null; + System.out.println("elements - "+elements.length); + ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>(); for (IJavaElement element : elements) { if (element instanceof IAnnotatable) { + System.out.println("element - "+element.getElementName()); + IAnnotatable annotatable = (IAnnotatable)element; IAnnotation annotation = annotatable.getAnnotation("Injected"); if (annotation == null) continue; - - String nameToSearch = element.getElementName(); - - IMemberValuePair[] mvPairs = annotation.getMemberValuePairs(); - if (mvPairs != null) { - for (IMemberValuePair mvPair : mvPairs) { - if ("value".equals(mvPair.getMemberName()) && mvPair.getValue() != null) { - String name = mvPair.getValue().toString(); - if (name != null && name.trim().length() != 0) { - nameToSearch = name; - break; - } - } + IInjectionPoint injectionPoint = findInjectionPoint(beans, element); + if(injectionPoint != null){ + Set<IBean> resultBeanSet = cdiProject.getBeans(injectionPoint); + List<IBean> resultBeanList = sortBeans(resultBeanSet); + for(IBean bean : resultBeanList){ + hyperlinks.add(new InjectedPointHyperlink(wordRegion, bean)); } } - - - if (nameToSearch == null && nameToSearch.trim().length() == 0) - continue; - } } if (hyperlinks != null && !hyperlinks.isEmpty()) { @@ -119,5 +130,44 @@ } return null; } + + private IInjectionPoint findInjectionPoint(Set<IBean> beans, IJavaElement element){ + if(!(element instanceof IField) && (element instanceof IMethod) ) + return null; + + for(IBean bean : beans){ + if(bean instanceof IClassBean){ + Set<IInjectionPoint> injectionPoints = bean.getInjectionPoints(); + for(IInjectionPoint iPoint : injectionPoints){ + if(element instanceof IField && iPoint instanceof IInjectionPointField){ + if(((IInjectionPointField)iPoint).getField() != null && ((IInjectionPointField)iPoint).getField().equals(element)) + return iPoint; + }else if(element instanceof IMethod && iPoint instanceof IInjectionPointMethod){ + if(((IInjectionPointMethod)iPoint).getMethod() != null && ((IInjectionPointMethod)iPoint).getMethod().equals(element)) + return iPoint; + + } + } + } + } + return null; + } + + private List<IBean> sortBeans(Set<IBean> beans){ + TreeSet<IBean> alternativeBeans = new TreeSet<IBean>(); + TreeSet<IBean> nonAlternativeBeans = new TreeSet<IBean>(); + + for(IBean bean : beans){ + if(bean.isAlternative()) + alternativeBeans.add(bean); + else + nonAlternativeBeans.add(bean); + } + + ArrayList<IBean> sortedBeans = new ArrayList<IBean>(); + sortedBeans.addAll(alternativeBeans); + sortedBeans.addAll(nonAlternativeBeans); + return sortedBeans; + } }

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19883 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2010-01-22 09:36:31 -0500 (Fri, 22 Jan 2010) New Revision: 19883 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParserException.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java Log: Changes needed to have SWTBot tests running on Hudson Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java 2010-01-22 14:36:31 UTC (rev 19883) @@ -0,0 +1,188 @@ +/******************************************************************************* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide; + +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Properties; +/** + * Parse and Compare Css File Content + * @author Vladimir Pakan + */ +public class CssFileParser { + private LinkedList<Properties> cssClasses = new LinkedList<Properties>(); + + private LinkedList<String> fileLines = new LinkedList<String>(); + private boolean parsed = false; + private enum ParserStatus {OUT_OF_CLASS_DEFINITION, + IN_CLASS_DEFINTION}; + + public CssFileParser(){ + + } + + public CssFileParser(String... lines){ + addLines(lines); + } + + public boolean isParsed() { + return parsed; + } + + public LinkedList<Properties> getCssClasses() { + return cssClasses; + } + /** + * Adds only non empty lines. Do not change it because parser doesn't + * check for empy lines + * @param line + */ + public void addLine(String line){ + if (line != null && line.trim().length() > 0){ + fileLines.add(line); + parsed = false; + } + } + + public void addLines(String... lines){ + for (String line : lines){ + addLine(line); + } + } + + public void reset(){ + cssClasses.clear(); + fileLines.clear(); + parsed = false; + } + + public void parse(){ + cssClasses.clear(); + ParserStatus parserStatus = ParserStatus.OUT_OF_CLASS_DEFINITION; + Properties classProperties = null; + for (String line : fileLines){ + line = line.trim(); + // inside Css Class Definition + if (parserStatus.equals(ParserStatus.IN_CLASS_DEFINTION)){ + if (line.equals("}")){ + parserStatus = ParserStatus.OUT_OF_CLASS_DEFINITION; + cssClasses.add(classProperties); + classProperties = null; + } + else{ + String[] styleLineParts = line.split(":"); + if (styleLineParts.length == 2){ + classProperties.put(styleLineParts[0], + (styleLineParts[1].endsWith(";")) ? + styleLineParts[1].substring(0 , styleLineParts[1].length() - 1) : styleLineParts[1]); + } + else{ + throw new CssFileParserException("Style Definition Line within CSS File has wrong format: " + + line); + } + } + }// Waiting for css class definition + else if(parserStatus.equals(ParserStatus.OUT_OF_CLASS_DEFINITION)){ + if (line.startsWith("cssclass")){ + if (line.endsWith("{")){ + parserStatus = ParserStatus.IN_CLASS_DEFINTION; + classProperties = new Properties(); + } + else{ + throw new CssFileParserException("Line should ends with '{' string but is: " + + line); + } + } + else{ + throw new CssFileParserException("Line should starts with 'cssclass' string but is: " + + line); + } + } + } + parsed = true; + } + + public boolean compare (CssFileParser cssFileParser){ + boolean result = false; + + if (cssFileParser != null){ + if (!cssFileParser.isParsed()){ + cssFileParser.parse(); + } + if (!this.isParsed()){ + this.parse(); + } + // Compare CSS Files Contents + boolean propertiesAreEqual = true; + if (this.getCssClasses().size() == cssFileParser.getCssClasses().size()){ + Iterator<Properties> itThisProperties = this.getCssClasses().iterator(); + Iterator<Properties> cssFileProperties = cssFileParser.getCssClasses().iterator(); + while (propertiesAreEqual && itThisProperties.hasNext()){ + Properties propsThis = (Properties)itThisProperties.next().clone(); + Properties propsCssFile = (Properties)cssFileProperties.next().clone(); + boolean styleAttributesAreEqual = true; + Iterator<Object> itThisPropertyName = propsThis.keySet().iterator(); + while (styleAttributesAreEqual && itThisPropertyName.hasNext()){ + String propertyName = (String)itThisPropertyName.next(); + if (propsCssFile.containsKey(propertyName)){ + styleAttributesAreEqual = propsThis.getProperty(propertyName).trim() + .equals(propsCssFile.getProperty(propertyName).trim()); + // Remove checked property from CSS file properties + propsCssFile.remove(propertyName); + } + else{ + styleAttributesAreEqual = false; + } + } + // If there are left properties in CSS file then files are not equal + propertiesAreEqual = styleAttributesAreEqual && propsCssFile.size() == 0; + } + result = propertiesAreEqual; + } + } + + return result; + } + // TODO: Remove It + public static void main (String[] args){ + CssFileParser parser1 = new CssFileParser( + "cssclass{", + "color: red;", + "background-color: green;", + "font-weight: bold;", + "text-decoration: underline", + "}", + "cssclass{", + "color: green;", + "background-color: red;", + "font-weight: lighter;", + "text-decoration: overline", + "}"); + + CssFileParser parser2 = new CssFileParser( + "cssclass{", + "color: red;", + "background-color: green;", + "text-decoration: underline", + "font-weight: bold;", + "}", + "cssclass{", + "color: green;", + "background-color: red;", + "text-decoration: overline", + "font-weight: lighter;", + "}"); + + System.out.println(parser1.compare(parser2)); + + } + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParserException.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParserException.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParserException.java 2010-01-22 14:36:31 UTC (rev 19883) @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide; +/** + * Exception thrown from CssFileParser class + * @author Vladimir Pakan + */ +public class CssFileParserException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 1L; + + public CssFileParserException (String errorMessage){ + super(errorMessage); + } +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParserException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2010-01-22 14:12:31 UTC (rev 19882) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2010-01-22 14:36:31 UTC (rev 19883) @@ -39,7 +39,6 @@ "background-color:green;\r}"); eclipseEditor.save(); eclipseEditor.contextMenu("Open CSS Dialog").click(); - //Test edit attrs of the first Class bot.shell("CSS Class").activate(); @@ -57,14 +56,22 @@ bot.comboBoxWithLabel("Font Weight:").setSelection("lighter"); bot.button("Apply").click(); bot.button("OK").click(); - - //Test check css file content - - String fileContainer = bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText(); - assertEquals("cssclass{\r\tcolor: red;\r\tbackground-color: green;\r" + - "\tfont-weight: bold;\r\ttext-decoration: underline\r}\rcssclass" + - "{\r\tcolor: green;\r\tbackground-color: red;\r" + - "\tfont-weight: lighter;\r\ttext-decoration: overline\r}", fileContainer); + //Test check CSS file content + assertTrue("Content of CSS file in Editor is not as expected.\n" + + "Content: " + bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText(), + JBIDE3148and4441Test.testCssFileEditorContent(bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor(), + "cssclass{", + "color: red;", + "background-color: green;", + "font-weight: bold;", + "text-decoration: underline", + "}", + "cssclass{", + "color: green;", + "background-color: red;", + "font-weight: lighter;", + "text-decoration: overline", + "}")); bot.editorByTitle(CSS_FILE_NAME+".css").close(); } @@ -88,4 +95,16 @@ return isOpened; } + private static boolean testCssFileEditorContent (SWTBotEclipseEditor cssFileEditor, String... lines){ + + CssFileParser parserCssFileEditor = new CssFileParser(); + for (String line : cssFileEditor.getLines()){ + parserCssFileEditor.addLine(line); + } + CssFileParser parserExceptedCssFile = new CssFileParser(lines); + + return parserCssFileEditor.compare(parserExceptedCssFile); + + } + } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2010-01-22 14:12:31 UTC (rev 19882) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2010-01-22 14:36:31 UTC (rev 19883) @@ -37,8 +37,11 @@ public class AddRemoveJSFCapabilitiesTest extends JSFAutoTestCase { private SWTJBTExt swtJbtExt = null; + private SWTUtilExt swtUtilExt = null; + public AddRemoveJSFCapabilitiesTest(){ swtJbtExt = new SWTJBTExt(bot); + swtUtilExt = new SWTUtilExt(bot); } public void testAddRemoveJSFCapabilities() { boolean jbdsIsRunning = SWTJBTExt.isJBDSRun(bot); @@ -146,16 +149,9 @@ ContextMenuHelper.prepareTreeItemForContextMenu(tree, tree.getTreeItem(JBT_TEST_PROJECT_NAME)); - if (jbdsIsRunning){ - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, - IDELabel.Menu.JBDS_REMOVE_JSF_CAPABILITIES, true)).click(); - } - else{ - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, + new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.WEB_PROJECT_JBT_JSF, false)).menu( IDELabel.Menu.JBT_REMOVE_JSF_CAPABILITIES).click(); - - } bot.shell("Confirmation").activate(); bot.button(WidgetVariables.OK_BUTTON).click(); @@ -260,12 +256,12 @@ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.CLOSE_PROJECT, false)).click(); - delay(); + swtUtilExt.waitForNonIgnoredJobs(5*1000L); new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.OPEN_PROJECT, false)).click(); - delay(); + swtUtilExt.waitForNonIgnoredJobs(5*1000L); } /** Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-22 14:12:31 UTC (rev 19882) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-22 14:36:31 UTC (rev 19883) @@ -13,8 +13,6 @@ import static org.jboss.tools.ui.bot.ext.SWTTestExt.eclipse; -import java.io.IOException; - import org.apache.log4j.Logger; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; @@ -27,7 +25,6 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; import org.jboss.tools.ui.bot.ext.types.IDELabel; -import org.jboss.tools.ui.bot.ext.types.JobName; import org.jboss.tools.ui.bot.ext.types.ViewType; /** * Provides JBoss Tools common operations based on SWTBot element operations @@ -104,7 +101,7 @@ * @param index - zero based Position of Server within Server Tree */ public static void startApplicationServer(SWTWorkbenchBot bot , int index){ - SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.START,45*1000L); + SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.START,120*1000L); bot.sleep(10*1000L); } /** @@ -121,7 +118,7 @@ * @param index - zero based Position of Server within Server Tree */ public static void stopApplicationServer(SWTWorkbenchBot bot , int index){ - SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.STOP,10*1000L); + SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.STOP,20*1000L); } /** * Choose Server Popup Menu with specified label on Server with position specified by index @@ -238,7 +235,6 @@ final SWTBotMenu menuRunAs = bot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.RUN_AS); final MenuItem menuItem = UIThreadRunnable .syncExec(new WidgetResult<MenuItem>() { - @SuppressWarnings("unchecked") public MenuItem run() { int menuItemIndex = 0; MenuItem menuItem = null; Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-01-22 14:12:31 UTC (rev 19882) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-01-22 14:36:31 UTC (rev 19883) @@ -50,13 +50,11 @@ public static final String CLOSE_PROJECT = "Close Project"; public static final String OPEN_PROJECT = "Open Project"; public static final String DELETE = "Delete"; - public static final String JBDS_REMOVE_JSF_CAPABILITIES = "Remove Red Hat Capabilities"; public static final String JBT_REMOVE_JSF_CAPABILITIES = "Remove JSF Capabilities"; public static final String START = "Start"; public static final String STOP = "Stop"; public static final String STRUTS_PROJECT = "Struts Project"; public static final String PREFERENCES = "Preferences"; - public static final String JBDS_REMOVE_STRUTS_CAPABILITIES = "Remove Red Hat Capabilities"; public static final String JBT_REMOVE_STRUTS_CAPABILITIES = "Remove Struts Capabilities"; public static final String ADD_STRUTS_CAPABILITIES = "Add Struts Capabilities..."; public static final String WEB_PROJECT_JBT_STRUTS = "JBoss Tools Struts"; Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java 2010-01-22 14:12:31 UTC (rev 19882) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/AddRemoveStrutsCapabilities.java 2010-01-22 14:36:31 UTC (rev 19883) @@ -56,15 +56,9 @@ ContextMenuHelper.prepareTreeItemForContextMenu(tree, tree.getTreeItem(StrutsAllBotTests.STRUTS_PROJECT_NAME)); - if (jbdsIsRunning){ - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, - IDELabel.Menu.JBDS_REMOVE_STRUTS_CAPABILITIES, true)).click(); - } - else{ - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, - IDELabel.Menu.WEB_PROJECT_JBT_STRUTS, false)).menu( - IDELabel.Menu.JBT_REMOVE_STRUTS_CAPABILITIES).click(); - } + new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, + IDELabel.Menu.WEB_PROJECT_JBT_STRUTS, false)).menu( + IDELabel.Menu.JBT_REMOVE_STRUTS_CAPABILITIES).click(); bot.shell("Confirmation").activate(); bot.button(IDELabel.Button.OK).click();

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19882 - in trunk/jsf/plugins/org.jboss.tools.jsf: resources/meta and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-01-22 09:12:31 -0500 (Fri, 22 Jan 2010) New Revision: 19882 Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddOrderingSupport.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/OrderingObjectImpl.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsfwizards.meta trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java Log: https://jira.jboss.org/jira/browse/JBIDE-5471 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-22 13:56:23 UTC (rev 19881) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-22 14:12:31 UTC (rev 19882) @@ -170,6 +170,9 @@ class="org.jboss.tools.jsf.model.ReferenceGroupImpl"/> <xclass id="org.jboss.tools.jsf.model.ReferenceObjectImpl" class="org.jboss.tools.jsf.model.ReferenceObjectImpl"/> + <xclass id="org.jboss.tools.jsf.model.impl.OrderingObjectImpl" + class="org.jboss.tools.jsf.model.impl.OrderingObjectImpl"/> + <xclass id="org.jboss.tools.jsf.model.handlers.AddCaseToGroupHandler" class="org.jboss.tools.jsf.model.handlers.AddCaseToGroupHandler"/> <xclass id="org.jboss.tools.jsf.model.handlers.AddNavigationCaseHandler" @@ -234,6 +237,10 @@ class="org.jboss.tools.jsf.model.handlers.SetApplicationHandler"/> <xclass id="org.jboss.tools.jsf.model.handlers.SetFactoryHandler" class="org.jboss.tools.jsf.model.handlers.SetFactoryHandler"/> + <xclass id="org.jboss.tools.jsf.model.handlers.AddOrderingSupport" + class="org.jboss.tools.jsf.model.handlers.AddOrderingSupport"/> + + <xclass id="org.jboss.tools.jsf.model.handlers.bean.AddManagedPropertySafeHandler" class="org.jboss.tools.jsf.model.handlers.bean.AddManagedPropertySafeHandler"/> <xclass id="org.jboss.tools.jsf.model.handlers.bean.DeleteManagedPropertyHandler" Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta 2010-01-22 13:56:23 UTC (rev 19881) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2.meta 2010-01-22 14:12:31 UTC (rev 19882) @@ -25,6 +25,7 @@ <XChildEntity maxCount="1" name="JSFConverters" required="yes"/> <XChildEntity maxCount="1" name="JSFManagedBeans20" required="yes"/> <XChildEntity maxCount="1" name="JSFNavigationRules20" required="yes"/> + <XChildEntity maxCount="1" name="JSFOrderings20" required="yes"/> <XChildEntity maxCount="1" name="JSFReferencedBeans" required="yes"/> <XChildEntity maxCount="1" name="JSFRenderKits20" required="yes"/> <XChildEntity maxCount="1" name="JSFValidators12" required="yes"/> @@ -161,6 +162,9 @@ WizardClassName="%Default%" displayName="Managed Bean..." kind="action" name="AddManagedBean"/> <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" + PROPERTIES="validator.add=true;sourcepath=Orderings;actionpath=CreateActions/AddOrdering" + WizardClassName="%Default%" displayName="Ordering..." kind="action" name="AddOrdering"/> + <XActionItem HandlerClassName="%Redirect%" ICON="action.empty" PROPERTIES="validator.add=true;sourcepath=Referenced Beans;actionpath=CreateActions/AddReferencedBean" WizardClassName="%Default%" displayName="Referenced Bean..." kind="action" name="AddReferencedBean"/> @@ -223,6 +227,111 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;children=%Ordered%;saveDefault=false" + XMLSUBPATH="absolute-ordering" name="JSFAbsoluteOrdering20"> + <XChildrenEntities> + <XChildEntity name="JSFOrderingName20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="absolute-ordering" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" default="Absolute Ordering" + name="name" visibility="false"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="others"> + <Constraint loader="List"> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Name..." kind="action" name="AddName"> + <EntityData EntityName="JSFOrderingName20"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;children=%Ordered%;saveDefault=false" + XMLSUBPATH="after" name="JSFAfter20"> + <XChildrenEntities> + <XChildEntity name="JSFOrderingName20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="after" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" default="After" name="name" visibility="false"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="others"> + <Constraint loader="List"> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Name..." kind="action" name="AddName"> + <EntityData EntityName="JSFOrderingName20"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.jsf.model.impl.ApplicationObjectImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;saveDefault=false" @@ -382,6 +491,58 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;children=%Ordered%;saveDefault=false" + XMLSUBPATH="before" name="JSFBefore20"> + <XChildrenEntities> + <XChildEntity name="JSFOrderingName20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="before" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" default="Before" name="name" visibility="false"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="others"> + <Constraint loader="List"> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Name..." kind="action" name="AddName"> + <EntityData EntityName="JSFOrderingName20"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" XMLSUBPATH="validator-id" name="JSFDefaultValidator"> <XChildrenEntities/> @@ -994,6 +1155,131 @@ <XDependencies/> </XModelEntity> <XModelEntity + ImplementingClass="org.jboss.tools.jsf.model.impl.OrderingObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData;saveDefault=false" + XMLSUBPATH="ordering" name="JSFOrdering20"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="JSFAfter20" required="yes"/> + <XChildEntity maxCount="1" name="JSFBefore20" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="ordering" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="_id_" visibility="false"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" + XMLSUBPATH="name" name="JSFOrderingName20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="name" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="#text"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Ordered%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" name="JSFOrderings20"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="JSFAbsoluteOrdering20" required="yes"/> + <XChildEntity name="JSFOrdering20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.jsf.renderkits" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="ordering list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="Orderings" name="name" xmlname="NAME"> + <Editor name="Uneditable"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%SpecialWizard%" + ICON="main.jsf.renderkit" + PROPERTIES="validator.add=true;support=org.jboss.tools.jsf.model.handlers.AddOrderingSupport;entity=JSFOrdering20" + displayName="Ordering..." kind="action" name="AddOrdering"> + <EntityData EntityName="JSFAddOrderingWizard"> + <AttributeData AttributeName="after name" Mandatory="no"/> + <AttributeData AttributeName="after others" Mandatory="no"/> + <AttributeData AttributeName="before name" Mandatory="no"/> + <AttributeData AttributeName="before others" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" + HandlerClassName="%DeleteChildren%" ICON="action.delete" + displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="org.jboss.tools.jsf.model.impl.RenderKitObjectImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.JSFFormLayoutData" XMLSUBPATH="render-kit" name="JSFRenderKit20"> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsfwizards.meta =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsfwizards.meta 2010-01-22 13:56:23 UTC (rev 19881) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsfwizards.meta 2010-01-22 14:12:31 UTC (rev 19882) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" "meta.dtd"> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> <XModelEntityGroup> <VERSION DEPENDS="Model:1.0" MODULE="JSF" VERSION="1.0"/> <MAPPINGS/> @@ -64,7 +65,6 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute PROPERTIES="save=always" name="value" xmlname="value.#text"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> <XModelAttribute default="true" name="add java property"> @@ -109,14 +109,10 @@ <Editor name="ContainerChooser"/> </XModelAttribute> <XModelAttribute name="separator"> - <Constraint/> <Editor name="Separator"/> </XModelAttribute> <XModelAttribute default="faces-config" name="name" - visibility="false" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> + visibility="false" xmlname="NAME"/> <XModelAttribute name="version"> <Constraint loader="ListString"/> <Editor name="DropDown"/> @@ -132,6 +128,30 @@ <XActionItem kind="list"/> <XDependencies/> </XModelEntity> + <XModelEntity name="JSFAddOrderingWizard"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes> + <XModelAttribute name="after name"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="after others"> + <Constraint loader="List"> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute name="before name"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="before others"> + <Constraint loader="List"> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"/> + <XDependencies/> + </XModelEntity> <XModelEntity name="JSFAddViewWizard"> <XChildrenEntities/> <XEntityRenderer/> @@ -169,10 +189,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute PROPERTIES="id=true" name="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" name="name"/> </XModelAttributes> <XActionItem kind="list"> <XActionItem HandlerClassName="%Edit%" ICON="action.empty" @@ -215,10 +232,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute PROPERTIES="id=true" name="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" name="name"/> </XModelAttributes> <XActionItem kind="list"> <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> @@ -248,10 +262,7 @@ <XChildrenEntities/> <XEntityRenderer/> <XModelAttributes> - <XModelAttribute name="var"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="var"/> <XModelAttribute PROPERTIES="nodeName=dataTable;attrName=value" name="value"> <Constraint loader="ListString"/> <Editor name="KnowledgeBase"/> @@ -272,10 +283,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute PROPERTIES="save=always" name="managed-bean-class" xmlname="managed-bean-class.#text"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="save=always" name="managed-bean-class" xmlname="managed-bean-class.#text"/> </XModelAttributes> <XActionItem kind="list"/> <XDependencies/> @@ -319,10 +327,7 @@ </Constraint> <Editor name="CheckBox"/> </XModelAttribute> - <XModelAttribute name="index" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="index" visibility="false"/> </XModelAttributes> <XActionItem kind="list"/> <XDependencies/> @@ -331,10 +336,7 @@ <XChildrenEntities/> <XEntityRenderer/> <XModelAttributes> - <XModelAttribute name="link text"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="link text"/> </XModelAttributes> <XActionItem kind="list"/> <XDependencies/> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2010-01-22 13:56:23 UTC (rev 19881) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2010-01-22 14:12:31 UTC (rev 19882) @@ -22,6 +22,7 @@ import org.jboss.tools.common.model.filesystems.impl.*; import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader; import org.jboss.tools.common.model.util.*; +import org.jboss.tools.common.xml.XMLUtilities; import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jst.web.model.*; @@ -173,6 +174,7 @@ JSFConstants.FOLDER_CONVERTERS, JSFConstants.FOLDER_MANAGED_BEANS, JSFConstants.FOLDER_NAVIGATION_RULES, + JSFConstants.FOLDER_ORDERINGS, JSFConstants.FOLDER_REFENCED_BEANS, JSFConstants.FOLDER_RENDER_KITS, JSFConstants.FOLDER_VALIDATORS, @@ -188,6 +190,9 @@ } else if("JSFNavigationCase".equals(entity.getName())) { //$NON-NLS-1$ children.add("redirect"); //$NON-NLS-1$ } + if(entity.getAttribute("others") != null) { + children.add("others"); + } return children; } @@ -239,9 +244,12 @@ XAttribute[] as = o.getModelEntity().getAttributes(); for (int i = 0; i < as.length; i++) { String xml = as[i].getXMLName(); + String v = o.getAttributeValue(as[i].getName()); + if("others".equals(as[i].getName())) { + if("true".equals(v)) return true; + } // it would be more safe to check isSavable if(xml == null || xml.length() == 0 || "NAME".equals(xml)) continue; //$NON-NLS-1$ - String v = o.getAttributeValue(as[i].getName()); if(v != null && v.length() > 0) return true; } String finalComment = o.get("#final-comment"); //$NON-NLS-1$ @@ -268,7 +276,11 @@ saveListEntriesChildren(element, o); return true; } else { - return super.saveChildren(element, o); + boolean b = super.saveChildren(element, o); + if("true".equals(o.getAttributeValue("others"))) { + XMLUtilities.createElement(element, "others"); + } + return b; } } @@ -284,7 +296,10 @@ o.setAttributeValue("null-value", "false"); //$NON-NLS-1$ //$NON-NLS-2$ o.setAttributeValue("value", super.getAttribute(element, "value.#text")); //$NON-NLS-1$ //$NON-NLS-2$ } - } + } + if(XMLUtilities.getUniqueChild(element, "others") != null) { + o.setAttributeValue("others", "true"); + } } protected boolean isSaveable(XModelEntity entity, String n, String v, String dv) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java 2010-01-22 13:56:23 UTC (rev 19881) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFConstants.java 2010-01-22 14:12:31 UTC (rev 19882) @@ -50,6 +50,7 @@ public static final String FOLDER_CONVERTERS = "Converters"; //$NON-NLS-1$ public static final String FOLDER_RENDER_KITS = "Render Kits"; //$NON-NLS-1$ public static final String FOLDER_VALIDATORS = "Validators"; //$NON-NLS-1$ + public static final String FOLDER_ORDERINGS = "Orderings"; //$NON-NLS-1$ public static final String FOLDER_EXTENSIONS = "Extensions"; //$NON-NLS-1$ public static final String ATT_ID = "id"; //$NON-NLS-1$ Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddOrderingSupport.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddOrderingSupport.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddOrderingSupport.java 2010-01-22 14:12:31 UTC (rev 19882) @@ -0,0 +1,49 @@ +package org.jboss.tools.jsf.model.handlers; + +import java.util.Properties; + +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateSupport; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; + +public class AddOrderingSupport extends DefaultCreateSupport { + static String ATTR_AFTER_NAME = "after name"; + static String ATTR_AFTER_OTHERS = "after others"; + static String ATTR_BEFORE_NAME = "before name"; + static String ATTR_BEFORE_OTHERS = "before others"; + + public AddOrderingSupport() {} + + protected void finish() throws XModelException { + String entity = getEntityName(); + Properties p = extractStepData(0); + XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p); + + String afterName = p.getProperty(ATTR_AFTER_NAME); + if(afterName == null || afterName.length() > 0) { + XModelObject n = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), c.getChildByPath("After").getModelEntity().getChildren()[0].getName()); + n.setAttributeValue("name", afterName); + c.getChildByPath("After").addChild(n); + } + String afterOthers = p.getProperty(ATTR_AFTER_OTHERS); + if("true".equals(afterOthers)) { + c.getChildByPath("After").setAttributeValue("others", "true"); + } + + String beforeName = p.getProperty(ATTR_BEFORE_NAME); + if(beforeName == null || beforeName.length() > 0) { + XModelObject n = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), c.getChildByPath("Before").getModelEntity().getChildren()[0].getName()); + n.setAttributeValue("name", beforeName); + c.getChildByPath("Before").addChild(n); + } + String beforeOthers = p.getProperty(ATTR_BEFORE_OTHERS); + if("true".equals(beforeOthers)) { + c.getChildByPath("Before").setAttributeValue("others", "true"); + } + + DefaultCreateHandler.addCreatedObject(getTarget(), c, getProperties()); + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddOrderingSupport.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/OrderingObjectImpl.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/OrderingObjectImpl.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/OrderingObjectImpl.java 2010-01-22 14:12:31 UTC (rev 19882) @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.model.impl; + +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.impl.CustomizedObjectImpl; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class OrderingObjectImpl extends CustomizedObjectImpl { + private static final long serialVersionUID = 1L; + + public OrderingObjectImpl() {} + + public String getPresentationString() { + XModelObject a = getChildByPath("After"); + if(a != null) { + if(a.getChildren().length > 0) { + return "After " + a.getChildren()[0].getAttributeValue("name"); + } + if("true".equals(a.getAttributeValue("others"))) { + return "After others"; + } + } + XModelObject b = getChildByPath("Before"); + if(b != null) { + if(b.getChildren().length > 0) { + return "Before " + b.getChildren()[0].getAttributeValue("name"); + } + if("true".equals(b.getAttributeValue("others"))) { + return "Before others"; + } + } + return "" + getModelEntity().getXMLSubPath(); + } + + public String name() { + return "" + getModelEntity().getXMLSubPath() + get(XModelObjectLoaderUtil.ATTR_ID_NAME); + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/impl/OrderingObjectImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19881 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-01-22 08:56:23 -0500 (Fri, 22 Jan 2010) New Revision: 19881 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/internal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 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 2010-01-22 13:19:30 UTC (rev 19880) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-01-22 13:56:23 UTC (rev 19881) @@ -125,21 +125,32 @@ IStereotype[] getStereotypes(); /** - * Returns stereotype model element for fully qualified name - * of stereotype annotation type + * Returns stereotype model element for fully qualified name of stereotype + * annotation type + * * @param qualifiedName - * @return stereotype model element for fully qualified name of stereotype annotation type + * @return stereotype model element for fully qualified name of stereotype + * annotation type */ - public IStereotype getStereotype(String qualifiedName); + IStereotype getStereotype(String qualifiedName); /** - * Returns interceptor binding model element for fully qualified name - * of interceptor binding annotation type + * Returns the stereotype by resource path. + * + * @param resource path + * @return the stereotype by resource path + */ + IStereotype getStereotype(IPath path); + + /** + * Returns interceptor binding model element for fully qualified name of + * interceptor binding annotation type + * * @param qualifiedName - * @return Returns interceptor binding model element for fully qualified name - * of interceptor binding annotation type + * @return interceptor binding model element for fully qualified name of + * interceptor binding annotation type */ - public InterceptorBindingElement getInterceptorBinding(String qualifiedName); + InterceptorBindingElement getInterceptorBinding(String qualifiedName); /** * Returns qualifier model element for fully qualified name @@ -148,16 +159,18 @@ * @return Returns qualifier model element for fully qualified name * of qualifier annotation type */ - public QualifierElement getQualifier(String qualifiedName); + QualifierElement getQualifier(String qualifiedName); /** - * Returns scope model element for fully qualified name - * of scope annotation type + * Returns scope model element for fully qualified name of scope annotation + * type + * * @param qualifiedName - * @return Returns scope model element for fully qualified name - * of scope annotation type + * @return the scope model element for fully qualified name of scope + * annotation type */ - public ScopeElement getScope(String qualifiedName); + ScopeElement getScope(String qualifiedName); + /** * Returns the set of observers for an event which is injected by given * injection point. 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 2010-01-22 13:19:30 UTC (rev 19880) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-01-22 13:56:23 UTC (rev 19881) @@ -49,6 +49,7 @@ CDICoreNature n; private Map<String, StereotypeElement> stereotypes = new HashMap<String, StereotypeElement>(); + private Map<IPath, StereotypeElement> stereotypesByPath = new HashMap<IPath, StereotypeElement>(); private Map<String, InterceptorBindingElement> interceptorBindings = new HashMap<String, InterceptorBindingElement>(); private Map<String, QualifierElement> qualifiers = new HashMap<String, QualifierElement>(); private Map<String, ScopeElement> scopes = new HashMap<String, ScopeElement>(); @@ -373,6 +374,10 @@ return stereotypes.get(qualifiedName); } + public StereotypeElement getStereotype(IPath path) { + return stereotypesByPath.get(path); + } + public InterceptorBindingElement getInterceptorBinding(String qualifiedName) { return interceptorBindings.get(qualifiedName); } @@ -393,6 +398,7 @@ void rebuildAnnotationTypes() { stereotypes.clear(); + stereotypesByPath.clear(); interceptorBindings.clear(); qualifiers.clear(); scopes.clear(); @@ -402,6 +408,7 @@ StereotypeElement s = new StereotypeElement(); initAnnotationElement(s, d); stereotypes.put(d.getQualifiedName(), s); + stereotypesByPath.put(d.getResource().getFullPath(), s); } else if(d.getKind() == AnnotationDefinition.INTERCEPTOR_BINDING) { InterceptorBindingElement s = new InterceptorBindingElement(); initAnnotationElement(s, d); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-01-22 13:19:30 UTC (rev 19880) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-01-22 13:56:23 UTC (rev 19881) @@ -15,6 +15,7 @@ import java.util.List; import java.util.Map; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IAnnotatable; import org.eclipse.jdt.core.IAnnotation; @@ -36,6 +37,7 @@ protected List<AnnotationDeclaration> annotations = new ArrayList<AnnotationDeclaration>(); protected IAnnotatable member; protected Map<String, AnnotationDeclaration> annotationsByType = new HashMap<String, AnnotationDeclaration>(); + protected IResource resource; public AbstractMemberDefinition() {} @@ -53,6 +55,7 @@ } protected void init(IType contextType, DefinitionContext context) throws CoreException { + resource = contextType.getResource(); IAnnotation[] ts = member.getAnnotations(); for (int i = 0; i < ts.length; i++) { AnnotationDeclaration a = new AnnotationDeclaration(); @@ -99,4 +102,7 @@ return annotationsByType.get(CDIConstants.SPECIALIZES_ANNOTATION_TYPE_NAME); } -} + public IResource getResource() { + return resource; + } +} \ No newline at end of file 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 2010-01-22 13:19:30 UTC (rev 19880) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-01-22 13:56:23 UTC (rev 19881) @@ -217,6 +217,10 @@ for (IBean bean : beans) { validateBean(bean); } + IStereotype stereotype = cdiProject.getStereotype(file.getFullPath()); + validateStereotype(stereotype); + + // TODO } /** @@ -232,6 +236,7 @@ if(name!=null) { validationContext.addVariableNameForELValidation(name); } + // TODO } /**

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r19880 - in trunk/jsf/docs/userguide/en: modules and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2010-01-22 08:19:30 -0500 (Fri, 22 Jan 2010) New Revision: 19880 Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_openon_jsf2_components.png Modified: trunk/jsf/docs/userguide/en/modules/editors.xml Log: https://jira.jboss.org/jira/browse/JBDS-897 -JSF 2.0 composition components support is implemented - information is added Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_openon_jsf2_components.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_openon_jsf2_components.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jsf/docs/userguide/en/modules/editors.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/editors.xml 2010-01-22 12:58:41 UTC (rev 19879) +++ trunk/jsf/docs/userguide/en/modules/editors.xml 2010-01-22 13:19:30 UTC (rev 19880) @@ -201,7 +201,7 @@ outcome:</para> <figure> - <title>OpenOn With JSF Tag</title> + <title>OpenOn with JSF Tag</title> <mediaobject> <imageobject> <imagedata fileref="images/editors_features/editors_features_8.png"/> @@ -215,6 +215,18 @@ <para>For details, see <link linkend="openOnForCustomFacelets">"OpenOn for Custom Facelets Tag Libraries"</link> later in this guide.</para> </listitem> + + <listitem> + <para>Custom JJSF 2.0 components</para> + <figure> + <title>OpenOn with JSF 2.0 Component</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/editors_features/editors_features_openon_jsf2_components.png"/> + </imageobject> + </mediaobject> + </figure> + </listitem> </orderedlist> </section>

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits January 2010