JBoss Tools SVN: r32486 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 19:30:44 -0400 (Wed, 29 Jun 2011)
New Revision: 32486
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-06-29 23:30:20 UTC (rev 32485)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-06-29 23:30:44 UTC (rev 32486)
@@ -33,10 +33,10 @@
import org.jboss.tools.cdi.core.test.tck.validation.CoreValidationTest;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
-import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.impl.JavaAnnotation;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.util.FileUtil;
13 years, 6 months
JBoss Tools SVN: r32485 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 19:30:20 -0400 (Wed, 29 Jun 2011)
New Revision: 32485
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IJavaAnnotation.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IJavaAnnotation.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IJavaAnnotation.java 2011-06-29 23:29:00 UTC (rev 32484)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IJavaAnnotation.java 2011-06-29 23:30:20 UTC (rev 32485)
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IType;
-import org.jboss.tools.common.text.ITextSourceReference;
-
-/**
- * Hides IAnnotation and allows to subtitute another implementation than wrapper for IAnnotation.
- *
- * @author Viacheslav Kabanovich
- *
- */
-public interface IJavaAnnotation extends ITextSourceReference {
-
- /**
- * Returns resource that declares this annotation.
- *
- * @return resource that declares this annotation
- */
- public IResource getResource();
-
- /**
- * Returns fully qualified type name if resolved or element name otherwise.
- *
- * @return fully qualified type name if resolved or element name otherwise
- */
- public String getTypeName();
-
- /**
- * Returns annotation type or null if it cannot be resolved.
- *
- * @return annotation type or null if it cannot be resolved
- */
- public IType getType();
- /**
- * Returns Java element on which or for which this annotation was created.
- *
- * @return Java element on which or for which this annotation was created
- */
- public IMember getParentMember();
-
- /**
- * Returns member value pairs as IAnnotation does.
- *
- * @return member value pairs as IAnnotation does
- */
- public IMemberValuePair[] getMemberValuePairs();
-
-}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-06-29 23:29:00 UTC (rev 32484)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-06-29 23:30:20 UTC (rev 32485)
@@ -17,8 +17,9 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.ICDIAnnotation;
-import org.jboss.tools.cdi.core.IJavaAnnotation;
import org.jboss.tools.common.java.IAnnotationDeclaration;
+import org.jboss.tools.common.java.IJavaAnnotation;
+import org.jboss.tools.common.java.impl.JavaAnnotation;
/**
*
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java 2011-06-29 23:29:00 UTC (rev 32484)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java 2011-06-29 23:30:20 UTC (rev 32485)
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.internal.core.impl;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.SourceRange;
-import org.eclipse.jdt.internal.core.MemberValuePair;
-import org.jboss.tools.cdi.core.IJavaAnnotation;
-
-public class AnnotationLiteral implements IJavaAnnotation {
- IResource declaringResource;
- IType annotationType;
-
- String source;
- ISourceRange range;
- IMemberValuePair[] memberValues = new IMemberValuePair[0];
-
- public AnnotationLiteral(IResource declaringResource, String source, ISourceRange range, IMemberValuePair[] memberValues, IType annotationType) {
- this.declaringResource = declaringResource;
- this.source = source;
- this.range = range;
- this.memberValues = memberValues;
- this.annotationType = annotationType;
- }
-
- public AnnotationLiteral(IResource declaringResource, int offset, int length, Object value, int valueType, IType annotationType) {
- this.declaringResource = declaringResource;
- this.range = new SourceRange(offset, length);
- if(value != null) {
- this.memberValues = new IMemberValuePair[]{
- createPair("value", value, valueType)
- };
- }
- this.annotationType = annotationType;
- }
-
- public void addMemberValuePair(String name, Object value, int valueType) {
- IMemberValuePair[] pairs = new IMemberValuePair[memberValues.length + 1];
- System.arraycopy(memberValues, 0, pairs, 0, memberValues.length);
- pairs[memberValues.length] = createPair(name, value, valueType);
- memberValues = pairs;
- }
-
- private IMemberValuePair createPair(String name, Object value, int valueType) {
- return new MemberValuePair(name, value, valueType);
- }
-
- public int getStartPosition() {
- return range == null ? -1 : range.getOffset();
- }
-
- public int getLength() {
- return range == null ? -1 : range.getLength();
- }
-
- public IResource getResource() {
- return declaringResource;
- }
-
- public String getTypeName() {
- if(annotationType != null) return annotationType.getFullyQualifiedName();
- return null;
- }
-
- public IType getType() {
- return annotationType;
- }
-
- public IMember getParentMember() {
- //Do we need it?
- return null;
- }
-
- public IMemberValuePair[] getMemberValuePairs() {
- return memberValues;
- }
-
-}
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java 2011-06-29 23:29:00 UTC (rev 32484)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java 2011-06-29 23:30:20 UTC (rev 32485)
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.internal.core.impl;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IJavaAnnotation;
-import org.jboss.tools.common.model.util.EclipseJavaUtil;
-
-public class JavaAnnotation implements IJavaAnnotation {
- IAnnotation annotation;
-
- String annotationTypeName;
- IType type;
-
- public JavaAnnotation(IAnnotation annotation, IType declaringType) {
- this.annotation = annotation;
- try {
- String name = annotation.getElementName();
- annotationTypeName = EclipseJavaUtil.resolveType(declaringType, name);
- type = EclipseJavaUtil.findType(annotation.getJavaProject(), annotationTypeName);
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- }
-
- public IResource getResource() {
- return annotation.getResource();
- }
-
- public String getTypeName() {
- return annotationTypeName;
- }
-
- public IType getType() {
- return type;
- }
-
- public int getLength() {
- try {
- ISourceRange range = annotation.getSourceRange();
- if(range != null) {
- return range.getLength();
- }
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- return 0;
- }
-
- public int getStartPosition() {
- try {
- ISourceRange range = annotation.getSourceRange();
- if(range != null) {
- return range.getOffset();
- }
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- return 0;
- }
-
- public IMember getParentMember() {
- return (IMember)annotation.getParent();
- }
-
- public IMemberValuePair[] getMemberValuePairs() {
- try {
- return annotation.getMemberValuePairs();
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- return new IMemberValuePair[0];
- }
-
- public IAnnotation getAnnotation() {
- return annotation;
- }
-
-}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-06-29 23:29:00 UTC (rev 32484)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-06-29 23:30:20 UTC (rev 32485)
@@ -27,16 +27,16 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IJavaAnnotation;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.InterceptorBindingDeclaration;
-import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation;
import org.jboss.tools.cdi.internal.core.impl.QualifierDeclaration;
import org.jboss.tools.cdi.internal.core.impl.ScopeDeclaration;
import org.jboss.tools.cdi.internal.core.impl.StereotypeDeclaration;
import org.jboss.tools.common.java.IAnnotated;
import org.jboss.tools.common.java.IAnnotationDeclaration;
+import org.jboss.tools.common.java.IJavaAnnotation;
+import org.jboss.tools.common.java.impl.JavaAnnotation;
import org.jboss.tools.common.text.ITextSourceReference;
/**
13 years, 6 months
JBoss Tools SVN: r32484 - in trunk/common/plugins/org.jboss.tools.common: src/org/jboss/tools/common/java and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 19:29:00 -0400 (Wed, 29 Jun 2011)
New Revision: 32484
Added:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaAnnotation.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationLiteral.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/JavaAnnotation.java
Modified:
trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-06-29 23:26:30 UTC (rev 32483)
+++ trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-06-29 23:29:00 UTC (rev 32484)
@@ -7,6 +7,7 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.common,
org.jboss.tools.common.java,
+ org.jboss.tools.common.java.impl,
org.jboss.tools.common.log,
org.jboss.tools.common.preferences,
org.jboss.tools.common.reporting,
Copied: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaAnnotation.java (from rev 32417, trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IJavaAnnotation.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaAnnotation.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaAnnotation.java 2011-06-29 23:29:00 UTC (rev 32484)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.java;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IMemberValuePair;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.common.text.ITextSourceReference;
+
+/**
+ * Hides IAnnotation and allows to subtitute another implementation than wrapper for IAnnotation.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public interface IJavaAnnotation extends ITextSourceReference {
+
+ /**
+ * Returns resource that declares this annotation.
+ *
+ * @return resource that declares this annotation
+ */
+ public IResource getResource();
+
+ /**
+ * Returns fully qualified type name if resolved or element name otherwise.
+ *
+ * @return fully qualified type name if resolved or element name otherwise
+ */
+ public String getTypeName();
+
+ /**
+ * Returns annotation type or null if it cannot be resolved.
+ *
+ * @return annotation type or null if it cannot be resolved
+ */
+ public IType getType();
+ /**
+ * Returns Java element on which or for which this annotation was created.
+ *
+ * @return Java element on which or for which this annotation was created
+ */
+ public IMember getParentMember();
+
+ /**
+ * Returns member value pairs as IAnnotation does.
+ *
+ * @return member value pairs as IAnnotation does
+ */
+ public IMemberValuePair[] getMemberValuePairs();
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationLiteral.java (from rev 32417, trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationLiteral.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationLiteral.java 2011-06-29 23:29:00 UTC (rev 32484)
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.java.impl;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IMemberValuePair;
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.SourceRange;
+import org.eclipse.jdt.internal.core.MemberValuePair;
+import org.jboss.tools.common.java.IJavaAnnotation;
+
+public class AnnotationLiteral implements IJavaAnnotation {
+ IResource declaringResource;
+ IType annotationType;
+
+ String source;
+ ISourceRange range;
+ IMemberValuePair[] memberValues = new IMemberValuePair[0];
+
+ public AnnotationLiteral(IResource declaringResource, String source, ISourceRange range, IMemberValuePair[] memberValues, IType annotationType) {
+ this.declaringResource = declaringResource;
+ this.source = source;
+ this.range = range;
+ this.memberValues = memberValues;
+ this.annotationType = annotationType;
+ }
+
+ public AnnotationLiteral(IResource declaringResource, int offset, int length, Object value, int valueType, IType annotationType) {
+ this.declaringResource = declaringResource;
+ this.range = new SourceRange(offset, length);
+ if(value != null) {
+ this.memberValues = new IMemberValuePair[]{
+ createPair("value", value, valueType)
+ };
+ }
+ this.annotationType = annotationType;
+ }
+
+ public void addMemberValuePair(String name, Object value, int valueType) {
+ IMemberValuePair[] pairs = new IMemberValuePair[memberValues.length + 1];
+ System.arraycopy(memberValues, 0, pairs, 0, memberValues.length);
+ pairs[memberValues.length] = createPair(name, value, valueType);
+ memberValues = pairs;
+ }
+
+ private IMemberValuePair createPair(String name, Object value, int valueType) {
+ return new MemberValuePair(name, value, valueType);
+ }
+
+ public int getStartPosition() {
+ return range == null ? -1 : range.getOffset();
+ }
+
+ public int getLength() {
+ return range == null ? -1 : range.getLength();
+ }
+
+ public IResource getResource() {
+ return declaringResource;
+ }
+
+ public String getTypeName() {
+ if(annotationType != null) return annotationType.getFullyQualifiedName();
+ return null;
+ }
+
+ public IType getType() {
+ return annotationType;
+ }
+
+ public IMember getParentMember() {
+ //Do we need it?
+ return null;
+ }
+
+ public IMemberValuePair[] getMemberValuePairs() {
+ return memberValues;
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationLiteral.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/JavaAnnotation.java (from rev 32464, trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/JavaAnnotation.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/JavaAnnotation.java 2011-06-29 23:29:00 UTC (rev 32484)
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.java.impl;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IMemberValuePair;
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.common.CommonPlugin;
+import org.jboss.tools.common.java.IJavaAnnotation;
+import org.jboss.tools.common.util.EclipseJavaUtil;
+
+public class JavaAnnotation implements IJavaAnnotation {
+ IAnnotation annotation;
+
+ String annotationTypeName;
+ IType type;
+
+ public JavaAnnotation(IAnnotation annotation, IType declaringType) {
+ this.annotation = annotation;
+ try {
+ String name = annotation.getElementName();
+ annotationTypeName = EclipseJavaUtil.resolveType(declaringType, name);
+ type = EclipseJavaUtil.findType(annotation.getJavaProject(), annotationTypeName);
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ }
+
+ public IResource getResource() {
+ return annotation.getResource();
+ }
+
+ public String getTypeName() {
+ return annotationTypeName;
+ }
+
+ public IType getType() {
+ return type;
+ }
+
+ public int getLength() {
+ try {
+ ISourceRange range = annotation.getSourceRange();
+ if(range != null) {
+ return range.getLength();
+ }
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ return 0;
+ }
+
+ public int getStartPosition() {
+ try {
+ ISourceRange range = annotation.getSourceRange();
+ if(range != null) {
+ return range.getOffset();
+ }
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ return 0;
+ }
+
+ public IMember getParentMember() {
+ return (IMember)annotation.getParent();
+ }
+
+ public IMemberValuePair[] getMemberValuePairs() {
+ try {
+ return annotation.getMemberValuePairs();
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ return new IMemberValuePair[0];
+ }
+
+ public IAnnotation getAnnotation() {
+ return annotation;
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/JavaAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r32483 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-29 19:26:30 -0400 (Wed, 29 Jun 2011)
New Revision: 32483
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/further_reading.xml
Log:
removed jbds references from further reading file
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/further_reading.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/further_reading.xml 2011-06-29 23:01:54 UTC (rev 32482)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/further_reading.xml 2011-06-29 23:26:30 UTC (rev 32483)
@@ -29,7 +29,7 @@
<emphasis role="bold">Visual Web Tools Reference Guide</emphasis>
</para>
<para>
- provides general orientation and an overview of JBDS visual web tools functionality. This guide discusses the following topics: editors, palette, web properties view, openOn, content assist, RichFaces support.
+ provides general orientation and an overview of visual web tools functionality. This guide discusses the following topics: editors, palette, web properties view, openOn, content assist, RichFaces support.
</para>
</listitem>
@@ -122,7 +122,7 @@
<emphasis role="bold">JSF Tools Tutorial</emphasis>
</para>
<para> This tutorial will describe how to deal with classic/old style of JSF development and how
- to create a simple JSF application using the JBoss Developer Studio. </para>
+ to create a simple JSF application. </para>
</listitem>
<listitem> <para>
@@ -149,18 +149,20 @@
<emphasis role="bold">Struts Tools Tutorial</emphasis>
</para>
<para> This tutorial will describe the classical style of Struts development, and will
- step-by-step show you how to create a simple Struts application in JBoss Developer Studio.</para>
+ step-by-step show you how to create a simple Struts application.</para>
</listitem>
- <listitem>
+<!-- <listitem>
<para>
<emphasis role="bold">Exadel Studio Migration Guide</emphasis>
</para>
<para>This document is intended to help you to migrate an existing Exadel JSF or Struts projects
from Exadel Studio into JBoss Developer Studio. </para>
- </listitem>
+ </listitem> -->
</itemizedlist>
-<para>If there's anything we didn't cover in this guide, please feel free to visit our <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=258">JBoss Developer Studio Users Forum</ulink> or <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss Tools Users Forum</ulink> to ask questions. There we are also looking for your suggestions and comments.</para>
+<!--
+<para>If there's anything we didn't cover in this guide, please feel free to visit our <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=258">JBoss Developer Studio Users Forum</ulink> or <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss Tools Users Forum</ulink> to ask questions. There we are also looking for your suggestions and comments.</para>
+-->
</chapter>
13 years, 6 months
JBoss Tools SVN: r32482 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 19:01:54 -0400 (Wed, 29 Jun 2011)
New Revision: 32482
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java
Log:
JBIDE-9279
https://issues.jboss.org/browse/JBIDE-9279
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java 2011-06-29 23:01:15 UTC (rev 32481)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/helpers/TLDToPaletteHelper.java 2011-06-29 23:01:54 UTC (rev 32482)
@@ -90,11 +90,12 @@
for (int i = 0; i < as.length; i++) {
if(!TLDUtil.isAttribute(as[i])) continue;
if(!isRequired(as[i])) continue;
- sb.append("<b>").append(as[i].getAttributeValue("name")).append("</b>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ sb.append("<b>").append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME)).append("</b>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
++k;
if(k < as.length) sb.append(", "); //$NON-NLS-1$
}
for (int i = 0; i < as.length; i++) {
+ if(!TLDUtil.isAttribute(as[i])) continue;
if(isRequired(as[i])) continue;
sb.append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME));
++k;
13 years, 6 months
JBoss Tools SVN: r32481 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test: src/org/jboss/tools/jsf/ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 19:01:15 -0400 (Wed, 29 Jun 2011)
New Revision: 32481
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/WEB-INF/kgcomponents.taglib.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java
Log:
JBIDE-9279
https://issues.jboss.org/browse/JBIDE-9279
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/WEB-INF/kgcomponents.taglib.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/WEB-INF/kgcomponents.taglib.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/WEB-INF/kgcomponents.taglib.xml 2011-06-29 23:01:15 UTC (rev 32481)
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC
+"-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+"http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib>
+ <namespace>http://www.krasig.org/paduan</namespace>
+ <tag>
+ <tag-name>myModal</tag-name>
+ <source>myModal.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>myModalMany</tag-name>
+ <source>myModalMany.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalTreeMany</tag-name>
+ <source>modalTreeMany.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>myModalJivObj</tag-name>
+ <source>myModalJivObject.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalLica</tag-name>
+ <source>modalLica.xhtml</source>
+ </tag>
+
+ <tag>
+ <tag-name>modalOrg</tag-name>
+ <source>modalOrg.xhtml</source>
+ </tag>
+
+ <tag>
+ <tag-name>modalJivObekt</tag-name>
+ <source>modalJivObekt.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalAnimals</tag-name>
+ <source>modalAnimals.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalAnimalsSimple</tag-name>
+ <source>modalAnimalsSimple.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalVetSpec</tag-name>
+ <source>modalVetSpec.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalVlzList</tag-name>
+ <source>modalVlzList.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalMpsList</tag-name>
+ <source>modalMpsList.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalSelectAnimals</tag-name>
+ <source>modalSelectAnimals.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalJivObektSelectMany</tag-name>
+ <source>modalJivObektSelectMany.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalLiceOrgJivotni</tag-name>
+ <source>modalLiceOrgJivotni.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalAddOperacia</tag-name>
+ <source>modalAddOperacia.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalAddImunoMerop</tag-name>
+ <source>modalAddImunoMerop.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalSelectRFID</tag-name>
+ <source>modalSelectRFID.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalAddSickness</tag-name>
+ <source>modalAddSickness.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>modalStado</tag-name>
+ <source>modalStado.xhtml</source>
+ </tag>
+</facelet-taglib>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/WEB-INF/kgcomponents.taglib.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java 2011-06-29 22:42:57 UTC (rev 32480)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestPalette.java 2011-06-29 23:01:15 UTC (rev 32481)
@@ -169,6 +169,20 @@
assertEquals("Text of macros containsIgnoreCase is not correct.", "${containsIgnoreCase('', '')}", m.getAttributeValue("start text"));
}
+ public void testFaceletTaglibImport() throws Exception {
+ XModel model = EclipseResourceUtil.getModelNature(jsfProject).getModel();
+
+ XModelObject tld = model.getByPath("/kgcomponents.taglib.xml");
+ assertNotNull("Facelet taglib kgcomponents.taglib.xml not found.", tld);
+ XModelObject g = new TLDToPaletteHelper().createGroupByTLD(tld, model);
+ assertNotNull(g);
+ assertEquals("Library uri is not set correctly to the palette group.", "http://www.krasig.org/paduan", g.getAttributeValue("library uri"));
+ XModelObject m = g.getChildByPath("myModal");
+ assertNotNull("Macros myModal was not created.", m);
+ assertEquals("Text of macros myModal is not correct.", "<myModal>", m.getAttributeValue("start text"));
+ assertTrue("Text of description of macro myModal is not correct.", m.getAttributeValue("description").endsWith("<code></code>"));
+ }
+
public void testPaletteInsertHelper() throws Exception {
IWorkbench w = JsfUiPlugin.getDefault().getWorkbench();
IWorkbenchWindow window = w.getActiveWorkbenchWindow();
13 years, 6 months
JBoss Tools SVN: r32480 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 18:42:57 -0400 (Wed, 29 Jun 2011)
New Revision: 32480
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-06-29 22:42:39 UTC (rev 32479)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-06-29 22:42:57 UTC (rev 32480)
@@ -9,7 +9,6 @@
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.ICDIProject;
@@ -24,6 +23,7 @@
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.java.ITypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-06-29 22:42:39 UTC (rev 32479)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-06-29 22:42:57 UTC (rev 32480)
@@ -6,11 +6,11 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IMember;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
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.IQualifierDeclaration;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.text.ITextSourceReference;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2011-06-29 22:42:39 UTC (rev 32479)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2011-06-29 22:42:57 UTC (rev 32480)
@@ -7,9 +7,9 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
public class CDIQualifier implements IQualifier{
private ICDIProject project;
13 years, 6 months
JBoss Tools SVN: r32479 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 18:42:39 -0400 (Wed, 29 Jun 2011)
New Revision: 32479
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java 2011-06-29 22:42:10 UTC (rev 32478)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java 2011-06-29 22:42:39 UTC (rev 32479)
@@ -23,9 +23,9 @@
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.text.edits.TextEdit;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
public class DeleteAllInjectedConstructorsProcessor extends MarkerResolutionRefactoringProcessor {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-06-29 22:42:10 UTC (rev 32478)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-06-29 22:42:39 UTC (rev 32479)
@@ -31,21 +31,14 @@
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility;
-import org.eclipse.jdt.internal.corext.util.JavaConventionsUtil;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.ui.CodeGeneration;
import org.eclipse.jdt.ui.wizards.NewClassWizardPage;
import org.eclipse.jdt.ui.wizards.NewTypeWizardPage.ImportsManager;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -55,7 +48,6 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.ICDIAnnotation;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IQualifier;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java 2011-06-29 22:42:10 UTC (rev 32478)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java 2011-06-29 22:42:39 UTC (rev 32479)
@@ -25,15 +25,13 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Composite;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIUtil;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.ICDIAnnotation;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IInterceptorBinding;
-import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.ui.widget.editor.ListFieldEditor;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java 2011-06-29 22:42:10 UTC (rev 32478)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java 2011-06-29 22:42:39 UTC (rev 32479)
@@ -29,7 +29,6 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIUtil;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.ICDIAnnotation;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IStereotype;
@@ -37,6 +36,7 @@
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.wizard.NewBeanWizardPage.CheckBoxEditorWrapper;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.ui.widget.editor.ITaggedFieldEditor;
import org.jboss.tools.common.ui.widget.editor.ListFieldEditor;
13 years, 6 months
JBoss Tools SVN: r32478 - trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 18:42:10 -0400 (Wed, 29 Jun 2011)
New Revision: 32478
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java 2011-06-29 22:41:53 UTC (rev 32477)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/VetoTest.java 2011-06-29 22:42:10 UTC (rev 32478)
@@ -17,10 +17,10 @@
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
/**
*
13 years, 6 months
JBoss Tools SVN: r32477 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core: generic and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-29 18:41:53 -0400 (Wed, 29 Jun 2011)
New Revision: 32477
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
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/GenericConfiguration.java
Log:
JBIDE-5046
https://issues.jboss.org/browse/JBIDE-5046
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-06-29 22:41:13 UTC (rev 32476)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-06-29 22:41:53 UTC (rev 32477)
@@ -19,8 +19,6 @@
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.IAnnotated;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
@@ -33,6 +31,8 @@
import org.jboss.tools.cdi.internal.core.impl.definition.PackageDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.java.IAnnotated;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.java.TypeDeclaration;
import org.jboss.tools.common.util.BeanUtil;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-06-29 22:41:13 UTC (rev 32476)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-06-29 22:41:53 UTC (rev 32477)
@@ -17,7 +17,6 @@
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IJavaAnnotation;
@@ -31,6 +30,7 @@
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
/**
* Implements support for org.jboss.seam.solder.bean.defaultbean.DefaultBeanExtension.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-06-29 22:41:13 UTC (rev 32476)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-06-29 22:41:53 UTC (rev 32477)
@@ -21,7 +21,6 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDICoreNature;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
@@ -32,6 +31,7 @@
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.scanner.FileSet;
import org.jboss.tools.cdi.seam.solder.core.definition.InterfaceDefinition;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.model.XModelObject;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java 2011-06-29 22:41:13 UTC (rev 32476)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java 2011-06-29 22:41:53 UTC (rev 32477)
@@ -13,7 +13,6 @@
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IJavaAnnotation;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
@@ -22,6 +21,7 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
/**
* This implementation detects @Unwrap annotation at methods and makes CDI builder aware of
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-29 22:41:13 UTC (rev 32476)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-29 22:41:53 UTC (rev 32477)
@@ -23,7 +23,6 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDICoreNature;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IJavaAnnotation;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -48,6 +47,7 @@
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferences;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.preferences.SeverityPreferences;
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-29 22:41:13 UTC (rev 32476)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-06-29 22:41:53 UTC (rev 32477)
@@ -23,7 +23,6 @@
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;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IProducer;
@@ -37,6 +36,7 @@
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferences;
import org.jboss.tools.cdi.seam.solder.core.validation.SeamSolderValidationMessages;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.text.ITextSourceReference;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-06-29 22:41:13 UTC (rev 32476)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-06-29 22:41:53 UTC (rev 32477)
@@ -19,13 +19,13 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.JavaModelException;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.util.EclipseJavaUtil;
13 years, 6 months