JBoss Tools SVN: r35884 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-21 02:09:16 -0400 (Fri, 21 Oct 2011)
New Revision: 35884
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
Log:
JBIDE-9711 - to trunk, default osgi suffix, and code if temp deploy folder is deleted to remake the dir
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21 03:28:41 UTC (rev 35883)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21 06:09:16 UTC (rev 35884)
@@ -5,6 +5,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.internal.core.exports.FeatureExportInfo;
import org.eclipse.pde.internal.core.exports.PluginExportOperation;
@@ -39,6 +40,9 @@
IDeployableServer server2 = ServerConverter.getDeployableServer(server);
IPath destination = PublishUtil.getDeployPath(method, module, server2);
String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
+ if( new Path(remoteTempDeployRoot).toFile().exists())
+ new Path(remoteTempDeployRoot).toFile().mkdirs();
+
IPath presumedSourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot, server2);
String name = presumedSourcePath.lastSegment();
IPath realSourcePathFolder = presumedSourcePath.removeLastSegments(1).append("plugins"); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21 03:28:41 UTC (rev 35883)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21 06:09:16 UTC (rev 35884)
@@ -263,6 +263,8 @@
suffix = ""; //$NON-NLS-1$
else if( "jst.jboss.sar".equals(type)) //$NON-NLS-1$
suffix = IWTPConstants.EXT_SAR;
+ if( suffix == null )
+ suffix = IWTPConstants.EXT_JAR;
return suffix;
}
13 years, 2 months
JBoss Tools SVN: r35883 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-20 23:28:41 -0400 (Thu, 20 Oct 2011)
New Revision: 35883
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
runtime depends on examples (https://issues.jboss.org/browse/JBIDE-9983)
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-10-21 00:23:43 UTC (rev 35882)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-10-21 03:28:41 UTC (rev 35883)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/10/02
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/10/20
------------------------
@@ -38,7 +38,7 @@
smooks [removed from JBDS, still in JBT]
seam -> hibernate, jsf
central -> examples, portlet, seam, as, archives, jmx, jsf, vpe, jst, hibernate, freemarker, runtime, common, tests
-runtime -> common, tests, jmx
+runtime -> common, tests, jmx, examples
esb -> as, jst, common, tests
cdi -> jst
(all but common and tests) -> usage
13 years, 2 months
JBoss Tools SVN: r35882 - 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-10-20 20:23:43 -0400 (Thu, 20 Oct 2011)
New Revision: 35882
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
Log:
JBIDE-9988
https://issues.jboss.org/browse/JBIDE-9988
Legal types of default producer bean without @DefaultBean annotation are restricted.
For that case, error markers are attached to member type.
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-21 00:20:00 UTC (rev 35881)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-10-21 00:23:43 UTC (rev 35882)
@@ -13,6 +13,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.TreeSet;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -31,10 +32,13 @@
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.feature.IAmbiguousBeanResolverFeature;
+import org.jboss.tools.cdi.core.extension.feature.IBeanKeyProvider;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
import org.jboss.tools.cdi.core.extension.feature.IValidatorFeature;
+import org.jboss.tools.cdi.internal.core.impl.BeanMember;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
@@ -43,9 +47,10 @@
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IJavaAnnotation;
import org.jboss.tools.common.java.IParametedType;
-import org.jboss.tools.common.java.ParametedTypeFactory;
+import org.jboss.tools.common.java.ITypeDeclaration;
import org.jboss.tools.common.java.impl.AnnotationLiteral;
import org.jboss.tools.common.preferences.SeverityPreferences;
+import org.jboss.tools.common.text.ITextSourceReference;
/**
* Implements support for org.jboss.seam.solder.bean.defaultbean.DefaultBeanExtension.
@@ -59,14 +64,15 @@
* @author Viacheslav Kabanovich
*
*/
-public class CDISeamSolderDefaultBeanExtension implements ICDIExtension, IProcessAnnotatedTypeFeature, IAmbiguousBeanResolverFeature, IValidatorFeature {
+public class CDISeamSolderDefaultBeanExtension implements ICDIExtension, IProcessAnnotatedTypeFeature, IAmbiguousBeanResolverFeature, IValidatorFeature, IBeanKeyProvider {
protected Version getVersion() {
return Version.instance;
}
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
- boolean defaultBean = typeDefinition.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName());
+ String defaultBeanAnnotationTypeName = getVersion().getDefaultBeanAnnotationTypeName();
+ boolean defaultBean = typeDefinition.isAnnotationPresent(defaultBeanAnnotationTypeName);
IJavaAnnotation beanTyped = null;
if(defaultBean) {
beanTyped = createFakeTypedAnnotation(typeDefinition, context);
@@ -77,7 +83,7 @@
List<MethodDefinition> ms = typeDefinition.getMethods();
for (MethodDefinition m: ms) {
if(m.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || m.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
+ if(defaultBean || m.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
IJavaAnnotation methodTyped = createFakeTypedAnnotation(m, context);
if(methodTyped != null) {
m.addAnnotation(methodTyped, context);
@@ -88,7 +94,7 @@
List<FieldDefinition> fs = typeDefinition.getFields();
for (FieldDefinition f: fs) {
if(f.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || f.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
+ if(defaultBean || f.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
IJavaAnnotation fieldTyped = createFakeTypedAnnotation(f, context);
if(fieldTyped != null) {
f.addAnnotation(fieldTyped, context);
@@ -110,6 +116,14 @@
result = new AnnotationLiteral(def.getResource(), a.getStartPosition(), a.getLength(), defaultType, IMemberValuePair.K_CLASS, typedAnnotation);
}
}
+ } else if(def instanceof BeanMemberDefinition) {
+ ITypeDeclaration type = BeanMember.getTypeDeclaration(def, context.getProject().getTypeFactory());
+ if(type != null) {
+ IType typedAnnotation = context.getProject().getType(CDIConstants.TYPED_ANNOTATION_TYPE_NAME);
+ if (typedAnnotation != null) {
+ result = new AnnotationLiteral(def.getResource(), type.getStartPosition(), type.getLength(), type.getType().getFullyQualifiedName(), IMemberValuePair.K_CLASS, typedAnnotation);
+ }
+ }
}
return result;
@@ -118,14 +132,8 @@
public Set<IBean> getResolvedBeans(Set<IBean> result) {
Set<IBean> defaultBeans = new HashSet<IBean>();
for (IBean b: result) {
- if(b.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
+ if(isBeanDefault(b)) {
defaultBeans.add(b);
- } else if(b instanceof IProducer) {
- IProducer producer = (IProducer)b;
- IClassBean parent = producer.getClassBean();
- if(parent != null && parent.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
- defaultBeans.add(b);
- }
}
}
if(!defaultBeans.isEmpty() && defaultBeans.size() < result.size()) {
@@ -134,13 +142,35 @@
return result;
}
+ private boolean isBeanDefault(IBean bean) {
+ String defaultBeanAnnotationTypeName = getVersion().getDefaultBeanAnnotationTypeName();
+ if(bean.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
+ return true;
+ } else if(bean instanceof IProducer) {
+ IProducer producer = (IProducer)bean;
+ IClassBean parent = producer.getClassBean();
+ if(parent != null && parent.isAnnotationPresent(defaultBeanAnnotationTypeName)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public void validateResource(IFile file, CDICoreValidator validator) {
String defaultBeanAnnotationTypeName = getVersion().getDefaultBeanAnnotationTypeName();
ICDIProject cdiProject = CDICorePlugin.getCDIProject(file.getProject(), true);
Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
for (IBean bean: bs) {
- IAnnotationDeclaration a = bean.getAnnotation(defaultBeanAnnotationTypeName);
- if(a != null) {
+ if(isBeanDefault(bean)) {
+ ITextSourceReference a = bean.getAnnotation(defaultBeanAnnotationTypeName);
+ if(a == null) {
+ Set<ITypeDeclaration> ds = bean.getAllTypeDeclarations();
+ if(!ds.isEmpty()) {
+ a = ds.iterator().next();
+ } else {
+ continue;
+ }
+ }
if(bean instanceof IProducerField) {
IClassBean cb = ((IProducerField) bean).getClassBean();
IScope scope = cb.getScope();
@@ -150,35 +180,28 @@
}
}
IQualifierDeclaration[] qs = bean.getQualifierDeclarations().toArray(new IQualifierDeclaration[0]);
- Set<IParametedType> ts = bean.getLegalTypes();
- if(ts.size() < 3) {
- IParametedType type = null;
- for (IParametedType t: ts) {
- if(!"java.lang.Object".equals(t.getType().getFullyQualifiedName())) {
- type = t;
- }
- }
- if(type != null) {
- Set<IBean> bs2 = cdiProject.getBeans(false, type, qs);
- StringBuilder otherDefaultBeans = new StringBuilder();
- for (IBean b: bs2) {
- try {
- if(b != bean && b.isAnnotationPresent(defaultBeanAnnotationTypeName)
- && CDIProject.areMatchingQualifiers(bean.getQualifierDeclarations(), b.getQualifierDeclarations(true))) {
- if(otherDefaultBeans.length() > 0) {
- otherDefaultBeans.append(", ");
- }
- otherDefaultBeans.append(b.getElementName());
+ IParametedType type = getDefaultType(bean);
+ if(type != null) {
+ validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, createKey(type, bean.getQualifierDeclarations(true)), file.getFullPath(), true);
+ Set<IBean> bs2 = cdiProject.getBeans(false, type, qs);
+ StringBuilder otherDefaultBeans = new StringBuilder();
+ for (IBean b: bs2) {
+ try {
+ if(b != bean && isBeanDefault(b)
+ && CDIProject.areMatchingQualifiers(bean.getQualifierDeclarations(), b.getQualifierDeclarations(true))) {
+ if(otherDefaultBeans.length() > 0) {
+ otherDefaultBeans.append(", ");
}
- } catch (CoreException e) {
- CDISeamSolderCorePlugin.getDefault().logError(e);
- }
+ otherDefaultBeans.append(b.getElementName());
}
- if(otherDefaultBeans.length() > 0) {
- String message = NLS.bind(SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS, otherDefaultBeans);
- validator.addError(message, CDISeamSolderPreferences.IDENTICAL_DEFAULT_BEANS, new String[]{}, a, file);
+ } catch (CoreException e) {
+ CDISeamSolderCorePlugin.getDefault().logError(e);
}
}
+ if(otherDefaultBeans.length() > 0) {
+ String message = NLS.bind(SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS, otherDefaultBeans);
+ validator.addError(message, CDISeamSolderPreferences.IDENTICAL_DEFAULT_BEANS, new String[]{}, a, file);
+ }
}
}
}
@@ -188,4 +211,44 @@
return CDISeamSolderPreferences.getInstance();
}
+ private IParametedType getDefaultType(IBean bean) {
+ Set<IParametedType> ts = bean.getLegalTypes();
+ if(ts.size() < 3) {
+ for (IParametedType t: ts) {
+ if(!"java.lang.Object".equals(t.getType().getFullyQualifiedName())) {
+ return t;
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getKey(IBean bean) {
+ IAnnotationDeclaration a = bean.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName());
+ if(a != null) {
+ IParametedType type = getDefaultType(bean);
+ if(type != null) {
+ return createKey(type, bean.getQualifierDeclarations(true));
+ }
+ }
+ return null;
+ }
+
+ private String createKey(IParametedType type, Set<IQualifierDeclaration> qs) {
+ Set<String> ss = new TreeSet<String>();
+ for (IQualifierDeclaration q: qs) {
+ if(!q.getTypeName().equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME)
+ && !q.getTypeName().equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)) {
+ ss.add(q.getTypeName());
+ }
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append("#DefaultBean_").append(type.getType().getFullyQualifiedName());
+ for (String s: ss) {
+ sb.append(':').append(s);
+ }
+ return sb.toString();
+ }
+
}
13 years, 2 months
JBoss Tools SVN: r35881 - 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-10-20 20:20:00 -0400 (Thu, 20 Oct 2011)
New Revision: 35881
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java
Log:
JBIDE-9244
https://issues.jboss.org/browse/JBIDE-9244
Tests.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-10-21 00:13:25 UTC (rev 35880)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-10-21 00:20:00 UTC (rev 35881)
@@ -31,8 +31,12 @@
}
public void testIdenticalDefaultBeans() throws CoreException {
+ String messageMask = SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS.substring(0, 50) + ".*";
IFile file = getTestProject().getFile(new Path("src/org/jboss/defaultbean/IdenticalDefaultBeans.java"));
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS.substring(0, 50) + ".*", 7, 12, 17);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, messageMask, 7, 12, 17);
+
+ file = getTestProject().getFile(new Path("src/org/jboss/defaultbean/validation/Test3.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, messageMask, 7, 13, 17);
}
public void testIncrementalValidationForIdenticalDefaultBeans() throws CoreException {
13 years, 2 months
JBoss Tools SVN: r35880 - trunk/forge/plugins/org.jboss.tools.forge.runtime.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-10-20 20:13:25 -0400 (Thu, 20 Oct 2011)
New Revision: 35880
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime/src/
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath
trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
Log:
reverted back fix for errors in source build. there is a fix that simpler that add fake empty src folders
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2011-10-21 00:13:00 UTC (rev 35879)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2011-10-21 00:13:25 UTC (rev 35880)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="modules/org/jboss/forge/shell-api/main/forge-shell-api.jar"/>
<classpathentry exported="true" kind="lib" path="modules/javax/enterprise/cdi-api/main/cdi-api.jar"/>
<classpathentry exported="true" kind="lib" path="modules/javax/enterprise/cdi-api/main/javax.inject.jar"/>
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2011-10-21 00:13:00 UTC (rev 35879)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2011-10-21 00:13:25 UTC (rev 35880)
@@ -3,4 +3,6 @@
modules/,\
jboss-modules.jar
src.includes = *
+jars.compile.order = .
+source.. =
13 years, 2 months
JBoss Tools SVN: r35879 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-20 20:13:00 -0400 (Thu, 20 Oct 2011)
New Revision: 35879
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
Log:
JBIDE-9988
https://issues.jboss.org/browse/JBIDE-9988
Code that builds reference to member type is reused for computing type restriction of default producer bean without @DefaultBean annotation.
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-10-21 00:11:06 UTC (rev 35878)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-10-21 00:13:00 UTC (rev 35879)
@@ -22,9 +22,11 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBeanMember;
import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.ParametedTypeFactory;
import org.jboss.tools.common.java.TypeDeclaration;
/**
@@ -43,6 +45,11 @@
}
protected void setMember(IJavaElement member) {
+ typeDeclaration = getTypeDeclaration(getDefinition(), getCDIProject().getNature().getTypeFactory());
+ }
+
+ public static TypeDeclaration getTypeDeclaration(AbstractMemberDefinition definition, ParametedTypeFactory typeFactory) {
+ IJavaElement member = (IJavaElement)definition.getMember();
try {
String returnType = null;
IMember currentMember = null;
@@ -57,12 +64,12 @@
currentMember = ((ILocalVariable)member).getDeclaringMember();
}
if(returnType != null) {
- ParametedType p = getCDIProject().getNature().getTypeFactory().getParametedType(currentMember, returnType);
+ ParametedType p = typeFactory.getParametedType(currentMember, returnType);
if(p != null) {
int offset = -1;
int length = 0;
- String content = getDefinition().getTypeDefinition().getContent();
+ String content = definition.getTypeDefinition().getContent();
if(content != null) {
ISourceRange sr = ((ISourceReference)member).getSourceRange();
ISourceRange nr = ((ISourceReference)member).getNameRange();
@@ -88,12 +95,13 @@
}
}
- typeDeclaration = new TypeDeclaration(p, member.getResource(), offset, length);
+ return new TypeDeclaration(p, member.getResource(), offset, length);
}
}
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
+ return null;
}
/**
13 years, 2 months
JBoss Tools SVN: r35878 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDISolderTest/src/org/jboss/defaultbean/producer and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-20 20:11:06 -0400 (Thu, 20 Oct 2011)
New Revision: 35878
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/Test1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeA.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeB.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/ITest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Q.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.modified
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.original
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test3.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java
Log:
JBIDE-9244
https://issues.jboss.org/browse/JBIDE-9244
Tests.
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/Test1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/Test1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/Test1.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,24 @@
+package org.jboss.defaultbean.producer;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+(a)DefaultBean(Test1.class)
+public class Test1 {
+
+ @Inject
+ TypeB b;
+
+ @Inject
+ TypeA a;
+
+ @Produces
+ TypeA pa;
+
+ @Produces
+ TypeB getType() {
+ return null;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/Test1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeA.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeA.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeA.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,5 @@
+package org.jboss.defaultbean.producer;
+
+public class TypeA {
+ TypeA(String s) {}
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeB.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeB.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeB.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,7 @@
+package org.jboss.defaultbean.producer;
+
+public class TypeB extends TypeA {
+ TypeB(String s) {
+ super(s);
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/producer/TypeB.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/ITest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/ITest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/ITest.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,5 @@
+package org.jboss.defaultbean.validation;
+
+public interface ITest {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/ITest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Q.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Q.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Q.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,21 @@
+package org.jboss.defaultbean.validation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Q {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Q.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test1.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,14 @@
+package org.jboss.defaultbean.validation;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test1 {
+
+ @Produces
+ @DefaultBean(String.class)
+ @Q
+ String s;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,15 @@
+package org.jboss.defaultbean.validation;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test2 {
+ @Produces
+ @DefaultBean(String.class)
+ @Q
+ String getString() {
+ return "";
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.modified
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.modified (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.modified 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,14 @@
+package org.jboss.defaultbean.validation;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test2 {
+ @Produces
+ @DefaultBean(String.class)
+ String getString() {
+ return "";
+ }
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.original (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test2.original 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,15 @@
+package org.jboss.defaultbean.validation;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+public class Test2 {
+ @Produces
+ @DefaultBean(String.class)
+ @Q
+ String getString() {
+ return "";
+ }
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test3.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -0,0 +1,20 @@
+package org.jboss.defaultbean.validation;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.solder.bean.defaultbean.DefaultBean;
+
+(a)DefaultBean(Test3.class)
+@Q
+public class Test3 {
+
+ @Produces
+ @Q
+ Test3 s2;
+
+ @Produces
+ @Q
+ Test3 getTest() {
+ return null;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/validation/Test3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-10-21 00:10:20 UTC (rev 35877)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanValidationTest.java 2011-10-21 00:11:06 UTC (rev 35878)
@@ -35,4 +35,26 @@
AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS.substring(0, 50) + ".*", 7, 12, 17);
}
+ public void testIncrementalValidationForIdenticalDefaultBeans() throws CoreException {
+ String messageMask = SeamSolderValidationMessages.IDENTICAL_DEFAULT_BEANS.substring(0, 50) + ".*";
+
+ String path1 = "src/org/jboss/defaultbean/validation/Test1.java";
+ String path2 = "src/org/jboss/defaultbean/validation/Test2.java";
+ String path2modified = "src/org/jboss/defaultbean/validation/Test2.modified";
+ String path2original = "src/org/jboss/defaultbean/validation/Test2.original";
+
+ IFile file1 = getTestProject().getFile(path1);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file1, messageMask, 10);
+ IFile file2 = getTestProject().getFile(path2);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file2, messageMask, 9);
+
+ GenericBeanValidationTest.writeFile(getTestProject(), path2modified, path2);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file1, messageMask);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file2, messageMask);
+
+ GenericBeanValidationTest.writeFile(getTestProject(), path2original, path2);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file1, messageMask, 10);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file2, messageMask, 9);
+ }
+
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r35877 - 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-10-20 20:10:20 -0400 (Thu, 20 Oct 2011)
New Revision: 35877
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java
Log:
JBIDE-9988
https://issues.jboss.org/browse/JBIDE-9988
Test for default producer beans without @DefaultBean annotation.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java 2011-10-20 23:23:32 UTC (rev 35876)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java 2011-10-21 00:10:20 UTC (rev 35877)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.solder.core.test;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -24,6 +25,7 @@
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IProducerField;
import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.common.java.IParametedType;
/**
*
@@ -44,6 +46,37 @@
doTestDefaultBeanInDependentProject(dependent, "src/org/jboss/defaultbean/Town2.java");
}
+ public void testLegalTypesOfDefaultProducerBeanWithoutDefaultBeanAnnotation() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+ IInjectionPointField injection = getInjectionPointField(cdi, "src/org/jboss/defaultbean/producer/Test1.java", "a");
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof IProducerField);
+ Set<IParametedType> ts = b.getLegalTypes();
+ Set<String> ss = new HashSet<String>();
+ for (IParametedType t: ts) {
+ ss.add(t.getType().getFullyQualifiedName());
+ }
+ assertTrue(ss.contains("org.jboss.defaultbean.producer.TypeA"));
+ assertTrue(ss.contains("java.lang.Object"));
+ assertEquals(2, ss.size());
+
+ injection = getInjectionPointField(cdi, "src/org/jboss/defaultbean/producer/Test1.java", "b");
+ bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ b = bs.iterator().next();
+ assertTrue(b instanceof IProducerMethod);
+ ts = b.getLegalTypes();
+ ss = new HashSet<String>();
+ for (IParametedType t: ts) {
+ ss.add(t.getType().getFullyQualifiedName());
+ }
+ assertTrue(ss.contains("org.jboss.defaultbean.producer.TypeB"));
+ assertTrue(ss.contains("java.lang.Object"));
+ assertEquals(2, ss.size());
+ }
+
/**
* Checks default bean injection resolution.
* If dependent == cdi, executes check of one project, otherwise looks for beans in
13 years, 2 months
JBoss Tools SVN: r35876 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-20 19:23:32 -0400 (Thu, 20 Oct 2011)
New Revision: 35876
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
Log:
fixed
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-10-20 23:11:38 UTC (rev 35875)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-10-20 23:23:32 UTC (rev 35876)
@@ -14,7 +14,7 @@
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
matches.add(new MatchStructure("/tck/WebContent/test.jsp", "sheep"));
- //matches.add(new MatchStructure("/tck/WebContent/el/integration/JSFTestPage.jsp", "sheep"));
+ matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSPTestPage.jsp", "sheep"));
matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSFTestPage.jsp", "sheep"));
matches.add(new MatchStructure("/tck/WebContent/elValidation1.xhtml", "sheep"));
@@ -59,7 +59,7 @@
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
matches.add(new MatchStructure("/tck/WebContent/test.jsp", "name"));
- //matches.add(new MatchStructure("/tck/WebContent/el/integration/JSFTestPage.jsp", "name"));
+ matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSPTestPage.jsp", "name"));
matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSFTestPage.jsp", "name"));
matches.add(new MatchStructure("/tck/WebContent/elValidation1.xhtml", "name"));
13 years, 2 months
JBoss Tools SVN: r35875 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: actions and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-10-20 19:11:38 -0400 (Thu, 20 Oct 2011)
New Revision: 35875
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/OpenJBossBlogsHandler.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java
Log:
JBIDE-9849 why is there both a feed and a atom url - isn't one sufficient ?
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-10-20 23:09:25 UTC (rev 35874)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-10-20 23:11:38 UTC (rev 35875)
@@ -104,14 +104,10 @@
public static final String NEW_PROJECT_EXAMPLES_WIZARD_ID = "org.jboss.tools.project.examples.wizard.NewProjectExamplesWizard";
- public static final String BLOG_URL = "http://planet.jboss.org/feeds/blogs";
+ public static final String BLOGS_URL = "http://planet.jboss.org/feeds/blogs";
- public static final String BLOGS_ATOM_URL = "http://planet.jboss.org/feeds/blogs";
-
- public static final String NEWS_URL = "http://pipes.yahoo.com/pipes/pipe.run?_id=660682be8ddf4b5db0cce318826f8a53";
+ public static final String NEWS_URL = "http://planet.jboss.org/feeds/news";
- public static final String NEWS_ATOM_URL = "http://pipes.yahoo.com/pipes/pipe.run?_id=660682be8ddf4b5db0cce318826f8a5...";
-
public static final String FORM_END_TAG = "</p></form>";
public static final String FORM_START_TAG = "<form><p>";
public static final String CANCELED = FORM_START_TAG + "<span color=\"header\" font=\"header\">Canceled.</span>" + FORM_END_TAG;
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/OpenJBossBlogsHandler.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/OpenJBossBlogsHandler.java 2011-10-20 23:09:25 UTC (rev 35874)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/OpenJBossBlogsHandler.java 2011-10-20 23:11:38 UTC (rev 35875)
@@ -22,7 +22,7 @@
@Override
public String getLocation() {
- return JBossCentralActivator.BLOG_URL;
+ return JBossCentralActivator.BLOGS_URL;
}
}
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java 2011-10-20 23:09:25 UTC (rev 35874)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java 2011-10-20 23:11:38 UTC (rev 35875)
@@ -39,7 +39,7 @@
private List<FeedsEntry> entries = new ArrayList<FeedsEntry>();
private Exception exception;
- public static RefreshBlogsJob INSTANCE = new RefreshBlogsJob(JBossCentralActivator.BLOGS_ATOM_URL);
+ public static RefreshBlogsJob INSTANCE = new RefreshBlogsJob(JBossCentralActivator.BLOGS_URL);
private String blogsurl;
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java 2011-10-20 23:09:25 UTC (rev 35874)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java 2011-10-20 23:11:38 UTC (rev 35875)
@@ -39,7 +39,7 @@
private List<FeedsEntry> entries = new ArrayList<FeedsEntry>();
private Exception exception;
- public static RefreshNewsJob INSTANCE = new RefreshNewsJob(JBossCentralActivator.NEWS_ATOM_URL);
+ public static RefreshNewsJob INSTANCE = new RefreshNewsJob(JBossCentralActivator.NEWS_URL);
private String newsurl;
13 years, 2 months