JBoss Tools SVN: r31486 - in trunk/runtime/tests/org.jboss.tools.runtime.test: src/org/jboss/tools/runtime/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-05-25 14:59:57 -0400 (Wed, 25 May 2011)
New Revision: 31486
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml
trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java
trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java
Log:
JBIDE-8906 jboss runtime detection doesn't spot AS 7 installations
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-05-25 18:44:30 UTC (rev 31485)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-05-25 18:59:57 UTC (rev 31486)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirement.build.root}/jboss-eap-4.3 -Dskip.runtime.scanner=true</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirement.build.root}/jboss-eap-4.3 -Dskip.runtime.scanner=true -Djbosstools.test.jboss.home.7.0=${requirement.build.root}/jboss-7.0.0.Beta3</systemProperties>
</properties>
<build>
<plugins>
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java 2011-05-25 18:44:30 UTC (rev 31485)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/IRuntimeDetectionConstants.java 2011-05-25 18:59:57 UTC (rev 31486)
@@ -21,6 +21,8 @@
final static String JBOSS_51_HOME = System.getProperty("jbosstools.test.jboss.home.5.1", "E:\\JBossRuntime2\\jboss-5.1.0.GA");
+ final static String JBOSS_70_HOME = System.getProperty("jbosstools.test.jboss.home.7.0", "E:\\jboss-7.0.0.Beta3");
+
final static String SEAM_20_HOME = System.getProperty("jbosstools.test.seam.2.0.1.GA.home", "E:\\JBossRuntimes\\jboss-seam-2.0.1.GA");
final static String SEAM_22_HOME = System.getProperty("jbosstools.test.seam.2.2.0.GA.home", "E:\\JBossRuntime2\\jboss-seam-2.2.1.Final");
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-05-25 18:44:30 UTC (rev 31485)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-05-25 18:59:57 UTC (rev 31486)
@@ -79,6 +79,7 @@
.getRuntimePaths();
String[] paths = { IRuntimeDetectionConstants.JBOSS_42_HOME,
IRuntimeDetectionConstants.JBOSS_51_HOME,
+ IRuntimeDetectionConstants.JBOSS_70_HOME,
IRuntimeDetectionConstants.SEAM_20_HOME,
IRuntimeDetectionConstants.SEAM_22_HOME,
IRuntimeDetectionConstants.EAP_43_HOME };
@@ -136,8 +137,8 @@
List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
.getRuntimePaths();
assertTrue(
- "runtimePaths.size()\nExpected: 5\nWas: " + runtimePaths.size(),
- runtimePaths.size() == 5);
+ "runtimePaths.size()\nExpected: 6\nWas: " + runtimePaths.size(),
+ runtimePaths.size() == 6);
}
@Test
@@ -208,10 +209,10 @@
.getDefault().getServerDefinitions();
List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
.getRuntimePaths();
- assertTrue("serverDefinitions.size()\nExpected: 5\nWas: "
+ assertTrue("serverDefinitions.size()\nExpected: 6\nWas: "
+ serverDefinitions.size() +
"\nserverDefinitions: " + serverDefinitions +
- "\nruntimePaths=" + runtimePaths, serverDefinitions.size() == 5);
+ "\nruntimePaths=" + runtimePaths, serverDefinitions.size() == 6);
}
@Test
@@ -289,6 +290,19 @@
}
assertTrue("JBoss AS 5.1\nExpected: 1\nWas: " + count, count == 1);
}
+
+ @Test
+ public void testJBossAs70() {
+ IRuntime[] runtimes = ServerCore.getRuntimes();
+ int count = 0;
+ for (IRuntime runtime : runtimes) {
+ IRuntimeType runtimeType = runtime.getRuntimeType();
+ if (IJBossToolingConstants.AS_70.equals(runtimeType.getId())) {
+ count++;
+ }
+ }
+ assertTrue("JBoss AS 7.0\nExpected: 1\nWas: " + count, count == 1);
+ }
@Test
public void testJBossEap43() {
@@ -306,8 +320,8 @@
@Test
public void testWtpRuntimes() {
IRuntime[] runtimes = ServerCore.getRuntimes();
- assertTrue("runtimes.length\nExpected: 3\nWas: " + runtimes.length,
- runtimes.length == 3);
+ assertTrue("runtimes.length\nExpected: 4\nWas: " + runtimes.length,
+ runtimes.length == 4);
}
@Test
13 years, 1 month
JBoss Tools SVN: r31485 - in trunk: runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-05-25 14:44:30 -0400 (Wed, 25 May 2011)
New Revision: 31485
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
Log:
JBIDE-8502 Cancel button doesn't work while searching via JBoss Tools Runtime Detection
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-05-25 18:37:46 UTC (rev 31484)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-05-25 18:44:30 UTC (rev 31485)
@@ -28,7 +28,10 @@
public ServerBean loadFromLocation(File location) {
JBossServerType type = getServerType(location);
- String version = getServerVersion(getFullServerVersion(new File(location,type.getSystemJarPath())));
+ String version = null;
+ if (!JBossServerType.UNKNOWN.equals(type)) {
+ version = getServerVersion(getFullServerVersion(new File(location,type.getSystemJarPath())));
+ }
ServerBean server = new ServerBean(location.getPath(),getName(location),type,version);
return server;
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2011-05-25 18:37:46 UTC (rev 31484)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2011-05-25 18:44:30 UTC (rev 31485)
@@ -140,7 +140,7 @@
@Override
public boolean isValid() {
if (super.isValid()) {
- Bundle droolsBundle = Platform.getBundle("org.eclipse.drools");
+ Bundle droolsBundle = Platform.getBundle("org.drools.eclipse"); //$NON-NLS-1$
return droolsBundle != null;
}
return false;
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-05-25 18:37:46 UTC (rev 31484)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-05-25 18:44:30 UTC (rev 31485)
@@ -57,6 +57,7 @@
import org.jboss.tools.runtime.Messages;
import org.jboss.tools.runtime.core.model.AbstractRuntimeDetector;
import org.jboss.tools.runtime.core.model.ServerDefinition;
+import org.osgi.framework.Bundle;
public class JBossASHandler extends AbstractRuntimeDetector implements IJBossRuntimePluginConstants {
@@ -395,7 +396,10 @@
}
if (SOA_P.equals(type)) {
- DroolsHandler.calculateIncludedServerDefinition(serverDefinition);
+ Bundle droolsBundle = Platform.getBundle("org.drools.eclipse"); //$NON-NLS-1$
+ if (droolsBundle != null) {
+ DroolsHandler.calculateIncludedServerDefinition(serverDefinition);
+ }
JbpmHandler.calculateIncludedServerDefinition(serverDefinition);
}
}
@@ -413,8 +417,11 @@
append(builder, includeSeam);
}
if (SOA_P.equals(type)) {
- String includeDrools = DroolsHandler.included(serverDefinition);
- append(builder, includeDrools);
+ Bundle droolsBundle = Platform.getBundle("org.drools.eclipse"); //$NON-NLS-1$
+ if (droolsBundle != null) {
+ String includeDrools = DroolsHandler.included(serverDefinition);
+ append(builder, includeDrools);
+ }
String includeJbpm = JbpmHandler.included(serverDefinition);
append(builder, includeJbpm);
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java 2011-05-25 18:37:46 UTC (rev 31484)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java 2011-05-25 18:44:30 UTC (rev 31485)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -11,6 +11,7 @@
package org.jboss.tools.runtime.core;
import java.io.File;
+import java.io.FileFilter;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -38,61 +39,76 @@
public List<ServerDefinition> searchForRuntimes(IPath path, IProgressMonitor monitor) {
List<ServerDefinition> serverDefinitions = new ArrayList<ServerDefinition>();
- Set<IRuntimeDetector> runtimeDetectors = RuntimeCoreActivator.getRuntimeDetectors();
- return searchForRuntimes(serverDefinitions, path, DEPTH, runtimeDetectors, monitor);
+ searchForRuntimes(serverDefinitions, path, monitor);
+ return serverDefinitions;
}
- private List<ServerDefinition> searchForRuntimes(List<ServerDefinition> serverDefinitions, IPath path,
- int depth, Set<IRuntimeDetector> runtimeDetectors, IProgressMonitor monitor) {
- if (monitor.isCanceled()) {
- return serverDefinitions;
- }
- File[] children = null;
+ private void searchForRuntimes(List<ServerDefinition> serverDefinitions, IPath path,
+ IProgressMonitor monitor) {
+ File[] files = null;
if (path != null) {
File root = path.toFile();
- monitor.setTaskName("Searching " + path.toOSString());
- ServerDefinition serverDefinition = null;
- for (IRuntimeDetector detector:runtimeDetectors) {
- if (monitor.isCanceled()) {
- return serverDefinitions;
- }
- if (!detector.isEnabled()) {
- continue;
- }
- serverDefinition = detector.getServerDefinition(root, monitor);
- if (serverDefinition != null) {
- serverDefinitions.add(serverDefinition);
- break;
- }
+ if (root.isDirectory())
+ files = new File[] { root };
+ else
+ return;
+ } else
+ files = File.listRoots();
+
+ if (files != null) {
+ int size = files.length;
+ int work = 100 / size;
+ int workLeft = 100 - (work * size);
+ for (int i = 0; i < size; i++) {
+ if (monitor.isCanceled())
+ return;
+ if (files[i] != null && files[i].isDirectory())
+ searchDirectory(files[i], serverDefinitions, DEPTH, monitor);
+ monitor.worked(work);
}
- if (serverDefinition == null) {
- children = root.listFiles();
- }
+ monitor.worked(workLeft);
} else {
- children = File.listRoots();
+ monitor.worked(100);
}
- if (monitor.isCanceled()) {
- return serverDefinitions;
+ }
+
+ private void searchDirectory(File directory, List<ServerDefinition> serverDefinitions,
+ int depth, IProgressMonitor monitor) {
+ if (depth == 0 || monitor.isCanceled() || directory == null || !directory.isDirectory()) {
+ return;
}
- if (depth == 0) {
- return serverDefinitions;
+
+ monitor.setTaskName("Searching " + directory.getAbsolutePath());
+
+ Set<IRuntimeDetector> runtimeDetectors = RuntimeCoreActivator.getRuntimeDetectors();
+ for (IRuntimeDetector detector:runtimeDetectors) {
+ if (monitor.isCanceled()) {
+ return;
+ }
+ if (!detector.isEnabled()) {
+ continue;
+ }
+ ServerDefinition serverDefinition = detector.getServerDefinition(directory, monitor);
+ if (serverDefinition != null) {
+ serverDefinitions.add(serverDefinition);
+ return;
+ }
}
- if( children != null ) {
- for( int i = 0; i < children.length; i++ ) {
- if (monitor.isCanceled()) {
- return serverDefinitions;
- }
- if( children[i].isDirectory()) {
- if (monitor.isCanceled()) {
- return serverDefinitions;
- }
- searchForRuntimes(serverDefinitions, new Path(children[i].getAbsolutePath()),
- --depth, runtimeDetectors, monitor);
- }
+
+ File[] files = directory.listFiles(new FileFilter() {
+ public boolean accept(File file) {
+ return file.isDirectory();
}
+ });
+ if (files != null) {
+ int size = files.length;
+ for (int i = 0; i < size; i++) {
+ if (monitor.isCanceled())
+ return;
+ searchDirectory(files[i], serverDefinitions, depth - 1, monitor);
+ }
}
- return serverDefinitions;
}
}
13 years, 1 month
JBoss Tools SVN: r31484 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-25 14:37:46 -0400 (Wed, 25 May 2011)
New Revision: 31484
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add org.hamcrest and org.hamcrest.core to M7 TPs (JBDS-1669)
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-05-25 18:34:26 UTC (rev 31483)
+++ trunk/build/target-platform/jbds.target 2011-05-25 18:37:46 UTC (rev 31484)
@@ -20,6 +20,8 @@
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<!-- CVS -->
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7LDT4FXJF"/>
@@ -166,4 +168,4 @@
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-25 18:34:26 UTC (rev 31483)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-25 18:37:46 UTC (rev 31484)
@@ -34,6 +34,8 @@
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.hamcrest" version=""/>
+<iu id="org.hamcrest.core" version=""/>
<iu id="org.eclipse.cvs.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-05-25 18:34:26 UTC (rev 31483)
+++ trunk/build/target-platform/multiple.target 2011-05-25 18:37:46 UTC (rev 31484)
@@ -47,6 +47,8 @@
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110429-1110"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
@@ -242,4 +244,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-25 18:34:26 UTC (rev 31483)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-25 18:37:46 UTC (rev 31484)
@@ -48,6 +48,8 @@
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.hamcrest" version=""/>
+<iu id="org.hamcrest.core" version=""/>
<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
<iu id="org.eclipse.emf.validation.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-05-25 18:34:26 UTC (rev 31483)
+++ trunk/build/target-platform/unified.target 2011-05-25 18:37:46 UTC (rev 31484)
@@ -47,6 +47,8 @@
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110429-1110"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
@@ -242,4 +244,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-25 18:34:26 UTC (rev 31483)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-25 18:37:46 UTC (rev 31484)
@@ -48,6 +48,8 @@
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.hamcrest" version=""/>
+<iu id="org.hamcrest.core" version=""/>
<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
<iu id="org.eclipse.emf.validation.feature.group" version=""/>
13 years, 1 month
JBoss Tools SVN: r31483 - in trunk: cdi/tests/org.jboss.tools.cdi.seam.config.ui.test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-25 14:34:26 -0400 (Wed, 25 May 2011)
New Revision: 31483
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/
trunk/common/plugins/org.jboss.tools.common.base.test/
Log:
added target to svn:ignore
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/common/plugins/org.jboss.tools.common.base.test
___________________________________________________________________
Added: svn:ignore
+ target
13 years, 1 month
JBoss Tools SVN: r31482 - trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-05-25 13:14:34 -0400 (Wed, 25 May 2011)
New Revision: 31482
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java
Log:
https://issues.jboss.org/browse/JBIDE-9003 Background image path not calculated when using image dialog from css property view
modified patch applied to trunk
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java 2011-05-25 16:51:44 UTC (rev 31481)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java 2011-05-25 17:14:34 UTC (rev 31482)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.css.dialog.tabs;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -19,6 +20,7 @@
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.resource.JFaceResources;
@@ -41,6 +43,9 @@
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.jboss.tools.jst.css.CSSPlugin;
@@ -59,6 +64,7 @@
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.util.Constants;
+
/**
* This is base tab control component that should be re-implemented by
* successor.
@@ -253,10 +259,18 @@
dialog.setInput(project);
if (dialog.open() == ImageSelectionDialog.OK) {
- IFile file = (IFile) dialog.getFirstResult();
- String value = file.getFullPath().toString();
- combo.add(value);
- combo.setText(value);
+ IFile imageFile = (IFile) dialog.getFirstResult();
+ IWorkbenchPage page = CSSPlugin.getDefault().getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ if (page != null
+ && page.getActiveEditor() != null
+ && page.getActiveEditor().getEditorInput() instanceof IFileEditorInput ) {
+ IEditorInput input = page.getActiveEditor().getEditorInput();
+ IFile pageFile = ((IFileEditorInput) input).getFile();
+ String relativePath = BaseTabControl.computeRelativePath(pageFile, imageFile);
+ combo.add(relativePath);
+ combo.setText(relativePath);
+ }
}
}
});
@@ -280,6 +294,31 @@
return wrapper;
}
+ /**
+ * Build a relative path to the given base path.
+ *
+ * @param base
+ * - the path used as the base
+ * @param path
+ * - the path to compute relative to the base path
+ * @return A relative path from base to path
+ */
+
+ private static String computeRelativePath(IFile baseFile, IFile otherFile) {
+
+ IPath basePath = baseFile.getLocation();
+ IPath otherPath = otherFile.getLocation();
+
+ String relativePath = otherPath.makeRelativeTo(basePath).toPortableString();
+
+ if (relativePath.startsWith("..")) {
+ relativePath = relativePath.replaceFirst("..", ".");
+ }
+
+ return relativePath;
+ }
+
+
protected Composite createWrapperComposite(Composite parent) {
Composite wrapper = new Composite(parent, SWT.None);
GridLayout layout = new GridLayout(COMPOSITE_NUM_COLUMNS, false);
13 years, 1 month
JBoss Tools SVN: r31481 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-25 12:51:44 -0400 (Wed, 25 May 2011)
New Revision: 31481
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
Log:
[JBIDE-9002] removed erroneous additional lookup in message properties (it is already looked up in the column class, no need for a 2nd lookup when creating the column widget
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-05-25 16:39:04 UTC (rev 31480)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-05-25 16:51:44 UTC (rev 31481)
@@ -48,7 +48,6 @@
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
-import org.jboss.tools.deltacloud.ui.views.CVMessages;
import org.jboss.tools.deltacloud.ui.views.Columns;
import org.jboss.tools.deltacloud.ui.views.Columns.Column;
import org.jboss.tools.deltacloud.ui.views.cloudelements.ITableContentAndLabelProvider;
@@ -307,7 +306,7 @@
if (i == 0) {
table.setSortColumn(tc);
}
- tc.setText(CVMessages.getString(c.getName()));
+ tc.setText(c.getName());
tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
tc.addSelectionListener(new ColumnListener(i, viewer));
}
13 years, 1 month
JBoss Tools SVN: r31480 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-25 12:39:04 -0400 (Wed, 25 May 2011)
New Revision: 31480
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
Log:
[JBIDE-8295] corrected preferences key which was pointing to "dont_confirm_create_instance" instead of "dont_confirm_stop_instance"
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2011-05-25 16:38:50 UTC (rev 31479)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2011-05-25 16:39:04 UTC (rev 31480)
@@ -121,7 +121,7 @@
CVMessages.getString("StopInstancesConfirm.title"),
CVMessages.getString("StopInstancesConfirm.msg"),
CVMessages.getString("StopInstancesConfirmDontWarn.msg"),
- IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE,
+ IDeltaCloudPreferenceConstants.DONT_CONFIRM_STOP_INSTANCE,
Activator.PLUGIN_ID,
WorkbenchUtils.getActiveShell());
}
13 years, 1 month
JBoss Tools SVN: r31479 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-25 12:38:50 -0400 (Wed, 25 May 2011)
New Revision: 31479
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
Log:
[JBIDE-8295] corrected preferences key which was pointing to "dont_confirm_create_instance" instead of "dont_confirm_stop_instance"
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2011-05-25 16:31:37 UTC (rev 31478)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2011-05-25 16:38:50 UTC (rev 31479)
@@ -37,8 +37,8 @@
*/
public class StopInstanceHandler extends AbstractInstanceHandler {
- private static final String DONT_CONFIRM_CREATE_INSTANCE = "dont_confirm_create_instance"; //$NON-NLS-1$
-
+ private static final String DONT_CONFIRM_STOP_INSTANCE = "dont_confirm_stop_instance"; //$NON-NLS-1$
+
private final static String STOPPING_INSTANCE_TITLE = "StoppingInstance.title"; //$NON-NLS-1$
private final static String STOPPING_INSTANCE_MSG = "StoppingInstance.msg"; //$NON-NLS-1$
private final static String STOP_INSTANCES_DIALOG_TITLE = "StopInstancesDialog.title"; //$NON-NLS-1$
@@ -122,7 +122,7 @@
CVMessages.getString("StopInstancesConfirm.title"),
CVMessages.getString("StopInstancesConfirm.msg"),
CVMessages.getString("StopInstancesConfirmDontWarn.msg"),
- DONT_CONFIRM_CREATE_INSTANCE,
+ DONT_CONFIRM_STOP_INSTANCE,
Activator.PLUGIN_ID,
WorkbenchUtils.getActiveShell());
}
13 years, 1 month
JBoss Tools SVN: r31478 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-25 12:31:37 -0400 (Wed, 25 May 2011)
New Revision: 31478
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
Log:
[JBIDE-9001] added update of command state if property change happens (was present already, was removed by mistake)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-05-25 16:31:33 UTC (rev 31477)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-05-25 16:31:37 UTC (rev 31478)
@@ -58,6 +58,7 @@
super.propertyChange(event);
if (DeltaCloud.PROP_INSTANCES.equals(event.getPropertyName())) {
updateFilteredLabel();
+ refreshToolbarCommandStates();
}
}
13 years, 1 month
JBoss Tools SVN: r31477 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-25 12:31:33 -0400 (Wed, 25 May 2011)
New Revision: 31477
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
Log:
[JBIDE-9001] added update of command state if property change happens (was present already, was removed by mistake)
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-05-25 15:55:20 UTC (rev 31476)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-05-25 16:31:33 UTC (rev 31477)
@@ -58,6 +58,7 @@
super.propertyChange(event);
if (DeltaCloud.PROP_INSTANCES.equals(event.getPropertyName())) {
updateFilteredLabel();
+ refreshToolbarCommandStates();
}
}
13 years, 1 month