[jbosstools-commits] JBoss Tools SVN: r35445 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core: src/org/jboss/tools/cdi/seam/solder/core and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Oct 6 19:51:33 EDT 2011
Author: scabanovich
Date: 2011-10-06 19:51:32 -0400 (Thu, 06 Oct 2011)
New Revision: 35445
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
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/CDISeamSolderLoggerExtension.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/GenericBeanDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.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/GenericClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Seam solder migrated to 3.1.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-10-06 23:51:32 UTC (rev 35445)
@@ -5,31 +5,61 @@
point="org.jboss.tools.cdi.core.cdiextensions">
<cdiextension
class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCoreExtension"
+ runtime="org.jboss.solder.core.CoreExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderLoggerExtension"
+ runtime="org.jboss.solder.logging.TypedMessageLoggerExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderServiceHandlerExtension"
+ runtime="org.jboss.solder.serviceHandler.ServiceHandlerExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderDefaultBeanExtension"
+ runtime="org.jboss.solder.bean.defaultbean.DefaultBeanExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderUnwrapsExtension"
+ runtime="org.jboss.solder.unwraps.UnwrapsExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.generic.CDISeamSolderGenericBeanExtension"
+ runtime="org.jboss.solder.bean.generic.GenericBeanExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30CoreExtension"
runtime="org.jboss.seam.solder.core.CoreExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderLoggerExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30LoggerExtension"
runtime="org.jboss.seam.solder.logging.TypedMessageLoggerExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderServiceHandlerExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30ServiceHandlerExtension"
runtime="org.jboss.seam.solder.serviceHandler.ServiceHandlerExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderDefaultBeanExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30DefaultBeanExtension"
runtime="org.jboss.seam.solder.bean.defaultbean.DefaultBeanExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderUnwrapsExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30UnwrapsExtension"
runtime="org.jboss.seam.solder.unwraps.UnwrapsExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.generic.CDISeamSolderGenericBeanExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.generic.CDISeamSolder30GenericBeanExtension"
runtime="org.jboss.seam.solder.bean.generic.GenericBeanExtension">
</cdiextension>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30CoreExtension extends CDISeamSolderCoreExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30DefaultBeanExtension extends CDISeamSolderDefaultBeanExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30LoggerExtension extends CDISeamSolderLoggerExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30ServiceHandlerExtension extends CDISeamSolderServiceHandlerExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30UnwrapsExtension extends CDISeamSolderUnwrapsExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -18,26 +18,29 @@
*
*/
public interface CDISeamSolderConstants extends CDIConstants {
- public String EXACT_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Exact";
- public String FULLY_QUALIFIED_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.FullyQualified";
- public String REQUIRES_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Requires";
- public String VETO_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Veto";
+ public String PACKAGE_NAME = "org.jboss.solder";
- public String MESSAGE_LOGGER_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.logging.MessageLogger";
- public String MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.messages.MessageBundle";
+ public String EXACT_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.Exact";
- public String SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.serviceHandler.ServiceHandlerType";
+ public String FULLY_QUALIFIED_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.FullyQualified";
+ public String REQUIRES_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.Requires";
+ public String VETO_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.Veto";
+
+ public String MESSAGE_LOGGER_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".logging.MessageLogger";
+ public String MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".messages.MessageBundle";
+
+ public String SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".serviceHandler.ServiceHandlerType";
public String SERVICE_ANNOTATION_KIND = "serviceAnnotation";
- public String DEFAULT_BEAN_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.defaultbean.DefaultBean";
+ public String DEFAULT_BEAN_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.defaultbean.DefaultBean";
- public String UNWRAPS_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.unwraps.Unwraps";
+ public String UNWRAPS_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".unwraps.Unwraps";
- public String GENERIC_TYPE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.GenericType";
+ public String GENERIC_TYPE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.GenericType";
public String GENERIC_ANNOTATION_KIND = "genericAnnotation";
- public String GENERIC_QUALIFIER_TYPE_NAME = "org.jboss.seam.solder.bean.generic.Generic";
- public String GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.GenericConfiguration";
- public String APPLY_SCOPE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.ApplyScope";
- public String INJECT_GENERIC_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.InjectGeneric";
+ public String GENERIC_QUALIFIER_TYPE_NAME = PACKAGE_NAME + ".bean.generic.Generic";
+ public String GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.GenericConfiguration";
+ public String APPLY_SCOPE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.ApplyScope";
+ public String INJECT_GENERIC_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.InjectGeneric";
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.seam.solder.core;
+
+import org.jboss.tools.cdi.core.CDIConstants;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public interface CDISeamSolderConstants30 extends CDISeamSolderConstants {
+ public String PACKAGE_NAME_30 = "org.jboss.seam.solder";
+
+ public String EXACT_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.Exact";
+
+ public String FULLY_QUALIFIED_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.FullyQualified";
+ public String REQUIRES_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.Requires";
+ public String VETO_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.Veto";
+
+ public String MESSAGE_LOGGER_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".logging.MessageLogger";
+ public String MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".messages.MessageBundle";
+
+ public String SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".serviceHandler.ServiceHandlerType";
+
+ public String DEFAULT_BEAN_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.defaultbean.DefaultBean";
+
+ public String UNWRAPS_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".unwraps.Unwraps";
+
+ public String GENERIC_TYPE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.GenericType";
+ public String GENERIC_QUALIFIER_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.Generic";
+ public String GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.GenericConfiguration";
+ public String APPLY_SCOPE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.ApplyScope";
+ public String INJECT_GENERIC_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.InjectGeneric";
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -52,6 +52,13 @@
*/
public class CDISeamSolderCoreExtension implements ICDIExtension, IProcessAnnotatedTypeFeature {
+ public CDISeamSolderCoreExtension() {
+ }
+
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
if(processVeto(typeDefinition, context)) {
@@ -71,11 +78,11 @@
// @Veto
private boolean processVeto(TypeDefinition typeDefinition, IRootDefinitionContext context) {
if (typeDefinition
- .isAnnotationPresent(CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME)
+ .isAnnotationPresent(getVersion().getVetoAnnotationTypeName())
|| (typeDefinition.getPackageDefinition() != null && typeDefinition
.getPackageDefinition()
.isAnnotationPresent(
- CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME))) {
+ getVersion().getVetoAnnotationTypeName()))) {
typeDefinition.veto();
return true;
}
@@ -108,7 +115,7 @@
IAnnotationDeclaration fullyQualifiedOnPackage = null;
if(p != null) {
namedOnPackage = p.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
- fullyQualifiedOnPackage = p.getAnnotation(CDISeamSolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
+ fullyQualifiedOnPackage = p.getAnnotation(getVersion().getFullyQualifiedAnnotationTypeName());
}
processNames(typeDefinition, context, namedOnPackage, fullyQualifiedOnPackage, p);
@@ -132,7 +139,7 @@
private void processNames(AbstractMemberDefinition d, IRootDefinitionContext context,
IAnnotationDeclaration namedOnPackage, IAnnotationDeclaration fullyQualifiedOnPackage, PackageDefinition p) {
IAnnotationDeclaration named = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
- IAnnotationDeclaration fullyQualified = d.getAnnotation(CDISeamSolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration fullyQualified = d.getAnnotation(getVersion().getFullyQualifiedAnnotationTypeName());
String beanName = null;
@@ -160,7 +167,7 @@
private List<String> getRequiredClasses(IAnnotated d) {
IAnnotationDeclaration requires = d
- .getAnnotation(CDISeamSolderConstants.REQUIRES_ANNOTATION_TYPE_NAME);
+ .getAnnotation(getVersion().getRequiresAnnotationTypeName());
return requires != null ? getArrayValue(requires) : new ArrayList<String>();
}
@@ -202,7 +209,7 @@
}
private TypeDeclaration getExactType(IAnnotated annotated, TypeDefinition declaringType, IRootDefinitionContext context) {
- IAnnotationDeclaration a = annotated.getAnnotation(CDISeamSolderConstants.EXACT_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = annotated.getAnnotation(getVersion().getExactAnnotationTypeName());
if(a != null) {
Object o = a.getMemberValue(null);
if(o != null) {
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-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -46,8 +46,12 @@
*/
public class CDISeamSolderDefaultBeanExtension implements ICDIExtension, IProcessAnnotatedTypeFeature, IAmbiguousBeanResolverFeature {
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
- boolean defaultBean = typeDefinition.isAnnotationPresent(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME);
+ boolean defaultBean = typeDefinition.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName());
IJavaAnnotation beanTyped = null;
if(defaultBean) {
beanTyped = createFakeTypedAnnotation(typeDefinition, context);
@@ -58,7 +62,7 @@
List<MethodDefinition> ms = typeDefinition.getMethods();
for (MethodDefinition m: ms) {
if(m.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || m.isAnnotationPresent(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME)) {
+ if(defaultBean || m.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
IJavaAnnotation methodTyped = createFakeTypedAnnotation(m, context);
if(methodTyped != null) {
m.addAnnotation(methodTyped, context);
@@ -69,7 +73,7 @@
List<FieldDefinition> fs = typeDefinition.getFields();
for (FieldDefinition f: fs) {
if(f.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || f.isAnnotationPresent(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME)) {
+ if(defaultBean || f.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
IJavaAnnotation fieldTyped = createFakeTypedAnnotation(f, context);
if(fieldTyped != null) {
f.addAnnotation(fieldTyped, context);
@@ -81,7 +85,7 @@
IJavaAnnotation createFakeTypedAnnotation(AbstractMemberDefinition def, IRootDefinitionContext context) {
IJavaAnnotation result = null;
- IAnnotationDeclaration a = def.getAnnotation(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = def.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName());
if(a != null) {
Object n = a.getMemberValue(null);
if(n != null && n.toString().length() > 0) {
@@ -99,12 +103,12 @@
public Set<IBean> getResolvedBeans(Set<IBean> result) {
Set<IBean> defaultBeans = new HashSet<IBean>();
for (IBean b: result) {
- if(b.getAnnotation(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME) != null) {
+ if(b.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
defaultBeans.add(b);
} else if(b instanceof IProducer) {
IProducer producer = (IProducer)b;
IClassBean parent = producer.getClassBean();
- if(parent != null && parent.getAnnotation(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME) != null) {
+ if(parent != null && parent.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
defaultBeans.add(b);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -19,7 +19,6 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.SourceRange;
-import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
@@ -41,6 +40,10 @@
public class CDISeamSolderLoggerExtension implements ICDIExtension, IBuildParticipantFeature {
LoggerDefinitionContext context = new LoggerDefinitionContext();
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public IDefinitionContextExtension getContext() {
return context;
}
@@ -65,17 +68,17 @@
Set<IType> ts = is.get(path);
for (IType t: ts) {
InterfaceDefinition i = new InterfaceDefinition(t, context);
- if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_LOGGER_ANNOTATION_TYPE_NAME)) {
+ if(i.isAnnotationPresent(getVersion().getMessageLoggerAnnotationTypeName())) {
TypeDefinition d = new TypeDefinition();
d.setType(t, workingCopy.getRootContext(), 0);
d.setBeanConstructor(true);
workingCopy.addMessageLogger(path, d);
- } else if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME)) {
+ } else if(i.isAnnotationPresent(getVersion().getMessageBundleAnnotationTypeName())) {
TypeDefinition d = new TypeDefinition();
d.setType(t, workingCopy.getRootContext(), 0);
d.setBeanConstructor(true);
workingCopy.addMessageBundle(path, d);
- AnnotationDeclaration ad = d.getAnnotation(CDISeamSolderConstants.MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME);
+ AnnotationDeclaration ad = d.getAnnotation(getVersion().getMessageBundleAnnotationTypeName());
if(ad.getMemberValue("projectCode") != null && ad.getMemberValue("projectCode").toString().length() > 0) {
String text = d.getContent();
int st = ad.getStartPosition();
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-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -20,7 +20,6 @@
import org.eclipse.core.runtime.IPath;
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.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
@@ -49,6 +48,10 @@
public class CDISeamSolderServiceHandlerExtension implements ICDIExtension, IBuildParticipantFeature {
ServiceHandlerDefinitionContext context = new ServiceHandlerDefinitionContext();
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public IDefinitionContextExtension getContext() {
return context;
}
@@ -144,7 +147,7 @@
@Override
public void computeAnnotationKind(AnnotationDefinition annotation) {
- if(annotation.isAnnotationPresent(CDISeamSolderConstants.SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME)) {
+ if(annotation.isAnnotationPresent(getVersion().getHandlerTypeAnnotationTypeName())) {
annotation.setExtendedKind(CDISeamSolderConstants.SERVICE_ANNOTATION_KIND);
serviceAnnotations.add(annotation.getType().getFullyQualifiedName());
}
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-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -33,9 +33,13 @@
*/
public class CDISeamSolderUnwrapsExtension implements ICDIExtension, IProcessAnnotatedMemberFeature {
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public void processAnnotatedMember(BeanMemberDefinition memberDefinition, IRootDefinitionContext context) {
if(memberDefinition instanceof MethodDefinition) {
- if(memberDefinition.isAnnotationPresent(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME)) {
+ if(memberDefinition.isAnnotationPresent(getVersion().getUnwrapsAnnotationTypeName())) {
IJavaAnnotation ja = createFakeProducesAnnotation(memberDefinition, context);
if(ja != null) {
memberDefinition.addAnnotation(ja, context);
@@ -55,7 +59,7 @@
*/
IJavaAnnotation createFakeProducesAnnotation(AbstractMemberDefinition def, IRootDefinitionContext context) {
IJavaAnnotation result = null;
- IAnnotationDeclaration a = def.getAnnotation(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = def.getAnnotation(getVersion().getUnwrapsAnnotationTypeName());
if(a != null) {
IType producesAnnotation = context.getProject().getType(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME);
if (producesAnnotation != null) {
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,61 @@
+package org.jboss.tools.cdi.seam.solder.core;
+
+public class Version implements CDISeamSolderConstants {
+ public static Version instance = new Version();
+
+ public String getExactAnnotationTypeName() {
+ return EXACT_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getFullyQualifiedAnnotationTypeName() {
+ return FULLY_QUALIFIED_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getRequiresAnnotationTypeName() {
+ return REQUIRES_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getVetoAnnotationTypeName() {
+ return VETO_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getMessageLoggerAnnotationTypeName() {
+ return MESSAGE_LOGGER_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getMessageBundleAnnotationTypeName() {
+ return MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getHandlerTypeAnnotationTypeName() {
+ return SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getDefaultBeanAnnotationTypeName() {
+ return DEFAULT_BEAN_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getUnwrapsAnnotationTypeName() {
+ return UNWRAPS_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getGenericTypeAnnotationTypeName() {
+ return GENERIC_TYPE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getGenericQualifierAnnotationTypeName() {
+ return GENERIC_QUALIFIER_TYPE_NAME;
+ }
+
+ public String getGenericConfigurationAnnotationTypeName() {
+ return GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getApplyScopeAnnotationTypeName() {
+ return APPLY_SCOPE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getInjectGenericAnnotationTypeName() {
+ return INJECT_GENERIC_ANNOTATION_TYPE_NAME;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,61 @@
+package org.jboss.tools.cdi.seam.solder.core;
+
+public class Version30 extends Version implements CDISeamSolderConstants30 {
+ public static Version instance = new Version30();
+
+ public String getExactAnnotationTypeName() {
+ return EXACT_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getFullyQualifiedAnnotationTypeName() {
+ return FULLY_QUALIFIED_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getRequiresAnnotationTypeName() {
+ return REQUIRES_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getVetoAnnotationTypeName() {
+ return VETO_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getMessageLoggerAnnotationTypeName() {
+ return MESSAGE_LOGGER_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getMessageBundleAnnotationTypeName() {
+ return MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getHandlerTypeAnnotationTypeName() {
+ return SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getDefaultBeanAnnotationTypeName() {
+ return DEFAULT_BEAN_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getUnwrapsAnnotationTypeName() {
+ return UNWRAPS_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getGenericTypeAnnotationTypeName() {
+ return GENERIC_TYPE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getGenericQualifierAnnotationTypeName() {
+ return GENERIC_QUALIFIER_TYPE_NAME_30;
+ }
+
+ public String getGenericConfigurationAnnotationTypeName() {
+ return GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getApplyScopeAnnotationTypeName() {
+ return APPLY_SCOPE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getInjectGenericAnnotationTypeName() {
+ return INJECT_GENERIC_ANNOTATION_TYPE_NAME_30;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.generic;
+
+import org.jboss.tools.cdi.seam.solder.core.Version;
+import org.jboss.tools.cdi.seam.solder.core.Version30;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30GenericBeanExtension extends CDISeamSolderGenericBeanExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -21,6 +21,7 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -41,9 +42,9 @@
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.scanner.FileSet;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
-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.cdi.seam.solder.core.Version;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IJavaAnnotation;
import org.jboss.tools.common.java.ParametedType;
@@ -56,9 +57,16 @@
* @author Viacheslav Kabanovich
*
*/
-public class CDISeamSolderGenericBeanExtension implements ICDIExtension, IBuildParticipantFeature, IProcessAnnotatedTypeFeature, IValidatorFeature, CDISeamSolderConstants {
- GenericBeanDefinitionContext context = new GenericBeanDefinitionContext();
+public class CDISeamSolderGenericBeanExtension implements ICDIExtension, IBuildParticipantFeature, IProcessAnnotatedTypeFeature, IValidatorFeature, CDIConstants {
+ GenericBeanDefinitionContext context = new GenericBeanDefinitionContext(getVersion());
+ public CDISeamSolderGenericBeanExtension() {
+ }
+
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public IDefinitionContextExtension getContext() {
return context;
}
@@ -109,7 +117,7 @@
List<MethodDefinition> ps = ti.getMethods();
for (MethodDefinition m: ps) {
if(m.isAnnotationPresent(PRODUCES_ANNOTATION_TYPE_NAME)
- || m.isAnnotationPresent(UNWRAPS_ANNOTATION_TYPE_NAME)) {
+ || m.isAnnotationPresent(getVersion().getUnwrapsAnnotationTypeName())) {
for (IAnnotationDeclaration d: list) {
m.addAnnotation(((AnnotationDeclaration)d).getDeclaration(), context.getRootContext());
}
@@ -125,7 +133,7 @@
}
replaceGenericInjections(ti, list);
- GenericClassBean cb = new GenericClassBean();
+ GenericClassBean cb = new GenericClassBean(getVersion());
cb.setGenericProducerBeanDefinition(gp);
cb.setParent(p);
cb.setDefinition(ti);
@@ -143,11 +151,11 @@
private void replaceGenericInjections(TypeDefinition ti, List<IQualifierDeclaration> list) {
List<FieldDefinition> fs = ti.getFields();
for (FieldDefinition f: fs) {
- if(f.isAnnotationPresent(INJECT_ANNOTATION_TYPE_NAME) && f.isAnnotationPresent(GENERIC_QUALIFIER_TYPE_NAME)) {
+ if(f.isAnnotationPresent(INJECT_ANNOTATION_TYPE_NAME) && f.isAnnotationPresent(getVersion().getGenericQualifierAnnotationTypeName())) {
for (IAnnotationDeclaration d: list) {
f.addAnnotation(((AnnotationDeclaration)d).getDeclaration(), context.getRootContext());
}
- AnnotationDeclaration gd = f.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
+ AnnotationDeclaration gd = f.getAnnotation(getVersion().getGenericQualifierAnnotationTypeName());
f.removeAnnotation(gd);
IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject());
if(ja != null) {
@@ -160,15 +168,15 @@
for (MethodDefinition m: ms) {
boolean isObserver = m.isObserver();
if(m.isAnnotationPresent(INJECT_ANNOTATION_TYPE_NAME) || isObserver) {
- boolean isMethodGeneric = m.isAnnotationPresent(GENERIC_QUALIFIER_TYPE_NAME);
+ boolean isMethodGeneric = m.isAnnotationPresent(getVersion().getGenericQualifierAnnotationTypeName());
List<ParameterDefinition> ps = m.getParameters();
for (ParameterDefinition p: ps) {
- if(isMethodGeneric || p.isAnnotationPresent(GENERIC_QUALIFIER_TYPE_NAME)
+ if(isMethodGeneric || p.isAnnotationPresent(getVersion().getGenericQualifierAnnotationTypeName())
|| (isObserver && p.isAnnotationPresent(OBSERVERS_ANNOTATION_TYPE_NAME))) {
for (IAnnotationDeclaration d: list) {
p.addAnnotation(((AnnotationDeclaration)d).getDeclaration(), context.getRootContext());
}
- AnnotationDeclaration gd = p.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
+ AnnotationDeclaration gd = p.getAnnotation(getVersion().getGenericQualifierAnnotationTypeName());
if(gd != null) {
p.removeAnnotation(gd);
IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject());
@@ -183,7 +191,7 @@
}
private IJavaAnnotation createInjectGenericAnnotation(AnnotationDeclaration genericAnnotation, CDICoreNature project) {
- IType type = project.getType(INJECT_GENERIC_ANNOTATION_TYPE_NAME);
+ IType type = project.getType(getVersion().getInjectGenericAnnotationTypeName());
return (type != null) ? new AnnotationLiteral(genericAnnotation.getResource(),
genericAnnotation.getStartPosition(), genericAnnotation.getLength(), null, 0, type)
: null;
@@ -191,11 +199,11 @@
@Override
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
- if(typeDefinition.isAnnotationPresent(VETO_ANNOTATION_TYPE_NAME)) {
+ if(typeDefinition.isAnnotationPresent(getVersion().getVetoAnnotationTypeName())) {
//ignore
- } else if(typeDefinition.isAnnotationPresent(GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME)) {
+ } else if(typeDefinition.isAnnotationPresent(getVersion().getGenericConfigurationAnnotationTypeName())) {
typeDefinition.veto();
- IAnnotationDeclaration d = typeDefinition.getAnnotation(GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration d = typeDefinition.getAnnotation(getVersion().getGenericConfigurationAnnotationTypeName());
Object o = d.getMemberValue(null);
if(o != null) {
String s = o.toString();
@@ -266,7 +274,7 @@
for (IAnnotationDeclaration d: ds) {
if(d.getTypeName() != null) {
AnnotationDefinition a = context.getRootContext().getAnnotation(d.getTypeName());
- if(a != null && a.isAnnotationPresent(GENERIC_TYPE_ANNOTATION_TYPE_NAME)) {
+ if(a != null && a.isAnnotationPresent(getVersion().getGenericTypeAnnotationTypeName())) {
return d;
}
}
@@ -275,7 +283,7 @@
}
public void validateResource(IFile file, CDICoreValidator validator) {
- new GenericBeanValidator().validateResource(file, validator, context.getRootContext().getProject(), context);
+ new GenericBeanValidator(getVersion()).validateResource(file, validator, context.getRootContext().getProject(), context);
}
public SeverityPreferences getSeverityPreferences() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.solder.core.generic;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -21,6 +20,7 @@
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.Version;
/**
*
@@ -29,9 +29,18 @@
*/
public class GenericBeanDefinitionContext extends AbstractDefinitionContextExtension {
Map<String, GenericConfiguration> genericConfiguartions = new HashMap<String, GenericConfiguration>();
+ Version version;
+ public GenericBeanDefinitionContext(Version version) {
+ this.version = version;
+ }
+
+ public Version getVersion() {
+ return version;
+ }
+
protected AbstractDefinitionContextExtension copy(boolean clean) {
- GenericBeanDefinitionContext copy = new GenericBeanDefinitionContext();
+ GenericBeanDefinitionContext copy = new GenericBeanDefinitionContext(version);
copy.root = root;
if(!clean) {
copy.genericConfiguartions.putAll(genericConfiguartions);
@@ -79,7 +88,7 @@
@Override
public void computeAnnotationKind(AnnotationDefinition annotation) {
- if(annotation.isAnnotationPresent(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME)) {
+ if(annotation.isAnnotationPresent(version.getGenericTypeAnnotationTypeName())) {
annotation.setExtendedKind(CDISeamSolderConstants.GENERIC_ANNOTATION_KIND);
String qn = annotation.getType().getFullyQualifiedName();
GenericConfiguration c = getGenericConfiguration(qn);
@@ -91,7 +100,7 @@
getRootContext().addDependency(p, newPath);
getRootContext().addDependency(newPath, p);
}
- ps.add(newPath);
+ ps.add(newPath);
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -13,7 +13,7 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.internal.core.impl.ProducerField;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.Version;
/**
*
@@ -21,13 +21,16 @@
*
*/
public class GenericBeanProducerField extends ProducerField implements IGenericBean {
+ Version version;
- public GenericBeanProducerField() {}
+ public GenericBeanProducerField(Version version) {
+ this.version = version;
+ }
@Override
public IScope getScope() {
IScope result = null;
- if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
+ if(definition.isAnnotationPresent(version.getApplyScopeAnnotationTypeName())) {
if(getParent() instanceof GenericClassBean) {
IBean generic = ((GenericClassBean)getParent()).getGenericProducerBean();
if(generic != null) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -13,7 +13,7 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.internal.core.impl.ProducerMethod;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.Version;
/**
*
@@ -21,13 +21,16 @@
*
*/
public class GenericBeanProducerMethod extends ProducerMethod implements IGenericBean {
+ Version version;
- public GenericBeanProducerMethod() {}
+ public GenericBeanProducerMethod(Version version) {
+ this.version = version;
+ }
@Override
public IScope getScope() {
IScope result = null;
- if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
+ if(definition.isAnnotationPresent(version.getApplyScopeAnnotationTypeName())) {
if(getParent() instanceof GenericClassBean) {
IBean generic = ((GenericClassBean)getParent()).getGenericProducerBean();
if(generic != null) {
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-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -32,9 +32,9 @@
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.internal.core.validation.CDICoreValidator;
-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.cdi.seam.solder.core.Version;
import org.jboss.tools.cdi.seam.solder.core.validation.SeamSolderValidationMessages;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
@@ -46,7 +46,12 @@
*
*/
public class GenericBeanValidator {
+ Version version;
+ public GenericBeanValidator(Version version) {
+ this.version = version;
+ }
+
public void validateResource(IFile file, CDICoreValidator validator, CDICoreNature project, GenericBeanDefinitionContext context) {
Map<String, GenericConfiguration> cs = context.getGenericConfigurations();
for (GenericConfiguration c: cs.values()) {
@@ -68,14 +73,14 @@
String n = c.getGenericTypeName();
for (TypeDefinition d: c.getGenericBeans()) {
if(d.getResource() != null && d.getResource().equals(file)) {
- IAnnotationDeclaration a = d.getAnnotation(CDISeamSolderConstants.GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = d.getAnnotation(version.getGenericConfigurationAnnotationTypeName());
validator.addError(SeamSolderValidationMessages.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE,
CDISeamSolderPreferences.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE, new String[]{n}, a, file);
}
}
} else if(file.equals(genericType.getResource())) {
if(t != null && context.isGenericBean(t.getType().getFullyQualifiedName())) {
- IAnnotationDeclaration a = genericType.getAnnotation(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = genericType.getAnnotation(version.getGenericTypeAnnotationTypeName());
validator.addError(SeamSolderValidationMessages.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN,
CDISeamSolderPreferences.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN, new String[0], a, file);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -20,7 +20,7 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
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.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.Version;
/**
*
@@ -29,17 +29,24 @@
*/
public class GenericClassBean extends ClassBean implements IGenericBean {
protected AbstractMemberDefinition genericProducerBean;
+ Version version;
- public GenericClassBean() {}
+ public GenericClassBean(Version version) {
+ this.version = version;
+ }
+ public Version getVersion() {
+ return version;
+ }
+
@Override
protected ProducerMethod newProducerMethod(MethodDefinition m) {
- return new GenericBeanProducerMethod();
+ return new GenericBeanProducerMethod(version);
}
@Override
protected ProducerField newProducerField(FieldDefinition f) {
- return new GenericBeanProducerField();
+ return new GenericBeanProducerField(version);
}
public void setGenericProducerBeanDefinition(AbstractMemberDefinition def) {
@@ -60,7 +67,7 @@
@Override
protected void computeScope() {
- if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
+ if(definition.isAnnotationPresent(version.getApplyScopeAnnotationTypeName())) {
IBean generic = getGenericProducerBean();
if(generic != null) {
scope = generic.getScope();
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-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -23,7 +23,6 @@
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;
@@ -74,7 +73,7 @@
public void setGenericTypeDefinition(AnnotationDefinition genericType, GenericBeanDefinitionContext context) {
this.genericType = genericType;
- IAnnotationDeclaration g = genericType.getAnnotation(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration g = genericType.getAnnotation(context.getVersion().getGenericTypeAnnotationTypeName());
Object o = g.getMemberValue(null);
if(o != null) {
String configTypeName = EclipseJavaUtil.resolveType(genericType.getType(), o.toString());
More information about the jbosstools-commits
mailing list