JBoss Tools SVN: r34115 - branches/jbosstools-3.2.x/hibernatetools/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 17:55:24 -0400 (Sun, 21 Aug 2011)
New Revision: 34115
Modified:
branches/jbosstools-3.2.x/hibernatetools/docs/reference/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/hibernatetools/docs/reference/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/hibernatetools/docs/reference/en-US/master.xml 2011-08-21 21:49:27 UTC (rev 34114)
+++ branches/jbosstools-3.2.x/hibernatetools/docs/reference/en-US/master.xml 2011-08-21 21:55:24 UTC (rev 34115)
@@ -42,15 +42,12 @@
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
<copyright>
- <year>2007</year>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.3.1.GA
+ Version: 3.2.1.GA
</releaseinfo>
14 years, 7 months
JBoss Tools SVN: r34114 - branches/jbosstools-3.2.x/drools/docs/guvnor_ref/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 17:49:27 -0400 (Sun, 21 Aug 2011)
New Revision: 34114
Modified:
branches/jbosstools-3.2.x/drools/docs/guvnor_ref/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/drools/docs/guvnor_ref/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/drools/docs/guvnor_ref/en-US/master.xml 2011-08-21 21:46:38 UTC (rev 34113)
+++ branches/jbosstools-3.2.x/drools/docs/guvnor_ref/en-US/master.xml 2011-08-21 21:49:27 UTC (rev 34114)
@@ -40,12 +40,11 @@
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
<copyright>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 5.1.0.trunk
+ Version: 3.2.1.GA
</releaseinfo>
<!--<abstract>
<title/>
14 years, 7 months
JBoss Tools SVN: r34113 - branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 17:46:38 -0400 (Sun, 21 Aug 2011)
New Revision: 34113
Modified:
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/master.xml 2011-08-21 21:38:51 UTC (rev 34112)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/master.xml 2011-08-21 21:46:38 UTC (rev 34113)
@@ -42,13 +42,10 @@
<title>Getting Started Guide</title>
<copyright>
- <year>2007</year>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
- <releaseinfo>Version: 3.2.0.GA</releaseinfo>
+ <releaseinfo>Version: 3.2.1.GA</releaseinfo>
<abstract>
<title/>
<para>
14 years, 7 months
JBoss Tools SVN: r34112 - branches/jbosstools-3.2.x/esb/docs/esb_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 17:38:51 -0400 (Sun, 21 Aug 2011)
New Revision: 34112
Modified:
branches/jbosstools-3.2.x/esb/docs/esb_ref_guide/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/esb/docs/esb_ref_guide/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/esb/docs/esb_ref_guide/en-US/master.xml 2011-08-21 21:13:15 UTC (rev 34111)
+++ branches/jbosstools-3.2.x/esb/docs/esb_ref_guide/en-US/master.xml 2011-08-21 21:38:51 UTC (rev 34112)
@@ -39,15 +39,11 @@
<author><firstname>Tatyana</firstname><surname>Romanovich</surname></author>
<copyright>
- <year>2007</year>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
<year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.3.1.GA
+ Version: 3.2.1.GA
</releaseinfo>
<!--<abstract>
14 years, 7 months
JBoss Tools SVN: r34111 - branches/jbosstools-3.2.x/drools/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-21 17:13:15 -0400 (Sun, 21 Aug 2011)
New Revision: 34111
Modified:
branches/jbosstools-3.2.x/drools/docs/reference/en-US/master.xml
Log:
updated for community release
Modified: branches/jbosstools-3.2.x/drools/docs/reference/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.x/drools/docs/reference/en-US/master.xml 2011-08-20 00:44:31 UTC (rev 34110)
+++ branches/jbosstools-3.2.x/drools/docs/reference/en-US/master.xml 2011-08-21 21:13:15 UTC (rev 34111)
@@ -40,14 +40,11 @@
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
<copyright>
- <year>2007</year>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 5.1.0.trunk
+ Version: 3.2.1.GA
</releaseinfo>
<!--<abstract>
<title/>
14 years, 7 months
JBoss Tools SVN: r34110 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-19 20:44:31 -0400 (Fri, 19 Aug 2011)
New Revision: 34110
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
https://issues.jboss.org/browse/JBIDE-9476
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-08-19 23:34:03 UTC (rev 34109)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-08-20 00:44:31 UTC (rev 34110)
@@ -122,7 +122,7 @@
for(IBean bean: beans){
if(bean.equals(selectedBean))
continue;
- if(AddQualifiersToBeanComposite.checkBeanQualifiers(selectedBean, bean, qualifiers))
+ if(MarkerResolutionUtils.checkBeanQualifiers(selectedBean, bean, qualifiers))
return true;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-08-19 23:34:03 UTC (rev 34109)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-08-20 00:44:31 UTC (rev 34110)
@@ -51,6 +51,7 @@
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
@@ -203,7 +204,7 @@
}
}
- public static void addQualifier(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
+ public static void addQualifier(String qualifiedName, String value, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
if(!(element instanceof ISourceReference))
return;
IAnnotation annotation = findAnnotation(element, qualifiedName);
@@ -217,19 +218,49 @@
IBuffer buffer = compilationUnit.getBuffer();
String shortName = getShortName(qualifiedName);
+ if(!value.isEmpty())
+ value = "(\""+value+"\")";
+
if(duplicateShortName)
shortName = qualifiedName;
annotation = findAnnotation(element, CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
if(annotation != null && annotation.exists())
- buffer.replace(annotation.getSourceRange().getOffset()+annotation.getSourceRange().getLength(), 0, lineDelim+AT+shortName);
+ buffer.replace(annotation.getSourceRange().getOffset()+annotation.getSourceRange().getLength(), 0, lineDelim+AT+shortName+value);
else
- buffer.replace(((ISourceReference)element).getSourceRange().getOffset(), 0, AT+shortName+lineDelim);
+ buffer.replace(((ISourceReference)element).getSourceRange().getOffset(), 0, AT+shortName+value+lineDelim);
synchronized(compilationUnit) {
compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
}
}
+
+ public static void updateQualifier(String qualifiedName, String value, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
+ if(!(element instanceof ISourceReference))
+ return;
+ IAnnotation annotation = findAnnotation(element, qualifiedName);
+ if(annotation == null || !annotation.exists())
+ return;
+
+ boolean duplicateShortName = addImport(qualifiedName, compilationUnit);
+
+ //String lineDelim = SPACE;
+
+ IBuffer buffer = compilationUnit.getBuffer();
+ String shortName = getShortName(qualifiedName);
+
+ if(!value.isEmpty())
+ value = "(\""+value+"\")";
+
+ if(duplicateShortName)
+ shortName = qualifiedName;
+
+ buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), AT+shortName+value);
+
+ synchronized(compilationUnit) {
+ compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
+ }
public static String getShortName(String qualifiedName){
int lastDot = qualifiedName.lastIndexOf(DOT);
@@ -283,9 +314,9 @@
return null;
}
- private static boolean contains(IQualifierDeclaration declaration, Set<IQualifier> qualifiers){
- for(IQualifier qualifier : qualifiers){
- if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(qualifier.getSourceType().getFullyQualifiedName()))
+ private static boolean contains(IQualifierDeclaration declaration, Set<IQualifierDeclaration> declarations){
+ for(IQualifierDeclaration d : declarations){
+ if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(d.getQualifier().getSourceType().getFullyQualifiedName()))
return true;
}
return false;
@@ -311,7 +342,7 @@
}
}
- private static List<IQualifier> findQualifiersToDelete(IInjectionPoint injectionPoint, Set<IQualifier> qualifiers){
+ private static List<IQualifier> findQualifiersToDelete(IInjectionPoint injectionPoint, Set<IQualifierDeclaration> qualifiers){
ArrayList<IQualifier> list = new ArrayList<IQualifier>();
Set<IQualifierDeclaration> declarations = injectionPoint.getQualifierDeclarations();
for(IQualifierDeclaration declaration : declarations){
@@ -321,19 +352,19 @@
return list;
}
- private static void addQualifiersToParameter(ICompilationUnit compilationUnit, IInjectionPoint injectionPoint, Set<IQualifier> qualifiers){
+ private static void addQualifiersToParameter(ICompilationUnit compilationUnit, IInjectionPoint injectionPoint, Set<IQualifierDeclaration> declarations){
HashMap<IQualifier, Boolean> duplicants = new HashMap<IQualifier, Boolean>();
if(!(injectionPoint instanceof IInjectionPointParameter))
return;
try{
- for(IQualifier qualifier : qualifiers){
- String qualifierName = qualifier.getSourceType().getFullyQualifiedName();
+ for(IQualifierDeclaration declaration : declarations){
+ String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName();
boolean duplicant = false;
if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) &&
!qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){
duplicant = addImport(qualifierName, compilationUnit);
}
- duplicants.put(qualifier, new Boolean(duplicant));
+ duplicants.put(declaration.getQualifier(), new Boolean(duplicant));
}
String paramName = ((IInjectionPointParameter)injectionPoint).getName();
@@ -350,17 +381,22 @@
StringBuffer b = new StringBuffer();
if(index > 0)
b.append(SPACE);
- for(IQualifier qualifier : qualifiers){
- String qualifierName = qualifier.getSourceType().getFullyQualifiedName();
+ for(IQualifierDeclaration declaration : declarations){
+ String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName();
+ String value = findQualifierValue(declaration);
+
+ if(!value.isEmpty())
+ value = "(\""+value+"\")";
+
if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){
- boolean duplicant = duplicants.get(qualifier).booleanValue();
+ boolean duplicant = duplicants.get(declaration.getQualifier()).booleanValue();
String annotation = getShortName(qualifierName);
if(duplicant)
annotation = qualifierName;
- if(qualifierName.equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))
- b.append(AT+annotation+"(\""+parameters[index].getElementName()+"\")"+SPACE);
- else
- b.append(AT+annotation+SPACE);
+ //if(qualifierName.equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))
+ // b.append(AT+annotation+"(\""+parameters[index].getElementName()+"\")"+SPACE);
+ //else
+ b.append(AT+annotation+value+SPACE);
}
}
b.append(Signature.getSignatureSimpleName(parameters[index].getTypeSignature())+SPACE);
@@ -394,9 +430,9 @@
try{
ICompilationUnit original = injectionPoint.getClassBean().getBeanClass().getCompilationUnit();
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
if(injectionPoint instanceof IInjectionPointParameter){
- addQualifiersToParameter(compilationUnit, injectionPoint, qualifiers);
+ addQualifiersToParameter(compilationUnit, injectionPoint, declarations);
}else{
IJavaElement element = getInjectedJavaElement(compilationUnit, injectionPoint);
if(element == null || !element.exists())
@@ -404,16 +440,18 @@
// delete unneeded qualifiers
- List<IQualifier> toDelete = findQualifiersToDelete(injectionPoint, qualifiers);
+ List<IQualifier> toDelete = findQualifiersToDelete(injectionPoint, declarations);
for(IQualifier qualifier : toDelete){
deleteQualifierAnnotation(compilationUnit, element, qualifier);
}
- for(IQualifier qualifier : qualifiers){
- String qualifierName = qualifier.getSourceType().getFullyQualifiedName();
+ for(IQualifierDeclaration declaration : declarations){
+ String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName();
+ String value = findQualifierValue(declaration);
if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){
- MarkerResolutionUtils.addQualifier(qualifierName, compilationUnit, element);
+ MarkerResolutionUtils.addQualifier(qualifierName, value, compilationUnit, element);
+ MarkerResolutionUtils.updateQualifier(qualifierName, value, compilationUnit, element);
}
}
}
@@ -595,5 +633,63 @@
}
return null;
}
+
+ public static boolean checkBeanQualifiers(IBean selectedBean, IBean bean, Set<IQualifier> qualifiers){
+ HashSet<ValuedQualifier> valuedQualifiers = new HashSet<ValuedQualifier>();
+ for(IQualifier qualifier : qualifiers){
+ valuedQualifiers.add(new ValuedQualifier(qualifier));
+ }
+ return checkValuedQualifiers(selectedBean, bean, valuedQualifiers);
+ }
+
+ public static boolean checkValuedQualifiers(IBean selectedBean, IBean bean, Set<ValuedQualifier> qualifiers){
+ for(ValuedQualifier qualifier : qualifiers){
+ if(!isBeanContainQualifier(bean, qualifier)){
+ return false;
+ }
+ }
+ if(bean.getQualifiers().size() == qualifiers.size())
+ return true;
+ return false;
+ }
+
+ private static boolean isBeanContainQualifier(IBean bean, ValuedQualifier valuedQualifier){
+
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ for(IQualifier q : qualifiers){
+ String value = findQualifierValue(bean, q);
+ if(q.getSourceType().getFullyQualifiedName().equals(valuedQualifier.getQualifier().getSourceType().getFullyQualifiedName()) &&
+ value.equals(valuedQualifier.getValue()))
+ return true;
+ }
+ return false;
+ }
+
+ public static String findQualifierValue(IBean bean, IQualifier qualifier){
+ IQualifierDeclaration declaration = findQualifierDeclaration(bean, qualifier);
+ if(declaration == null)
+ return "";
+
+ return findQualifierValue(declaration);
+ }
+
+ private static String findQualifierValue(IQualifierDeclaration declaration){
+ Object value = declaration.getMemberValue(null);
+
+ return value == null ? "" : value.toString();
+ }
+
+ private static IQualifierDeclaration findQualifierDeclaration(IBean bean, IQualifier qualifier){
+ Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
+
+ if(declarations == null)
+ return null;
+
+ for(IQualifierDeclaration declaration : declarations){
+ if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(qualifier.getSourceType().getFullyQualifiedName()))
+ return declaration;
+ }
+ return null;
+ }
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-08-19 23:34:03 UTC (rev 34109)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-08-20 00:44:31 UTC (rev 34110)
@@ -132,7 +132,7 @@
this.bean = bean;
originalQualifiers = new ArrayList<ValuedQualifier>();
for(IQualifier q : bean.getQualifiers()){
- String value = findQualifierValue(bean, q);
+ String value = MarkerResolutionUtils.findQualifierValue(bean, q);
originalQualifiers.add(new ValuedQualifier(q, value));
}
@@ -226,68 +226,13 @@
for(IBean b: beans){
if(b.equals(bean))
continue;
- if(checkValuedQualifiers(bean, b, qfs))
+ if(MarkerResolutionUtils.checkValuedQualifiers(bean, b, qfs))
return false;
}
return true;
}
- public static boolean checkBeanQualifiers(IBean selectedBean, IBean bean, Set<IQualifier> qualifiers){
- HashSet<ValuedQualifier> valuedQualifiers = new HashSet<ValuedQualifier>();
- for(IQualifier qualifier : qualifiers){
- valuedQualifiers.add(new ValuedQualifier(qualifier));
- }
- return checkValuedQualifiers(selectedBean, bean, valuedQualifiers);
- }
-
- private static boolean checkValuedQualifiers(IBean selectedBean, IBean bean, Set<ValuedQualifier> qualifiers){
- for(ValuedQualifier qualifier : qualifiers){
- if(!isBeanContainQualifier(bean, qualifier)){
- return false;
- }
- }
- if(bean.getQualifiers().size() == qualifiers.size())
- return true;
- return false;
- }
-
- private static boolean isBeanContainQualifier(IBean bean, ValuedQualifier valuedQualifier){
-
- Set<IQualifier> qualifiers = bean.getQualifiers();
- for(IQualifier q : qualifiers){
- String value = findQualifierValue(bean, q);
- if(q.getSourceType().getFullyQualifiedName().equals(valuedQualifier.getQualifier().getSourceType().getFullyQualifiedName()) &&
- value.equals(valuedQualifier.getValue()))
- return true;
- }
- return false;
- }
-
- private static String findQualifierValue(IBean bean, IQualifier qualifier){
- IQualifierDeclaration declaration = findQualifierDeclaration(bean, qualifier);
- if(declaration == null)
- return "";
-
- Object value = declaration.getMemberValue(null);
-
- return value == null ? "" : value.toString();
- }
-
- private static IQualifierDeclaration findQualifierDeclaration(IBean bean, IQualifier qualifier){
- Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
-
- if(declarations == null)
- return null;
-
- for(IQualifierDeclaration declaration : declarations){
- if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(qualifier.getSourceType().getFullyQualifiedName()))
- return declaration;
- }
- return null;
- }
-
-
protected void createControl() {
GridLayout layout = new GridLayout();
layout.horizontalSpacing = 4;
@@ -712,10 +657,6 @@
moveAll(qualifiers, false);
}
-// public ArrayList<ValuedQualifier> getAvailableValuedQualifiers(){
-// return qualifiers;
-// }
-
public ArrayList<IQualifier> getAvailableQualifiers(){
ArrayList<IQualifier> result = new ArrayList<IQualifier>();
for(ValuedQualifier vq : qualifiers){
14 years, 7 months
JBoss Tools SVN: r34109 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: src/org/jboss/tools/jst/web/kb/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-19 19:34:03 -0400 (Fri, 19 Aug 2011)
New Revision: 34109
Added:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/utility-lib.tld
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java
Log:
JBIDE-9527
https://issues.jboss.org/browse/JBIDE-9527
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/utility-lib.tld
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/utility-lib.tld (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/utility-lib.tld 2011-08-19 23:34:03 UTC (rev 34109)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib version="2.1" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
+ <tlib-version>1.0</tlib-version>
+ <short-name>utility-lib</short-name>
+ <uri>utility-lib</uri>
+ <tag>
+ <name>tag1</name>
+ <tag-class>xxx</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java 2011-08-19 23:33:46 UTC (rev 34108)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java 2011-08-19 23:34:03 UTC (rev 34109)
@@ -23,6 +23,7 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
import org.jboss.tools.test.util.JUnitUtils;
/**
@@ -31,57 +32,35 @@
*
*/
public class WebWithModuleTest extends TestCase {
+ protected IProject utility = null;
+ protected IProject webapp = null;
- protected IProject project = null;
- protected boolean makeCopy = true;
-
public WebWithModuleTest() {
super("MyFaces Kb Model Test");
}
public void setUp() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("webapp");
- assertNotNull("Can't load webapp", project); //$NON-NLS-1$
+ utility = ResourcesPlugin.getWorkspace().getRoot().getProject("utility");
+ assertNotNull("Can't load utility", utility); //$NON-NLS-1$
+ webapp = ResourcesPlugin.getWorkspace().getRoot().getProject("webapp");
+ assertNotNull("Can't load webapp", webapp); //$NON-NLS-1$
}
/**
* webapp project has kb nature, and depends on utility project without kb nature.
- * In this case we add sources of 'utility' to file systems of 'webapp'.
+ * In this case builder adds kb problem marker to 'webapp'
+ * and sets on 'utility' property '...mock' to 'true'..
*
- * Check that file systems created but no links added to 'webapp'.
+ * Check that file 'utility' has correct property '...mock'.
+ * Check that kb model of 'webapp' has tag library declared in sources of 'utility'.
*
- * Warning: If we decide to stop adding sources of one project to other project,
- * this test should be removed.
- *
* @throws CoreException
*/
public void testWebProject() throws CoreException {
- KbProjectFactory.getKbProject(project, true);
- XModelObject o = EclipseResourceUtil.createObjectForResource(project);
- XModelObject libsrc = null;
- XModelObject f = FileSystemsHelper.getFileSystems(o.getModel());
- Libs libs = ((FileSystemsImpl)f).getLibs();
- libs.requestForUpdate();
- libs.update();
-
- //Check that sources of 'utility' are loaded by model of 'webapp'.
- XModelObject[] fs = f.getChildren();
- for (XModelObject s: fs) {
- String name = s.getAttributeValue("name");
- if(name.equals("lib-src")) {
- libsrc = s;
- }
- }
- assertNotNull(libsrc);
- XModelObject q = libsrc.getChildByPath("foo/bar/Dummy.java");
- assertNotNull(q);
+ assertTrue("true".equals(utility.getPersistentProperty(KbProjectFactory.NATURE_MOCK)));
- //Check that no links is added to 'webapp'
- IResource[] ms = project.members();
- for (IResource m: ms) {
- assertFalse(m.isLinked());
- }
-
+ IKbProject kb = KbProjectFactory.getKbProject(webapp, true);
+ ITagLibrary[] ls = kb.getTagLibraries("utility-lib");
+ assertTrue(ls.length > 0);
}
-
-}
\ No newline at end of file
+}
14 years, 7 months
JBoss Tools SVN: r34108 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-19 19:33:46 -0400 (Fri, 19 Aug 2011)
New Revision: 34108
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java
Log:
JBIDE-9527
https://issues.jboss.org/browse/JBIDE-9527
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java 2011-08-19 23:33:16 UTC (rev 34107)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java 2011-08-19 23:33:46 UTC (rev 34108)
@@ -38,6 +38,11 @@
String messageId = list.size() == 1 ? KbMessages.KBPROBLEM_DEPENDS_ON_JAVA_SINGLE : KbMessages.KBPROBLEM_DEPENDS_ON_JAVA_MANY;
String message = MessageFormat.format(messageId, projectList);
m = KbBuilderMarker.createOrUpdateKbProblemMarker(m, project.getProject(), message, KbBuilderMarker.KIND_DEPENDS_ON_NON_KB_POJECTS);
+ for (IProject p: list) {
+ if(p.isAccessible()) {
+ p.setPersistentProperty(KbProjectFactory.NATURE_MOCK, "true"); //$NON-NLS-1$
+ }
+ }
}
}
14 years, 7 months
JBoss Tools SVN: r34107 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-19 19:33:16 -0400 (Fri, 19 Aug 2011)
New Revision: 34107
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-9527
https://issues.jboss.org/browse/JBIDE-9527
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-08-19 22:49:07 UTC (rev 34106)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-08-19 23:33:16 UTC (rev 34107)
@@ -673,14 +673,14 @@
//ignore - we do not care about malformed URLs in classpath here.
}
} else if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
- if(p == null || !p.isAccessible()) continue;
- if(p.hasNature(JavaCore.NATURE_ID)
- && !p.hasNature("org.jboss.tools.jst.web.kb.kbnature")
- && project.hasNature("org.jboss.tools.jst.web.kb.kbnature")) {
- String[] srcs = getJavaProjectSrcLocations(p);
- for (String s: srcs) l.add(s);
- }
+// IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
+// if(p == null || !p.isAccessible()) continue;
+// if(p.hasNature(JavaCore.NATURE_ID)
+// && !p.hasNature("org.jboss.tools.jst.web.kb.kbnature")
+// && project.hasNature("org.jboss.tools.jst.web.kb.kbnature")) {
+// String[] srcs = getJavaProjectSrcLocations(p);
+// for (String s: srcs) l.add(s);
+// }
}
}
14 years, 7 months
JBoss Tools SVN: r34106 - in trunk/common/plugins: org.jboss.tools.common.model/src/org/jboss/tools/common/model/project and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-19 18:49:07 -0400 (Fri, 19 Aug 2011)
New Revision: 34106
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java
Log:
Code cleanup related style and complexity
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java 2011-08-19 22:42:47 UTC (rev 34105)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java 2011-08-19 22:49:07 UTC (rev 34106)
@@ -18,19 +18,12 @@
public final static int UNDEFINED_ERROR = 0;
public final static String UNSPECIFIED_MESSAGE = null;
public final static String EMPTY_MESSAGE = ""; //$NON-NLS-1$
- public final static String EMPTY_PLUGIN = ""; //$NON-NLS-1$
public static IStatus getInstance(int severity, String pluginId,
int code, String message, Throwable t) {
- return new Status(severity, pluginId == null ? EMPTY_PLUGIN : pluginId,
- code, checkMessage(message, t), t);
+ return new Status(severity, pluginId, code, checkMessage(message, t), t);
}
- public static IStatus getInstance(int severity, int code, String message,
- Throwable t) {
- return getInstance(severity, EMPTY_PLUGIN, code, message, t);
- }
-
public static IStatus getInstance(int severity, String pluginId,
String message, Throwable t) {
return getInstance(severity, pluginId, UNDEFINED_ERROR, message, t);
@@ -76,10 +69,8 @@
if (t != null && t.getMessage() != null) {
return t.getMessage();
}
-
return EMPTY_MESSAGE;
}
-
return message;
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java 2011-08-19 22:42:47 UTC (rev 34105)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ClassPathUpdate.java 2011-08-19 22:49:07 UTC (rev 34106)
@@ -39,7 +39,7 @@
String entity = model.getRoot().getModelEntity().getName();
if("RootDummy".equals(entity)) { //$NON-NLS-1$
String pn = (project == null) ? "?" : project.getName(); //$NON-NLS-1$
- throw new IllegalArgumentException("Project " + pn + " is corrupted."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new IllegalStateException("Project " + pn + " is corrupted."); //$NON-NLS-1$ //$NON-NLS-2$
}
this.model = model;
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2011-08-19 22:42:47 UTC (rev 34105)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2011-08-19 22:49:07 UTC (rev 34106)
@@ -139,10 +139,9 @@
}
private IJavaElement searchForClass(final String className) {
- IFile documentFile = getFile();
-
+ IJavaElement result = null;
try {
-
+ IFile documentFile = getFile();
IProject project = null;
if (documentFile == null) {
IWorkbenchPage workbenchPage = ExtensionsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
@@ -155,7 +154,7 @@
JarEntryResource jarEntryFile = (JarEntryResource) jarEntryEditorInput.getStorage();
IJavaProject parentProject = getProjectForJarResource(jarEntryFile);
if (parentProject != null) {
- return searchForClass(parentProject, className);
+ result = searchForClass(parentProject, className);
}
} else if (editorInput instanceof IStorageEditorInput) {
IStorageEditorInput moeInput = (IStorageEditorInput)editorInput;
@@ -163,7 +162,7 @@
if (storage instanceof JarEntryFile) {
IJavaProject parentProject = getProjectForJarResource((JarEntryFile)storage);
if (parentProject != null) {
- return searchForClass(parentProject, className);
+ result = searchForClass(parentProject, className);
}
}
IPath p = storage.getFullPath();
@@ -174,17 +173,14 @@
project = documentFile.getProject();
}
- if(project == null || !project.isOpen())
- return null;
- if(!project.hasNature(JavaCore.NATURE_ID))
- return null;
- IJavaProject javaProject = JavaCore.create(project);
- return searchForClass(javaProject, className);
-
+ if(result==null && project != null && project.isOpen() && project.hasNature(JavaCore.NATURE_ID)) {
+ IJavaProject javaProject = JavaCore.create(project);
+ result = searchForClass(javaProject, className);
+ }
} catch (CoreException x) {
ExtensionsPlugin.getPluginLog().logError("Error while looking for class " + className, x); //$NON-NLS-1$
- return null;
}
+ return result;
}
private IJavaProject getProjectForJarResource(JarEntryResource jarResource){
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2011-08-19 22:42:47 UTC (rev 34105)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2011-08-19 22:49:07 UTC (rev 34106)
@@ -138,41 +138,43 @@
}
}
- protected IJavaElement searchForClassMethod(IJavaProject javaProject, String className, String methodName) {
- try {
-// Get the search pattern
- SearchPattern pattern = SearchPattern.createPattern(className + "." + methodName, IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$
-
- // Get the search scope
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject });
+ protected IJavaElement searchForClassMethod(IJavaProject javaProject,
+ String className, String methodName) {
+ // Get the search pattern
+ SearchPattern pattern = SearchPattern
+ .createPattern(
+ className + "." + methodName, IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$
- final List<SearchMatch> matches = new ArrayList<SearchMatch>();
- // Get the search requestor
- SearchRequestor requestor = new SearchRequestor() {
- public void acceptSearchMatch(SearchMatch match) throws CoreException {
+ // Get the search scope
+ IJavaSearchScope scope = SearchEngine
+ .createJavaSearchScope(new IJavaElement[] { javaProject });
+
+ final List<SearchMatch> matches = new ArrayList<SearchMatch>();
+ // Get the search requestor
+ SearchRequestor requestor = new SearchRequestor() {
+ public void acceptSearchMatch(SearchMatch match)
+ throws CoreException {
matches.add(match);
}
- };
+ };
- // Search
- SearchEngine searchEngine = new SearchEngine();
- try {
- searchEngine.search(pattern, new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()}, scope, requestor, null);
- } catch (CoreException ex) {
- //ignore
- }
- for (Iterator i = matches.iterator(); i != null && i.hasNext();) {
- return (IJavaElement)((SearchMatch)i.next()).getElement();
- }
- return null;
- } finally {
- //
+ // Search
+ SearchEngine searchEngine = new SearchEngine();
+ try {
+ searchEngine.search(pattern, new SearchParticipant[] { SearchEngine
+ .getDefaultSearchParticipant() }, scope, requestor, null);
+ } catch (CoreException ex) {
+ // ignore
}
+ for (Iterator i = matches.iterator(); i != null && i.hasNext();) {
+ return (IJavaElement) ((SearchMatch) i.next()).getElement();
+ }
+ return null;
}
protected IJavaElement searchForClassMethod(String className, String methodName) {
IFile documentFile = getFile();
-
+ IJavaElement result = null;
try {
IProject project = null;
if (documentFile == null) {
@@ -189,18 +191,14 @@
project = documentFile.getProject();
}
- if(project == null || !project.isOpen())
- return null;
- if(!project.hasNature(JavaCore.NATURE_ID))
- return null;
- IJavaProject javaProject = JavaCore.create(project);
- return searchForClassMethod(javaProject, className, methodName);
-
+ if(project != null && project.isOpen() && project.hasNature(JavaCore.NATURE_ID)) {
+ IJavaProject javaProject = JavaCore.create(project);
+ result = searchForClassMethod(javaProject, className, methodName);
+ }
} catch (CoreException x) {
ExtensionsPlugin.getPluginLog().logError("Error while looking for method " + methodName + " of class " + className, x); //$NON-NLS-1$ //$NON-NLS-2$
- return null;
}
-
+ return result;
}
protected String getAttributeValue(Node node, String attrName) {
14 years, 7 months