JBoss Tools SVN: r37412 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-12-16 20:16:51 -0500 (Fri, 16 Dec 2011)
New Revision: 37412
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/DOMTreeDumper.java
Log:
dumpStyle method added to fix compilation problem in trunk
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/DOMTreeDumper.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/DOMTreeDumper.java 2011-12-17 01:16:37 UTC (rev 37411)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/DOMTreeDumper.java 2011-12-17 01:16:51 UTC (rev 37412)
@@ -340,4 +340,9 @@
public void setIgnoredAttributes(List<String> ignoredAttributes) {
this.ignoredAttributes = ignoredAttributes;
}
+
+ public void dumpStyle(nsIDOMNode visualNode) {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
14 years
JBoss Tools SVN: r37411 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-16 20:16:37 -0500 (Fri, 16 Dec 2011)
New Revision: 37411
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 00:52:35 UTC (rev 37410)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 01:16:37 UTC (rev 37411)
@@ -14,6 +14,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
@@ -119,6 +120,7 @@
if(change != null){
change.perform(new NullProgressMonitor());
+ file.touch(new NullProgressMonitor());
}
compilationUnit.discardWorkingCopy();
} catch (JavaModelException e) {
14 years
JBoss Tools SVN: r37410 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-16 19:52:35 -0500 (Fri, 16 Dec 2011)
New Revision: 37410
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 00:25:08 UTC (rev 37409)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 00:52:35 UTC (rev 37410)
@@ -119,7 +119,6 @@
if(change != null){
change.perform(new NullProgressMonitor());
- compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
}
compilationUnit.discardWorkingCopy();
} catch (JavaModelException e) {
14 years
JBoss Tools SVN: r37409 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-16 19:25:08 -0500 (Fri, 16 Dec 2011)
New Revision: 37409
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 00:20:53 UTC (rev 37408)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 00:25:08 UTC (rev 37409)
@@ -119,6 +119,7 @@
if(change != null){
change.perform(new NullProgressMonitor());
+ compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
}
compilationUnit.discardWorkingCopy();
} catch (JavaModelException e) {
14 years
JBoss Tools SVN: r37408 - trunk/common/plugins/org.jboss.tools.common.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-12-16 19:20:53 -0500 (Fri, 16 Dec 2011)
New Revision: 37408
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-10187 Add support for a @SuppressWarnings
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-16 21:19:12 UTC (rev 37407)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-17 00:20:53 UTC (rev 37408)
@@ -27,7 +27,7 @@
org.jboss.tools.common.validation;bundle-version="3.3.0",
org.eclipse.ui.cheatsheets;bundle-version="3.4.0",
org.eclipse.jdt.core.manipulation;bundle-version="1.4.0",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.201",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
org.eclipse.jpt.common.core;bundle-version="1.0.0"
Export-Package: org.jboss.tools.common.ui,
org.jboss.tools.common.ui.databinding,
14 years
JBoss Tools SVN: r37407 - in trunk/common/plugins/org.jboss.tools.common.ui: src/org/jboss/tools/common/ui/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-16 16:19:12 -0500 (Fri, 16 Dec 2011)
New Revision: 37407
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-16 21:07:33 UTC (rev 37406)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-16 21:19:12 UTC (rev 37407)
@@ -27,7 +27,8 @@
org.jboss.tools.common.validation;bundle-version="3.3.0",
org.eclipse.ui.cheatsheets;bundle-version="3.4.0",
org.eclipse.jdt.core.manipulation;bundle-version="1.4.0",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.201"
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.201",
+ org.eclipse.jpt.common.core;bundle-version="1.0.0"
Export-Package: org.jboss.tools.common.ui,
org.jboss.tools.common.ui.databinding,
org.jboss.tools.common.ui.marker,
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-16 21:07:33 UTC (rev 37406)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-16 21:19:12 UTC (rev 37407)
@@ -28,10 +28,14 @@
import org.eclipse.jdt.core.ISourceReference;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
+import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Shell;
@@ -97,14 +101,20 @@
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
+ CompilationUnit cuNode = ASTTools.buildASTRoot(compilationUnit);
+
IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, (IJavaElement)element);
+ ASTNode elementNode = null;
+ if(workingCopyElement instanceof JavaElement){
+ elementNode = ((JavaElement) workingCopyElement).findNode(cuNode);
+ }
IAnnotation annotation = findAnnotation(workingCopyElement);
CompilationUnitChange change = null;
if(annotation != null){
change = updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
}else{
- change = addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, workingCopyElement);
+ change = addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, workingCopyElement, elementNode);
}
if(change != null){
@@ -268,18 +278,27 @@
return change;
}
- private CompilationUnitChange addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
+ private CompilationUnitChange addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element, ASTNode node) throws JavaModelException{
if(!(element instanceof ISourceReference))
return null;
ISourceReference workingCopySourceReference = (ISourceReference) element;
+ IBuffer buffer = compilationUnit.getBuffer();
+
+ int position = workingCopySourceReference.getSourceRange().getOffset();
+
+ if(node != null){
+ position = node.getStartPosition();
+ }
+
String str = AT+name;
if(!(workingCopySourceReference instanceof ILocalVariable)){
+
str += compilationUnit.findRecommendedLineSeparator();
- IBuffer buffer = compilationUnit.getBuffer();
- int index = workingCopySourceReference.getSourceRange().getOffset();
+
+ int index = position;
while(index >= 0){
char c = buffer.getChar(index);
if(c == '\r' || c == '\n')
@@ -287,8 +306,8 @@
index--;
}
index++;
- if(index != workingCopySourceReference.getSourceRange().getOffset()){
- String spaces = buffer.getText(index, workingCopySourceReference.getSourceRange().getOffset()-index);
+ if(index != position){
+ String spaces = buffer.getText(index, position-index);
str += spaces;
}
@@ -298,7 +317,7 @@
CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
- InsertEdit edit = new InsertEdit(workingCopySourceReference.getSourceRange().getOffset(), str);
+ InsertEdit edit = new InsertEdit(position, str);
change.setEdit(edit);
14 years
JBoss Tools SVN: r37406 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-16 16:07:33 -0500 (Fri, 16 Dec 2011)
New Revision: 37406
Modified:
trunk/build/publish.sh
Log:
add COMMON_TOOLS folder to ant's lib folder
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-12-16 20:42:22 UTC (rev 37405)
+++ trunk/build/publish.sh 2011-12-16 21:07:33 UTC (rev 37406)
@@ -225,11 +225,15 @@
if [[ ! $ANT_HOME ]]; then # find ant in PATH - select LAST entry if more than one
ANT_HOME=$(for d in $(echo ${PATH//:/ }); do if [[ ${d/ant/} != ${d} ]]; then echo -n " ${d%/bin}"; fi; done); ANT_HOME=${ANT_HOME##* }
fi
-ANT_EXEC=ant
+ANT_EXEC="ant"
if [[ -d ${ANT_HOME} ]] && [[ -x ${ANT_HOME}/bin/ant ]]; then
export ANT_HOME=${ANT_HOME}
ANT_EXEC=${ANT_HOME}/bin/ant
fi
+ANT_LIB="" # add COMMON_TOOLS folder to ant's lib folder
+if [[ -d /home/hudson/static_build_env/jbds/tools ]]; then
+ ANT_LIB=" -lib /home/hudson/static_build_env/jbds/tools"
+fi
ANT_PARAMS=" -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
if [[ -f ${buildxml} ]]; then
@@ -238,7 +242,7 @@
fi
done
ANT_TARGET="buildResults.single"; if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then ANT_TARGET="buildResults.aggregate"; fi
-if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ${ANT_EXEC} -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi
+if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ${ANT_EXEC}${ANT_LIB} -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi
# copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs
if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then
14 years
JBoss Tools SVN: r37405 - trunk/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-16 15:42:22 -0500 (Fri, 16 Dec 2011)
New Revision: 37405
Modified:
trunk/build/results/build.xml
Log:
not sure that it matters, but use a pathelement instead of just a location to resolve saxon for xslt processing. ''Error! Error checking type of the expression 'funcall(replace, [funcall(substring-after, [cast(step(attribute, 17), string), literal-expr(jbosstools-)]), literal-expr(_stable_branch), literal-expr()])'.''
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2011-12-16 20:40:59 UTC (rev 37404)
+++ trunk/build/results/build.xml 2011-12-16 20:42:22 UTC (rev 37405)
@@ -172,7 +172,9 @@
<var name="propertiesFileFound" value="true" />
<delete quiet="true" file="buildResults.html" />
<xslt in="@{propertiesFile}" out="buildResults.html" style="buildResults.xsl" force="true">
- <classpath location="${COMMON_TOOLS}/saxon.jar" />
+ <classpath>
+ <pathelement location="${COMMON_TOOLS}/saxon.jar" />
+ </classpath>
</xslt>
</then>
<else>
14 years
JBoss Tools SVN: r37404 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-16 15:40:59 -0500 (Fri, 16 Dec 2011)
New Revision: 37404
Modified:
trunk/build/publish.sh
Log:
find actual ant executable -- seems that we can't just run any ol' ant exec anymore after latest Jenkins restart (2011-12-16 07:00 GMT)
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-12-16 19:30:56 UTC (rev 37403)
+++ trunk/build/publish.sh 2011-12-16 20:40:59 UTC (rev 37404)
@@ -221,6 +221,15 @@
echo " " >> ${md5sumsFile}
mkdir -p ${STAGINGDIR}/logs
+
+if [[ ! $ANT_HOME ]]; then # find ant in PATH - select LAST entry if more than one
+ ANT_HOME=$(for d in $(echo ${PATH//:/ }); do if [[ ${d/ant/} != ${d} ]]; then echo -n " ${d%/bin}"; fi; done); ANT_HOME=${ANT_HOME##* }
+fi
+ANT_EXEC=ant
+if [[ -d ${ANT_HOME} ]] && [[ -x ${ANT_HOME}/bin/ant ]]; then
+ export ANT_HOME=${ANT_HOME}
+ ANT_EXEC=${ANT_HOME}/bin/ant
+fi
ANT_PARAMS=" -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
if [[ -f ${buildxml} ]]; then
@@ -229,7 +238,7 @@
fi
done
ANT_TARGET="buildResults.single"; if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then ANT_TARGET="buildResults.aggregate"; fi
-if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi
+if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ${ANT_EXEC} -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi
# copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs
if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then
14 years
JBoss Tools SVN: r37403 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-16 14:30:56 -0500 (Fri, 16 Dec 2011)
New Revision: 37403
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java
Log:
JBIDE-10496
https://issues.jboss.org/browse/JBIDE-10496
Tests are added.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java 2011-12-16 19:30:11 UTC (rev 37402)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java 2011-12-16 19:30:56 UTC (rev 37403)
@@ -29,4 +29,8 @@
}
@Inject Fish fish3BROKEN;
+
+ public void useEL() {
+ String s = "#{fishDulipcatedNameSecond.abc}";
+ }
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java 2011-12-16 19:30:56 UTC (rev 37403)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.suppresswarnings;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Typed;
+
+@SessionScoped
+public class AnotherRabbit {
+
+ @Produces
+ @Typed(Integer.class)
+ String s;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java 2011-12-16 19:30:11 UTC (rev 37402)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java 2011-12-16 19:30:56 UTC (rev 37403)
@@ -33,4 +33,9 @@
@SuppressWarnings("unsatisfiedInjectionPoints")
@Inject Fish fish3OK;
+
+ @SuppressWarnings("unknownElVariablePropertyName")
+ public void useEL() {
+ String s = "#{fishDulipcatedName.abc}";
+ }
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java 2011-12-16 19:30:56 UTC (rev 37403)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.suppresswarnings;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Typed;
+
+@SuppressWarnings("notPassivationCapableBean")
+@SessionScoped
+public class Rabbit {
+
+ @SuppressWarnings("illegalTypeInTypedDeclaration")
+ @Produces
+ @Typed(Integer.class)
+ String s;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-16 19:30:11 UTC (rev 37402)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-16 19:30:56 UTC (rev 37403)
@@ -15,10 +15,12 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -28,18 +30,26 @@
*/
public class SuppressWarningsTests extends ValidationTest {
- private void modifyPreferences() throws Exception{
+ private void modifyPreferences(String preference) throws Exception{
IPreferenceStore store = CDICorePlugin.getDefault().getPreferenceStore();
- store.putValue(CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferences.WARNING);
+ store.putValue(preference, CDIPreferences.WARNING);
((IPersistentPreferenceStore)store).save();
}
- private void restorePreferences() throws Exception{
+ private void restorePreferences(String preference) throws Exception{
IPreferenceStore store = CDICorePlugin.getDefault().getPreferenceStore();
- store.putValue(CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferences.ERROR);
+ store.putValue(preference, CDIPreferences.ERROR);
((IPersistentPreferenceStore)store).save();
}
+ private void modifyPreferences() throws Exception{
+ modifyPreferences(CDIPreferences.PRODUCER_ANNOTATED_INJECT);
+ }
+
+ private void restorePreferences() throws Exception{
+ restorePreferences(CDIPreferences.PRODUCER_ANNOTATED_INJECT);
+ }
+
public void testClass() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DUPLCICATE_EL_NAME, ".*"), 8);
@@ -109,4 +119,49 @@
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java");
AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 20, 24, 28, 31);
}
+
+ /**
+ *
+ * @throws Exception
+ */
+ public void testEL() throws Exception {
+ String message = NLS.bind(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, "abc");
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java");
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, message, 39);
+
+ file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, message, 34);
+ }
+
+ public void testWarningsOnClassNameRegion() throws Exception {
+ String message = NLS.bind(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, "Rabbit", "SessionScoped");
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Rabbit.java");
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, message, 9);
+
+ message = NLS.bind(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, "AnotherRabbit", "SessionScoped");
+ file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, message, 8);
+ }
+
+ /**
+ * In creating some markers, validator uses ITypeDeclaration as text source reference.
+ * It should convert it to IJavaSourceReference when it is relevant.
+ *
+ * @throws Exception
+ */
+ public void testWarningsOnTyped() throws Exception {
+ try {
+ modifyPreferences(CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION);
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Rabbit.java");
+ TestUtil.validate(file);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 13);
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ } finally {
+ restorePreferences(CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION);
+ }
+
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 11);
+ }
}
\ No newline at end of file
14 years