JBoss Tools SVN: r32365 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-26 18:55:41 -0400 (Sun, 26 Jun 2011)
New Revision: 32365
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml
Log:
added subclipse info so it is all there for future releases until this issue is fixed - if it is ever fixed by the subclipse team - JBDS-1685
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-06-26 21:01:02 UTC (rev 32364)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-06-26 22:55:41 UTC (rev 32365)
@@ -616,6 +616,29 @@
<para>
The components available on the extras site will then be listed, which you can select and install by following the prompts.
</para>
+ <section>
+ <title>Installing and setting up Subclipse</title>
+ <para>
+ If you decide to install Subclipse from the JBoss Developer Studio Extras site, upon restarting your JBoss Developer Studio installation, an error exists that sets a default SVN property incorrectly. The workaround for this issue is to navigate to <menuchoice>
+ <guimenuitem>Window</guimenuitem>
+ <guimenuitem>Preferences</guimenuitem>
+ <guimenuitem>Team</guimenuitem>
+ <guimenuitem>SVN</guimenuitem>
+ </menuchoice>.
+ </para>
+ <para>
+ If you then see an error window, click the <guibutton>OK</guibutton> button.
+ </para>
+ <para>
+ On the SVN Preferences page, in the <guilabel>SVN interface</guilabel> section, change the drop-down list value of <guilabel>Client</guilabel> to <guimenuitem>SVNKit (Pure Java) SVNKit v1.3.5.7406</guimenuitem>.
+ </para>
+ <para>
+ Click the <guibutton>Apply</guibutton> button and then the <guibutton>OK</guibutton> button.
+ </para>
+ <para>
+ Subclipse will now function correctly.
+ </para>
+ </section>
</section>
<section id="tech_previews">
<title>Accessing to Tech Previews</title>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32364 - in workspace/snjeza/swt.xulrunner.patch: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-06-26 17:01:02 -0400 (Sun, 26 Jun 2011)
New Revision: 32364
Added:
workspace/snjeza/swt.xulrunner.patch/.project
workspace/snjeza/swt.xulrunner.patch/artifacts.jar
workspace/snjeza/swt.xulrunner.patch/content.jar
workspace/snjeza/swt.xulrunner.patch/features/
workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.patch64_1.0.0.jar
workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.patch_1.0.0.jar
workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.source.patch64_1.0.0.jar
workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.source.patch_1.0.0.jar
workspace/snjeza/swt.xulrunner.patch/plugins/
workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86.source_3.7.0.v3736.jar
workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_3.7.0.v3736.jar
workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_64.source_3.7.0.v3736.jar
workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_64_3.7.0.v3736.jar
workspace/snjeza/swt.xulrunner.patch/site.xml
Log:
JBIDE-9231 Create patched SWT plugins for Linux GTK x86 and x86_64
Added: workspace/snjeza/swt.xulrunner.patch/.project
===================================================================
--- workspace/snjeza/swt.xulrunner.patch/.project (rev 0)
+++ workspace/snjeza/swt.xulrunner.patch/.project 2011-06-26 21:01:02 UTC (rev 32364)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>swt.xulrunner.patch</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: workspace/snjeza/swt.xulrunner.patch/artifacts.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/artifacts.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/content.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/content.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.patch64_1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.patch64_1.0.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.patch_1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.patch_1.0.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.source.patch64_1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.source.patch64_1.0.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.source.patch_1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/features/org.eclipse.rcp.source.patch_1.0.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86.source_3.7.0.v3736.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86.source_3.7.0.v3736.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_3.7.0.v3736.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_3.7.0.v3736.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_64.source_3.7.0.v3736.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_64.source_3.7.0.v3736.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_64_3.7.0.v3736.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/swt.xulrunner.patch/plugins/org.eclipse.swt.gtk.linux.x86_64_3.7.0.v3736.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/swt.xulrunner.patch/site.xml
===================================================================
--- workspace/snjeza/swt.xulrunner.patch/site.xml (rev 0)
+++ workspace/snjeza/swt.xulrunner.patch/site.xml 2011-06-26 21:01:02 UTC (rev 32364)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.rcp.patch_1.0.0.jar" id="org.eclipse.rcp.patch" version="1.0.0" patch="true">
+ <category name="org.eclipse.rcp.patch"/>
+ </feature>
+ <feature url="features/org.eclipse.rcp.source.patch_1.0.0.jar" id="org.eclipse.rcp.source.patch" version="1.0.0" patch="true">
+ <category name="org.eclipse.rcp.patch"/>
+ </feature>
+ <feature url="features/org.eclipse.rcp.patch64_1.0.0.jar" id="org.eclipse.rcp.patch64" version="1.0.0" patch="true">
+ <category name="org.eclipse.rcp.patch"/>
+ </feature>
+ <feature url="features/org.eclipse.rcp.source.patch64_1.0.0.jar" id="org.eclipse.rcp.source.patch64" version="1.0.0" patch="true">
+ <category name="org.eclipse.rcp.patch"/>
+ </feature>
+ <category-def name="org.eclipse.rcp.patch" label="SWT XULRunner Patch"/>
+</site>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32363 - in trunk/ws/docs/reference/en-US: images/topdown and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-26 17:01:00 -0400 (Sun, 26 Jun 2011)
New Revision: 32363
Modified:
trunk/ws/docs/reference/en-US/Book_Info.xml
trunk/ws/docs/reference/en-US/Revision_History.xml
trunk/ws/docs/reference/en-US/images/topdown/jbossws_ws_creation2.png
trunk/ws/docs/reference/en-US/topdown.xml
Log:
Updated with patch and new screenshot from Grid in TOOLSDOC-189
Modified: trunk/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Book_Info.xml 2011-06-26 20:52:53 UTC (rev 32362)
+++ trunk/ws/docs/reference/en-US/Book_Info.xml 2011-06-26 21:01:00 UTC (rev 32363)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
Modified: trunk/ws/docs/reference/en-US/Revision_History.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Revision_History.xml 2011-06-26 20:52:53 UTC (rev 32362)
+++ trunk/ws/docs/reference/en-US/Revision_History.xml 2011-06-26 21:01:00 UTC (rev 32363)
@@ -5,6 +5,17 @@
<title>Revision History</title>
<simpara>
<revhistory>
+ <revision>
+ <revnumber>3.0</revnumber><date>Mon Jun 27 2011</date>
+ <author>
+ <firstname>Isaac</firstname><surname>Rooskov</surname><email></email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updated with new information concerning JBoss Web Service Code Generation Configuration</member>
+ </simplelist>
+ </revdescription>
+ </revision>
<revision>
<revnumber>2.0</revnumber><date>Tue Nov 16 2010</date>
<author>
Modified: trunk/ws/docs/reference/en-US/images/topdown/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/reference/en-US/topdown.xml
===================================================================
--- trunk/ws/docs/reference/en-US/topdown.xml 2011-06-26 20:52:53 UTC (rev 32362)
+++ trunk/ws/docs/reference/en-US/topdown.xml 2011-06-26 21:01:00 UTC (rev 32363)
@@ -233,9 +233,61 @@
</imageobject>
</mediaobject>
</figure>
-
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis> <property>WSDL Service</property> </emphasis> : display the services in your WSDL file, you can select one to generate Web Service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Source Folder</property> </emphasis> : display the source codes folder in your web project, you can select one to generate java codes.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Package name</property> </emphasis> : input a package name. You can click the Brown button to choose one. If you don't input a package name, system will generate one for you.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>JAX-WS specificaiton</property> </emphasis> : display the supported JAX-WS version, include, 2.0, 2.1, 2.2
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Catalog file</property> </emphasis> : specify a catalog file.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Binding files</property> </emphasis> : specify some binding files that are used by your WSDL file
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Enable binding extension support (Only available for JBossWS 3.0 or later)</property> </emphasis> : select it if you need the binding extension support. Only work based on JBossWS 3.0 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Generate default Web Service implementation classes</property> </emphasis> : select it if you want to generate empty implementation classes for the selected WSDL Service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Update the default Web.xml</property> </emphasis> : update the Web.xml file with your Web Service servlets configured.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Additional Options</property> </emphasis> : the senior options for the generating process. Only for the senior user.
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- On this page, the default package name comes from the namespace of the WSDL document, you also can change it to any valid package name you want. JAX-WS specification should be set to 2.0 if your JBossWS runtime in JBoss Server is JBossWS native runtime. You can specify a catalog file and binding files if you have them. If you want the wizard to generate empty implementation classes for the Web Service, check the <emphasis> <property>Generate default Web Service implementation classes</property> </emphasis> check box. If you want to update the default Web.xml file with the Web Service servlets configured, check the <emphasis> <property>Update the default Web.xml</property> </emphasis> check box. Click on the <emphasis> <property>Next</property> </emphasis> or on the <emphasis> <property>Finish</property> </emphasis> button to generate code.
+ Click on the <emphasis> <property>Next</property> </emphasis> or on the <emphasis> <property>Finish</property> </emphasis> button to generate code.
</para>
<para>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32362 - workspace/snjeza.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-06-26 16:52:53 -0400 (Sun, 26 Jun 2011)
New Revision: 32362
Added:
workspace/snjeza/swt.xulrunner.patch/
Log:
Initial import.
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32361 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-24 21:03:42 -0400 (Fri, 24 Jun 2011)
New Revision: 32361
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DispatcherPolicy.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Durable.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DurableMessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageSystemConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MyMessageQueues.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Payload.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java
Log:
https://issues.jboss.org/browse/JBIDE-9255
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-24 22:24:15 UTC (rev 32360)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -309,6 +309,7 @@
validateResource(file);
}
+ cleanSavedMarkers();
return OK_STATUS;
}
@@ -382,6 +383,7 @@
validateResource(file);
}
+ cleanSavedMarkers();
return OK_STATUS;
}
@@ -574,10 +576,15 @@
if(reference==null) {
reference = CDIUtil.getNamedDeclaration(bean);
}
- StringBuffer sb = new StringBuffer(bean.getSimpleJavaName());
+ Set<String> names = new HashSet<String>();
+ String bName = bean.getSimpleJavaName();
+ names.add(bName);
+ StringBuffer sb = new StringBuffer(bName);
for (IBean iBean : beans) {
- if(bean!=iBean) {
- sb.append(", ").append(iBean.getSimpleJavaName());
+ bName = iBean.getSimpleJavaName();
+ if(bean!=iBean && !names.contains(bName)) {
+ names.add(bName);
+ sb.append(", ").append(bName);
}
}
addError(MessageFormat.format(CDIValidationMessages.DUPLCICATE_EL_NAME, sb.toString()), CDIPreferences.AMBIGUOUS_EL_NAMES, reference, bean.getResource());
@@ -617,6 +624,15 @@
}
/*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager#shouldCheckDuplicateMarkers()
+ */
+ @Override
+ protected boolean shouldCheckDuplicateMarkers() {
+ return true;
+ }
+
+ /*
* Returns set of EL names which are declared in the resource
*/
private Set<String> getELNamesByResource(IPath resourcePath) {
@@ -753,6 +769,7 @@
*/
Set<IParametedType> beanTypes = bean.getLegalTypes();
Set<IParametedType> specializingBeanTypes = specializedBean.getLegalTypes();
+ StringBuffer missingTypes = new StringBuffer();
for (IParametedType specializingType : specializingBeanTypes) {
boolean found = false;
for (IParametedType type : beanTypes) {
@@ -762,11 +779,18 @@
}
}
if(!found) {
- addError(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN,
- new String[]{beanName, specializingBeanName, specializingType.getType().getElementName()},
- bean.getSpecializesAnnotationDeclaration(), bean.getResource());
+ if(missingTypes.length()>0) {
+ missingTypes.append(", ");
+ }
+ missingTypes.append(specializingType.getType().getElementName());
}
}
+ if(missingTypes.length()>0) {
+ addError(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN,
+ new String[]{beanName, specializingBeanName, missingTypes.toString()},
+ bean.getSpecializesAnnotationDeclaration(), bean.getResource());
+ }
+
/*
* 4.3.1. Direct and indirect specialization
* - X specializes Y and Y has a name and X declares a name explicitly, using @Named
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-06-24 22:24:15 UTC (rev 32360)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-06-25 01:03:42 UTC (rev 32361)
@@ -112,7 +112,7 @@
ILLEGAL_SPECIALIZING_SESSION_BEAN=Session bean class annotated @Specializes must directly extend the bean class of another session bean [JSR-299 �3.2.4]
ILLEGAL_SPECIALIZING_PRODUCER_STATIC=Producer method annotated @Specializes cannot be static [JSR-299 �3.3.3]
ILLEGAL_SPECIALIZING_PRODUCER_OVERRIDE=Producer method annotated @Specializes must directly override another producer method [JSR-299 �3.3.3]
-MISSING_TYPE_IN_SPECIALIZING_BEAN=Bean {0} specializes {1} but does not have {2} bean type of {1} [JSR-299 �4.3.1]
+MISSING_TYPE_IN_SPECIALIZING_BEAN=Bean {0} specializes {1} but does not have bean type(s): {2} of bean {1} [JSR-299 �4.3.1]
CONFLICTING_NAME_IN_SPECIALIZING_BEAN=Bean {0} specializes {1} and {1} has a name and {0} declares a name explicitly, using @Named [JSR-299 �4.3.1]
INTERCEPTOR_ANNOTATED_SPECIALIZES=Interceptor is annotated @Specializes [JSR-299 �4.3.1]
DECORATOR_ANNOTATED_SPECIALIZES=Decorator is annotated @Specializes [JSR-299 �4.3.1]
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-06-24 22:24:15 UTC (rev 32360)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -12,6 +12,7 @@
package org.jboss.tools.cdi.core.test.tck.validation;
import java.text.MessageFormat;
+import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.osgi.util.NLS;
@@ -928,8 +929,17 @@
*/
public void testBeanDoesNotHaveSomeTypeOfSpecializedBean() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Farmer"), 6);
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Simple"), 6);
+
+ String message = AbstractResourceMarkerTest.convertMessageToPatern(MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Farmer, Simple"));
+ List<Integer> lines = AbstractResourceMarkerTest.findMarkerLines(file, AbstractResourceMarkerTest.MARKER_TYPE, message, true);
+ if(!lines.contains(new Integer(6))) {
+ message = AbstractResourceMarkerTest.convertMessageToPatern(MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Simple, Farmer"));
+ lines = AbstractResourceMarkerTest.findMarkerLines(file, AbstractResourceMarkerTest.MARKER_TYPE, message, true);
+ assertTrue(lines.contains(new Integer(6)));
+ }
+
+// AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Farmer"), 6);
+// AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Simple"), 6);
}
/**
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,13 @@
+package org.jboss.generic4;
+
+import java.lang.annotation.Retention;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+(a)GenericType(MessageSystemConfiguration.class)
+@interface ACMEQueue {
+
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DispatcherPolicy.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DispatcherPolicy.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DispatcherPolicy.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,7 @@
+package org.jboss.generic4;
+
+public interface DispatcherPolicy {
+
+ void removeDuplicates();
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DispatcherPolicy.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Durable.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Durable.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Durable.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,21 @@
+package org.jboss.generic4;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Durable {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Durable.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DurableMessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DurableMessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DurableMessageLogger.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,23 @@
+package org.jboss.generic4;
+
+import javax.inject.Inject;
+
+public class DurableMessageLogger {
+
+ @Inject
+ @Durable
+ MessageDispatcher dispatcher;
+
+ @Inject
+ @Durable
+ DispatcherPolicy policy;
+
+ /* Tweak the dispatch policy to enable duplicate removal */
+ @Inject
+ void tweakPolicy(@Durable DispatcherPolicy policy) {
+ policy.removeDuplicates();
+ }
+
+ void logMessage(Payload payload) {
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/DurableMessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,9 @@
+package org.jboss.generic4;
+
+import org.jboss.seam.solder.messages.Message;
+
+public interface MessageDispatcher {
+
+ void send(Message message);
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageLogger.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,19 @@
+package org.jboss.generic4;
+
+import javax.inject.Inject;
+
+public class MessageLogger {
+
+ @Inject
+ MessageDispatcher dispatcher;
+
+ void logMessage(Payload payload) {
+ /* Add metaddata to the message */
+ dispatcher.send(null);
+ }
+
+ @Inject
+ @Durable
+ MessageDispatcher durableDispatcher;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,27 @@
+package org.jboss.generic4;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(ACMEQueue.class)
+class MessageManager {
+
+ @Inject
+ @Generic
+ MessageQueue queue;
+
+ @Produces
+ @ApplyScope
+ MessageDispatcher messageDispatcherProducer() {
+ return queue.createMessageDispatcher();
+ }
+
+ @Produces
+ DispatcherPolicy getPolicy() {
+ return queue.getDispatcherPolicy();
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageQueue.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,8 @@
+package org.jboss.generic4;
+
+public interface MessageQueue {
+
+ public MessageDispatcher createMessageDispatcher();
+
+ public DispatcherPolicy getDispatcherPolicy();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageSystemConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageSystemConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageSystemConfiguration.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,10 @@
+package org.jboss.generic4;
+
+public class MessageSystemConfiguration {
+
+ MessageSystemConfiguration(Object o) {
+
+ }
+
+ protected boolean durable;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageSystemConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MyMessageQueues.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MyMessageQueues.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MyMessageQueues.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,23 @@
+package org.jboss.generic4;
+
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+public class MyMessageQueues {
+ @Produces
+ @ACMEQueue("defaultQueue")
+ @Named("aaa")
+ MessageSystemConfiguration defaultQueue = new MessageSystemConfiguration(null);
+
+ @Produces
+ @Durable
+ @ConversationScoped
+ @ACMEQueue("durableQueue")
+ @Named("aaa")
+ MessageSystemConfiguration producerDefaultQueue() {
+ MessageSystemConfiguration config = new MessageSystemConfiguration(null);
+// config.setDurable(true);
+ return config;
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MyMessageQueues.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Payload.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Payload.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Payload.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,5 @@
+package org.jboss.generic4;
+
+public class Payload {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/Payload.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -0,0 +1,38 @@
+package org.jboss.generic4;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import java.io.Serializable;
+
+(a)GenericConfiguration(ACMEQueue.class)
+@ApplyScope
+public class QueueManager implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Inject
+ @Generic
+ MessageSystemConfiguration systemConfig;
+
+ @Inject
+ ACMEQueue config;
+
+// MessageQueueFactory factory;
+
+ @PostConstruct
+ void init() {
+// factory = systemConfig.createMessageQueueFactory();
+ }
+
+ @Produces
+ @ApplyScope
+ public MessageQueue messageQueueProducer() {
+// return factory.createMessageQueue(config.name());
+ return null;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-06-24 22:24:15 UTC (rev 32360)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -164,6 +164,11 @@
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT.substring(0, 35) + ".*");
}
+ // https://issues.jboss.org/browse/JBIDE-9255
+ public void testDuplicateNamedBeans() throws CoreException {
+ IFile file = project.getFile(new Path("src/org/jboss/generic4/MyMessageQueues.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.DUPLCICATE_EL_NAME.substring(0, 11) + ".*", 10, 17);
+ }
static void writeFile(IProject project, String sourcePath, String targetPath) throws CoreException {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2011-06-24 22:24:15 UTC (rev 32360)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2011-06-25 01:03:42 UTC (rev 32361)
@@ -11,6 +11,7 @@
package org.jboss.tools.jst.web.kb.internal.validation;
import java.text.MessageFormat;
+import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.resources.IMarker;
@@ -76,6 +77,7 @@
* @see org.jboss.tools.jst.web.kb.validation.IValidationErrorManager#init(org.eclipse.core.resources.IProject, org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, org.jboss.tools.jst.web.kb.validation.IProjectValidationContext, org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IReporter)
*/
public void init(IProject project, ContextValidationHelper validationHelper, IProjectValidationContext validationContext, IValidator manager, IReporter reporter) {
+ cleanSavedMarkers();
setProject(project);
setCoreHelper(validationHelper);
setValidationManager(manager);
@@ -187,6 +189,51 @@
*/
protected abstract String getPreference(IProject project, String preferenceKey);
+ private Set<MarkerID> markers = new HashSet<MarkerID>();
+
+ private static class MarkerID {
+
+ String preferenceKey;
+ int length;
+ int offset;
+ String path;
+
+ public MarkerID(String preferenceKey, int length, int offset, String path) {
+ super();
+ this.preferenceKey = preferenceKey;
+ this.length = length;
+ this.offset = offset;
+ this.path = path;
+ }
+
+ @Override
+ public int hashCode() {
+ return toString().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof MarkerID && toString().equals(obj.toString());
+ }
+
+ @Override
+ public String toString() {
+ return path + ":" + preferenceKey + ":" + length + ":" + offset; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ }
+
+ /**
+ * Returns true if the manager should not add a problem markers with the same location and preference key twice.
+ * @return
+ */
+ protected boolean shouldCheckDuplicateMarkers() {
+ return false;
+ }
+
+ protected void cleanSavedMarkers() {
+ markers.clear();
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#addError(java.lang.String, java.lang.String, java.lang.String[], int, int, org.eclipse.core.resources.IResource)
@@ -199,8 +246,18 @@
int severity = IMessage.HIGH_SEVERITY;
if (SeverityPreferences.WARNING.equals(preferenceValue)) {
severity = IMessage.NORMAL_SEVERITY;
- }
- marker = addError(message, severity, messageArguments, lineNumber, length, offset, target, getDocumentProvider(), getMarkerId(), getMarkerOwner());
+ }
+ if(shouldCheckDuplicateMarkers()) {
+ MarkerID id = new MarkerID(preferenceKey, length, offset, target.getFullPath().toOSString());
+ if(!markers.contains(id)) {
+ marker = addError(message, severity, messageArguments, lineNumber, length, offset, target, getDocumentProvider(), getMarkerId(), getMarkerOwner());
+ if(marker!=null) {
+ markers.add(id);
+ }
+ }
+ } else {
+ marker = addError(message, severity, messageArguments, lineNumber, length, offset, target, getDocumentProvider(), getMarkerId(), getMarkerOwner());
+ }
}
return marker;
}
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32360 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDISolderTest/src/org/jboss/generic3 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-24 18:24:15 -0400 (Fri, 24 Jun 2011)
New Revision: 32360
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Configuration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.duplicates
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.original
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier2.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
Log:
JBIDE-8695
https://issues.jboss.org/browse/JBIDE-8695
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Configuration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Configuration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Configuration.java 2011-06-24 22:24:15 UTC (rev 32360)
@@ -0,0 +1,5 @@
+package org.jboss.generic3;
+
+public class Configuration {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Configuration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.duplicates
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.duplicates (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.duplicates 2011-06-24 22:24:15 UTC (rev 32360)
@@ -0,0 +1,27 @@
+package org.jboss.generic3;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Produces;
+
+/*
+ * Generic configuration points point1 and point2 are not duplicate.
+ * This test checks algorithm comparing qualifiers.
+ * (First, incorrect version considered point1 a duplicate of point2,
+ * if qualifiers of point1 made a subset of qualifiers of point2.)
+ *
+ */
+public class ConfigurationPointProducer {
+
+ @Produces
+ @GenericAnnotation("a")
+ @Qualifier1
+ @Qualifier2
+ Configuration point1;
+
+ @Produces
+ @GenericAnnotation("b")
+ @Qualifier1
+ @Qualifier2
+ Configuration point2;
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.java 2011-06-24 22:24:15 UTC (rev 32360)
@@ -0,0 +1,26 @@
+package org.jboss.generic3;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Produces;
+
+/*
+ * Generic configuration points point1 and point2 are not duplicate.
+ * This test checks algorithm comparing qualifiers.
+ * (First, incorrect version considered point1 a duplicate of point2,
+ * if qualifiers of point1 made a subset of qualifiers of point2.)
+ *
+ */
+public class ConfigurationPointProducer {
+
+ @Produces
+ @GenericAnnotation("a")
+ @Qualifier1
+ Configuration point1;
+
+ @Produces
+ @GenericAnnotation("b")
+ @Qualifier1
+ @Qualifier2
+ Configuration point2;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.original (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/ConfigurationPointProducer.original 2011-06-24 22:24:15 UTC (rev 32360)
@@ -0,0 +1,26 @@
+package org.jboss.generic3;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Produces;
+
+/*
+ * Generic configuration points point1 and point2 are not duplicate.
+ * This test checks algorithm comparing qualifiers.
+ * (First, incorrect version considered point1 a duplicate of point2,
+ * if qualifiers of point1 made a subset of qualifiers of point2.)
+ *
+ */
+public class ConfigurationPointProducer {
+
+ @Produces
+ @GenericAnnotation("a")
+ @Qualifier1
+ Configuration point1;
+
+ @Produces
+ @GenericAnnotation("b")
+ @Qualifier1
+ @Qualifier2
+ Configuration point2;
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java 2011-06-24 22:24:15 UTC (rev 32360)
@@ -0,0 +1,12 @@
+package org.jboss.generic3;
+
+import java.lang.annotation.Retention;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+(a)GenericType(Configuration.class)
+@interface GenericAnnotation {
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier1.java 2011-06-24 22:24:15 UTC (rev 32360)
@@ -0,0 +1,21 @@
+package org.jboss.generic3;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier2.java 2011-06-24 22:24:15 UTC (rev 32360)
@@ -0,0 +1,21 @@
+package org.jboss.generic3;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/Qualifier2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-06-24 22:23:07 UTC (rev 32359)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-06-24 22:24:15 UTC (rev 32360)
@@ -136,7 +136,35 @@
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT + ".*");
}
+ public void testDuplicateGenericPointConfiguration() throws CoreException {
+ /*
+ * ConfigurationPointProducer has no duplicate generic configuration points,
+ * because one of them has an additional qualifier.
+ */
+ IFile file = project.getFile(new Path("src/org/jboss/generic3/ConfigurationPointProducer.java"));
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT.substring(0, 35) + ".*");
+
+ /*
+ * Replace ConfigurationPointProducer with version where configuration points have same qualifiers.
+ * It has duplicate generic configuration points.
+ */
+ writeFile(project, "src/org/jboss/generic3/ConfigurationPointProducer.duplicates",
+ "src/org/jboss/generic3/ConfigurationPointProducer.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT.substring(0, 35) + ".*", 19, 25);
+
+ /*
+ * Set original ConfigurationPointProducer.java back.
+ * ConfigurationPointProducer has no duplicate generic configuration points.
+ */
+ writeFile(project, "src/org/jboss/generic3/ConfigurationPointProducer.original",
+ "src/org/jboss/generic3/ConfigurationPointProducer.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT.substring(0, 35) + ".*");
+ }
+
+
static void writeFile(IProject project, String sourcePath, String targetPath) throws CoreException {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
JobUtils.waitForIdle();
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32359 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core: validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-24 18:23:07 -0400 (Fri, 24 Jun 2011)
New Revision: 32359
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties
Log:
JBIDE-8695
https://issues.jboss.org/browse/JBIDE-8695
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-06-24 21:42:56 UTC (rev 32358)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-06-24 22:23:07 UTC (rev 32359)
@@ -16,7 +16,11 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IAnnotatable;
import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
@@ -35,7 +39,6 @@
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferences;
import org.jboss.tools.cdi.seam.solder.core.validation.SeamSolderValidationMessages;
import org.jboss.tools.common.text.ITextSourceReference;
-import org.jboss.tools.common.util.EclipseJavaUtil;
/**
*
@@ -88,14 +91,22 @@
* than respective generic beans will result in ambiguous beans for injections
* with that set of qualifiers.
*/
+ StringBuffer duplicates = new StringBuffer();
List<IQualifierDeclaration> ds = bs.get(d);
for (AbstractMemberDefinition d1: bs.keySet()) {
List<IQualifierDeclaration> ds2 = bs.get(d1);
- if(ds2 != ds && !d1.getTypeDefinition().isVetoed() && CDIProject.areMatchingQualifiers(ds, ds2)) {
- validator.addError(SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT,
- CDISeamSolderPreferences.AMBIGUOUS_GENERIC_CONFIGURATION_POINT, new String[0], reference, file);
+ if(ds2 != ds && !d1.getTypeDefinition().isVetoed()
+ && CDIProject.areMatchingQualifiers(ds, ds2)
+ && CDIProject.areMatchingQualifiers(ds2, ds)) {
+ duplicates.append(", ").append(definitionToString(d1));
}
}
+ if(duplicates.length() > 0) {
+ duplicates.insert(0, definitionToString(d));
+ String message = NLS.bind(SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT, duplicates.toString());
+ validator.addError(message,
+ CDISeamSolderPreferences.AMBIGUOUS_GENERIC_CONFIGURATION_POINT, new String[0], reference, file);
+ }
/*
* Type of generic configuration point must be assignable to the configuration type.
@@ -112,6 +123,21 @@
}
+ private String definitionToString(AbstractMemberDefinition d) {
+ IAnnotatable e = d.getMember();
+ String result = "";
+ if(e instanceof IType) {
+ result = ((IType)e).getElementName();
+ } else if(e instanceof IMember) {
+ IMember m = (IMember)e;
+ result = m.getDeclaringType().getElementName() + "." + m.getElementName();
+ if(e instanceof IMethod) {
+ result += "()";
+ }
+ }
+ return result;
+ }
+
private IBean findGenericBean(IFile file, IMember member, CDICoreNature project) {
Set<IBean> bs = project.getDelegate().getBeans(file.getFullPath());
for (IBean b: bs) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties 2011-06-24 21:42:56 UTC (rev 32358)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties 2011-06-24 22:23:07 UTC (rev 32359)
@@ -1,4 +1,4 @@
-AMBIGUOUS_GENERIC_CONFIGURATION_POINT=Duplicate generic configuration point.
+AMBIGUOUS_GENERIC_CONFIGURATION_POINT=Duplicate generic configuration point: {0}.
WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT=Type of generic configuration point must be assignable to the generic configuration type.
WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE=Annotation type mismatch: {0} is not a generic configuration annotation.
GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN=Generic configuration types may not be generic beans.
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32358 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-24 17:42:56 -0400 (Fri, 24 Jun 2011)
New Revision: 32358
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
Log:
https://issues.jboss.org/browse/JBIDE-9251
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2011-06-24 20:48:45 UTC (rev 32357)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2011-06-24 21:42:56 UTC (rev 32358)
@@ -106,114 +106,114 @@
elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
+ if(elements.length != 1)
+ return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
- for (IJavaElement element : elements) {
- if (element instanceof IAnnotatable) {
- IAnnotatable annotatable = (IAnnotatable)element;
-
- IAnnotation annotation = annotatable.getAnnotation("In");
- if (annotation == null || !annotation.exists())
- continue;
-
- String nameToSearch = element.getElementName();
-
- IMemberValuePair[] mvPairs = annotation.getMemberValuePairs();
- if (mvPairs != null) {
- for (IMemberValuePair mvPair : mvPairs) {
- if ("value".equals(mvPair.getMemberName()) && mvPair.getValue() != null) {
- String name = mvPair.getValue().toString();
- if (name != null && name.trim().length() != 0) {
- nameToSearch = name;
- break;
- }
+ if (elements[0] instanceof IAnnotatable) {
+ IAnnotatable annotatable = (IAnnotatable)elements[0];
+
+ IAnnotation annotation = annotatable.getAnnotation("In");
+ if (annotation == null || !annotation.exists())
+ return null;
+
+ String nameToSearch = elements[0].getElementName();
+
+ IMemberValuePair[] mvPairs = annotation.getMemberValuePairs();
+ if (mvPairs != null) {
+ for (IMemberValuePair mvPair : mvPairs) {
+ if ("value".equals(mvPair.getMemberName()) && mvPair.getValue() != null) {
+ String name = mvPair.getValue().toString();
+ if (name != null && name.trim().length() != 0) {
+ nameToSearch = name;
+ break;
}
}
}
-
+ }
+
- if (nameToSearch == null && nameToSearch.trim().length() == 0)
- continue;
-
- ISeamJavaComponentDeclaration declaration = null;
-
- if(file != null) {
- Set<ISeamComponent> cs = seamProject.getComponentsByPath(file.getFullPath());
- for (ISeamComponent c: cs) {
- ISeamJavaComponentDeclaration d = c.getJavaDeclaration();
- if(d != null && file.getFullPath().equals(d.getSourcePath()) && !((SeamJavaComponentDeclaration)d).getImports().isEmpty()) {
- declaration = d;
- }
+ if (nameToSearch == null && nameToSearch.trim().length() == 0)
+ return null;
+
+ ISeamJavaComponentDeclaration declaration = null;
+
+ if(file != null) {
+ Set<ISeamComponent> cs = seamProject.getComponentsByPath(file.getFullPath());
+ for (ISeamComponent c: cs) {
+ ISeamJavaComponentDeclaration d = c.getJavaDeclaration();
+ if(d != null && file.getFullPath().equals(d.getSourcePath()) && !((SeamJavaComponentDeclaration)d).getImports().isEmpty()) {
+ declaration = d;
}
-
}
- Set<ISeamContextVariable> vars = seamProject.getVariables(declaration);
- if (vars != null) {
- for (ISeamContextVariable var : vars) {
- if (nameToSearch.equals(var.getName())){
- while (var instanceof ISeamContextShortVariable) {
- var = ((ISeamContextShortVariable)var).getOriginal();
+
+ }
+ Set<ISeamContextVariable> vars = seamProject.getVariables(declaration);
+ if (vars != null) {
+ for (ISeamContextVariable var : vars) {
+ if (nameToSearch.equals(var.getName())){
+ while (var instanceof ISeamContextShortVariable) {
+ var = ((ISeamContextShortVariable)var).getOriginal();
+ }
+ if (var == null)
+ continue;
+
+ if (var instanceof ISeamXmlFactory) {
+ ISeamXmlFactory xmlFactory = (ISeamXmlFactory)var;
+
+ String value = xmlFactory.getValue();
+ if (value == null || value.trim().length() == 0) {
+ value = xmlFactory.getMethod();
}
- if (var == null)
+
+ if (value == null || value.trim().length() == 0)
continue;
- if (var instanceof ISeamXmlFactory) {
- ISeamXmlFactory xmlFactory = (ISeamXmlFactory)var;
-
- String value = xmlFactory.getValue();
- if (value == null || value.trim().length() == 0) {
- value = xmlFactory.getMethod();
- }
-
- if (value == null || value.trim().length() == 0)
- continue;
-
- List<IJavaElement> javaElements = null;
-
- try {
- javaElements = engine.getJavaElementsForExpression(
- seamProject, file, value, region.getOffset());
- } catch (StringIndexOutOfBoundsException e) {
- SeamExtPlugin.getDefault().logError(e);
- } catch (BadLocationException e) {
- SeamExtPlugin.getDefault().logError(e);
- }
- if (javaElements != null) {
- for (IJavaElement javaElement : javaElements) {
- String resourceName = null;
- if (javaElement.getResource() != null) {
- resourceName=javaElement.getResource().getName();
- }
- hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, javaElement, nameToSearch));
+ List<IJavaElement> javaElements = null;
+
+ try {
+ javaElements = engine.getJavaElementsForExpression(
+ seamProject, file, value, region.getOffset());
+ } catch (StringIndexOutOfBoundsException e) {
+ SeamExtPlugin.getDefault().logError(e);
+ } catch (BadLocationException e) {
+ SeamExtPlugin.getDefault().logError(e);
+ }
+ if (javaElements != null) {
+ for (IJavaElement javaElement : javaElements) {
+ String resourceName = null;
+ if (javaElement.getResource() != null) {
+ resourceName=javaElement.getResource().getName();
}
+ hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, javaElement, nameToSearch));
}
- } else if (var instanceof ISeamComponent) {
- String resourceName = null;
- ISeamComponent comp = (ISeamComponent)var;
- Set<ISeamComponentDeclaration> decls = comp.getAllDeclarations();
- for (ISeamComponentDeclaration decl : decls) {
- if (decl.getResource() != null) {
- resourceName = decl.getResource().getName();
- break;
- }
+ }
+ } else if (var instanceof ISeamComponent) {
+ String resourceName = null;
+ ISeamComponent comp = (ISeamComponent)var;
+ Set<ISeamComponentDeclaration> decls = comp.getAllDeclarations();
+ for (ISeamComponentDeclaration decl : decls) {
+ if (decl.getResource() != null) {
+ resourceName = decl.getResource().getName();
+ break;
}
- hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, (ISeamComponent)var, nameToSearch));
- } else if (var instanceof IRole) {
- String resourceName = null;
- if (var.getResource() != null) {
- resourceName = var.getResource().getName();
- }
- hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, (IRole)var, nameToSearch));
- } else if (var instanceof IBijectedAttribute) {
- String resourceName = null;
- if (var.getResource() != null) {
- resourceName = var.getResource().getName();
- }
- IBijectedAttribute attr = (IBijectedAttribute)var;
- if (attr.getSourceMember() != null) {
- hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, (IBijectedAttribute)var, nameToSearch));
- }
}
+ hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, (ISeamComponent)var, nameToSearch));
+ } else if (var instanceof IRole) {
+ String resourceName = null;
+ if (var.getResource() != null) {
+ resourceName = var.getResource().getName();
+ }
+ hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, (IRole)var, nameToSearch));
+ } else if (var instanceof IBijectedAttribute) {
+ String resourceName = null;
+ if (var.getResource() != null) {
+ resourceName = var.getResource().getName();
+ }
+ IBijectedAttribute attr = (IBijectedAttribute)var;
+ if (attr.getSourceMember() != null) {
+ hyperlinks.add(new SeamComponentHyperlink(wordRegion, resourceName, (IBijectedAttribute)var, nameToSearch));
+ }
}
}
}
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32357 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-24 16:48:45 -0400 (Fri, 24 Jun 2011)
New Revision: 32357
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
Log:
https://issues.jboss.org/browse/JBIDE-9251
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-06-24 19:00:59 UTC (rev 32356)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-06-24 20:48:45 UTC (rev 32357)
@@ -23,9 +23,8 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.ResolvedBinaryType;
-import org.eclipse.jdt.internal.core.ResolvedSourceType;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
import org.eclipse.jdt.internal.ui.text.JavaWordFinder;
@@ -99,23 +98,23 @@
elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
+ if(elements.length != 1)
+ return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
- for (IJavaElement element : elements) {
- int position = 0;
- if(element instanceof ResolvedSourceType || element instanceof ResolvedBinaryType){
- ICompilationUnit cUnit = (ICompilationUnit)input;
- element = cUnit.getElementAt(wordRegion.getOffset());
- if(element == null)
- continue;
-
- if(element instanceof IMethod){
- position = offset;
- }
+ int position = 0;
+ if(elements[0] instanceof IType){
+ ICompilationUnit cUnit = (ICompilationUnit)input;
+ elements[0] = cUnit.getElementAt(wordRegion.getOffset());
+ if(elements[0] == null)
+ return null;
+
+ if(elements[0] instanceof IMethod){
+ position = offset;
}
-
- findInjectedBeans(cdiNature, element, position, file, hyperlinks);
}
+
+ findInjectedBeans(cdiNature, elements[0], position, file, hyperlinks);
if (hyperlinks != null && !hyperlinks.isEmpty()) {
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-06-24 19:00:59 UTC (rev 32356)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-06-24 20:48:45 UTC (rev 32357)
@@ -11,7 +11,6 @@
package org.jboss.tools.cdi.text.ext.hyperlink;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -22,9 +21,8 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.ResolvedBinaryType;
-import org.eclipse.jdt.internal.core.ResolvedSourceType;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
import org.eclipse.jdt.internal.ui.text.JavaWordFinder;
@@ -37,11 +35,9 @@
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
@@ -91,38 +87,38 @@
elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
+ if(elements.length != 1)
+ return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
- for (IJavaElement element : elements) {
- int position = 0;
- if(element instanceof ResolvedSourceType || element instanceof ResolvedBinaryType){
- ICompilationUnit cUnit = (ICompilationUnit)input;
- element = cUnit.getElementAt(wordRegion.getOffset());
- if(element == null)
- continue;
-
- if(element instanceof IMethod){
- position = offset;
- }
+ int position = 0;
+ if(elements[0] instanceof IType){
+ ICompilationUnit cUnit = (ICompilationUnit)input;
+ elements[0] = cUnit.getElementAt(wordRegion.getOffset());
+ if(elements[0] == null)
+ return null;
+
+ if(elements[0] instanceof IMethod){
+ position = offset;
}
- ICDIProject cdiProject = cdiNature.getDelegate();
- if(cdiProject != null){
- IInjectionPoint injectionPoint = findInjectedPoint(cdiProject, element, position, file);
- Set<IParameter> param = findObserverParameter(cdiProject, element, offset, file);
- if(injectionPoint != null){
- Set<IObserverMethod> observerMethods = cdiProject.resolveObserverMethods(injectionPoint);
+ }
+ ICDIProject cdiProject = cdiNature.getDelegate();
+ if(cdiProject != null){
+ IInjectionPoint injectionPoint = findInjectedPoint(cdiProject, elements[0], position, file);
+ Set<IParameter> param = findObserverParameter(cdiProject, elements[0], offset, file);
+ if(injectionPoint != null){
+ Set<IObserverMethod> observerMethods = cdiProject.resolveObserverMethods(injectionPoint);
- if(observerMethods.size() > 0)
- hyperlinks.add(new ObserverMethodListHyperlink(textViewer, region, observerMethods, document));
-
- } else if(param != null) {
- Set<IInjectionPoint> events = new HashSet<IInjectionPoint>();
- for (IParameter p: param)
- events.addAll(cdiProject.findObservedEvents(p));
-
- if(events.size() > 0)
- hyperlinks.add(new EventListHyperlink(textViewer, region, events, document));
- }
+ if(observerMethods.size() > 0)
+ hyperlinks.add(new ObserverMethodListHyperlink(textViewer, region, observerMethods, document));
+
+ } else if(param != null) {
+ Set<IInjectionPoint> events = new HashSet<IInjectionPoint>();
+ for (IParameter p: param)
+ events.addAll(cdiProject.findObservedEvents(p));
+
+ if(events.size() > 0)
+ hyperlinks.add(new EventListHyperlink(textViewer, region, events, document));
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-06-24 19:00:59 UTC (rev 32356)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-06-24 20:48:45 UTC (rev 32357)
@@ -88,23 +88,23 @@
elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
+ if(elements.length != 1)
+ return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
- for (IJavaElement element : elements) {
- int position = 0;
- if(element instanceof IType){
- ICompilationUnit cUnit = (ICompilationUnit)input;
- element = cUnit.getElementAt(wordRegion.getOffset());
- if(element == null)
- continue;
-
- if(element instanceof IMethod){
- position = offset;
- }
+ int position = 0;
+ if(elements[0] instanceof IType){
+ ICompilationUnit cUnit = (ICompilationUnit)input;
+ elements[0] = cUnit.getElementAt(wordRegion.getOffset());
+ if(elements[0] == null)
+ return null;
+
+ if(elements[0] instanceof IMethod){
+ position = offset;
}
+ }
- findInjectedBeans(cdiNature, element, position, file, hyperlinks);
- }
+ findInjectedBeans(cdiNature, elements[0], position, file, hyperlinks);
if (hyperlinks != null && !hyperlinks.isEmpty()) {
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-06-24 19:00:59 UTC (rev 32356)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-06-24 20:48:45 UTC (rev 32357)
@@ -89,36 +89,35 @@
elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
+ if(elements.length != 1)
+ return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
- for (IJavaElement element : elements) {
-
- if(element instanceof IType){
- if(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME.equals(((IType) element).getFullyQualifiedName())){
- ICompilationUnit cUnit = (ICompilationUnit)input;
- element = cUnit.getElementAt(wordRegion.getOffset());
- if(element == null)
- continue;
- }
+ if(elements[0] instanceof IType){
+ if(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME.equals(((IType) elements[0]).getFullyQualifiedName())){
+ ICompilationUnit cUnit = (ICompilationUnit)input;
+ elements[0] = cUnit.getElementAt(wordRegion.getOffset());
+ if(elements[0] == null)
+ return null;
}
-
- if (element instanceof IMethod) {
- for(IBean bean : beans){
- if(bean instanceof IClassBean){
- IProducerMethod producer = getProducer((IClassBean)bean, (IMethod)element);
- if(producer != null){
- List<IMethod> disposers = findDisposerMethods(producer);
- for(IMethod method : disposers){
- hyperlinks.add(new DisposerHyperlink(region, method, document));
+ }
+
+ if (elements[0] instanceof IMethod) {
+ for(IBean bean : beans){
+ if(bean instanceof IClassBean){
+ IProducerMethod producer = getProducer((IClassBean)bean, (IMethod)elements[0]);
+ if(producer != null){
+ List<IMethod> disposers = findDisposerMethods(producer);
+ for(IMethod method : disposers){
+ hyperlinks.add(new DisposerHyperlink(region, method, document));
+ }
+ }else{
+ IBeanMethod disposer = getDisposer((IClassBean)bean, (IMethod)elements[0]);
+ if(disposer != null){
+ List<IMethod> producers = findProducerMethods((IClassBean)bean, disposer);
+ for(IMethod method : producers){
+ hyperlinks.add(new ProducerHyperlink(region, method, document));
}
- }else{
- IBeanMethod disposer = getDisposer((IClassBean)bean, (IMethod)element);
- if(disposer != null){
- List<IMethod> producers = findProducerMethods((IClassBean)bean, disposer);
- for(IMethod method : producers){
- hyperlinks.add(new ProducerHyperlink(region, method, document));
- }
- }
}
}
}
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32356 - in trunk/cdi/plugins/org.jboss.tools.cdi.xml: resources/meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-24 15:00:59 -0400 (Fri, 24 Jun 2011)
New Revision: 32356
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/weld_file.gif
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
Log:
JBIDE-9254
https://issues.jboss.org/browse/JBIDE-9254
Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/weld_file.gif
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/weld_file.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2011-06-24 19:00:18 UTC (rev 32355)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2011-06-24 19:00:59 UTC (rev 32356)
@@ -23,7 +23,7 @@
<GROUP name="main">
<GROUP name="cdi">
<ICON name="bean" path="images/struts/form_bean.gif"/>
- <ICON name="file" path="images/jsf/jsf-config.gif"/>
+ <ICON name="file" path="plugin:org.jboss.tools.cdi.xml:images/weld_file.gif"/>
</GROUP>
</GROUP>
</ICONS>
14 years, 9 months
- 1
- 0