JBoss Tools SVN: r24095 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-08-12 08:07:43 -0400 (Thu, 12 Aug 2010)
New Revision: 24095
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6806
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 2010-08-12 12:06:25 UTC (rev 24094)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-08-12 12:07:43 UTC (rev 24095)
@@ -23,11 +23,11 @@
MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER=Array-valued member of a qualifier type must be annotated @Nonbinding [JSR-299 �5.2.5]
MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Annotation-valued member of an interceptor binding type must be annotated @Nonbinding [JSR-299 �9.5.2]
MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Array-valued member of an interceptor binding type must be annotated @Nonbinding [JSR-299 �9.5.2]
-MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with correct targets [JSR-299 �2.3.2, �10.1]
+MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with @Target('{'TYPE, METHOD, FIELD, PARAMETER'}') or @Target('{'METHOD, FIELD'}') [JSR-299 �2.3.2, �10.1]
MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with @Retention(RUNTIME) [JSR-299 �2.3.2]
-MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE=Stereotype annotation type must be annotated with @Target with correct targets [JSR-299 �2.7.1]
+MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE=Stereotype annotation type must be annotated with one of @Target('{'TYPE, METHOD, FIELD'}'), @Target('{'METHOD, FIELD'}'), @Target('{'TYPE'}'), @Target('{'METHOD'}'), @Target('{'FIELD'}') [JSR-299 �2.7.1]
MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE=Stereotype annotation type must be annotated with @Retention(RUNTIME) [JSR-299 �2.7.1]
-MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE=Scope annotation type must be annotated with @Target with correct targets [JSR-299 �2.4.2]
+MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE=Scope annotation type must be annotated with @Target('{'TYPE, METHOD, FIELD'}') [JSR-299 �2.4.2]
MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE=Scope annotation type must be annotated with @Retention(RUNTIME) [JSR-299 �2.4.2]
MULTIPLE_SCOPE_TYPE_ANNOTATIONS=Bean class or producer method or field specifies multiple scope type annotations [JSR-299 �2.4.3]
15 years, 8 months
JBoss Tools SVN: r24094 - trunk/usage/plugins/org.jboss.tools.usage/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-12 08:06:25 -0400 (Thu, 12 Aug 2010)
New Revision: 24094
Modified:
trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
Log:
[JBIDE-6376] focuspoint & test fixed
Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-12 12:05:58 UTC (rev 24093)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-12 12:06:25 UTC (rev 24094)
@@ -5,7 +5,8 @@
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.usage,
- org.jboss.tools.usage.jgoogleanalytics
+ org.jboss.tools.usage.jgoogleanalytics,
+ org.jboss.tools.usage.util
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.osgi;bundle-version="3.5.2",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
15 years, 8 months
JBoss Tools SVN: r24093 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-12 08:05:58 -0400 (Thu, 12 Aug 2010)
New Revision: 24093
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
Log:
[JBIDE-6376] focuspoint & test fixed
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-12 12:05:48 UTC (rev 24092)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-12 12:05:58 UTC (rev 24093)
@@ -1,6 +1,7 @@
package org.jboss.tools.usage.test;
import org.jboss.tools.usage.jgoogleanalytics.FocusPoint;
+import org.jboss.tools.usage.util.EncodingUtils;
import junit.framework.TestCase;
@@ -8,20 +9,20 @@
private static final String root = "root";
private static final String child1 = "child1";
- private static final String child2 = "child2";
+ private static final String URI_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
public void testGetContentURI_Simple() throws Exception {
FocusPoint focusPoint = new FocusPoint(root);
String contentURI = focusPoint.getContentURI();
assertNotNull(contentURI);
- assertEquals(FocusPoint.URI_SEPARATOR + root, contentURI);
+ assertEquals(URI_SEPARATOR_ENCODED + root, contentURI);
}
public void testGetContentURI_OneLevel() throws Exception {
FocusPoint focusPoint = new FocusPoint(root).setChild(new FocusPoint(child1));
String contentURI = focusPoint.getContentURI();
assertNotNull(contentURI);
- assertEquals(FocusPoint.URI_SEPARATOR + root + FocusPoint.URI_SEPARATOR + child1, contentURI);
+ assertEquals(URI_SEPARATOR_ENCODED + root + URI_SEPARATOR_ENCODED + child1, contentURI);
}
public void testGetContentTitle_Simple() throws Exception {
@@ -30,13 +31,4 @@
assertNotNull(contentTitle);
assertEquals(root, contentTitle);
}
-
- public void testGetContentTitle_OneLevel() throws Exception {
-// FocusPoint parentFocusPoint = new FocusPoint(JBOSS_TOOLS_USAGE_ID);
-// FocusPoint childFocusPoint = new FocusPoint(JBOSS_TOOLS_SMOOKS_UI,
-// parentFocusPoint);
-// String contentTitle = childFocusPoint.getContentTitle();
-// assertNotNull(contentTitle);
-// assertEquals(JBOSS_TOOLS_USAGE_ID + FocusPoint.TITLE_SEPARATOR + JBOSS_TOOLS_SMOOKS_UI, contentTitle);
- }
}
15 years, 8 months
JBoss Tools SVN: r24092 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-12 08:05:48 -0400 (Thu, 12 Aug 2010)
New Revision: 24092
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/FocusPoint.java
Log:
[JBIDE-6376] focuspoint & test fixed
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/FocusPoint.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/FocusPoint.java 2010-08-12 12:03:05 UTC (rev 24091)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/FocusPoint.java 2010-08-12 12:05:48 UTC (rev 24092)
@@ -65,8 +65,8 @@
private void appendContentTitle(StringBuilder builder, FocusPoint focusPoint) {
FocusPoint childFocusPoint = focusPoint.getChild();
builder.append(focusPoint.getName());
- builder.append(TITLE_SEPARATOR);
if (childFocusPoint != null) {
+ builder.append(TITLE_SEPARATOR);
appendContentTitle(builder, childFocusPoint);
}
}
15 years, 8 months
JBoss Tools SVN: r24091 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-08-12 08:03:05 -0400 (Thu, 12 Aug 2010)
New Revision: 24091
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
https://jira.jboss.org/browse/JBIDE-6820
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-08-12 11:42:42 UTC (rev 24090)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-08-12 12:03:05 UTC (rev 24091)
@@ -13,7 +13,9 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -1984,7 +1986,9 @@
sc = new HashSet<SeamComponentDeclaration>();
declarationsBySource.put(path, sc);
}
- sc.add(d);
+ synchronized(sc) {
+ sc.add(d);
+ }
if(d instanceof ISeamJavaComponentDeclaration) {
SeamJavaComponentDeclaration jd = (SeamJavaComponentDeclaration)d;
for (ISeamContextVariable v: jd.getDeclaredVariables()) addVariable(v);
@@ -2006,14 +2010,24 @@
IPath path = d.getSourcePath();
Set<SeamComponentDeclaration> sc = declarationsBySource.get(path);
if(sc != null) {
- sc.remove(d);
+ synchronized(sc) {
+ sc.remove(d);
+ }
if(sc.isEmpty()) declarationsBySource.remove(path);
}
removeDeclarationWithClass(d);
}
public Set<SeamComponentDeclaration> getDeclarationsBySource(IPath path) {
- return declarationsBySource.get(path);
+ Set<SeamComponentDeclaration> result = declarationsBySource.get(path);
+ if (result != null) {
+ Set<SeamComponentDeclaration> copy = new HashSet<SeamComponentDeclaration>();
+ synchronized(result) {
+ copy.addAll(result);
+ }
+ result = copy;
+ }
+ return result;
}
public SeamJavaComponentDeclaration getJavaDeclaration(String className) {
@@ -2029,8 +2043,10 @@
public void removePath(IPath path) {
Set<SeamComponentDeclaration> sd = declarationsBySource.get(path);
if(sd == null) return;
- for (SeamComponentDeclaration d: sd) {
- removeDeclarationWithClass(d);
+ synchronized(sd) {
+ for (SeamComponentDeclaration d: sd) {
+ removeDeclarationWithClass(d);
+ }
}
declarationsBySource.remove(path);
}
15 years, 8 months
JBoss Tools SVN: r24090 - in trunk/usage: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-12 07:42:42 -0400 (Thu, 12 Aug 2010)
New Revision: 24090
Added:
trunk/usage/tests/org.jboss.tools.usage.test/
Removed:
trunk/usage/org.jboss.tools.usage.test/
Log:
Copied: trunk/usage/tests/org.jboss.tools.usage.test (from rev 24089, trunk/usage/org.jboss.tools.usage.test)
15 years, 8 months
JBoss Tools SVN: r24089 - in trunk/usage: plugins and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-12 06:09:27 -0400 (Thu, 12 Aug 2010)
New Revision: 24089
Added:
trunk/usage/plugins/org.jboss.tools.usage/
Removed:
trunk/usage/org.jboss.tools.usage/
Log:
Copied: trunk/usage/plugins/org.jboss.tools.usage (from rev 24088, trunk/usage/org.jboss.tools.usage)
15 years, 8 months
JBoss Tools SVN: r24088 - trunk/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-12 06:08:54 -0400 (Thu, 12 Aug 2010)
New Revision: 24088
Added:
trunk/usage/tests/
Log:
15 years, 8 months
JBoss Tools SVN: r24087 - trunk/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-12 06:04:57 -0400 (Thu, 12 Aug 2010)
New Revision: 24087
Added:
trunk/usage/plugins/
Log:
15 years, 8 months
JBoss Tools SVN: r24086 - trunk/as.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-08-12 04:36:10 -0400 (Thu, 12 Aug 2010)
New Revision: 24086
Removed:
trunk/as/as/
Log:
bad merge
15 years, 8 months