JBoss Tools SVN: r24902 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-09-13 17:03:31 -0400 (Mon, 13 Sep 2010)
New Revision: 24902
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/TagObject.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer.java
Log:
https://jira.jboss.org/browse/JBIDE-7047
Exception when trying to map from input to XML/XSD template without java class in middle
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/TagObject.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/TagObject.java 2010-09-13 17:21:51 UTC (rev 24901)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/TagObject.java 2010-09-13 21:03:31 UTC (rev 24902)
@@ -43,7 +43,7 @@
if (attribute.getParentNode() == parentElement) {
return;
}
- parentElement.appendChild(attribute);
+ parentElement.setAttributeNode(attribute);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer.java 2010-09-13 17:21:51 UTC (rev 24901)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer.java 2010-09-13 21:03:31 UTC (rev 24902)
@@ -188,6 +188,7 @@
if (localName == null) {
localName = name;
}
+ pro.setReferenceAttibute(attr);
pro.setName(localName);
pro.setValue(value);
pro.setNamespaceURI(attr.getNamespaceURI());
15 years, 7 months
JBoss Tools SVN: r24901 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext: hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-09-13 13:21:51 -0400 (Mon, 13 Sep 2010)
New Revision: 24901
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6640
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2010-09-13 15:45:17 UTC (rev 24900)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2010-09-13 17:21:51 UTC (rev 24901)
@@ -24,6 +24,11 @@
public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR;
public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR;
public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN;
+ public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN;
+ public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_SELECTED_ALTERNATIVE;
+ public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE;
+ public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER;
+ public static String CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES;
public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER;
public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER;
public static String CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS;
Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java 2010-09-13 17:21:51 UTC (rev 24901)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.text.ext.hyperlink;
+
+import java.util.List;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+
+public class AlternativeInjectedPointListHyperlink extends AbstractHyperlink{
+ private IRegion region;
+ private List<IBean> beans;
+ private ITextViewer viewer;
+
+ public AlternativeInjectedPointListHyperlink(IRegion region, List<IBean> beans, ITextViewer viewer, IDocument document){
+ this.beans = beans;
+ this.region = region;
+ this.viewer = viewer;
+ setDocument(document);
+ }
+
+
+ @Override
+ protected IRegion doGetHyperlinkRegion(int offset) {
+ return region;
+ }
+
+ protected void doHyperlink(IRegion region) {
+ IHyperlink[] hyperlinks = new IHyperlink[beans.size()];
+
+ int index=0;
+ for(IBean bean : beans){
+ hyperlinks[index++] = new InjectedPointHyperlink(region, bean, getDocument());
+ }
+
+ if(hyperlinks.length == 0){
+ openFileFailed();
+ return;
+ }
+
+ if(hyperlinks.length == 1){
+ ((InjectedPointHyperlink)hyperlinks[0]).doHyperlink(region);
+ }else{
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
+ }
+ }
+
+ @Override
+ public String getHyperlinkText() {
+ return CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2010-09-13 15:45:17 UTC (rev 24900)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2010-09-13 17:21:51 UTC (rev 24901)
@@ -29,12 +29,18 @@
public class InjectedPointHyperlink extends AbstractHyperlink{
IBean bean;
IRegion region;
+ boolean first = false;
public InjectedPointHyperlink(IRegion region, IBean bean, IDocument document){
this.bean = bean;
this.region = region;
setDocument(document);
}
+
+ public InjectedPointHyperlink(IRegion region, IBean bean, IDocument document, boolean first){
+ this(region, bean, document);
+ this.first = first;
+ }
@Override
@@ -67,20 +73,34 @@
public String getHyperlinkText() {
String text="";
if(bean != null){
- if(bean instanceof IDecorator)
- text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR+" ";
- else if(bean instanceof IInterceptor)
- text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR+" ";
- else
- text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN+" ";
+ if(first){
+ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+" ";
+ }else{
+ if(bean.isSelectedAlternative())
+ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_SELECTED_ALTERNATIVE+" ";
+ else if(bean.isAlternative())
+ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE+" ";
+ else if(bean instanceof IProducerField || bean instanceof IProducerMethod)
+ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER+" ";
+ else if(bean instanceof IDecorator)
+ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR+" ";
+ else if(bean instanceof IInterceptor)
+ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR+" ";
+ else
+ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN+" ";
+
+ }
+
text += bean.getBeanClass().getElementName();
if(bean instanceof IProducerField){
text += "."+((IProducerField)bean).getField().getElementName();
}else if(bean instanceof IProducerMethod){
- text += "."+((IProducerMethod)bean).getMethod().getElementName();
+ text += "."+((IProducerMethod)bean).getMethod().getElementName()+"()";
}
+
+
}
return text;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java 2010-09-13 15:45:17 UTC (rev 24900)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java 2010-09-13 17:21:51 UTC (rev 24901)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.text.ext.hyperlink;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -73,25 +74,37 @@
return;
}
- Set<IBean> resultBeanSet = cdiProject.getBeans(false, injectionPoint);
+ Set<IBean> resultBeanSet = cdiProject.getBeans(true, injectionPoint);
List<IBean> resultBeanList = CDIUtil.sortBeans(resultBeanSet);
+
+ Set<IBean> alternativeBeanSet = cdiProject.getBeans(false, injectionPoint);
+ List<IBean> alternativeBeanList = CDIUtil.sortBeans(alternativeBeanSet);
- IHyperlink[] hyperlinks = new IHyperlink[resultBeanList.size()];
+ ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
- int index=0;
- for(IBean bean : resultBeanList){
- hyperlinks[index++] = new InjectedPointHyperlink(region, bean, getDocument());
+ if(resultBeanList.size() > 0){
+ hyperlinks.add(new InjectedPointHyperlink(region, resultBeanList.get(0), getDocument(), true));
+ //alternativeBeanList.remove(resultBeanList.get(0));
+ if(alternativeBeanList.size() > 0)
+ hyperlinks.add(new AlternativeInjectedPointListHyperlink(region, alternativeBeanList, viewer, getDocument()));
+ }else if(alternativeBeanList.size() > 0){
+ hyperlinks.add(new InjectedPointHyperlink(region, alternativeBeanList.get(0), getDocument(), true));
+ //alternativeBeanList.remove(0);
+ if(alternativeBeanList.size() > 0)
+ hyperlinks.add(new AlternativeInjectedPointListHyperlink(region, alternativeBeanList, viewer, getDocument()));
}
- if(hyperlinks.length == 0){
+ IHyperlink[] result = hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
+
+ if(result.length == 0){
openFileFailed();
return;
}
- if(hyperlinks.length == 1){
- ((InjectedPointHyperlink)hyperlinks[0]).doHyperlink(region);
+ if(result.length == 1){
+ ((InjectedPointHyperlink)result[0]).doHyperlink(region);
}else{
- MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, result);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2010-09-13 15:45:17 UTC (rev 24900)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2010-09-13 17:21:51 UTC (rev 24901)
@@ -1,8 +1,13 @@
CDI_EXT_PLUGIN_NO_MESSAGE=No message
-CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN=Open CDI Bean
-CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR=Open CDI Decorator
-CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR=Open CDI Interceptor
+CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN=Open
+CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR=Open @Decorator
+CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR=Open @Interceptor
CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN=Open Injected Bean
+CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN=Open @Inject Bean
+CDI_INJECTED_POINT_HYPERLINK_OPEN_SELECTED_ALTERNATIVE=Open *@Alternative
+CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE=Open @Alternative
+CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER=Open @Produces
+CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES=Show All...
CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER=Open Bound Disposer Method
CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER=Open Bound Producer Method
CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS=Open CDI Observer Methods
15 years, 7 months
JBoss Tools SVN: r24899 - trunk/drools.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-13 11:44:25 -0400 (Mon, 13 Sep 2010)
New Revision: 24899
Modified:
trunk/drools/
Log:
svn:ignore
Property changes on: trunk/drools
___________________________________________________________________
Name: svn:ignore
- drools-*eclipse-all.zip
+ target
buildlog.latest.txt
bin
build
*.class
*drools*.zip
15 years, 7 months
JBoss Tools SVN: r24898 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-13 11:43:14 -0400 (Mon, 13 Sep 2010)
New Revision: 24898
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/
Log:
svn:ignore
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext
___________________________________________________________________
Name: svn:ignore
+ target
buildlog.latest.txt
bin
build
*.class
15 years, 7 months
JBoss Tools SVN: r24897 - trunk/bpel/plugins/org.eclipse.bpel.common.model.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-13 11:41:57 -0400 (Mon, 13 Sep 2010)
New Revision: 24897
Modified:
trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties
Log:
add copyright header
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties 2010-09-13 15:04:30 UTC (rev 24896)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties 2010-09-13 15:41:57 UTC (rev 24897)
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2010 JBoss by Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# IBM Corporation - initial API and implementation
+# JBoss by Red Hat - subsequent contributions and maintenance
+###############################################################################
+
bin.includes = .,\
META-INF/,\
plugin.*,\
15 years, 7 months
JBoss Tools SVN: r24896 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-13 11:04:30 -0400 (Mon, 13 Sep 2010)
New Revision: 24896
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6517
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2010-09-13 14:32:08 UTC (rev 24895)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2010-09-13 15:04:30 UTC (rev 24896)
@@ -102,8 +102,21 @@
assertEquals("Wrong number of the beans", 0, beans.size());
}
- // TODO This test fails because of https://jira.jboss.org/browse/JBIDE-6517
- public void testQualifierCoincidingSimpleNameInInjectingBeanAndCoincidingSimpleNameInInjectedBeanResolved() throws CoreException {
+ /**
+ * This test is created to check fixes for issue https://jira.jboss.org/browse/JBIDE-6517
+ *
+ * However, the fix is postponed until JDT includes method parameters into Java model
+ * as detailed Java element objects instead of providing limited string data
+ * (getParameterNames(), getParameterTypes()).
+ *
+ * We refrain from getting necessary data by building AST, because it would affect performance.
+ *
+ * TODO The prefix '_' disabling this test must be removed as soon as JBIDE-6517 is assigned
+ * to be fixed for a concrete version.
+ *
+ * @throws CoreException
+ */
+ public void _testQualifierCoincidingSimpleNameInInjectingBeanAndCoincidingSimpleNameInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java", "cashPaymentProcessor");
Set<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
15 years, 7 months
JBoss Tools SVN: r24895 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-13 10:32:08 -0400 (Mon, 13 Sep 2010)
New Revision: 24895
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6957
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java 2010-09-13 13:26:51 UTC (rev 24894)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-@Decorator
-public abstract class TimestampLoggerBroken extends Clazz<Logger> implements Logger {
-
- @Inject @Delegate private Clazz<String> logger;
-
-}
\ No newline at end of file
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+public abstract class TimestampLoggerOk extends Clazz<Logger> implements Logger {
+
+ @Inject @Delegate private Clazz<String> logger;
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java 2010-09-13 13:26:51 UTC (rev 24894)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-@Decorator
-public abstract class TimestampLoggerWithMethodBroken extends Clazz<String> implements Logger {
-
- @Inject void setInt(@Delegate Clazz<Logger> logger) {
- }
-}
\ No newline at end of file
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+public abstract class TimestampLoggerWithMethodOk extends Clazz<String> implements Logger {
+
+ @Inject void setInt(@Delegate Clazz<Logger> logger) {
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java 2010-09-13 13:26:51 UTC (rev 24894)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-@Decorator
-public abstract class TimestampParametedLoggerBroken extends Clazz<String> {
-
- @Inject @Delegate private Clazz<Logger> logger;
-
-}
\ No newline at end of file
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+public abstract class TimestampParametedLoggerOk extends Clazz<String> {
+
+ @Inject @Delegate private Clazz<Logger> logger;
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java 2010-09-13 13:26:51 UTC (rev 24894)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
-
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
-import javax.inject.Inject;
-
-@Decorator
-public abstract class TimestampParametedLoggerWithMethodBroken extends Clazz<Logger> {
-
- @Inject void setInt(@Delegate Clazz<String> logger) {
- }
-}
\ No newline at end of file
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+public abstract class TimestampParametedLoggerWithMethodOk extends Clazz<Logger> {
+
+ @Inject void setInt(@Delegate Clazz<String> logger) {
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2010-09-13 13:26:51 UTC (rev 24894)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2010-09-13 14:32:08 UTC (rev 24895)
@@ -1084,33 +1084,42 @@
* 8.1.3. Decorator delegate injection points
* - delegate type specifies different type parameters
*
+ * However, if type parameter does not affect decorated types
+ * (that is implemented interfaces), there is no error.
+ *
* @throws Exception
*/
public void testDelegateSpecifiesDifferentTypeParameterWithInterfaceInFiled() throws Exception {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10);
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java");
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10);
}
/**
* 8.1.3. Decorator delegate injection points
* - delegate type specifies different type parameters
*
+ * However, if type parameter does not affect decorated types
+ * (that is implemented interfaces), there is no error.
+ *
* @throws Exception
*/
public void testDelegateSpecifiesDifferentTypeParameterWithInterfaceInMethod() throws Exception {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10);
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java");
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10);
}
/**
* 8.1.3. Decorator delegate injection points
* - delegate type specifies different type parameters
*
+ * However, if type parameter does not affect decorated types
+ * (that is implemented interfaces), there is no error.
+ *
* @throws Exception
*/
public void testDelegateSpecifiesDifferentTypeParameterInFiled() throws Exception {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10);
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java");
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10);
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLogger.java");
assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Logger"));
@@ -1123,11 +1132,13 @@
* 8.1.3. Decorator delegate injection points
* - delegate type specifies different type parameters
*
+ * However, if type parameter does not affect decorated types
+ * (that is implemented interfaces), there is no error.
* @throws Exception
*/
public void testDelegateSpecifiesDifferentTypeParameterInMethod() throws Exception {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10);
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java");
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10);
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethod.java");
assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Logger"));
15 years, 7 months
JBoss Tools SVN: r24894 - in trunk/vpe: plugins/org.jboss.tools.vpe.docbook/templates and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-09-13 09:26:51 -0400 (Mon, 13 Sep 2010)
New Revision: 24894
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
Log:
add ability to specify tag name in vpe-template by using of regexp
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2010-09-13 13:16:30 UTC (rev 24893)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2010-09-13 13:26:51 UTC (rev 24894)
@@ -244,6 +244,9 @@
public static final String ATTR_LINK_HREF = "href"; //$NON-NLS-1$
public static final String ATTR_LINK_REL = "rel"; //$NON-NLS-1$
public static final String ATTR_LINK_EXT = "ext"; //$NON-NLS-1$
+
+ //added by Denis Vinnichek, for tags which are defined with regexp
+ static final String ATTR_TAG_MATCHING_MODE = "matching-mode"; //$NON-NLS-1$
private static VpeTemplateManager instance = null;
private static Object monitor = new Object();
@@ -257,8 +260,10 @@
private Map<String,VpeTemplateSet> ignoreSensitiveTags = new HashMap<String,VpeTemplateSet>();
//added by Maksim Areshkau, docbook tags stored separately, because name duality
private Map<String,VpeTemplateSet> docbookTags = new HashMap<String,VpeTemplateSet>();
+ //added by Denis Vinnichek, for tags which are defined with regexp
+ private Map<String,VpeTemplateSet> matchingTags = new HashMap<String,VpeTemplateSet>();
- private static final String ATTR_DOCBOOK_NAME = "docbook";
+ private static final String ATTR_DOCBOOK_NAME = "docbook"; //$NON-NLS-1$
private VpeTemplate defTemplate;
private VpeTemplateListener[] templateListeners = new VpeTemplateListener[0];
@@ -362,6 +367,18 @@
if (set != null) {
return set.getTemplate(pageContext, sourceNode, dependencySet);
}
+ //added by Denis Vinnichek, for tags which are defined with regexp
+ if (matchingTags.entrySet() != null) {
+ for (Map.Entry<String,VpeTemplateSet> entry : matchingTags.entrySet()) {
+ if (name.matches(entry.getKey())) {
+ set = entry.getValue();
+ if (set != null) {
+ return set.getTemplate(pageContext, sourceNode, dependencySet);
+ }
+ }
+ }
+ }
+
return null;
}
@@ -495,18 +512,27 @@
}
private void setTagElement(Element tagElement,IConfigurationElement confElement) {
+
String name = tagElement.getAttribute(ATTR_TAG_NAME);
+
if (name.length() > 0) {
- boolean docbookTemplate = ATTR_VALUE_YES.equalsIgnoreCase(tagElement.getAttribute(VpeTemplateManager.ATTR_DOCBOOK_NAME));
+
+ boolean docbookTemplate = ATTR_VALUE_YES.equalsIgnoreCase(tagElement.getAttribute(ATTR_DOCBOOK_NAME));
boolean caseSensitive = !ATTR_VALUE_NO.equals(tagElement.getAttribute(ATTR_TAG_CASE_SENSITIVE));
+ boolean matchingMode = ATTR_VALUE_YES.equals(tagElement.getAttribute(ATTR_TAG_MATCHING_MODE));
Map<String,VpeTemplateSet> tags;
- if(docbookTemplate){
- tags = docbookTags;
- }else if (caseSensitive) {
- tags = caseSensitiveTags;
+
+ if (!matchingMode) {
+ if(docbookTemplate){
+ tags = docbookTags;
+ }else if (caseSensitive) {
+ tags = caseSensitiveTags;
+ } else {
+ name = name.toLowerCase();
+ tags = ignoreSensitiveTags;
+ }
} else {
- name = name.toLowerCase();
- tags = ignoreSensitiveTags;
+ tags = matchingTags;
}
VpeTemplateSet set = (VpeTemplateSet) tags.get(name);
@@ -886,6 +912,8 @@
if (templateFileList.isChanged()) {
caseSensitiveTags.clear();
ignoreSensitiveTags.clear();
+ matchingTags.clear();
+ docbookTags.clear();
defTemplate = null;
loadImpl();
fireTemplateReloaded();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-09-13 13:16:30 UTC (rev 24893)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-09-13 13:26:51 UTC (rev 24894)
@@ -116,26 +116,11 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="sect1" case-sensitive="yes" docbook="yes">
+ <vpe:tag name="sect[0-9]*" matching-mode="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="sect2" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="sect3" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="sect4" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
<vpe:tag name="book" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div/>
@@ -238,16 +223,11 @@
<div/>
</vpe:template>
</vpe:tag>
- <vpe:tag name="toclevel1" case-sensitive="yes" docbook="yes">
+ <vpe:tag name="toclevel[0-9]*" matching-mode="yes">
<vpe:template children="yes" modify="yes">
<div/>
</vpe:template>
</vpe:tag>
- <vpe:tag name="toclevel2" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <div/>
- </vpe:template>
- </vpe:tag>
<vpe:tag name="tocback" case-sensitive="yes" docbook="yes">
<vpe:if test="attrpresent('pagenum')">
<vpe:template children="no" modify="yes">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2010-09-13 13:16:30 UTC (rev 24893)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2010-09-13 13:26:51 UTC (rev 24894)
@@ -39,6 +39,7 @@
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="docbook" use="optional" type="vpe:VPE-BOOLEAN"/>
<xsd:attribute name="haveVisualPreview" use="optional" type="vpe:VPE-BOOLEAN"/>
+ <xsd:attribute name="matching-mode" use="optional" type="vpe:VPE-BOOLEAN"/>
</xsd:complexType>
<!-- -->
<xsd:complexType name="TEMPLATE">
15 years, 7 months
JBoss Tools SVN: r24893 - trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-09-13 09:16:30 -0400 (Mon, 13 Sep 2010)
New Revision: 24893
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
Log:
https://jira.jboss.org/browse/JBIDE-7011 Mavenized Seam Web project can't be created using m2eclipse 0.11
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-09-13 12:50:25 UTC (rev 24892)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-09-13 13:16:30 UTC (rev 24893)
@@ -26,6 +26,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.xmi.XMIResource;
@@ -64,6 +65,7 @@
import org.maven.ide.eclipse.project.ResolverConfiguration;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Version;
import org.w3c.dom.Node;
/**
@@ -288,7 +290,9 @@
//build.setFinalName(testProjectName);
String sourceDirectory = MavenCoreActivator.getSourceDirectory(javaProject);
if (sourceDirectory != null) {
- build.setSourceDirectory(sourceDirectory);
+ if (isM2eclipse010()) {
+ build.setSourceDirectory(sourceDirectory);
+ }
build.setTestSourceDirectory(sourceDirectory);
}
String outputDirectory = MavenCoreActivator.getOutputDirectory(javaProject);
@@ -325,6 +329,17 @@
}
+ /**
+ * @return
+ */
+ private boolean isM2eclipse010() {
+ Bundle bundle = Platform.getBundle("org.maven.ide.eclipse"); //$NON-NLS-1$
+ if (bundle != null && bundle.getVersion().toString().startsWith("0.10")) { //$NON-NLS-1$
+ return true;
+ }
+ return false;
+ }
+
private void configureEarProject(IDataModel m2FacetModel,
IDataModel seamFacetModel) {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName);
15 years, 7 months