JBoss Tools SVN: r30320 - in trunk/bpel/plugins/org.jboss.tools.bpel.runtimes: src/org/jboss/tools/bpel/runtimes and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-04-05 11:14:04 -0400 (Tue, 05 Apr 2011)
New Revision: 30320
Added:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/JBT_BPELFacetInstallDataModelProvider.java
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java
Log:
https://issues.jboss.org/browse/JBIDE-8533
Deprecated the jbt.bpel.facet.core in favor of bpel.facet.core with backward compatibility for SOA-P 5.1
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-04-05 01:26:19 UTC (rev 30319)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-04-05 15:14:04 UTC (rev 30320)
@@ -16,9 +16,14 @@
MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
BPEL_CORE_FACET_LABEL=BPEL 2.0 Facet
-BPEL_CORE_FACET_DESCRIPTION=Enables modelling and deployment of BPEL processes.
+BPEL_CORE_FACET_DESCRIPTION=Enables modeling and deployment of BPEL processes.
BPEL_FACET_CATEGORY_LABEL=BPEL 2.0
BPEL_FACET_TEMPLATE_LABEL=BPEL 2.0 Project
NEW_BPEL_CATEGORY=BPEL 2.0
NEW_BPEL_PROJECT=BPEL Project
NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project.
+
+# This is provided for backward compatibility with the deprecated jbt.bpel.facet.core
+OLD_BPEL_CORE_FACET_LABEL=JBoss BPEL 2.0 Facet (SOA-P v5.1 and earlier)
+OLD_BPEL_CORE_FACET_DESCRIPTION=Enables modeling and deployment of BPEL processes to JBoss SOA-Platform version 5.1 and earlier.
+OLD_BPEL_FACET_TEMPLATE_LABEL=JBoss BPEL 2.0 Project (SOA-P v5.1 and earlier)
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-04-05 01:26:19 UTC (rev 30319)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-04-05 15:14:04 UTC (rev 30320)
@@ -65,14 +65,19 @@
<!-- BPEL Facet -->
<!--=========================================================================-->
+ <!--
+ This facet is now the same as the one defined by the eclipse.org BPEL editor.
+ An uninstall action was added to allow the facet to be swapped out with the
+ deprecated jbt.bpel.facet.core facet, or to be removed altogether
+ -->
<extension point="org.eclipse.wst.common.project.facet.core.facets">
- <project-facet id="jbt.bpel.facet.core">
+ <project-facet id="bpel.facet.core">
<label>%BPEL_CORE_FACET_LABEL</label>
<description>%BPEL_CORE_FACET_DESCRIPTION</description>
</project-facet>
- <project-facet-version facet="jbt.bpel.facet.core" version="2.0">
+ <project-facet-version facet="bpel.facet.core" version="2.0">
<group-member
id="modules">
</group-member>
@@ -83,19 +88,65 @@
</constraint>
</project-facet-version>
- <action facet="jbt.bpel.facet.core" version="2.0" type="INSTALL" id="bpel.facet.core.install">
+ <action facet="bpel.facet.core" version="2.0" type="INSTALL" id="bpel.facet.core.install">
<delegate class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/>
<config-factory class="org.jboss.tools.bpel.runtimes.facets.BPELFacetInstallDataModelProvider"/>
</action>
-
+ <action facet="bpel.facet.core" version="2.0" type="UNINSTALL" id="bpel.facet.core.uninstall">
+ <delegate class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetUninstallDelegate"/>
+ </action>
+
<category id="bpel.category">
<label>%BPEL_FACET_CATEGORY_LABEL</label>
- <description>%bpelCoreFacetDescription</description>
+ <description>%BPEL_CORE_FACET_DESCRIPTION</description>
</category>
<template id="jbt.template.bpel.core">
<label>%BPEL_FACET_TEMPLATE_LABEL</label>
+ <fixed facet="bpel.facet.core"/>
+ </template>
+
+ </extension>
+
+ <!--
+ This facet is has been deprecated, but retained for backward compatibility
+ with JBoss 5.1.0 and SOA-P 5.1 and earlier
+ -->
+ <extension point="org.eclipse.wst.common.project.facet.core.facets">
+
+ <project-facet id="jbt.bpel.facet.core">
+ <label>%OLD_BPEL_CORE_FACET_LABEL</label>
+ <description>%OLD_BPEL_CORE_FACET_DESCRIPTION</description>
+ </project-facet>
+
+ <project-facet-version facet="jbt.bpel.facet.core" version="2.0">
+ <group-member
+ id="modules">
+ </group-member>
+ <constraint>
+ <and>
+ <conflicts group="modules"/>
+ </and>
+ </constraint>
+ </project-facet-version>
+
+ <category id="bpel.category">
+ <label>%OLD_BPEL_FACET_CATEGORY_LABEL</label>
+ <description>%OLD_BPEL_CORE_FACET_DESCRIPTION</description>
+ </category>
+
+ <action facet="jbt.bpel.facet.core" version="2.0" type="INSTALL" id="jbt.bpel.facet.core.install">
+ <delegate class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/>
+ <config-factory class="org.jboss.tools.bpel.runtimes.facets.JBT_BPELFacetInstallDataModelProvider"/>
+ </action>
+
+ <action facet="jbt.bpel.facet.core" version="2.0" type="UNINSTALL" id="jbt.bpel.facet.core.uninstall">
+ <delegate class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetUninstallDelegate"/>
+ </action>
+
+ <template id="jbt.template.bpel.core">
+ <label>%OLD_BPEL_FACET_TEMPLATE_LABEL</label>
<fixed facet="jbt.bpel.facet.core"/>
</template>
@@ -108,7 +159,7 @@
<extension
point="org.eclipse.wst.common.modulecore.componentimpl">
<componentimpl
- typeID="jbt.bpel.facet.core"
+ typeID="bpel.facet.core"
class="org.jboss.tools.bpel.runtimes.facets.BPELVirtualComponent">
</componentimpl>
</extension>
@@ -119,7 +170,7 @@
<!--=========================================================================-->
<extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image facet="jbt.bpel.facet.core" path="icons/obj16/bpelfacet.gif"/>
+ <image facet="bpel.facet.core" path="icons/obj16/bpelfacet.gif"/>
</extension>
<!--=========================================================================-->
@@ -279,7 +330,7 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.stripped.component"
version="1.0"/>
- <facet id="jbt.bpel.facet.core" version="1.2,2.0"/>
+ <facet id="bpel.facet.core" version="1.2,2.0"/>
</supported>
</extension>
@@ -293,7 +344,7 @@
<runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
version="5.0"/>
- <facet id="jbt.bpel.facet.core" version="1.2,2.0"/>
+ <facet id="bpel.facet.core" version="1.2,2.0"/>
</supported>
</extension>
@@ -309,22 +360,29 @@
<runtime-component-version
type="org.jboss.ide.eclipse.as.runtime.component"
version="7.0"/>
+
<supported>
<runtime-component version="5.1"
id="org.jboss.ide.eclipse.as.runtime.component"/>
+ <facet id="bpel.facet.core" version="1.2,2.0"/>
+ </supported>
+
+ <supported>
+ <runtime-component version="5.1"
+ id="org.jboss.ide.eclipse.as.runtime.component"/>
<facet id="jbt.bpel.facet.core" version="1.2,2.0"/>
</supported>
<supported>
<runtime-component version="6.0"
id="org.jboss.ide.eclipse.as.runtime.component"/>
- <facet id="jbt.bpel.facet.core" version="1.2,2.0"/>
+ <facet id="bpel.facet.core" version="1.2,2.0"/>
</supported>
<supported>
<runtime-component version="7.0"
id="org.jboss.ide.eclipse.as.runtime.component"/>
- <facet id="jbt.bpel.facet.core" version="1.2,2.0"/>
+ <facet id="bpel.facet.core" version="1.2,2.0"/>
</supported>
</extension>
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2011-04-05 01:26:19 UTC (rev 30319)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2011-04-05 15:14:04 UTC (rev 30320)
@@ -32,7 +32,9 @@
public final static String BPEL20_FACET_TEMPLATE = "jbt.template.bpel.core"; //$NON-NLS-1$
// facet
- public final static String BPEL_PROJECT_FACET = "jbt.bpel.facet.core"; //$NON-NLS-1$
+ // this facet has been deprecated
+ public final static String JBT_BPEL_PROJECT_FACET = "jbt.bpel.facet.core"; //$NON-NLS-1$
+ public final static String BPEL_PROJECT_FACET = "bpel.facet.core"; //$NON-NLS-1$
// bpel file extension
public final static String BPEL_FILE_EXTENSION = "bpel"; //$NON-NLS-1$
Added: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java 2011-04-05 15:14:04 UTC (rev 30320)
@@ -0,0 +1,22 @@
+package org.jboss.tools.bpel.runtimes.facets;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jst.common.project.facet.WtpUtils;
+import org.eclipse.wst.common.project.facet.core.IDelegate;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+
+/*
+ * Added to support deprecated jbt.bpel.facet.core
+ * https://issues.jboss.org/browse/JBIDE-8533
+ */
+public class BPELCoreFacetUninstallDelegate implements IDelegate {
+
+ @Override
+ public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor)
+ throws CoreException {
+ WtpUtils.removeNatures(project);
+ }
+
+}
Added: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/JBT_BPELFacetInstallDataModelProvider.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/JBT_BPELFacetInstallDataModelProvider.java (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/JBT_BPELFacetInstallDataModelProvider.java 2011-04-05 15:14:04 UTC (rev 30320)
@@ -0,0 +1,34 @@
+package org.jboss.tools.bpel.runtimes.facets;
+
+import java.util.Set;
+
+import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
+import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants;
+
+/*
+ * Added to support deprecated jbt.bpel.facet.core
+ * https://issues.jboss.org/browse/JBIDE-8533
+ */
+public class JBT_BPELFacetInstallDataModelProvider extends
+ FacetInstallDataModelProvider implements IActionConfigFactory, IFacetDataModelProperties, IBPELModuleFacetConstants {
+
+ @Override
+ public Set getPropertyNames() {
+ Set names = super.getPropertyNames();
+ names.add(FACET_PROJECT_NAME);
+ names.add(FACET_ID);
+ names.add(BPEL_CONTENT_FOLDER);
+ return names;
+ }
+
+ @Override
+ public Object getDefaultProperty(String propertyName) {
+ if (propertyName.equals(FACET_ID)) {
+ return IBPELModuleFacetConstants.JBT_BPEL_PROJECT_FACET;
+ }
+ return super.getDefaultProperty(propertyName);
+ }
+
+}
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java 2011-04-05 01:26:19 UTC (rev 30319)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java 2011-04-05 15:14:04 UTC (rev 30320)
@@ -94,6 +94,15 @@
return facetedProject.getInstalledVersion(projectFacet).getVersionString();
}
+ // https://issues.jboss.org/browse/JBIDE-8533
+ // Added to support deprecated jbt.bpel.facet.core
+ if (facetedProject != null
+ && ProjectFacetsManager.isProjectFacetDefined(IBPELModuleFacetConstants.JBT_BPEL_PROJECT_FACET))
+ {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IBPELModuleFacetConstants.JBT_BPEL_PROJECT_FACET);
+
+ return facetedProject.getInstalledVersion(projectFacet).getVersionString();
+ }
} catch (Exception e) {
Logger.getLogger().write(e);
}
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2011-04-05 01:26:19 UTC (rev 30319)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2011-04-05 15:14:04 UTC (rev 30320)
@@ -93,7 +93,10 @@
}
protected boolean canHandleProject(IProject p) {
- return FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.BPEL_PROJECT_FACET);
+ // https://issues.jboss.org/browse/JBIDE-8533
+ // Added support for deprecated jbt.bpel.facet.core
+ return FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.BPEL_PROJECT_FACET) ||
+ FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.JBT_BPEL_PROJECT_FACET);
}
protected IModule[] createModuleDelegates(IVirtualComponent component) {
13 years, 2 months
JBoss Tools SVN: r30319 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-04 21:26:19 -0400 (Mon, 04 Apr 2011)
New Revision: 30319
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
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-04-05 01:25:40 UTC (rev 30318)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-04-05 01:26:19 UTC (rev 30319)
@@ -1,12 +1,12 @@
package org.jboss.tools.cdi.seam.solder.core;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IAnnotated;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
@@ -14,6 +14,8 @@
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
+import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
@@ -22,107 +24,123 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.EclipseJavaUtil;
-public class CDISeamSolderCoreExtension implements ICDIExtension, IProcessAnnotatedTypeFeature {
+public class CDISeamSolderCoreExtension implements ICDIExtension,
+ IProcessAnnotatedTypeFeature {
public Object getAdapter(Class adapter) {
- if(adapter == IBeanNameFeature.class) {
+ if (adapter == IBeanNameFeature.class) {
return BeanNameFeature.instance;
}
return null;
}
- public void processAnnotatedType(TypeDefinition typeDefinition, DefinitionContext context) {
- if(typeDefinition.isAnnotationPresent(CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME)
- || (typeDefinition.getPackageDefinition() != null
- && typeDefinition.getPackageDefinition().isAnnotationPresent(CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME))) {
+ public void processAnnotatedType(TypeDefinition typeDefinition,
+ DefinitionContext context) {
+ if (typeDefinition
+ .isAnnotationPresent(CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME)
+ || (typeDefinition.getPackageDefinition() != null && typeDefinition
+ .getPackageDefinition()
+ .isAnnotationPresent(
+ CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME))) {
typeDefinition.veto();
return;
}
Set<String> requiredClasses = new HashSet<String>();
List<String> typeRequiredClasses = getRequiredClasses(typeDefinition);
- if(typeRequiredClasses != null) requiredClasses.addAll(typeRequiredClasses);
- List<String> packageRequiredClasses = getRequiredClasses(typeDefinition.getPackageDefinition());;
- if(packageRequiredClasses != null) requiredClasses.addAll(packageRequiredClasses);
- IJavaProject jp = EclipseResourceUtil.getJavaProject(context.getProject().getProject());
- if (!requiredClasses.isEmpty() && jp != null) {
- for (String c : requiredClasses) {
- try {
- if(EclipseJavaUtil.findType(jp, c) == null) {
- typeDefinition.veto();
- return;
- }
- } catch (JavaModelException e) {
- CDISeamSolderCorePlugin.getDefault().logError(e);
- typeDefinition.veto();
- return;
- }
- }
- }
+ if (typeRequiredClasses != null)
+ requiredClasses.addAll(typeRequiredClasses);
+ List<String> packageRequiredClasses = getRequiredClasses(typeDefinition
+ .getPackageDefinition());
+ ;
+ if (packageRequiredClasses != null)
+ requiredClasses.addAll(packageRequiredClasses);
+ IJavaProject jp = EclipseResourceUtil.getJavaProject(context
+ .getProject().getProject());
+ if (!requiredClasses.isEmpty() && jp != null) {
+ for (String c : requiredClasses) {
+ try {
+ if (EclipseJavaUtil.findType(jp, c) == null) {
+ typeDefinition.veto();
+ return;
+ }
+ } catch (JavaModelException e) {
+ CDISeamSolderCorePlugin.getDefault().logError(e);
+ typeDefinition.veto();
+ return;
+ }
+ }
+ }
- List<FieldDefinition> fs = typeDefinition.getFields();
- for (FieldDefinition f: fs) {
- IParametedType exact = getExactType(f, typeDefinition.getType(), context);
- System.out.println("field:" + exact);
- if(exact != null) {
-
- }
- }
-
- List<MethodDefinition> ms = typeDefinition.getMethods();
- for (MethodDefinition m: ms) {
- List<ParameterDefinition> ps = m.getParameters();
- for (ParameterDefinition p: ps) {
- IParametedType exact = getExactType(p, typeDefinition.getType(), context);
- System.out.println("parameter:" + exact);
- if(exact != null) {
-
- }
- }
- }
+ List<FieldDefinition> fs = typeDefinition.getFields();
+ for (FieldDefinition f : fs) {
+ TypeDeclaration exact = getExactType(f, typeDefinition, context);
+ if (exact != null) {
+ f.setOverridenType(exact);
+ }
+ }
+
+ List<MethodDefinition> ms = typeDefinition.getMethods();
+ for (MethodDefinition m : ms) {
+ List<ParameterDefinition> ps = m.getParameters();
+ for (ParameterDefinition p : ps) {
+ TypeDeclaration exact = getExactType(p, typeDefinition, context);
+ if (exact != null) {
+ p.setOverridenType(exact);
+ }
+ }
+ }
}
private List<String> getRequiredClasses(IAnnotated d) {
- if(d == null) return null;
- IAnnotationDeclaration requires = d.getAnnotation(CDISeamSolderConstants.REQUIRES_ANNOTATION_TYPE_NAME);
+ if (d == null)
+ return null;
+ IAnnotationDeclaration requires = d
+ .getAnnotation(CDISeamSolderConstants.REQUIRES_ANNOTATION_TYPE_NAME);
return requires != null ? getArrayValue(requires) : null;
}
private List<String> getArrayValue(IAnnotationDeclaration d) {
Object value = d.getMemberValue(null);
List<String> result = new ArrayList<String>();
- if(value instanceof Object[]) {
- Object[] array = (Object[])value;
+ if (value instanceof Object[]) {
+ Object[] array = (Object[]) value;
for (int i = 0; i < array.length; i++) {
- if(array[i] != null) result.add(array[i].toString());
+ if (array[i] != null)
+ result.add(array[i].toString());
}
- } else if(value instanceof String) {
+ } else if (value instanceof String) {
result.add(value.toString());
}
return result;
}
- private IParametedType getExactType(IAnnotated annotated, IType declaringType, DefinitionContext context) {
- IAnnotationDeclaration a = annotated.getAnnotation(CDISeamSolderConstants.EXACT_ANNOTATION_TYPE_NAME);
- if(a != null) {
- Object o = a.getMemberValue(null);
- if(o != null) {
- String s = o.toString();
- if(s.length() > 0) {
- String q = EclipseJavaUtil.resolveType(declaringType, s);
- if(q != null) {
- try {
- return context.getProject().getTypeFactory().getParametedType(declaringType, "Q" + q + ";");
- } catch (JavaModelException e) {
- CDISeamSolderCorePlugin.getDefault().logError(e);
+ private TypeDeclaration getExactType(IAnnotated annotated, TypeDefinition declaringType, DefinitionContext context) {
+ IAnnotationDeclaration a = annotated.getAnnotation(CDISeamSolderConstants.EXACT_ANNOTATION_TYPE_NAME);
+ if(a != null) {
+ Object o = a.getMemberValue(null);
+ if(o != null) {
+ String s = o.toString();
+ if(s.length() > 0) {
+ try {
+ ParametedType p = context.getProject().getTypeFactory().getParametedType(declaringType.getType(), "Q" + s + ";");
+ int b = a.getStartPosition();
+ int e = b + a.getLength();
+ if(b >= 0 && e > b) {
+ String content = declaringType.getContent().substring(b, e);
+ int i = content.indexOf(s);
+ if(i >= 0) {
+ b = i;
+ e = i + s.length();
+ }
}
-
- }
- }
- System.out.println("Exact:" + s);
- }
- }
- return null;
+ return new TypeDeclaration(p, b, e - b);
+ } catch (JavaModelException e) {
+ CDISeamSolderCorePlugin.getDefault().logError(e);
+ }
+ }
+ }
+ }
+ return null;
}
-
}
13 years, 2 months
JBoss Tools SVN: r30318 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-04 21:25:40 -0400 (Mon, 04 Apr 2011)
New Revision: 30318
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -25,4 +25,11 @@
* @return
*/
IClassBean getClassBean();
-}
\ No newline at end of file
+
+ /**
+ * Returns type of underlying Java member.
+ *
+ * @return
+ */
+ IParametedType getMemberType();
+}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -17,11 +17,4 @@
*/
public interface IInjectionPointField extends IBeanField, IInjectionPoint {
- /**
- * Extensions can override type.
- *
- * @return type that was set by an extension instead of Java member type
- */
- public ITypeDeclaration getOverridenType();
-
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -16,12 +16,4 @@
* @author Alexey Kazakov
*/
public interface IInjectionPointParameter extends IParameter, IInjectionPoint {
-
- /**
- * Extensions can override type.
- *
- * @return type that was set by an extension instead of Java parameter type
- */
- public ITypeDeclaration getOverridenType();
-
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -93,6 +93,10 @@
return typeDeclaration;
}
+ public IParametedType getMemberType() {
+ return typeDeclaration;
+ }
+
public int getLength() {
ISourceRange r = null;
try {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -45,7 +45,6 @@
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IObserverMethod;
@@ -286,14 +285,6 @@
return result;
}
- IParametedType overridenType = null;
- if(injectionPoint instanceof IInjectionPointField) {
- overridenType = ((IInjectionPointField)injectionPoint).getOverridenType();
- } else if(injectionPoint instanceof IInjectionPointParameter) {
- overridenType = ((IInjectionPointParameter)injectionPoint).getOverridenType();
- }
- if(overridenType != null) type = overridenType;
-
if(type.getType() != null && CDIConstants.EVENT_TYPE_NAME.equals(type.getType().getFullyQualifiedName())) {
List<? extends IParametedType> ps = type.getParameters();
if(ps != null && ps.size() == 1) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.ITypeDeclaration;
/**
@@ -25,10 +26,17 @@
public InjectionPointField() {}
- public ITypeDeclaration getOverridenType() {
- return getDefinition().getOverridenType();
+ public IParametedType getType() {
+ if(getDefinition().getOverridenType() != null) {
+ return getDefinition().getOverridenType();
+ }
+ return super.getType();
}
+ public IParametedType getJavaMemberType() {
+ return super.getType();
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -30,9 +30,6 @@
public class InjectionPointParameter extends Parameter implements
IInjectionPointParameter {
- public ITypeDeclaration getOverridenType() {
- return definition.getOverridenType();
- }
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -37,7 +37,14 @@
return definition.getName();
}
+ public IParametedType getMemberType() {
+ return definition.getType();
+ }
+
public IParametedType getType() {
+ if(definition.getOverridenType() != null) {
+ return definition.getOverridenType();
+ }
return definition.getType();
}
13 years, 2 months
JBoss Tools SVN: r30317 - trunk/cdi/tests.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-04 21:06:20 -0400 (Mon, 04 Apr 2011)
New Revision: 30317
Modified:
trunk/cdi/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8673
Modified: trunk/cdi/tests/pom.xml
===================================================================
--- trunk/cdi/tests/pom.xml 2011-04-05 00:37:24 UTC (rev 30316)
+++ trunk/cdi/tests/pom.xml 2011-04-05 01:06:20 UTC (rev 30317)
@@ -10,6 +10,7 @@
<module>org.jboss.tools.cdi.core.test</module>
<module>org.jboss.tools.cdi.text.ext.test</module>
<module>org.jboss.tools.cdi.ui.test</module>
+ <module>org.jboss.tools.cdi.seam.solder.core.test</module>
</modules>
</project>
13 years, 2 months
JBoss Tools SVN: r30316 - 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-04-04 20:37:24 -0400 (Mon, 04 Apr 2011)
New Revision: 30316
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java 2011-04-05 00:10:21 UTC (rev 30315)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java 2011-04-05 00:37:24 UTC (rev 30316)
@@ -17,4 +17,11 @@
*/
public interface IInjectionPointField extends IBeanField, IInjectionPoint {
+ /**
+ * Extensions can override type.
+ *
+ * @return type that was set by an extension instead of Java member type
+ */
+ public ITypeDeclaration getOverridenType();
+
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java 2011-04-05 00:10:21 UTC (rev 30315)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java 2011-04-05 00:37:24 UTC (rev 30316)
@@ -17,4 +17,11 @@
*/
public interface IInjectionPointParameter extends IParameter, IInjectionPoint {
+ /**
+ * Extensions can override type.
+ *
+ * @return type that was set by an extension instead of Java parameter type
+ */
+ public ITypeDeclaration getOverridenType();
+
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-04-05 00:10:21 UTC (rev 30315)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-04-05 00:37:24 UTC (rev 30316)
@@ -45,6 +45,7 @@
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IObserverMethod;
@@ -284,6 +285,14 @@
if(type == null) {
return result;
}
+
+ IParametedType overridenType = null;
+ if(injectionPoint instanceof IInjectionPointField) {
+ overridenType = ((IInjectionPointField)injectionPoint).getOverridenType();
+ } else if(injectionPoint instanceof IInjectionPointParameter) {
+ overridenType = ((IInjectionPointParameter)injectionPoint).getOverridenType();
+ }
+ if(overridenType != null) type = overridenType;
if(type.getType() != null && CDIConstants.EVENT_TYPE_NAME.equals(type.getType().getFullyQualifiedName())) {
List<? extends IParametedType> ps = type.getParameters();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-04-05 00:10:21 UTC (rev 30315)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-04-05 00:37:24 UTC (rev 30316)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.ITypeDeclaration;
/**
*
@@ -24,6 +25,10 @@
public InjectionPointField() {}
+ public ITypeDeclaration getOverridenType() {
+ return getDefinition().getOverridenType();
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-04-05 00:10:21 UTC (rev 30315)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-04-05 00:37:24 UTC (rev 30316)
@@ -19,6 +19,7 @@
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
+import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
/**
@@ -29,6 +30,9 @@
public class InjectionPointParameter extends Parameter implements
IInjectionPointParameter {
+ public ITypeDeclaration getOverridenType() {
+ return definition.getOverridenType();
+ }
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2011-04-05 00:10:21 UTC (rev 30315)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2011-04-05 00:37:24 UTC (rev 30316)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.internal.core.impl.definition;
import org.eclipse.jdt.core.IField;
+import org.jboss.tools.cdi.core.ITypeDeclaration;
/**
*
@@ -19,6 +20,7 @@
*/
public class FieldDefinition extends BeanMemberDefinition {
IField field;
+ ITypeDeclaration overridenType = null;
public FieldDefinition() {}
@@ -31,4 +33,12 @@
return field;
}
+ public void setOverridenType(ITypeDeclaration overridenType) {
+ this.overridenType = overridenType;
+ }
+
+ public ITypeDeclaration getOverridenType() {
+ return overridenType;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-04-05 00:10:21 UTC (rev 30315)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-04-05 00:37:24 UTC (rev 30316)
@@ -27,8 +27,8 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.AnnotationLiteral;
-import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -37,6 +37,7 @@
protected String name;
protected ParametedType type;
+ protected TypeDeclaration overridenType;
protected int index;
protected ITextSourceReference position = null;
@@ -52,6 +53,14 @@
return type;
}
+ public TypeDeclaration getOverridenType() {
+ return overridenType;
+ }
+
+ public void setOverridenType(TypeDeclaration overridenType) {
+ this.overridenType = overridenType;
+ }
+
public MethodDefinition getMethodDefinition() {
return methodDefinition;
}
@@ -104,7 +113,11 @@
} else if(params.endsWith(".class")) {
params = params.substring(0, params.length() - 6);
IMemberValuePair pair = new MemberValuePair("value", params, IMemberValuePair.K_CLASS);
- return new IMemberValuePair[]{pair};
+ return new IMemberValuePair[]{pair};
+ } else if(params.startsWith("\"") && params.endsWith("\"")) {
+ params = params.substring(1, params.length() - 1);
+ IMemberValuePair pair = new MemberValuePair("value", params, IMemberValuePair.K_STRING);
+ return new IMemberValuePair[]{pair};
} else {
//TODO
}
@@ -157,4 +170,5 @@
String text = methodDefinition.getTypeDefinition().getContent().substring(pos.getStartPosition(), pos.getStartPosition() + pos.getLength());
return text;
}
+
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r30315 - trunk/cdi/features.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-04 20:10:21 -0400 (Mon, 04 Apr 2011)
New Revision: 30315
Modified:
trunk/cdi/features/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8673
Modified: trunk/cdi/features/pom.xml
===================================================================
--- trunk/cdi/features/pom.xml 2011-04-05 00:00:36 UTC (rev 30314)
+++ trunk/cdi/features/pom.xml 2011-04-05 00:10:21 UTC (rev 30315)
@@ -8,6 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.cdi.feature</module>
+ <module>org.jboss.tools.cdi.seam.feature</module>
</modules>
</project>
13 years, 2 months
JBoss Tools SVN: r30313 - trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-04 19:04:59 -0400 (Mon, 04 Apr 2011)
New Revision: 30313
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml 2011-04-04 22:38:44 UTC (rev 30312)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml 2011-04-04 23:04:59 UTC (rev 30313)
@@ -13,7 +13,7 @@
<properties>
<emma.filter>org.jboss.tools.cdi.seam.solder.core*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.seam.older.core</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.seam.solder.core</emma.instrument.bundles>
</properties>
<build>
13 years, 2 months
JBoss Tools SVN: r30312 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-04 18:38:44 -0400 (Mon, 04 Apr 2011)
New Revision: 30312
Added:
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/CDISeamSolderCorePlugin.java
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCoreExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCorePlugin.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF
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/BeanNameFeature.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF 2011-04-04 22:34:39 UTC (rev 30311)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF 2011-04-04 22:38:44 UTC (rev 30312)
@@ -3,7 +3,7 @@
Bundle-Name: Context and Dependency Injection Core
Bundle-SymbolicName: org.jboss.tools.cdi.seam.solder.core;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.jboss.tools.cdi.seam.solder.core.CDISolderCorePlugin
+Bundle-Activator: org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
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-04-04 22:34:39 UTC (rev 30311)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-04-04 22:38:44 UTC (rev 30312)
@@ -4,7 +4,7 @@
<extension
point="org.jboss.tools.cdi.core.cdiextensions">
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISolderCoreExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCoreExtension"
runtime="org.jboss.seam.solder.core.CoreExtension">
</cdiextension>
</extension>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/BeanNameFeature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/BeanNameFeature.java 2011-04-04 22:34:39 UTC (rev 30311)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/BeanNameFeature.java 2011-04-04 22:38:44 UTC (rev 30312)
@@ -53,10 +53,10 @@
AnnotationDeclaration fullyQualifiedOnPackage = null;
if(p != null) {
namedOnPackage = p.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
- fullyQualifiedOnPackage = p.getAnnotation(CDISolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
+ fullyQualifiedOnPackage = p.getAnnotation(CDISeamSolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
}
- AnnotationDeclaration fullyQualified = d.getAnnotation(CDISolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
+ AnnotationDeclaration fullyQualified = d.getAnnotation(CDISeamSolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
//@FullyQualified
if((fullyQualified != null || fullyQualifiedOnPackage != null) && (named != null || namedOnPackage != null)) {
Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java (from rev 30307, trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderConstants.java)
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-04-04 22:38:44 UTC (rev 30312)
@@ -0,0 +1,11 @@
+package org.jboss.tools.cdi.seam.solder.core;
+
+import org.jboss.tools.cdi.core.CDIConstants;
+
+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";
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java (from rev 30307, trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCoreExtension.java)
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-04-04 22:38:44 UTC (rev 30312)
@@ -0,0 +1,128 @@
+package org.jboss.tools.cdi.seam.solder.core;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IAnnotated;
+import org.jboss.tools.cdi.core.IAnnotationDeclaration;
+import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.core.extension.ICDIExtension;
+import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature;
+import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
+import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
+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.ParameterDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.EclipseJavaUtil;
+
+public class CDISeamSolderCoreExtension implements ICDIExtension, IProcessAnnotatedTypeFeature {
+
+ public Object getAdapter(Class adapter) {
+ if(adapter == IBeanNameFeature.class) {
+ return BeanNameFeature.instance;
+ }
+ return null;
+ }
+
+ public void processAnnotatedType(TypeDefinition typeDefinition, DefinitionContext context) {
+ if(typeDefinition.isAnnotationPresent(CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME)
+ || (typeDefinition.getPackageDefinition() != null
+ && typeDefinition.getPackageDefinition().isAnnotationPresent(CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME))) {
+ typeDefinition.veto();
+ return;
+ }
+
+ Set<String> requiredClasses = new HashSet<String>();
+ List<String> typeRequiredClasses = getRequiredClasses(typeDefinition);
+ if(typeRequiredClasses != null) requiredClasses.addAll(typeRequiredClasses);
+ List<String> packageRequiredClasses = getRequiredClasses(typeDefinition.getPackageDefinition());;
+ if(packageRequiredClasses != null) requiredClasses.addAll(packageRequiredClasses);
+ IJavaProject jp = EclipseResourceUtil.getJavaProject(context.getProject().getProject());
+ if (!requiredClasses.isEmpty() && jp != null) {
+ for (String c : requiredClasses) {
+ try {
+ if(EclipseJavaUtil.findType(jp, c) == null) {
+ typeDefinition.veto();
+ return;
+ }
+ } catch (JavaModelException e) {
+ CDISeamSolderCorePlugin.getDefault().logError(e);
+ typeDefinition.veto();
+ return;
+ }
+ }
+ }
+
+ List<FieldDefinition> fs = typeDefinition.getFields();
+ for (FieldDefinition f: fs) {
+ IParametedType exact = getExactType(f, typeDefinition.getType(), context);
+ System.out.println("field:" + exact);
+ if(exact != null) {
+
+ }
+ }
+
+ List<MethodDefinition> ms = typeDefinition.getMethods();
+ for (MethodDefinition m: ms) {
+ List<ParameterDefinition> ps = m.getParameters();
+ for (ParameterDefinition p: ps) {
+ IParametedType exact = getExactType(p, typeDefinition.getType(), context);
+ System.out.println("parameter:" + exact);
+ if(exact != null) {
+
+ }
+ }
+ }
+ }
+
+ private List<String> getRequiredClasses(IAnnotated d) {
+ if(d == null) return null;
+ IAnnotationDeclaration requires = d.getAnnotation(CDISeamSolderConstants.REQUIRES_ANNOTATION_TYPE_NAME);
+ return requires != null ? getArrayValue(requires) : null;
+ }
+
+ private List<String> getArrayValue(IAnnotationDeclaration d) {
+ Object value = d.getMemberValue(null);
+ List<String> result = new ArrayList<String>();
+ if(value instanceof Object[]) {
+ Object[] array = (Object[])value;
+ for (int i = 0; i < array.length; i++) {
+ if(array[i] != null) result.add(array[i].toString());
+ }
+ } else if(value instanceof String) {
+ result.add(value.toString());
+ }
+ return result;
+ }
+
+ private IParametedType getExactType(IAnnotated annotated, IType declaringType, DefinitionContext context) {
+ IAnnotationDeclaration a = annotated.getAnnotation(CDISeamSolderConstants.EXACT_ANNOTATION_TYPE_NAME);
+ if(a != null) {
+ Object o = a.getMemberValue(null);
+ if(o != null) {
+ String s = o.toString();
+ if(s.length() > 0) {
+ String q = EclipseJavaUtil.resolveType(declaringType, s);
+ if(q != null) {
+ try {
+ return context.getProject().getTypeFactory().getParametedType(declaringType, "Q" + q + ";");
+ } catch (JavaModelException e) {
+ CDISeamSolderCorePlugin.getDefault().logError(e);
+ }
+
+ }
+ }
+ System.out.println("Exact:" + s);
+ }
+ }
+ return null;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java (from rev 30307, trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCorePlugin.java)
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java 2011-04-04 22:38:44 UTC (rev 30312)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * 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.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.jboss.tools.common.log.BaseUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class CDISeamSolderCorePlugin extends BaseUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.cdi.solder.core";
+
+ // The shared instance
+ private static CDISeamSolderCorePlugin plugin;
+
+ /**
+ * The constructor
+ */
+ public CDISeamSolderCorePlugin() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static CDISeamSolderCorePlugin getDefault() {
+ return plugin;
+ }
+
+}
+
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderConstants.java 2011-04-04 22:34:39 UTC (rev 30311)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderConstants.java 2011-04-04 22:38:44 UTC (rev 30312)
@@ -1,11 +0,0 @@
-package org.jboss.tools.cdi.seam.solder.core;
-
-import org.jboss.tools.cdi.core.CDIConstants;
-
-public interface CDISolderConstants 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";
-
-}
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCoreExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCoreExtension.java 2011-04-04 22:34:39 UTC (rev 30311)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCoreExtension.java 2011-04-04 22:38:44 UTC (rev 30312)
@@ -1,128 +0,0 @@
-package org.jboss.tools.cdi.seam.solder.core;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.jboss.tools.cdi.core.IAnnotated;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
-import org.jboss.tools.cdi.core.IParametedType;
-import org.jboss.tools.cdi.core.extension.ICDIExtension;
-import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature;
-import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
-import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
-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.ParameterDefinition;
-import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.util.EclipseJavaUtil;
-
-public class CDISolderCoreExtension implements ICDIExtension, IProcessAnnotatedTypeFeature {
-
- public Object getAdapter(Class adapter) {
- if(adapter == IBeanNameFeature.class) {
- return BeanNameFeature.instance;
- }
- return null;
- }
-
- public void processAnnotatedType(TypeDefinition typeDefinition, DefinitionContext context) {
- if(typeDefinition.isAnnotationPresent(CDISolderConstants.VETO_ANNOTATION_TYPE_NAME)
- || (typeDefinition.getPackageDefinition() != null
- && typeDefinition.getPackageDefinition().isAnnotationPresent(CDISolderConstants.VETO_ANNOTATION_TYPE_NAME))) {
- typeDefinition.veto();
- return;
- }
-
- Set<String> requiredClasses = new HashSet<String>();
- List<String> typeRequiredClasses = getRequiredClasses(typeDefinition);
- if(typeRequiredClasses != null) requiredClasses.addAll(typeRequiredClasses);
- List<String> packageRequiredClasses = getRequiredClasses(typeDefinition.getPackageDefinition());;
- if(packageRequiredClasses != null) requiredClasses.addAll(packageRequiredClasses);
- IJavaProject jp = EclipseResourceUtil.getJavaProject(context.getProject().getProject());
- if (!requiredClasses.isEmpty() && jp != null) {
- for (String c : requiredClasses) {
- try {
- if(EclipseJavaUtil.findType(jp, c) == null) {
- typeDefinition.veto();
- return;
- }
- } catch (JavaModelException e) {
- CDISolderCorePlugin.getDefault().logError(e);
- typeDefinition.veto();
- return;
- }
- }
- }
-
- List<FieldDefinition> fs = typeDefinition.getFields();
- for (FieldDefinition f: fs) {
- IParametedType exact = getExactType(f, typeDefinition.getType(), context);
- System.out.println("field:" + exact);
- if(exact != null) {
-
- }
- }
-
- List<MethodDefinition> ms = typeDefinition.getMethods();
- for (MethodDefinition m: ms) {
- List<ParameterDefinition> ps = m.getParameters();
- for (ParameterDefinition p: ps) {
- IParametedType exact = getExactType(p, typeDefinition.getType(), context);
- System.out.println("parameter:" + exact);
- if(exact != null) {
-
- }
- }
- }
- }
-
- private List<String> getRequiredClasses(IAnnotated d) {
- if(d == null) return null;
- IAnnotationDeclaration requires = d.getAnnotation(CDISolderConstants.REQUIRES_ANNOTATION_TYPE_NAME);
- return requires != null ? getArrayValue(requires) : null;
- }
-
- private List<String> getArrayValue(IAnnotationDeclaration d) {
- Object value = d.getMemberValue(null);
- List<String> result = new ArrayList<String>();
- if(value instanceof Object[]) {
- Object[] array = (Object[])value;
- for (int i = 0; i < array.length; i++) {
- if(array[i] != null) result.add(array[i].toString());
- }
- } else if(value instanceof String) {
- result.add(value.toString());
- }
- return result;
- }
-
- private IParametedType getExactType(IAnnotated annotated, IType declaringType, DefinitionContext context) {
- IAnnotationDeclaration a = annotated.getAnnotation(CDISolderConstants.EXACT_ANNOTATION_TYPE_NAME);
- if(a != null) {
- Object o = a.getMemberValue(null);
- if(o != null) {
- String s = o.toString();
- if(s.length() > 0) {
- String q = EclipseJavaUtil.resolveType(declaringType, s);
- if(q != null) {
- try {
- return context.getProject().getTypeFactory().getParametedType(declaringType, "Q" + q + ";");
- } catch (JavaModelException e) {
- CDISolderCorePlugin.getDefault().logError(e);
- }
-
- }
- }
- System.out.println("Exact:" + s);
- }
- }
- return null;
- }
-
-}
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCorePlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCorePlugin.java 2011-04-04 22:34:39 UTC (rev 30311)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISolderCorePlugin.java 2011-04-04 22:38:44 UTC (rev 30312)
@@ -1,65 +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.seam.solder.core;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.jboss.tools.common.log.BaseUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class CDISolderCorePlugin extends BaseUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.cdi.solder.core";
-
- // The shared instance
- private static CDISolderCorePlugin plugin;
-
- /**
- * The constructor
- */
- public CDISolderCorePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CDISolderCorePlugin getDefault() {
- return plugin;
- }
-
-}
-
13 years, 2 months
JBoss Tools SVN: r30311 - 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-04-04 18:34:39 -0400 (Mon, 04 Apr 2011)
New Revision: 30311
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Copied: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java (from rev 30307, trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-04-04 22:34:39 UTC (rev 30311)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.jdt.internal.core.JavaModelManager;
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class CDISeamSolderCoreAllTests {
+
+ public static Test suite() {
+ // it could be done here because it is not needed to be enabled back
+ JavaModelManager.getIndexManager().disable();
+
+ TestSuite suiteAll = new TestSuite("CDI Solder Core Tests");
+
+ suiteAll.addTestSuite(BeanNamingTest.class);
+ suiteAll.addTestSuite(VetoTest.class);
+
+ return suiteAll;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java 2011-04-04 22:33:42 UTC (rev 30310)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISolderCoreAllTests.java 2011-04-04 22:34:39 UTC (rev 30311)
@@ -1,33 +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.seam.solder.core.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.core.JavaModelManager;
-/**
- * @author Viacheslav Kabanovich
- */
-public class CDISolderCoreAllTests {
-
- public static Test suite() {
- // it could be done here because it is not needed to be enabled back
- JavaModelManager.getIndexManager().disable();
-
- TestSuite suiteAll = new TestSuite("CDI Solder Core Tests");
-
- suiteAll.addTestSuite(BeanNamingTest.class);
- suiteAll.addTestSuite(VetoTest.class);
-
- return suiteAll;
- }
-}
13 years, 2 months