JBoss Tools SVN: r34757 - in trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-15 06:44:28 -0400 (Thu, 15 Sep 2011)
New Revision: 34757
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml
Log:
corrected plugin version to 0.0.1
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-15 10:44:07 UTC (rev 34756)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-15 10:44:28 UTC (rev 34757)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Openshift Core Plugin
Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.core
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 0.0.1.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftCoreActivator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.eclipse.core.runtime,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml 2011-09-15 10:44:07 UTC (rev 34756)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/pom.xml 2011-09-15 10:44:28 UTC (rev 34757)
@@ -9,4 +9,5 @@
<groupId>org.jboss.tools.as.plugins</groupId>
<artifactId>org.jboss.ide.eclipse.as.openshift.core</artifactId>
<packaging>eclipse-plugin</packaging>
+ <version>0.0.1</version>
</project>
14 years, 7 months
JBoss Tools SVN: r34756 - in trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-15 06:44:07 -0400 (Thu, 15 Sep 2011)
New Revision: 34756
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/pom.xml
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF
Log:
[JBIDE-9510] corrected plugin version to 0.0.1
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF 2011-09-15 08:51:59 UTC (rev 34755)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF 2011-09-15 10:44:07 UTC (rev 34756)
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Openshift Test Plugin
Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.0.1.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.openshift.test.internal.core.Activator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.junit;bundle-version="[4.8.0,5.0.0)",
- org.jboss.ide.eclipse.as.openshift.core;bundle-version="[1.0.0,2.0.0)"
+ org.jboss.ide.eclipse.as.openshift.core;bundle-version="[0.0.1,1.0.0]"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/pom.xml (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/pom.xml 2011-09-15 10:44:07 UTC (rev 34756)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.as</groupId>
+ <artifactId>plugins</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.as.plugins</groupId>
+ <artifactId>org.jboss.ide.eclipse.as.openshift.test</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <version>0.0.1</version>
+</project>
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 7 months
JBoss Tools SVN: r34755 - in trunk/as: plugins/org.jboss.ide.eclipse.as.openshift.ui/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-15 04:51:59 -0400 (Thu, 15 Sep 2011)
New Revision: 34755
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/META-INF/MANIFEST.MF
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/pom.xml
Log:
fix versions of manifest.mf vs. pom.xml (set everything to 2.3.0 to be consistent w/ project root pom)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-15 08:36:05 UTC (rev 34754)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-15 08:51:59 UTC (rev 34755)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Openshift Core Plugin
Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.core
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftCoreActivator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.eclipse.core.runtime,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/META-INF/MANIFEST.MF 2011-09-15 08:36:05 UTC (rev 34754)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/META-INF/MANIFEST.MF 2011-09-15 08:51:59 UTC (rev 34755)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ui
Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.ui
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.openshift.ui.OpenshiftUIActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF 2011-09-15 08:36:05 UTC (rev 34754)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF 2011-09-15 08:51:59 UTC (rev 34755)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EGit Tests
Bundle-SymbolicName: org.jboss.ide.eclipse.as.egit.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.egit.internal.test.EGitTestActivator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.jboss.ide.eclipse.as.egit.core;bundle-version="0.0.1",
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/pom.xml 2011-09-15 08:36:05 UTC (rev 34754)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/pom.xml 2011-09-15 08:51:59 UTC (rev 34755)
@@ -9,5 +9,4 @@
<groupId>org.jboss.tools.as.tests</groupId>
<artifactId>org.jboss.ide.eclipse.as.egit.internal.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>0.0.1</version>
</project>
14 years, 7 months
JBoss Tools SVN: r34754 - trunk/as/plugins.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-15 04:36:05 -0400 (Thu, 15 Sep 2011)
New Revision: 34754
Modified:
trunk/as/plugins/pom.xml
Log:
remove duplicate entry: org.jboss.ide.eclipse.as.egit.core
Modified: trunk/as/plugins/pom.xml
===================================================================
--- trunk/as/plugins/pom.xml 2011-09-15 08:12:42 UTC (rev 34753)
+++ trunk/as/plugins/pom.xml 2011-09-15 08:36:05 UTC (rev 34754)
@@ -24,7 +24,6 @@
<module>org.jboss.ide.eclipse.as.rse.ui</module>
<module>org.jboss.ide.eclipse.as.jmx.integration</module>
<module>org.jboss.ide.eclipse.as.management.as7</module>
- <module>org.jboss.ide.eclipse.as.egit.core</module>
<module>org.jboss.ide.eclipse.as.egit.core</module>
<module>org.jboss.ide.eclipse.as.openshift.core</module>
<module>org.jboss.ide.eclipse.as.openshift.ui</module>
14 years, 7 months
JBoss Tools SVN: r34753 - trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-15 04:12:42 -0400 (Thu, 15 Sep 2011)
New Revision: 34753
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java
Log:
cleanup
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java 2011-09-15 08:12:13 UTC (rev 34752)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java 2011-09-15 08:12:42 UTC (rev 34753)
@@ -59,10 +59,8 @@
} else {
escapeSequence.append(c);
if (hidden) {
-// appendToHiddenBuffer(escapeSequence);
hiddenBuffer.append(escapeSequence);
} else {
-// appendToTargetBuffer(escapeSequence);
targetBuffer.append(escapeSequence);
}
escapeSequence.setLength(0);
@@ -70,10 +68,8 @@
} else {
escapeSequence.append(c);
if (hidden) {
-// appendToHiddenBuffer(escapeSequence);
hiddenBuffer.append(escapeSequence);
} else {
-// appendToTargetBuffer(escapeSequence);
targetBuffer.append(escapeSequence);
}
escapeSequence.setLength(0);
14 years, 7 months
JBoss Tools SVN: r34752 - trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-15 04:12:13 -0400 (Thu, 15 Sep 2011)
New Revision: 34752
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
Log:
make sure the tools don't have to wait forever on a response from the runtime when sending a command
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-09-15 06:49:19 UTC (rev 34751)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-09-15 08:12:13 UTC (rev 34752)
@@ -103,11 +103,12 @@
ForgeCorePlugin.log(e);
}
try {
- while (commandResultListener.result == null) {
+ int count = 0; // give up after 5 seconds
+ while (commandResultListener.result == null && count++ < 50) {
Thread.sleep(100);
}
} catch (InterruptedException e) {}
- result = commandResultListener.result;
+ result = commandResultListener.result == null ? "" : commandResultListener.result;
commandResultListener.result = null;
commandResultListener.command = null;
streamMonitor.removeListener(commandResultListener);
@@ -204,6 +205,7 @@
String command = null;
@Override
public void streamAppended(String text, IStreamMonitor monitor) {
+ System.out.println("streamAppended: " + text);
outputAvailable(text);
}
@Override
14 years, 7 months
JBoss Tools SVN: r34751 - in trunk: cdi/features/org.jboss.tools.cdi.seam.feature and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-15 02:49:19 -0400 (Thu, 15 Sep 2011)
New Revision: 34751
Modified:
trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml
trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
Log:
apply patch for JBIDE-9397 - add missing upstream feature deps
Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2011-09-15 00:56:50 UTC (rev 34750)
+++ trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2011-09-15 06:49:19 UTC (rev 34751)
@@ -21,6 +21,11 @@
%license
</license>
+ <requires>
+ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.jst.feature" version="3.3.0" match="greaterOrEqual"/>
+ </requires>
+
<plugin
id="org.jboss.tools.cdi.core"
download-size="0"
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml 2011-09-15 00:56:50 UTC (rev 34750)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml 2011-09-15 06:49:19 UTC (rev 34751)
@@ -17,6 +17,11 @@
%license
</license>
+ <requires>
+ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.jst.feature" version="3.3.0" match="greaterOrEqual"/>
+ </requires>
+
<plugin
id="org.jboss.tools.cdi.seam.core"
download-size="0"
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-09-15 00:56:50 UTC (rev 34750)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-09-15 06:49:19 UTC (rev 34751)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch and 3.3_trunk jobs, 2011/09/08
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/09/14
------------------------
@@ -37,4 +37,6 @@
tptp [REMOVED]
smooks [removed from JBDS, still in JBT]
+seam -> hibernate, jsf **[TODO: FIX JOBS in both 3.3 streams]**
+
------------------------
Modified: trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml 2011-09-15 00:56:50 UTC (rev 34750)
+++ trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml 2011-09-15 06:49:19 UTC (rev 34751)
@@ -24,6 +24,12 @@
Raleigh NC 27606 USA.
</license>
+ <requires>
+ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.jst.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.vpe.feature" version="3.3.0" match="greaterOrEqual"/>
+ </requires>
+
<plugin
id="org.jboss.tools.jsf"
download-size="0"
Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2011-09-15 00:56:50 UTC (rev 34750)
+++ trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2011-09-15 06:49:19 UTC (rev 34751)
@@ -22,6 +22,10 @@
Raleigh NC 27606 USA.
</license>
+ <requires>
+ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/>
+ </requires>
+
<plugin
id="org.jboss.tools.jst.web"
download-size="0"
Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2011-09-15 00:56:50 UTC (rev 34750)
+++ trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2011-09-15 06:49:19 UTC (rev 34751)
@@ -21,6 +21,9 @@
<requires>
<import feature="org.jboss.ide.eclipse.as.feature" version="1.0.0" match="greaterOrEqual"/>
<import feature="org.hibernate.eclipse.feature" version="3.2.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.jst.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.jsf.feature" version="3.3.0" match="greaterOrEqual"/>
<import feature="org.eclipse.datatools.connectivity.feature" version="1.6.1" match="greaterOrEqual"/>
<import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.1" match="greaterOrEqual"/>
</requires>
14 years, 7 months
JBoss Tools SVN: r34750 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-14 20:56:50 -0400 (Wed, 14 Sep 2011)
New Revision: 34750
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
Added methods to import project without waiting for JobManager is idle. It can be used when test requires only project structure and files content.
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-09-15 00:19:48 UTC (rev 34749)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-09-15 00:56:50 UTC (rev 34750)
@@ -67,12 +67,24 @@
throws
IOException, CoreException,
InvocationTargetException, InterruptedException {
+ return importProject(
+ bundle, templLocation, projectName,
+ monitor,false);
+
+ }
+
+ public static IProject importProject(
+ Bundle bundle, String templLocation, String projectName,
+ IProgressMonitor monitor, boolean skipWaitForIdle)
+ throws
+ IOException, CoreException,
+ InvocationTargetException, InterruptedException {
String tplPrjLcStr;
tplPrjLcStr = FileLocator.resolve(bundle.getEntry(templLocation))
.getFile();
String protocol = FileLocator.resolve(bundle.getEntry(templLocation)).getProtocol();
- IProject importedPrj = importProjectIntoWorkspace(tplPrjLcStr, projectName, protocol);
+ IProject importedPrj = importProjectIntoWorkspace(tplPrjLcStr, projectName, protocol,skipWaitForIdle);
return importedPrj;
}
@@ -227,16 +239,12 @@
return oldAutoBuilding;
}
- //static public void importProjectIntoWorkspace(ImportBean bean) {
- // importProjectIntoWorkspace(bean);
- //}
-
private static final long IMPORT_DELAY = 200;
static public IProject importProjectIntoWorkspace(String path, String projectName) {
return importProjectIntoWorkspace(path, projectName,"file");
}
-
+
/**
* Import project into workspace.
*
@@ -245,7 +253,18 @@
* @param protocol
*/
static public IProject importProjectIntoWorkspace(String path, String projectName, String protocol) {
+ return importProjectIntoWorkspace(path, projectName, protocol, false);
+ }
+ /**
+ * Import project into workspace.
+ *
+ * @param path the path
+ * @param projectName the project name
+ * @param protocol
+ */
+ static public IProject importProjectIntoWorkspace(String path, String projectName, String protocol, boolean skipWaitForIdle) {
+
IProject project = null;
try {
@@ -303,8 +322,9 @@
importOp.run(null);
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
ResourcesUtils.setBuildAutomatically(state);
-
- JobUtils.waitForIdle(IMPORT_DELAY);
+ if(!skipWaitForIdle) {
+ JobUtils.waitForIdle(IMPORT_DELAY);
+ }
} catch (InvocationTargetException ite) {
// TePlugin.getDefault().logError(ite.getCause());
ite.printStackTrace();
14 years, 7 months
JBoss Tools SVN: r34749 - 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: 2011-09-14 20:19:48 -0400 (Wed, 14 Sep 2011)
New Revision: 34749
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
Log:
JBIDE-9699
https://issues.jboss.org/browse/JBIDE-9699
Test added.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2011-09-14 23:59:14 UTC (rev 34748)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2011-09-15 00:19:48 UTC (rev 34749)
@@ -66,6 +66,13 @@
assertEquals(1, injections.size());
}
+ public void testDisposerMethodParameters() {
+ IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/disposers/DisposerOk.java");
+ assertNotNull("Can't find the bean.", bean);
+ Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ assertEquals(1, injections.size());
+ }
+
public void testGetInjections() {
Set<IInjectionPoint> ps = cdiProject.getInjections("org.jboss.jsr299.tck.tests.lookup.injection.Fox");
assertTrue(!ps.isEmpty());
14 years, 7 months
JBoss Tools SVN: r34748 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-14 19:59:14 -0400 (Wed, 14 Sep 2011)
New Revision: 34748
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
Log:
JBIDE-9347
https://issues.jboss.org/browse/JBIDE-9347
Popup version.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-14 23:19:21 UTC (rev 34747)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-14 23:59:14 UTC (rev 34748)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -66,7 +67,7 @@
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.text.ITextSourceReference;
-public class AssignableBeansDialog extends TitleAreaDialog {
+public class AssignableBeansDialog extends PopupDialog {// TitleAreaDialog {
IInjectionPoint injectionPoint;
Set<IBean> beans = new HashSet<IBean>();
Set<IBean> eligibleBeans = new HashSet<IBean>();
@@ -77,7 +78,10 @@
TableViewer list;
public AssignableBeansDialog(Shell parentShell) {
- super(parentShell);
+ // TitleAreaDialog
+// super(parentShell);
+ //PopupDialog
+ super(parentShell, 0, true, true, true, true, true, "title", null);
setShellStyle(getShellStyle() | SWT.RESIZE);
}
@@ -122,7 +126,8 @@
protected void buttonPressed(int buttonId) {
if(buttonId == IDialogConstants.CLOSE_ID) {
- cancelPressed();
+ // TitleAreaDialog
+// cancelPressed();
}
}
@@ -136,15 +141,18 @@
composite.setLayout(layout);
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
composite.setFont(parent.getFont());
- setTitle(computeTitle());
+ // TitleAreaDialog
+// setTitle(computeTitle());
+ // PopupDialog
+ setTitleText(computeTitle());
createListView(composite);
createFilterView(composite);
return composite;
}
protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL,
- true);
+ // TitleAreaDialog
+// createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL, true);
}
void createListView(Composite parent) {
14 years, 7 months