JBoss Tools SVN: r22778 - in branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-06-12 05:46:44 -0400 (Sat, 12 Jun 2010)
New Revision: 22778
Added:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-20100611.170738-20.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-20100611.170738-18.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-20100611.170738-16.jar
Removed:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
Log:
fixing params serialization
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-11 19:55:05 UTC (rev 22777)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-12 09:46:44 UTC (rev 22778)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.4-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.4-20100611.170738-20.jar"/>
<classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.4-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.4-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.4-20100611.170738-18.jar"/>
<classpathentry exported="true" kind="lib" path="libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.4-20100611.170738-16.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxen-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="libs/mvel2-2.0.17.jar"/>
<classpathentry exported="true" kind="lib" path="libs/xstream-1.2.2.jar"/>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-11 19:55:05 UTC (rev 22777)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-12 09:46:44 UTC (rev 22778)
@@ -20,12 +20,12 @@
libs/mvel2-2.0.17.jar,
libs/xstream-1.2.2.jar,
libs/milyn-commons-1.4-SNAPSHOT.jar,
- libs/milyn-edisax-parser-1.4-SNAPSHOT.jar,
+ libs/milyn-edisax-parser-1.4-20100611.170738-20.jar,
libs/milyn-smooks-core-1.4-SNAPSHOT.jar,
libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,
- libs/milyn-smooks-edi-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-edi-1.4-20100611.170738-18.jar,
libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,
- libs/milyn-smooks-json-1.4-SNAPSHOT.jar
+ libs/milyn-smooks-json-1.4-20100611.170738-16.jar
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Export-Package: au.com.bytecode.opencsv,
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-11 19:55:05 UTC (rev 22777)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-12 09:46:44 UTC (rev 22778)
@@ -8,10 +8,10 @@
libs/mvel2-2.0.17.jar,\
libs/xstream-1.2.2.jar,\
libs/milyn-commons-1.4-SNAPSHOT.jar,\
- libs/milyn-edisax-parser-1.4-SNAPSHOT.jar,\
+ libs/milyn-edisax-parser-1.4-20100611.170738-20.jar,\
libs/milyn-smooks-core-1.4-SNAPSHOT.jar,\
libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,\
- libs/milyn-smooks-edi-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-edi-1.4-20100611.170738-18.jar,\
libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,\
- libs/milyn-smooks-json-1.4-SNAPSHOT.jar
+ libs/milyn-smooks-json-1.4-20100611.170738-16.jar
jars.compile.order =
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-20100611.170738-20.jar
===================================================================
(Binary files differ)
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-20100611.170738-20.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-20100611.170738-18.jar
===================================================================
(Binary files differ)
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-20100611.170738-18.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-20100611.170738-16.jar
===================================================================
(Binary files differ)
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-20100611.170738-16.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
14 years, 7 months
JBoss Tools SVN: r22777 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-06-11 15:55:05 -0400 (Fri, 11 Jun 2010)
New Revision: 22777
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java
Log:
JBIDE-6212: CA initialization fails on Eclipse 3.6M6 with WTP-SDK-S-3.2.0M6-20100315195309
The WTP CA processors are moved to the same level as JBoss CA compound processor is due to prevent initialization errors while using the CA
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2010-06-11 14:10:43 UTC (rev 22776)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2010-06-11 19:55:05 UTC (rev 22777)
@@ -58,8 +58,17 @@
protected IContentAssistProcessor[] getContentAssistProcessors(
ISourceViewer sourceViewer, String partitionType) {
- return configurationDelegate.getContentAssistProcessors(sourceViewer,
- partitionType);
+
+ IContentAssistProcessor[] superProcessors = super.getContentAssistProcessors(
+ sourceViewer, partitionType);
+ List<IContentAssistProcessor> processors = new ArrayList<IContentAssistProcessor>();
+ processors.addAll(
+ Arrays.asList(
+ configurationDelegate.getContentAssistProcessors(
+ sourceViewer,
+ partitionType)));
+ processors.addAll(Arrays.asList(superProcessors));
+ return processors.toArray(new IContentAssistProcessor[0]);
}
/*
@@ -94,15 +103,14 @@
public IContentAssistProcessor[] getContentAssistProcessorsForPartitionType(
ISourceViewer sourceViewer, String partitionType) {
- IContentAssistProcessor[] results = super.getContentAssistProcessors(
- sourceViewer, partitionType);
+// IContentAssistProcessor[] results = super.getContentAssistProcessors(
+// sourceViewer, partitionType);
// added by Maksim Areshkau
if ("org.eclipse.wst.html.HTML_DEFAULT".equalsIgnoreCase(partitionType)) { //$NON-NLS-1$
List<IContentAssistProcessor> contAssists = getVpeTestExtensions();
- contAssists.addAll(Arrays.asList(results));
- results = contAssists.toArray(new IContentAssistProcessor[0]);
+ return contAssists.toArray(new IContentAssistProcessor[0]);
}
- return results;
+ return new IContentAssistProcessor[0];
}
/**
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2010-06-11 14:10:43 UTC (rev 22776)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2010-06-11 19:55:05 UTC (rev 22777)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.jst.jsp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
import org.eclipse.jface.text.source.ISourceViewer;
@@ -74,7 +78,16 @@
}
protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
- return configurationDelegate.getContentAssistProcessors(sourceViewer, partitionType);
+ IContentAssistProcessor[] superProcessors = super.getContentAssistProcessors(
+ sourceViewer, partitionType);
+ List<IContentAssistProcessor> processors = new ArrayList<IContentAssistProcessor>();
+ processors.addAll(
+ Arrays.asList(
+ configurationDelegate.getContentAssistProcessors(
+ sourceViewer,
+ partitionType)));
+ processors.addAll(Arrays.asList(superProcessors));
+ return processors.toArray(new IContentAssistProcessor[0]);
}
/*
@@ -90,6 +103,7 @@
public IContentAssistProcessor[] getContentAssistProcessorsForPartitionType(
ISourceViewer sourceViewer, String partitionType) {
// TODO Auto-generated method stub
- return super.getContentAssistProcessors(sourceViewer, partitionType);
+// return super.getContentAssistProcessors(sourceViewer, partitionType);
+ return new IContentAssistProcessor[0];
}
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java 2010-06-11 14:10:43 UTC (rev 22776)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/TextViewerConfigurationDelegate.java 2010-06-11 19:55:05 UTC (rev 22777)
@@ -24,7 +24,8 @@
SortingCompoundContentAssistProcessor sortingCompoundProcessor = new SortingCompoundContentAssistProcessor(sourceViewer, partitionType);
if (sortingCompoundProcessor.supportsPartitionType(partitionType)) {
- // Add the default WTP CA processors to our SortingCompoundContentAssistProcessor
+ // No more default WTP CA processors are to be added to our SortingCompoundContentAssistProcessor
+
IContentAssistProcessor[] superProcessors = target.getContentAssistProcessorsForPartitionType(sourceViewer, partitionType);
if (superProcessors != null && superProcessors.length > 0) {
14 years, 7 months
JBoss Tools SVN: r22775 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-06-11 10:00:43 -0400 (Fri, 11 Jun 2010)
New Revision: 22775
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-6287 , Validation was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-11 13:53:20 UTC (rev 22774)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-11 14:00:43 UTC (rev 22775)
@@ -195,7 +195,7 @@
} else {
enableBundleGroup(true);
}
- setPageComplete(isPageComplete());
+ updateStatus();
}
});
@@ -227,7 +227,6 @@
updateDuplicateKeyStatus();
updateStatus();
- setPageComplete(isPageComplete());
}
});
@@ -353,7 +352,7 @@
private boolean isDuplicatedKey(String key) {
boolean isDupliacted = false;
- if ((tagsTable.getItemCount() > 0) && (null != key)) {
+ if ((tagsTable.getItemCount() > 0) && (null != key) && !isNewFile()) {
TableItem[] items = tagsTable.getItems();
for (TableItem tableItem : items) {
if (key.equalsIgnoreCase(tableItem.getText(0))) {
14 years, 7 months
JBoss Tools SVN: r22774 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-06-11 09:53:20 -0400 (Fri, 11 Jun 2010)
New Revision: 22774
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
moving to XR 1.9 under mac os x86
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-06-11 13:29:38 UTC (rev 22773)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-06-11 13:53:20 UTC (rev 22774)
@@ -51,8 +51,8 @@
public class XulRunnerBrowser implements nsIWebBrowserChrome,
nsIWebProgressListener, nsITooltipListener {
- private static final String XULRUNNER_LOWER_VERSION = "1.9.1.0"; //$NON-NLS-1$
- private static final String XULRUNNER_HIGHER_VERSION = "1.9.1.9"; //$NON-NLS-1$
+ private static final String XULRUNNER_LOWER_VERSION = "1.9.2.0"; //$NON-NLS-1$
+ private static final String XULRUNNER_HIGHER_VERSION = "1.9.2.9"; //$NON-NLS-1$
// TODO Sergey Vasilyev Think. May be XULRUNNER_BUNDLE shouldn't be final?
private static final String XULRUNNER_BUNDLE;
private static final String XULRUNNER_ENTRY = "/xulrunner"; //$NON-NLS-1$
@@ -84,7 +84,7 @@
public XulRunnerBrowser(Composite parent) throws XulRunnerException {
// initXulRunner();
- if(Platform.OS_MACOSX.equals(Platform.getOS()) && Platform.ARCH_X86_64.equals(Platform.getOSArch())){
+ if(Platform.OS_MACOSX.equals(Platform.getOS())){
getXulRunnerPath();
}
14 years, 7 months
JBoss Tools SVN: r22773 - 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-06-11 09:29:38 -0400 (Fri, 11 Jun 2010)
New Revision: 22773
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6441
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java 2010-06-11 13:04:34 UTC (rev 22772)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolutionByTypeTest.java 2010-06-11 13:29:38 UTC (rev 22773)
@@ -182,7 +182,7 @@
assertContainsBeanTypes(false, bean, "java.lang.Object");
assertContainsBeanTypes(false, bean, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.FlightlessBird");
- assertContainsBeanTypeSignatures(false, bean, "QFlightlessBird<QAustralian;>;");
+ assertContainsBeanTypeSignatures(false, bean, "Qorg.jboss.jsr299.tck.tests.lookup.typesafe.resolution.FlightlessBird<Qorg.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Australian;>;");
}
/**
@@ -217,7 +217,7 @@
assertContainsBeanTypes(false, bean, "java.lang.Object");
assertContainsBeanTypes(false, bean, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Cat");
- assertContainsBeanTypeSignatures(false, bean, "QCat<QEuropean;>;");
+ assertContainsBeanTypeSignatures(false, bean, "Qorg.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Cat<Qorg.jboss.jsr299.tck.tests.lookup.typesafe.resolution.European;>;");
beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.DomesticCat", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Tame");
assertEquals("Wrong number of the beans", 0, beans.size());
@@ -240,7 +240,7 @@
assertContainsBeanTypes(false, bean, "java.lang.Object");
assertContainsBeanTypes(false, bean, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Cat");
- assertContainsBeanTypeSignatures(false, bean, "QCat<QAfrican;>;");
+ assertContainsBeanTypeSignatures(false, bean, "Qorg.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Cat<Qorg.jboss.jsr299.tck.tests.lookup.typesafe.resolution.African;>;");
beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Lion", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Wild");
assertEquals("Wrong number of the beans", 0, beans.size());
14 years, 7 months
JBoss Tools SVN: r22772 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-06-11 09:04:34 -0400 (Fri, 11 Jun 2010)
New Revision: 22772
Modified:
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
Log:
Add support for JBossAS 5.1.x
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2010-06-11 13:02:39 UTC (rev 22771)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2010-06-11 13:04:34 UTC (rev 22772)
@@ -8,11 +8,13 @@
import org.jboss.tools.ui.bot.ext.gen.IServerRuntime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS42;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS50;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS51;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS60;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss42Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss50Runtime;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss51Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss60Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime;
@@ -96,6 +98,9 @@
if ("5.0".equals(version)) {
return new ServerInfo(JBossCommunityJBoss50Runtime.LABEL,JBossCommunityJBossAS50.LABEL);
}
+ if ("5.1".equals(version)) {
+ return new ServerInfo(JBossCommunityJBoss51Runtime.LABEL,JBossCommunityJBossAS51.LABEL);
+ }
if ("6.0".equals(version)) {
return new ServerInfo(JBossCommunityJBoss60Runtime.LABEL,JBossCommunityJBossAS60.LABEL);
}
14 years, 7 months
JBoss Tools SVN: r22771 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-11 09:02:39 -0400 (Fri, 11 Jun 2010)
New Revision: 22771
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6414
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-06-11 13:01:10 UTC (rev 22770)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-06-11 13:02:39 UTC (rev 22771)
@@ -26,7 +26,9 @@
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.wizard.NewCDIAnnotationCreationWizard;
import org.jboss.tools.cdi.ui.wizard.NewCDIAnnotationWizardPage;
+import org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewQualifierWizardPage;
+import org.jboss.tools.cdi.ui.wizard.NewScopeWizardPage;
import org.jboss.tools.cdi.ui.wizard.NewStereotypeWizardPage;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.util.FileUtil;
@@ -42,6 +44,8 @@
static String PACK_NAME = "test";
static String QUALIFIER_NAME = "MyQualifier";
static String STEREOTYPE_NAME = "MyStereotype";
+ static String SCOPE_NAME = "MyScope";
+ static String INTERCEPTOR_BINDING_NAME = "MyInterceptorBinding";
static class WizardContext {
NewCDIAnnotationCreationWizard wizard;
@@ -148,4 +152,48 @@
}
+ public void testNewScopeWizard() {
+ WizardContext context = new WizardContext();
+ context.init("org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard",
+ PACK_NAME, SCOPE_NAME);
+
+ try {
+ NewScopeWizardPage page = (NewScopeWizardPage)context.page;
+
+ context.wizard.performFinish();
+
+ String text = context.getNewTypeContent();
+
+ assertTrue(text.contains("@NormalScope"));
+ assertTrue(text.contains("@Inherited"));
+ assertTrue(text.contains("@Target( { TYPE, METHOD, FIELD })"));
+ assertTrue(text.contains("@Retention(RUNTIME)"));
+
+ } finally {
+ context.close();
+ }
+ }
+
+ public void testNewInterceptorBindingWizard() {
+ WizardContext context = new WizardContext();
+ context.init("org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard",
+ PACK_NAME, INTERCEPTOR_BINDING_NAME);
+
+ try {
+ NewInterceptorBindingWizardPage page = (NewInterceptorBindingWizardPage)context.page;
+
+ context.wizard.performFinish();
+
+ String text = context.getNewTypeContent();
+
+ assertTrue(text.contains("@InterceptorBinding"));
+ assertTrue(text.contains("@Inherited"));
+ assertTrue(text.contains("@Target( { TYPE, METHOD })"));
+ assertTrue(text.contains("@Retention(RUNTIME)"));
+
+ } finally {
+ context.close();
+ }
+ }
+
}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r22770 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test: utils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-06-11 09:01:10 -0400 (Fri, 11 Jun 2010)
New Revision: 22770
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/ValidationUIEditorBot.java
Log:
minor improvements in test
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-06-11 12:55:34 UTC (rev 22769)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-06-11 13:01:10 UTC (rev 22770)
@@ -14,14 +14,17 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.eclipse.draw2d.FigureCanvas;
+import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.finders.WorkbenchContentsFinder;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
@@ -29,14 +32,19 @@
import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.matchers.AbstractMatcher;
+import org.eclipse.swtbot.swt.finder.matchers.WidgetOfType;
import org.eclipse.swtbot.swt.finder.results.Result;
import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.eclipse.ui.IEditorReference;
+import org.hamcrest.Description;
import org.jboss.tools.struts.ui.bot.test.utils.DndSupport;
import org.jboss.tools.struts.ui.bot.test.utils.PartMatcher;
import org.jboss.tools.struts.ui.bot.test.utils.StrutsUIEditorBot;
@@ -55,6 +63,7 @@
import org.jboss.tools.ui.bot.ext.types.ViewType;
import org.jboss.tools.ui.bot.test.SWTBotJSPMultiPageEditor;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -73,6 +82,11 @@
private static final Logger L = Logger.getLogger(TutorialTest.class.getName());
private static final String PROJECT_NAME = "StrutsHello";
+ @Before
+ public void waitForJobs() {
+ util.waitForNonIgnoredJobs();
+ }
+
/**
* 2.1. Starting Up
*/
@@ -130,7 +144,7 @@
//2.2.1.2. Placing the Page Placeholders
nodeContextMenu(
tree,
- projectNode.getNode("Configuration").expand().getNode("default").expand().getNode("struts-config.xml"), "Open").click();
+ projectNode.expandNode("Configuration", "default", "struts-config.xml"), "Open").click();
SWTBotEditor botEditor = bot.activeEditor();
StrutsUIEditorBot ge = new StrutsUIEditorBot(botEditor.getReference());
Control c = ge.getControl();
@@ -147,7 +161,6 @@
ge.clickContextMenu("Auto-Layout");
SWTBotShell sh = bot.activeShell();
sh.bot().button("OK").click();
- botEditor.save();
//2.2.2. Creating an Action Mappings
new SWTBotGefContextMenu(c, "Action...").click();
@@ -157,7 +170,6 @@
sh.bot().comboBoxWithLabel("Scope").setSelection("request");
sh.bot().textWithLabel("Type").setText("sample.GreetingAction");
sh.bot().button("Finish").click();
- botEditor.save();
//2.2.3. Creating a Link
ge.activateTool("Create New Connection");
@@ -179,7 +191,6 @@
item.getNode("greeting").select();
bot.activeEditor().bot().textWithLabel("Name").setText("sayHello");
ge.selectPage("Diagram");
- botEditor.save();
//2.2.5. Creating a Global Forward
new SWTBotGefContextMenu(c, "Global Forward...").click();
@@ -203,6 +214,7 @@
sh.bot().textWithLabel("Type*").setText("sample.GetNameForm");
sh.bot().button("Finish").click();
botEditor.save();
+ util.waitForNonIgnoredJobs();
}
/**
@@ -215,12 +227,12 @@
guiBot.clickContextMenu("Generate Java Code...");
SWTBot sh = bot.activeShell().bot();
sh.button(1).click();
- sh.sleep(1500);
+ util.waitForNonIgnoredJobs();
String status = sh.text().getText();
+ sh.button("Finish").click();
Assert.assertTrue(status.contains("Generated classes: 2"));
Assert.assertTrue(status.contains("Actions: 1"));
Assert.assertTrue(status.contains("Form beans: 1"));
- sh.button(0).click();
}
/**
@@ -232,7 +244,7 @@
pe.show();
SWTBotTree fTree = pe.bot().tree();
nodeContextMenu(fTree, fTree.getTreeItem(PROJECT_NAME), "Refresh");
- bot.sleep(3000);
+ util.waitForNonIgnoredJobs();
//4.1.1. GetNameForm.java
SWTBotEditor editor = packageExplorer.openFile(PROJECT_NAME, "JavaSource", "sample", "GetNameForm.java");
SWTBotEclipseEditor eeditor = editor.toTextEditor();
@@ -316,6 +328,7 @@
StrutsUIEditorBot gui = new StrutsUIEditorBot(bot.activeEditor().getReference());
gui.mainEditPart().descendants(new PartMatcher("getName")).get(0).select();
gui.save();
+ util.waitForNonIgnoredJobs();
new SWTBotGefContextMenu(gui.getControl(), "Run on Server").click();
SWTBotBrowserExt browser = bot.browser();
bot.sleep(5000);
@@ -342,7 +355,7 @@
SWTBotShell sh = bot.activeShell();
sh.bot().button("Browse...").click();
SWTBotShell sh2 = sh.bot().activeShell();
- sh2.bot().tree().getTreeItem("StrutsHello").expand().getNode("JavaSource").expand().getNode("sample").select();
+ sh2.bot().tree().getTreeItem("StrutsHello").expandNode("JavaSource", "sample").select();
sh2.bot().button("OK").click();
sh.bot().textWithLabel("Name*").setText("applResources");
sh.bot().button("Finish").click();
@@ -407,11 +420,21 @@
st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname63.jsp.gf")));
jspEditor.save();
bot.editorByTitle("struts-config.xml").save();
- bot.sleep(5000);
-
+ util.waitForNonIgnoredJobs();
+ servers.show();
+ SWTBotTree srvs = servers.tree();
+ SWTBotTreeItem s = getProjectNodeFromServerView(srvs);
+ nodeContextMenu(servers.tree(), s, "Full Publish").click();
+ SWTBotEditor ed = new SWTBotEditor(getBrowserReference(), new SWTWorkbenchBot());
+ ed.show();
+ Browser b = ed.bot().widget(WidgetOfType.widgetOfType(Browser.class));
+ SWTBotBrowserExt browser = new SWTBotBrowserExt(b);
+ String out1 = refreshBrowser(browser);
+ L.info(out1);
//6.4. Server Side Validation
//6.5. Editing the JSP File
+ jspEditor.show();
st.selectRange(0, 0, st.getText().length());
st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname65.jsp.gf")));
jspEditor.saveAndClose();
@@ -436,8 +459,17 @@
st.selectRange(0, 0, st.getText().length());
st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/GetNameForm67.java.gf")));
editor.saveAndClose();
+ new StrutsUIEditorBot(bot.editorByTitle("struts-config.xml").getReference()).show();
bot.activeShell().bot().menu("File").menu("Save All").click();
- bot.sleep(40000);
+ bot.sleep(1000);
+ util.waitForNonIgnoredJobs();
+ SWTBotToolbarButton tb = bot.activeShell().bot().toolbarButtonWithTooltip("Touch descriptors");
+ tb.click();
+ ed.show();
+ String out2 = refreshBrowser(browser);
+ L.info(out2);
+ Assert.assertTrue(out1.contains("onsubmit=\"return validateGetNameForm(this)\""));
+ Assert.assertFalse(out2.contains("onsubmit=\"return validateGetNameForm(this)\""));
}
private SWTBotMenu nodeContextMenu(final SWTBotTree tree,
@@ -494,4 +526,46 @@
}
return sb.toString();
}
+
+ private IEditorReference getBrowserReference() {
+ List<IEditorReference> refs = new WorkbenchContentsFinder().findEditors(new AbstractMatcher<IEditorReference>() {
+
+ @Override
+ protected boolean doMatch(Object item) {
+ IEditorReference ref = (IEditorReference) item;
+ return "Web Browser".equals(ref.getName());
+ }
+
+ public void describeTo(Description description) {
+ }
+ });
+ return refs.get(0);
+ }
+
+ private String refreshBrowser(SWTBotBrowserExt b) {
+ util.waitForNonIgnoredJobs();
+ bot.sleep(10000);
+ b.refresh();
+ util.waitForNonIgnoredJobs();
+ bot.sleep(1000);
+ return b.getText();
+ }
+
+ private SWTBotTreeItem getProjectNodeFromServerView(SWTBotTree serversTree) {
+ SWTBotTreeItem s = null;
+ for (SWTBotTreeItem i: serversTree.getAllItems()) {
+ if (i.getText().startsWith(configuredState.getServer().name)) {
+ s = i;
+ break;
+ }
+ }
+ s.expand();
+ for (SWTBotTreeItem i: s.getItems()) {
+ if (i.getText().contains(PROJECT_NAME)) {
+ s = i;
+ break;
+ }
+ }
+ return s;
+ }
}
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-06-11 12:55:34 UTC (rev 22769)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-06-11 13:01:10 UTC (rev 22770)
@@ -33,7 +33,6 @@
import org.eclipse.ui.part.EditorPart;
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
-import org.junit.Assert;
public class StrutsUIEditorBot extends SWTBotGefEditor {
@@ -90,7 +89,7 @@
public void selectPage(final String page) {
IWorkbenchPart p = ((EditorPartWrapper) (getReference().getPart(true))).getEditor();
- Assert.assertTrue(p instanceof ObjectMultiPageEditor);
+ assert p instanceof ObjectMultiPageEditor;
final ObjectMultiPageEditor editor = (ObjectMultiPageEditor) p;
// Select page
Display.getDefault().syncExec(new Runnable() {
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/ValidationUIEditorBot.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/ValidationUIEditorBot.java 2010-06-11 12:55:34 UTC (rev 22769)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/ValidationUIEditorBot.java 2010-06-11 13:01:10 UTC (rev 22770)
@@ -37,7 +37,6 @@
import org.hamcrest.Description;
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
-import org.junit.Assert;
public class ValidationUIEditorBot extends SWTBotEditor {
@@ -98,7 +97,7 @@
public void selectPage(final String page) {
IWorkbenchPart p = ((EditorPartWrapper) (getReference().getPart(true))).getEditor();
- Assert.assertTrue(p instanceof ObjectMultiPageEditor);
+ assert p instanceof ObjectMultiPageEditor;
final ObjectMultiPageEditor editor = (ObjectMultiPageEditor) p;
// Select page
Display.getDefault().syncExec(new Runnable() {
14 years, 7 months
JBoss Tools SVN: r22769 - 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: 2010-06-11 08:55:34 -0400 (Fri, 11 Jun 2010)
New Revision: 22769
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
Log:
https://jira.jboss.org/browse/JBIDE-6441
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-06-11 12:36:59 UTC (rev 22768)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-06-11 12:55:34 UTC (rev 22769)
@@ -11,8 +11,10 @@
package org.jboss.tools.cdi.internal.core.impl;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -22,6 +24,7 @@
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.Signature;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -29,6 +32,7 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IScopeDeclaration;
@@ -205,7 +209,11 @@
return result;
}
- public Set<ITypeDeclaration> getRestrictedTypeDeclaratios() {
+ public Set<ITypeDeclaration> getRestrictedTypeDeclarations(Set<IParametedType> alltypes) {
+ Map<String, IParametedType> map = new HashMap<String, IParametedType>();
+ for (IParametedType t: alltypes) {
+ map.put(t.getType().getFullyQualifiedName(), t);
+ }
Set<ITypeDeclaration> result = new HashSet<ITypeDeclaration>();
AnnotationDeclaration typed = getDefinition().getTypedAnnotation();
if(typed != null) {
@@ -245,6 +253,14 @@
length = rawTypeName.length();
}
}
+ IParametedType other = p.getType() == null ? null : map.get(p.getType().getFullyQualifiedName());
+ if(other != null) {
+ String s1 = p.getSignature();
+ String s2 = other.getSignature();
+ if(!s1.equals(s2) && Signature.getArrayCount(s1) == Signature.getArrayCount(s2)) {
+ p.setSignature(s2);
+ }
+ }
result.add(new TypeDeclaration(p, offset, length));
}
}
@@ -263,6 +279,14 @@
length = rawTypeName.length();
}
}
+ IParametedType other = p.getType() == null ? null : map.get(p.getType().getFullyQualifiedName());
+ if(other != null) {
+ String s1 = p.getSignature();
+ String s2 = other.getSignature();
+ if(!s1.equals(s2) && Signature.getArrayCount(s1) == Signature.getArrayCount(s2)) {
+ p.setSignature(s2);
+ }
+ }
result.add(new TypeDeclaration(p, offset, length));
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-06-11 12:36:59 UTC (rev 22768)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-06-11 12:55:34 UTC (rev 22769)
@@ -23,6 +23,7 @@
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.Signature;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
@@ -259,8 +260,9 @@
public Set<IParametedType> getLegalTypes() {
Set<IParametedType> result = new HashSet<IParametedType>();
AnnotationDeclaration d = getDefinition().getTypedAnnotation();
+ Set<IParametedType> all = getAllTypes();
if(d != null) {
- Set<ITypeDeclaration> ts = getRestrictedTypeDeclaratios();
+ Set<ITypeDeclaration> ts = getRestrictedTypeDeclarations(all);
result.addAll(ts);
ParametedType object = getObjectType(getBeanClass());
if(object != null) {
@@ -268,7 +270,7 @@
}
return result;
}
- return getAllTypes();
+ return all;
}
/*
@@ -279,6 +281,10 @@
return getDefinition().getAllTypes();
}
+ public Set<ITypeDeclaration> getRestrictedTypeDeclaratios() {
+ return getRestrictedTypeDeclarations(getAllTypes());
+ }
+
public String getName() {
ClassBean specialized = getSpecializedBean();
if(specialized != null) {
@@ -468,4 +474,5 @@
}
return false;
}
+
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-06-11 12:36:59 UTC (rev 22768)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-06-11 12:55:34 UTC (rev 22769)
@@ -64,8 +64,9 @@
public Set<IParametedType> getLegalTypes() {
Set<IParametedType> result = new HashSet<IParametedType>();
AnnotationDeclaration d = getDefinition().getTypedAnnotation();
+ Set<IParametedType> all = getAllTypes();
if(d != null) {
- Set<ITypeDeclaration> ts = getRestrictedTypeDeclaratios();
+ Set<ITypeDeclaration> ts = getRestrictedTypeDeclarations(all);
result.addAll(ts);
ParametedType object = getObjectType(getBeanClass());
if(object != null) {
@@ -73,7 +74,7 @@
}
return result;
}
- return getAllTypes();
+ return all;
}
/*
@@ -87,6 +88,10 @@
return new HashSet<IParametedType>();
}
+ public Set<ITypeDeclaration> getRestrictedTypeDeclaratios() {
+ return getRestrictedTypeDeclarations(getAllTypes());
+ }
+
public String getName() {
AnnotationDeclaration named = findNamedAnnotation();
if(named == null) return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-06-11 12:36:59 UTC (rev 22768)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-06-11 12:55:34 UTC (rev 22769)
@@ -86,8 +86,9 @@
public Set<IParametedType> getLegalTypes() {
Set<IParametedType> result = new HashSet<IParametedType>();
AnnotationDeclaration d = getDefinition().getTypedAnnotation();
+ Set<IParametedType> all = getAllTypes();
if(d != null) {
- Set<ITypeDeclaration> ts = getRestrictedTypeDeclaratios();
+ Set<ITypeDeclaration> ts = getRestrictedTypeDeclarations(all);
result.addAll(ts);
ParametedType object = getObjectType(getBeanClass());
if(object != null) {
@@ -95,7 +96,7 @@
}
return result;
}
- return getAllTypes();
+ return all;
}
/*
@@ -109,6 +110,10 @@
return new HashSet<IParametedType>();
}
+ public Set<ITypeDeclaration> getRestrictedTypeDeclaratios() {
+ return getRestrictedTypeDeclarations(getAllTypes());
+ }
+
public String getName() {
ProducerMethod specialized = getSpecializedBean();
if(specialized != null) {
14 years, 7 months
JBoss Tools SVN: r22768 - in trunk/jsf: plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-06-11 08:36:59 -0400 (Fri, 11 Jun 2010)
New Revision: 22768
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiPlugin.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6433 - fixed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiPlugin.java 2010-06-11 12:18:35 UTC (rev 22767)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiPlugin.java 2010-06-11 12:36:59 UTC (rev 22768)
@@ -26,7 +26,7 @@
public void start(BundleContext context) throws Exception {
super.start(context);
-// ProjectNaturesChecker.getInstance();
+ ProjectNaturesChecker.getInstance();
}
public static JsfUiPlugin getDefault() {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2010-06-11 12:18:35 UTC (rev 22767)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2010-06-11 12:36:59 UTC (rev 22768)
@@ -65,8 +65,8 @@
private ProjectNaturesChecker() {
projectsCollection = new HashSet<IProject>(0);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
- IResourceChangeEvent.POST_CHANGE);
+// ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
+// IResourceChangeEvent.POST_CHANGE);
IWorkbenchWindow window = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow();
window.getPartService().addPartListener(partListener);
@@ -165,11 +165,11 @@
private void updateProjectPersistentProperties(IProject project)
throws CoreException {
if (project.isAccessible()) {
- String jsfCheckString = project
- .getPersistentProperty(IS_JSF_CHECK_NEED);
- if (jsfCheckString == null) {
+// String jsfCheckString = project
+// .getPersistentProperty(IS_JSF_CHECK_NEED);
+// if (jsfCheckString == null) {
updateProjectJSFPersistents(project);
- }
+// }
if (project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED) == null) {
project
.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED,
@@ -198,7 +198,7 @@
window.getPartService().removePartListener(partListener);
partListener = null;
}
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+// ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
projectsCollection.clear();
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-06-11 12:18:35 UTC (rev 22767)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-06-11 12:36:59 UTC (rev 22768)
@@ -51,14 +51,14 @@
ELReferencesRenameTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
new String[] { "projects/testJSFProject", }, //$NON-NLS-1$
new String[] { "testJSFProject" })); //$NON-NLS-1$
-// suite.addTest(new ProjectImportTestSetup(new TestSuite(
-// JSFNaturesInfoDialog_JBIDE5701.class),
-// "org.jboss.tools.jsf.ui.test", "projects/naturesCheckTest", //$NON-NLS-1$ //$NON-NLS-2$
-// "naturesCheckTest")); //$NON-NLS-1$
-// suite.addTest(new ProjectImportTestSetup(new TestSuite(
-// KbNaturesInfoDialog_JBIDE6125.class),
-// "org.jboss.tools.jsf.ui.test", "projects/naturesCheckKBTest", //$NON-NLS-1$ //$NON-NLS-2$
-// "naturesCheckKBTest")); //$NON-NLS-1$
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ JSFNaturesInfoDialog_JBIDE5701.class),
+ "org.jboss.tools.jsf.ui.test", "projects/naturesCheckTest", //$NON-NLS-1$ //$NON-NLS-2$
+ "naturesCheckTest")); //$NON-NLS-1$
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ KbNaturesInfoDialog_JBIDE6125.class),
+ "org.jboss.tools.jsf.ui.test", "projects/naturesCheckKBTest", //$NON-NLS-1$ //$NON-NLS-2$
+ "naturesCheckKBTest")); //$NON-NLS-1$
return new TestWizardsProject(suite);
}
}
\ No newline at end of file
14 years, 7 months