JBoss Tools SVN: r37251 - 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-12 20:55:56 -0500 (Mon, 12 Dec 2011)
New Revision: 37251
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-13 01:03:28 UTC (rev 37250)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-13 01:55:56 UTC (rev 37251)
@@ -133,7 +133,8 @@
if(projectValue != null){
MessageDialog dialog = new MessageDialog(getShell(), label, null,
- "Do you want to disable 'Unsupported @SuppressWarnings' error/warning",
+ "This quick fix uses warning names that are not supported by Java Validator and will cause \"Unsupported @SuppressWarning\" problem message\n\n"+
+ "Do you want to disable 'Unsupported @SuppressWarnings' validation",
MessageDialog.QUESTION_WITH_CANCEL,
new String[]{"Cancel", "Disable"},
0);
@@ -149,7 +150,8 @@
}
}else{
MessageDialog dialog = new MessageDialog(getShell(), label, null,
- "Do you want to disable 'Unsupported @SuppressWarnings' error/warning on the Workspace or only on the project '"+file.getProject().getName()+"'",
+ "This quick fix uses warning names that are not supported by Java Validator and will cause \"Unsupported @SuppressWarning\" problem message\n\n"+
+ "Do you want to disable 'Unsupported @SuppressWarnings' validation on the Workspace or only on the project '"+file.getProject().getName()+"'",
MessageDialog.QUESTION_WITH_CANCEL,
new String[]{"Cancel", "Workspace", file.getProject().getName()},
0);
14 years, 4 months
JBoss Tools SVN: r37250 - in trunk/requirements: riftsaw-2.3.0.Final and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-12-12 20:03:28 -0500 (Mon, 12 Dec 2011)
New Revision: 37250
Added:
trunk/requirements/riftsaw-2.3.0.Final/
trunk/requirements/riftsaw-2.3.0.Final/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-10257 Add new set of requirements for usage in SWT Bot tests
riftsaw-2.3.0.Final added
Added: trunk/requirements/riftsaw-2.3.0.Final/build.properties
===================================================================
--- trunk/requirements/riftsaw-2.3.0.Final/build.properties (rev 0)
+++ trunk/requirements/riftsaw-2.3.0.Final/build.properties 2011-12-13 01:03:28 UTC (rev 37250)
@@ -0,0 +1,7 @@
+riftsaw.build.uri=http://downloads.jboss.org/riftsaw/releases/2.3.0.Final
+build.uri=${riftsaw.build.uri}
+build.archive.root=riftsaw-2.3.0.Final
+build.archive=${build.archive.root}.zip
+md5=d57290b01d25ec0d15e143c6053d0878
+
+
Property changes on: trunk/requirements/riftsaw-2.3.0.Final/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 4 months
JBoss Tools SVN: r37249 - in trunk/openshift/docs/reference/en-US: images/Creating_an_OpenShift_Express_Application and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-12-12 19:45:26 -0500 (Mon, 12 Dec 2011)
New Revision: 37249
Added:
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_09.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_10.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_11.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_12.png
Modified:
trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
Log:
updated with new wizard info and steps
Modified: trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2011-12-13 00:43:46 UTC (rev 37248)
+++ trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2011-12-13 00:45:26 UTC (rev 37249)
@@ -153,7 +153,7 @@
Click the <guibutton>Next</guibutton> to proceed to the next screen.
</para>
<figure id="application_creation_08">
- <title>Importing the project</title>
+ <title>Cloned Git Repository</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_08.png" format="PNG" />
@@ -177,6 +177,69 @@
<para>
Click the <guibutton>Finish</guibutton> to begin the cloning of the Git repository.
</para>
- <!--Figure-->
+ <figure id="application_creation_09">
+ <title>Importing the project</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_09.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The cloned Git Repository is now available within your workbench.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ After the Git repository has been cloned, you will see a new <guilabel>Git Repositories</guilabel> tab appear near the bottom of your workbench. If you do not see the tab you can open it manually by navigating to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Show View</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Git</guimenuitem><guimenuitem>Git Repositories</guimenuitem></menuchoice>. With the <guilabel>Git Repositories</guilabel> option selected, click <guibutton>OK</guibutton>.
+ </para>
+ <figure id="application_creation_10">
+ <title>Project in Package Explorer</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_10.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The project you just created is now available within the Package Explorer.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The OpenShift application that you created through the wizard, will appear in your <guilabel>Package Explorer</guilabel> tab.
+ </para>
+ <figure id="application_creation_11">
+ <title>Publising your project through the server adaptor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_11.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Selecting Full Publish to the OpenShift server, from the context menu of the project.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The wizard has also created a server adaptor that connects to your OpenShift service. In the <guilabel>Servers</guilabel> tab there will be an OpenShift server available that contains your application. Any changes you make locally to the application can be published to your OpenShift instance by right-clicking on the application under the server in the <guilabel>Servers</guilabel> view, and selecting <guimenuitem>Full Publish</guimenuitem>.
+ </para>
+ <figure id="application_creation_12">
+ <title>OpenShift server overview and settings</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_12.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The OpenShift overview and settings are displayed within your workbench.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ As with a local server, double-clicking on the OpenShift server instance in the <guilabel>Servers</guilabel> tab will open the server overview page in your workbench.
+ </para>
</chapter>
Added: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_09.png
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_09.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_10.png
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_10.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_11.png
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_11.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_12.png
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_12.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 4 months
JBoss Tools SVN: r37248 - 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-12 19:43:46 -0500 (Mon, 12 Dec 2011)
New Revision: 37248
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/ConfigureProblemSeverityResolutionGenerator.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-12 23:51:57 UTC (rev 37247)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-13 00:43:46 UTC (rev 37248)
@@ -86,18 +86,34 @@
public void run(IMarker marker) {
if(element != null){
disablePreference();
-
- IAnnotation annotation = findAnnotation();
- if(annotation != null){
- updateSuppressWarningsAnnotation(annotation);
- }else{
- addSuppressWarningsAnnotation();
+ try {
+ ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
+ ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
+
+ IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, (IJavaElement)element);
+
+ IAnnotation annotation = findAnnotation(workingCopyElement);
+ boolean status = false;
+ if(annotation != null){
+ status = updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
+ }else{
+ status = addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, workingCopyElement);
+ }
+
+ if(status){
+ compilationUnit.commitWorkingCopy(true, new NullProgressMonitor());
+ }
+ compilationUnit.discardWorkingCopy();
+ } catch (JavaModelException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ } catch (CoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
}
}
}
- private IAnnotation findAnnotation(){
- IAnnotation annotation = element.getAnnotation(SUPPRESS_WARNINGS_ANNOTATION);
+ private IAnnotation findAnnotation(IJavaElement workingCopyElement) throws JavaModelException{
+ IAnnotation annotation = ((IAnnotatable)workingCopyElement).getAnnotation(SUPPRESS_WARNINGS_ANNOTATION);
if(annotation != null && annotation.exists()){
return annotation;
}
@@ -105,68 +121,57 @@
return null;
}
- private void updateSuppressWarningsAnnotation(IAnnotation annotation){
- try {
- ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
- ICompilationUnit compilationUnit;
- compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
-
- updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
-
- compilationUnit.commitWorkingCopy(true, new NullProgressMonitor());
- compilationUnit.discardWorkingCopy();
- } catch (JavaModelException e) {
- CommonUIPlugin.getDefault().logError(e);
- } catch (CoreException e) {
- CommonUIPlugin.getDefault().logError(e);
- }
- }
-
- private void addSuppressWarningsAnnotation(){
- try {
- ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
- ICompilationUnit compilationUnit;
- compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
-
- addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, (IJavaElement)element);
-
- compilationUnit.commitWorkingCopy(true, new NullProgressMonitor());
- compilationUnit.discardWorkingCopy();
- } catch (JavaModelException e) {
- CommonUIPlugin.getDefault().logError(e);
- } catch (CoreException e) {
- CommonUIPlugin.getDefault().logError(e);
- }
- }
-
private void disablePreference(){
String value = preferences.getProjectPreference(file.getProject(), PROBLEM_ID);
if(!SeverityPreferences.IGNORE.equals(value)){
- MessageDialog dialog = null;
- dialog = new MessageDialog(getShell(), label, null,
- "Do you want to disable 'Unsupported @SuppressWarnings' error/warning on the Workspace or only on the project '"+file.getProject().getName()+"'",
- MessageDialog.QUESTION_WITH_CANCEL,
- new String[]{"Cancel", "Workspace", file.getProject().getName()},
- 0);
- int result = dialog.open();
- if(result == 1){
- IEclipsePreferences ePrefs = preferences.getInstancePreferences();
- ePrefs.put(PROBLEM_ID, SeverityPreferences.IGNORE);
- try {
- ePrefs.flush();
- } catch (BackingStoreException e) {
- CommonUIPlugin.getDefault().logError(e);
- }
- }else if(result == 2){
- IEclipsePreferences ePrefs = preferences.getProjectPreferences(file.getProject());
- ePrefs.put(PROBLEM_ID, SeverityPreferences.IGNORE);
- try {
- ePrefs.flush();
- } catch (BackingStoreException e) {
- CommonUIPlugin.getDefault().logError(e);
- }
+
+ IEclipsePreferences projectPreferences = preferences.getProjectPreferences(file.getProject());
+ String projectValue = null;
+ if(projectPreferences != null){
+ projectValue = projectPreferences.get(PROBLEM_ID, null);
}
+ if(projectValue != null){
+ MessageDialog dialog = new MessageDialog(getShell(), label, null,
+ "Do you want to disable 'Unsupported @SuppressWarnings' error/warning",
+ MessageDialog.QUESTION_WITH_CANCEL,
+ new String[]{"Cancel", "Disable"},
+ 0);
+ int result = dialog.open();
+ if(result == 1){
+ IEclipsePreferences ePrefs = preferences.getProjectPreferences(file.getProject());
+ ePrefs.put(PROBLEM_ID, SeverityPreferences.IGNORE);
+ try {
+ ePrefs.flush();
+ } catch (BackingStoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ }
+ }else{
+ MessageDialog dialog = new MessageDialog(getShell(), label, null,
+ "Do you want to disable 'Unsupported @SuppressWarnings' error/warning on the Workspace or only on the project '"+file.getProject().getName()+"'",
+ MessageDialog.QUESTION_WITH_CANCEL,
+ new String[]{"Cancel", "Workspace", file.getProject().getName()},
+ 0);
+ int result = dialog.open();
+ if(result == 1){
+ IEclipsePreferences ePrefs = preferences.getInstancePreferences();
+ ePrefs.put(PROBLEM_ID, SeverityPreferences.IGNORE);
+ try {
+ ePrefs.flush();
+ } catch (BackingStoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ }else if(result == 2){
+ IEclipsePreferences ePrefs = preferences.getProjectPreferences(file.getProject());
+ ePrefs.put(PROBLEM_ID, SeverityPreferences.IGNORE);
+ try {
+ ePrefs.flush();
+ } catch (BackingStoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ }
+ }
}
}
@@ -193,17 +198,7 @@
return JavaPlugin.getImageDescriptorRegistry().get(JavaPluginImages.DESC_OBJS_ANNOTATION);
}
- private void updateAnnotation(String name, String parameter, ICompilationUnit compilationUnit, IAnnotation annotation) throws JavaModelException{
- IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, annotation);
- if(workingCopyElement == null){
- return;
- }
-
- if(!(workingCopyElement instanceof ISourceReference))
- return;
-
- ISourceReference workingCopySourceReference = (ISourceReference) workingCopyElement;
-
+ private boolean updateAnnotation(String name, String parameter, ICompilationUnit compilationUnit, IAnnotation annotation) throws JavaModelException{
IBuffer buffer = compilationUnit.getBuffer();
String str = AT+name;
@@ -212,7 +207,7 @@
for(IMemberValuePair pair : annotation.getMemberValuePairs()){
if(pair.getValue().toString().equals(parameter)){
- return;
+ return false;
}
str += "\""+pair.getValue()+"\", ";
}
@@ -221,20 +216,17 @@
str += "})";
- buffer.replace(workingCopySourceReference.getSourceRange().getOffset(), workingCopySourceReference.getSourceRange().getLength(), str);
+ buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), str);
+
+ return true;
}
- private void addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
- IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element);
- if(workingCopyElement == null){
- return;
- }
+ private boolean addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
+ if(!(element instanceof ISourceReference))
+ return false;
- if(!(workingCopyElement instanceof ISourceReference))
- return;
+ ISourceReference workingCopySourceReference = (ISourceReference) element;
- ISourceReference workingCopySourceReference = (ISourceReference) workingCopyElement;
-
IBuffer buffer = compilationUnit.getBuffer();
String str = AT+name;
@@ -246,6 +238,8 @@
}
buffer.replace(workingCopySourceReference.getSourceRange().getOffset(), 0, str);
+
+ return true;
}
@SuppressWarnings("unchecked")
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2011-12-12 23:51:57 UTC (rev 37247)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2011-12-13 00:43:46 UTC (rev 37248)
@@ -64,12 +64,12 @@
try {
compilationUnit = EclipseUtil.getCompilationUnit(file);
IJavaElement element = compilationUnit.getElementAt(position);
- if(element != null && element instanceof IMethod){
- IJavaElement parameter = findParameter((IMethod)element, position);
- if(parameter != null){
- return parameter;
- }
- }
+// if(element != null && element instanceof IMethod){
+// IJavaElement parameter = findParameter((IMethod)element, position);
+// if(parameter != null){
+// return parameter;
+// }
+// }
return element;
} catch (CoreException e) {
CommonUIPlugin.getDefault().logError(e);
@@ -77,13 +77,13 @@
return null;
}
- private ILocalVariable findParameter(IMethod method, int position) throws JavaModelException{
- for(ILocalVariable parameter : method.getParameters()){
- if(parameter.getSourceRange().getOffset() <= position && parameter.getSourceRange().getOffset()+parameter.getSourceRange().getLength() > position)
- return parameter;
- }
- return null;
- }
+// private ILocalVariable findParameter(IMethod method, int position) throws JavaModelException{
+// for(ILocalVariable parameter : method.getParameters()){
+// if(parameter.getSourceRange().getOffset() <= position && parameter.getSourceRange().getOffset()+parameter.getSourceRange().getLength() > position)
+// return parameter;
+// }
+// return null;
+// }
public boolean hasResolutions(IMarker marker) {
try {
14 years, 4 months
JBoss Tools SVN: r37247 - in trunk: cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-12-12 18:51:57 -0500 (Mon, 12 Dec 2011)
New Revision: 37247
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java
Removed:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java
Log:
https://issues.jboss.org/browse/JBIDE-10187 Add support for a @SuppressWarnings
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -63,7 +63,7 @@
import org.jboss.tools.common.java.IAnnotated;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IAnnotationType;
-import org.jboss.tools.common.java.IJavaMemberReference;
+import org.jboss.tools.common.java.IJavaReference;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -1191,8 +1191,8 @@
}
public static IJavaElement getJavaElement(ICDIElement cdiElement){
- if(cdiElement instanceof IJavaMemberReference)
- return ((IJavaMemberReference)cdiElement).getSourceMember();
+ if(cdiElement instanceof IJavaReference)
+ return ((IJavaReference)cdiElement).getSourceMember();
if(cdiElement instanceof IBean)
return ((IBean)cdiElement).getBeanClass();
else if(cdiElement instanceof IInjectionPointParameter){
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -12,14 +12,14 @@
import java.util.Set;
-import org.jboss.tools.common.java.IJavaMemberReference;
+import org.jboss.tools.common.java.IJavaReference;
/**
* Represents a class-based bean.
*
* @author Alexey Kazakov
*/
-public interface IClassBean extends IBean, IInterceptorBinded, IJavaMemberReference {
+public interface IClassBean extends IBean, IInterceptorBinded, IJavaReference {
/**
* Returns a set of producers that are declared in this bean class.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -50,7 +50,7 @@
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.java.IAnnotated;
import org.jboss.tools.common.java.IAnnotationDeclaration;
-import org.jboss.tools.common.java.IJavaMemberReference;
+import org.jboss.tools.common.java.IJavaReference;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.java.ITypeDeclaration;
import org.jboss.tools.common.java.ParametedType;
@@ -396,8 +396,8 @@
if(part != null) {
part.getEditorSite().getSelectionProvider().setSelection(new TextSelection(source.getStartPosition(), source.getLength()));
}
- } else if (this instanceof IJavaMemberReference) {
- IMember member = ((IJavaMemberReference)this).getSourceMember();
+ } else if (this instanceof IJavaReference) {
+ IMember member = ((IJavaReference)this).getSourceMember();
try {
JavaUI.openInEditor(member);
} catch (PartInitException e) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -40,6 +40,7 @@
public BeanMember() {}
+ @Override
public BeanMemberDefinition getDefinition() {
return (BeanMemberDefinition)definition;
}
@@ -48,6 +49,11 @@
typeDeclaration = getTypeDeclaration(getDefinition(), getCDIProject().getNature().getTypeFactory());
}
+ @Override
+ public IJavaElement getSourceElement() {
+ return (IJavaElement)getDefinition().getMember();
+ }
+
public static TypeDeclaration getTypeDeclaration(AbstractMemberDefinition definition, ParametedTypeFactory typeFactory) {
IJavaElement member = (IJavaElement)definition.getMember();
try {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -70,7 +70,7 @@
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.scanner.ImplementationCollector;
import org.jboss.tools.common.java.IAnnotationDeclaration;
-import org.jboss.tools.common.java.IJavaMemberReference;
+import org.jboss.tools.common.java.IJavaReference;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.model.XModelObject;
@@ -651,9 +651,9 @@
public synchronized Set<IBean> getBeans(IJavaElement element) {
Set<IBean> result = new HashSet<IBean>();
for (IBean bean: allBeans) {
- if(bean instanceof IJavaMemberReference) {
- IMember m = ((IJavaMemberReference)bean).getSourceMember();
- if(((IJavaMemberReference)bean).getSourceMember().equals(element)) {
+ if(bean instanceof IJavaReference) {
+ IMember m = ((IJavaReference)bean).getSourceMember();
+ if(((IJavaReference)bean).getSourceMember().equals(element)) {
result.add(bean);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -18,6 +18,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
@@ -615,6 +616,15 @@
return getBeanClass();
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.java.IJavaReference#getSourceElement()
+ */
+ @Override
+ public IJavaElement getSourceElement() {
+ return getSourceMember();
+ }
+
public void cleanCache() {
specializingClassBeans.clear();
scope = null;
Added: 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 (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.tck.validation;
+
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ * @author Alexey Kazakov
+ * See https://issues.jboss.org/browse/JBIDE-10187
+ */
+public class SuppressWarningsTests extends ValidationTest {
+
+ public void testLegalTypesInTyped() throws Exception {
+ IFile petShopFile = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 25);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -6,6 +6,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
@@ -211,55 +212,46 @@
@Override
public Set<IInterceptorBindingDeclaration> getInterceptorBindingDeclarations(
boolean includeInherited) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<IInterceptorBinding> getInterceptorBindings() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<IProducer> getProducers() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<IBeanMethod> getDisposers() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<IBeanMethod> getBeanConstructors() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<IBeanMethod> getAllMethods() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<IObserverMethod> getObserverMethods() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<? extends IClassBean> getSpecializingBeans() {
- // TODO Auto-generated method stub
return null;
}
@Override
public IClassBean getSuperClassBean() {
- // TODO Auto-generated method stub
return null;
}
@@ -270,7 +262,6 @@
@Override
public ICDIProject getDeclaringProject() {
- // TODO Auto-generated method stub
return null;
}
@@ -281,13 +272,15 @@
@Override
public void open() {
- // TODO Auto-generated method stub
-
}
@Override
public Set<IInitializerMethod> getInitializers() {
- // TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public IJavaElement getSourceElement() {
+ return getSourceMember();
+ }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -37,13 +37,11 @@
@Override
public IPath getSourcePath() {
- // TODO Auto-generated method stub
return null;
}
@Override
public IResource getResource() {
- // TODO Auto-generated method stub
return null;
}
@@ -54,85 +52,71 @@
@Override
public IParametedType getMemberType() {
- // TODO Auto-generated method stub
return null;
}
@Override
public IMember getSourceMember() {
- // TODO Auto-generated method stub
return null;
}
@Override
public int getStartPosition() {
- // TODO Auto-generated method stub
return 0;
}
@Override
public int getLength() {
- // TODO Auto-generated method stub
return 0;
}
@Override
public List<IAnnotationDeclaration> getAnnotations() {
- // TODO Auto-generated method stub
return null;
}
@Override
public IAnnotationDeclaration getAnnotation(String annotationTypeName) {
- // TODO Auto-generated method stub
return null;
}
@Override
public ITextSourceReference getAnnotationPosition(String annotationTypeName) {
- // TODO Auto-generated method stub
return null;
}
@Override
public boolean isAnnotationPresent(String annotationTypeName) {
- // TODO Auto-generated method stub
return false;
}
@Override
public IParametedType getType() {
- // TODO Auto-generated method stub
return null;
}
@Override
public Set<IQualifierDeclaration> getQualifierDeclarations() {
- // TODO Auto-generated method stub
return null;
}
@Override
public boolean hasDefaultQualifier() {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean isDelegate() {
- // TODO Auto-generated method stub
return false;
}
@Override
public ITextSourceReference getDelegateAnnotation() {
- // TODO Auto-generated method stub
return null;
}
@Override
public IAnnotationDeclaration getInjectAnnotation() {
- // TODO Auto-generated method stub
return null;
}
@@ -160,4 +144,9 @@
public boolean isDeclaredFor(IJavaElement element) {
return false;
}
+
+ @Override
+ public IJavaElement getSourceElement() {
+ return getSourceMember();
+ }
}
\ No newline at end of file
Deleted: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.java;
-
-import org.eclipse.jdt.core.IMember;
-
-/**
- * @author Alexey Kazakov
- */
-public interface IJavaMemberReference {
-
- IMember getSourceMember();
-}
\ No newline at end of file
Copied: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java (from rev 37198, trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.java;
+
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IMember;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface IJavaReference {
+
+ /**
+ * Returns the closest java member of this element.
+ * For example for local variable (method parameter) it will return the parent method.
+ * @return
+ */
+ IMember getSourceMember();
+
+ /**
+ * Returns java element. For java members this method will return the same object as getSourceMember();
+ * @return
+ */
+ IJavaElement getSourceElement();
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -15,6 +15,6 @@
/**
* @author Alexey Kazakov
*/
-public interface IJavaSourceReference extends ITextSourceReference, IJavaMemberReference {
+public interface IJavaSourceReference extends ITextSourceReference, IJavaReference {
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -176,4 +176,11 @@
public IMember getSourceMember() {
return getParentMember();
}
+
+ @Override
+ public IJavaElement getSourceElement() {
+ // Should we return the corresponding java element instead of member?
+ // If this is an annotation declared on local variable (method parameter) then the parent member and element are not the same object.
+ return getSourceMember();
+ }
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -229,9 +229,9 @@
* @return
* @throws JavaModelException
*/
- public static IAnnotation findAnnotationByShortName(IMember member, String name, boolean checkParents) throws JavaModelException {
- if(member instanceof IAnnotatable) {
- IAnnotation[] annotations = ((IAnnotatable)member).getAnnotations();
+ public static IAnnotation findAnnotationByShortName(IJavaElement element, String name, boolean checkParents) throws JavaModelException {
+ if(element instanceof IAnnotatable) {
+ IAnnotation[] annotations = ((IAnnotatable)element).getAnnotations();
for (IAnnotation annotation : annotations) {
String aName = annotation.getElementName();
int i = aName.lastIndexOf('.');
@@ -244,7 +244,7 @@
}
}
if(checkParents) {
- IJavaElement parent = member.getParent();
+ IJavaElement parent = element.getParent();
if(parent!=null && parent instanceof IMember) {
return findAnnotationByShortName((IMember)parent, name, true);
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -21,7 +21,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.BadLocationException;
@@ -178,9 +178,9 @@
private static final String SUPPRESS_WARNINGS_ANNOTATION_FULL = "java.lang.SuppressWarnings";
private static final String ALL_WARNINGS = "all";
- private static IAnnotation getSuppressWarningsAnnotation(String preferenceKey, IMember member) throws JavaModelException {
+ private static IAnnotation getSuppressWarningsAnnotation(String preferenceKey, IJavaElement element) throws JavaModelException {
// Does the element have @SuppressWarnings? Check it by the short name only.
- IAnnotation annotation = EclipseJavaUtil.findAnnotationByShortName(member, SUPPRESS_WARNINGS_ANNOTATION_SHORT, true);
+ IAnnotation annotation = EclipseJavaUtil.findAnnotationByShortName(element, SUPPRESS_WARNINGS_ANNOTATION_SHORT, true);
IAnnotation result = null;
if(annotation!=null) {
IMemberValuePair[] pairs = annotation.getMemberValuePairs();
@@ -211,8 +211,8 @@
private static boolean hasSuppressWarningsAnnotation(String preferenceKey, ITextSourceReference location) throws JavaModelException {
boolean result = false;
if(location instanceof IJavaSourceReference) {
- IMember member = ((IJavaSourceReference) location).getSourceMember();
- result = getSuppressWarningsAnnotation(preferenceKey, member)!=null;
+ IJavaElement element = ((IJavaSourceReference) location).getSourceElement();
+ result = getSuppressWarningsAnnotation(preferenceKey, element)!=null;
}
return result;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -16,6 +16,7 @@
import java.util.Set;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.common.model.project.ext.event.Change;
@@ -149,4 +150,8 @@
}
}
-}
+ @Override
+ public IJavaElement getSourceElement() {
+ return getSourceMember();
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -19,6 +19,7 @@
import java.util.Set;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
@@ -725,4 +726,8 @@
context.remove(SeamXMLConstants.ATTR_TYPE);
}
-}
+ @Override
+ public IJavaElement getSourceElement() {
+ return getSourceMember();
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2011-12-12 22:55:46 UTC (rev 37246)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2011-12-12 23:51:57 UTC (rev 37247)
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -41,7 +42,11 @@
public IMember getSourceMember() {
return javaSource;
}
-
+
+ public IJavaElement getSourceElement() {
+ return getSourceMember();
+ }
+
public void setSourceMember(IMember javaSource) {
this.javaSource = javaSource;
}
14 years, 4 months
JBoss Tools SVN: r37246 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-12 17:55:46 -0500 (Mon, 12 Dec 2011)
New Revision: 37246
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java
Log:
JBIDE-10442
https://issues.jboss.org/browse/JBIDE-10442
Do not read content of .class entries.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java 2011-12-12 22:32:47 UTC (rev 37245)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java 2011-12-12 22:55:46 UTC (rev 37246)
@@ -93,7 +93,7 @@
if("FileAny".equals(entity)) { //$NON-NLS-1$
if(jar.getSize(cpath) > 100000) entity = XModelObjectConstants.ENT_FILE_ANY_LONG;
else if(jar.isTextEntry(cpath, 100)) entity = "FileTXT"; //$NON-NLS-1$
- } else /*if(entity == null)*/ {
+ } else if(!"FileCLASS".equals(entity)) { //$NON-NLS-1$
body = jar.getContent(cpath);
entity = getModel().getEntityRecognizer().getEntityName(new EntityRecognizerContext(name, ext, body));
}
14 years, 4 months
JBoss Tools SVN: r37245 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-12 17:32:47 -0500 (Mon, 12 Dec 2011)
New Revision: 37245
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
Log:
[JBIDE-10447] committed fixed client library
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2011-12-12 21:35:01 UTC (rev 37244)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2011-12-12 22:32:47 UTC (rev 37245)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar" sourcepath="/openshift-java-client"/>
+ <classpathentry exported="true" kind="lib" path="org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar" sourcepath="/home/adietish/jboss-workspaces/openshift-java-client_andre/org.jboss.tools.openshift.express.client"/>
<classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Final.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
14 years, 4 months
JBoss Tools SVN: r37244 - branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 16:35:01 -0500 (Mon, 12 Dec 2011)
New Revision: 37244
Modified:
branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
remove GAE, add GPE into GWT connector (JBDS-1945, JBDS-1737) [apply patch JBDS1737.patch.txt]
Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:34:52 UTC (rev 37243)
+++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:35:01 UTC (rev 37244)
@@ -312,29 +312,15 @@
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.web"
- description="Google App Engine for Java 1.6.0 SDK Bundle"
- id="com.google.appengine.eclipse.sdkbundle.e37.feature"
- kind="task"
- license="EPL, Other"
- name="Google App Engine Java SDK"
- provider="Google, Inc."
- siteUrl="http://dl.google.com/eclipse/plugin/3.7/">
- <icon
- image32="images/google_32.png">
- </icon>
- <overview
- url="http://code.google.com/p/google-plugin-for-eclipse/">
- </overview>
- </connectorDescriptor>
- <connectorDescriptor
- categoryId="org.jboss.tools.central.discovery.web"
- description="Google Web Toolkit 2.4.0 SDK Bundle"
+ description="Google Plugin for Eclipse (GPE) + Google Web Toolkit 2.4.0 SDK (GWT)"
id="com.google.gwt.eclipse.sdkbundle.e37.feature"
kind="task"
license="EPL, Other"
- name="Google Web Toolkit SDK"
+ name="Google Plugin + Web Toolkit"
provider="Google, Inc."
siteUrl="http://dl.google.com/eclipse/plugin/3.7/">
+ <iu id="com.google.gwt.eclipse.sdkbundle.e37.feature"/>
+ <iu id="com.google.gdt.eclipse.suite.e37.feature"/>
<icon
image32="images/google_32.png">
</icon>
14 years, 4 months
JBoss Tools SVN: r37243 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 16:34:52 -0500 (Mon, 12 Dec 2011)
New Revision: 37243
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
remove GAE, add GPE into GWT connector (JBDS-1945, JBDS-1737) [apply patch JBDS1737.patch.txt]
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:24:13 UTC (rev 37242)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:34:52 UTC (rev 37243)
@@ -312,29 +312,15 @@
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.web"
- description="Google App Engine for Java 1.6.0 SDK Bundle"
- id="com.google.appengine.eclipse.sdkbundle.e37.feature"
- kind="task"
- license="EPL, Other"
- name="Google App Engine Java SDK"
- provider="Google, Inc."
- siteUrl="http://dl.google.com/eclipse/plugin/3.7/">
- <icon
- image32="images/google_32.png">
- </icon>
- <overview
- url="http://code.google.com/p/google-plugin-for-eclipse/">
- </overview>
- </connectorDescriptor>
- <connectorDescriptor
- categoryId="org.jboss.tools.central.discovery.web"
- description="Google Web Toolkit 2.4.0 SDK Bundle"
+ description="Google Plugin for Eclipse (GPE) + Google Web Toolkit 2.4.0 SDK (GWT)"
id="com.google.gwt.eclipse.sdkbundle.e37.feature"
kind="task"
license="EPL, Other"
- name="Google Web Toolkit SDK"
+ name="Google Plugin + Web Toolkit"
provider="Google, Inc."
siteUrl="http://dl.google.com/eclipse/plugin/3.7/">
+ <iu id="com.google.gwt.eclipse.sdkbundle.e37.feature"/>
+ <iu id="com.google.gdt.eclipse.suite.e37.feature"/>
<icon
image32="images/google_32.png">
</icon>
14 years, 4 months
JBoss Tools SVN: r37242 - branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 16:24:13 -0500 (Mon, 12 Dec 2011)
New Revision: 37242
Modified:
branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
add other SpringIDE features to SpringIDE connector (JBDS-1966)
Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:24:12 UTC (rev 37241)
+++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:24:13 UTC (rev 37242)
@@ -348,9 +348,16 @@
id="org.springframework.ide.eclipse.feature"
kind="task"
license="Free, EPL, Other"
- name="Spring IDE Core"
+ name="Spring IDE"
provider="Spring IDE Developers"
siteUrl="http://download.jboss.org/jbosstools/updates/indigo/extras/">
+ <iu id="org.springframework.ide.eclipse.aop.feature"/>
+ <iu id="org.springframework.ide.eclipse.autowire.feature"/>
+ <iu id="org.springframework.ide.eclipse.feature"/>
+ <iu id="org.springframework.ide.eclipse.integration.feature"/>
+ <iu id="org.springframework.ide.eclipse.osgi.feature"/>
+ <iu id="org.springframework.ide.eclipse.webflow.feature"/>
+ <iu id="org.springframework.ide.eclipse.security.feature"/>
<icon
image32="images/springide_32.png">
</icon>
14 years, 4 months