JBoss Tools SVN: r27268 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 06:25:17 -0500 (Thu, 09 Dec 2010)
New Revision: 27268
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
Log:
bogus svn commit in eclipse destroyed this file, restoring it
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-12-09 11:12:36 UTC (rev 27267)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-12-09 11:25:17 UTC (rev 27268)
@@ -1,7 +1,26 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: DeltaCloud Core (Experimental)
-Bundle-SymbolicName: org.jboss.tools.deltacloud.as
+Bundle-SymbolicName: org.jboss.tools.deltacloud.core
Bundle-Version: 0.1.0.qualifier
+Bundle-Activator: org.jboss.tools.deltacloud.core.Activator
Bundle-Vendor: Red Hat Inc.
+Require-Bundle: org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime,
+ org.eclipse.equinox.security;bundle-version="[1.0.100,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: org.apache.http.client.methods;x-friends:="org.jboss.tools.deltacloud.test",
+ org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test",
+ org.jboss.tools.deltacloud.core.client;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.ui",
+ org.jboss.tools.deltacloud.core.client.request;x-friends:="org.jboss.tools.deltacloud.test"
+Bundle-ClassPath: .,
+ lib/apache-mime4j-0.6.jar,
+ lib/commons-codec-1.3.jar,
+ lib/commons-logging-1.1.1.jar,
+ lib/httpclient-4.0.1.jar,
+ lib/httpcore-4.0.1.jar,
+ lib/httpcore-nio-4.0.1.jar,
+ lib/httpmime-4.0.1.jar,
+ lib/log4j-1.2.14.jar,
+ lib/deltacloudclient-1.0.jar
14 years
JBoss Tools SVN: r27267 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 06:12:36 -0500 (Thu, 09 Dec 2010)
New Revision: 27267
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java
trunk/deltacloud/plugins/pom.xml
Log:
initial commit: new empty as integration plugin
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2010-12-09 11:10:04 UTC (rev 27266)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2010-12-09 11:12:36 UTC (rev 27267)
@@ -77,6 +77,7 @@
public void run() {
try {
Object[] elements = filter(getFilter(currentCloud), cloudElements);
+// viewer.getTable().clearAll();
viewer.add(elements);
} catch (DeltaCloudException e) {
// TODO: internationalize strings
Modified: trunk/deltacloud/plugins/pom.xml
===================================================================
--- trunk/deltacloud/plugins/pom.xml 2010-12-09 11:10:04 UTC (rev 27266)
+++ trunk/deltacloud/plugins/pom.xml 2010-12-09 11:12:36 UTC (rev 27267)
@@ -3,12 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.deltacloud</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<name>deltacloud.plugins</name>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.deltacloud.ui</module>
<module>org.jboss.tools.deltacloud.core</module>
+ <module>org.jboss.tools.deltacloud.as</module>
<module>org.jboss.tools.deltacloud.docs</module>
</modules>
</project>
14 years
JBoss Tools SVN: r27266 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 06:10:04 -0500 (Thu, 09 Dec 2010)
New Revision: 27266
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
Log:
initial commit: new empty as integration plugin for deltacloud
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-12-09 11:08:53 UTC (rev 27265)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-12-09 11:10:04 UTC (rev 27266)
@@ -1,27 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: DeltaCloud Core (Experimental)
-Bundle-SymbolicName: org.jboss.tools.deltacloud.core
+Bundle-SymbolicName: org.jboss.tools.deltacloud.as
Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.jboss.tools.deltacloud.core.Activator
Bundle-Vendor: Red Hat Inc.
-Require-Bundle: org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.equinox.security;bundle-version="[1.0.100,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Export-Package: org.apache.http.client.methods;x-friends:="org.jboss.tools.deltacloud.test",
- org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test",
- org.jboss.tools.deltacloud.core.client;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.ui",
- org.jboss.tools.deltacloud.core.client.request;x-friends:="org.jboss.tools.deltacloud.test",
- org.jboss.tools.deltacloud.core.job
-Bundle-ClassPath: .,
- lib/apache-mime4j-0.6.jar,
- lib/commons-codec-1.3.jar,
- lib/commons-logging-1.1.1.jar,
- lib/httpclient-4.0.1.jar,
- lib/httpcore-4.0.1.jar,
- lib/httpcore-nio-4.0.1.jar,
- lib/httpmime-4.0.1.jar,
- lib/log4j-1.2.14.jar,
- lib/deltacloudclient-1.0.jar
14 years
JBoss Tools SVN: r27265 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as: src and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 06:08:53 -0500 (Thu, 09 Dec 2010)
New Revision: 27265
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/.project
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/about.html
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/build.properties
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/pom.xml
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/src/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/src/org/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/src/org/jboss/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/src/org/jboss/tools/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/src/org/jboss/tools/deltacloud/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/src/org/jboss/tools/deltacloud/as/
Log:
initial commit: new empty as integration plugin for deltacloud
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/.project
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/.project (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/.project 2010-12-09 11:08:53 UTC (rev 27265)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.deltacloud.as</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/ChangeLog (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/ChangeLog 2010-12-09 11:08:53 UTC (rev 27265)
@@ -0,0 +1,3 @@
+2010-12-09 André Dietisheim <adietish(a)redhat.com>
+
+ * create new empty plugin
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/about.html
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/about.html (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/about.html 2010-12-09 11:08:53 UTC (rev 27265)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Cloud Development Tools</title>
+<style type="text/css" media="screen">
+<!--
+ body {
+ font-family: Sans-serif, Arial, Helvetica;
+ }
+
+-->
+</style>
+</head>
+<body>
+<h1>Cloud Development Tools</h1>
+
+<p>
+This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
+</p>
+
+<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
+
+<p>
+This software is distributed under the terms of the Eclipse Public License - v 1.0
+(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>).
+</p>
+</body>
+</html>
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/about.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/build.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/build.properties (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/build.properties 2010-12-09 11:08:53 UTC (rev 27265)
@@ -0,0 +1,20 @@
+source.. = src/,\
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ lib/apache-mime4j-0.6.jar,\
+ lib/commons-codec-1.3.jar,\
+ lib/commons-logging-1.1.1.jar,\
+ lib/httpclient-4.0.1.jar,\
+ lib/httpcore-4.0.1.jar,\
+ lib/httpcore-nio-4.0.1.jar,\
+ lib/httpmime-4.0.1.jar,\
+ lib/log4j-1.2.14.jar,\
+ about.html,\
+ pom.xml,\
+ src/,\
+ .settings/,\
+ .project
+src.includes = bin/,\
+ lib/,\
+ pom.xml
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/pom.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/pom.xml (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/pom.xml 2010-12-09 11:08:53 UTC (rev 27265)
@@ -0,0 +1,13 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.deltacloud.plugins</groupId>
+ <artifactId>org.jboss.tools.deltacloud.as</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years
JBoss Tools SVN: r27263 - in trunk/ws/tests/org.jboss.tools.ws.creation.core.test: projects/JavaFirstTestProject/build/classes and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-12-09 05:03:02 -0500 (Thu, 09 Dec 2010)
New Revision: 27263
Removed:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/build/classes/org/
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JavaFirstTestProject/build/classes/org/
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
Log:
JBIDE-6581: modify thes ws tests
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2010-12-09 09:09:15 UTC (rev 27262)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2010-12-09 10:03:02 UTC (rev 27263)
@@ -8,6 +8,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
@@ -92,7 +93,11 @@
IServerWorkingCopy serverWC = currentServer.createWorkingCopy();
serverWC.modifyModules(modules, null, null);
serverWC.save(true, null).publish(0, null);
- currentServer.publish(IServer.PUBLISH_FULL, null);
+ IStatus status = currentServer.publish(IServer.PUBLISH_FULL, null);
+ int i = 0;
+ while(!status.isOK() && i++ <30){
+ JobUtils.delay(500);
+ }
}
private boolean isServerSupplied() {
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-12-09 09:09:15 UTC (rev 27262)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-12-09 10:03:02 UTC (rev 27263)
@@ -43,18 +43,15 @@
try {
JobUtils.delay(500);
try {
- System.out.println("Deleting " + prj);
prj.delete(true, null);
JobUtils.delay(500);
} catch (Exception e) {
- System.out.println("Error deleting " + prj);
e.printStackTrace();
last = e;
}
} finally {
ResourcesUtils.setBuildAutomatically(oldAutoBuilding);
}
-
if (last != null)
throw last;
super.tearDown();
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2010-12-09 09:09:15 UTC (rev 27262)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2010-12-09 10:03:02 UTC (rev 27263)
@@ -77,10 +77,8 @@
project.refreshLocal(IResource.DEPTH_INFINITE, null);
project.build(IncrementalProjectBuilder.FULL_BUILD, null);
- publishWebProject();
- assertTrue(currentServer.getModules().length > 0);
startup(currentServer);
- JobUtils.delay(12000);
+ publishWebProject();
String webServiceUrl = "http://127.0.0.1:8080/JavaFirstTestProject/HelloWorld?wsdl";
URL url = new URL(webServiceUrl);
URLConnection conn = url.openConnection();
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java 2010-12-09 09:09:15 UTC (rev 27262)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java 2010-12-09 10:03:02 UTC (rev 27263)
@@ -44,11 +44,9 @@
try {
JobUtils.delay(500);
try {
- System.out.println("Deleting " + prj);
prj.delete(true, null);
JobUtils.delay(500);
} catch (Exception e) {
- System.out.println("Error deleting " + prj);
e.printStackTrace();
last = e;
}
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-12-09 09:09:15 UTC (rev 27262)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-12-09 10:03:02 UTC (rev 27263)
@@ -63,9 +63,8 @@
fproject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
fproject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
- publishWebProject();
startup(currentServer);
- JobUtils.delay(12000);
+ publishWebProject();
assertTrue(currentServer.getModules().length > 0);
String webServiceUrl = "http://127.0.0.1:8080/JBossWSTestProject/Greeter?wsdl";
URL url = new URL(webServiceUrl);
14 years
JBoss Tools SVN: r27262 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 04:09:15 -0500 (Thu, 09 Dec 2010)
New Revision: 27262
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
Log:
[JBIDE-7849] only change selected cloud if a new cloud has been selected
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-09 09:09:00 UTC (rev 27261)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-09 09:09:15 UTC (rev 27262)
@@ -1,3 +1,8 @@
+2010-12-09 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java (.selectionChanged):
+ [JBIDE-7849] only change selected cloud if a new cloud has been selected
+
2010-12-08 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
14 years
JBoss Tools SVN: r27261 - 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: 2010-12-09 04:09:00 -0500 (Thu, 09 Dec 2010)
New Revision: 27261
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
Log:
[JBIDE-7849] only change selected cloud if a new cloud has been selected
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2010-12-09 09:06:45 UTC (rev 27260)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2010-12-09 09:09:00 UTC (rev 27261)
@@ -49,7 +49,6 @@
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
-import org.jboss.tools.deltacloud.ui.views.cloud.DeltaCloudView;
import org.jboss.tools.internal.deltacloud.ui.preferences.TextPreferenceValue;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
@@ -88,8 +87,9 @@
return;
}
- AbstractCloudElementTableView.this.currentCloud = getCurrentCloud(index, getClouds());
- if (currentCloud != null) {
+ DeltaCloud newSelectedCloud = getCloud(index, getClouds());
+ if (isNewCloud(newSelectedCloud)) {
+ currentCloud = newSelectedCloud;
lastSelectedCloudPref.store(currentCloud.getName());
Display.getCurrent().asyncExec(new Runnable() {
@@ -106,16 +106,20 @@
@Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- if (DeltaCloudView.class.equals(part.getClass())) {
- // we want to listen to selection changes in the deltacloud view only
- DeltaCloud cloud = UIUtils.getFirstAdaptedElement(selection, DeltaCloud.class);
- if (cloud != null) {
- currentCloudSelector.select(getCloudIndex(cloud, getClouds()));
- }
+ // we want to listen to selection changes in the deltacloud view
+ // only
+ DeltaCloud cloud = UIUtils.getFirstAdaptedElement(selection, DeltaCloud.class);
+ if (isNewCloud(cloud)) {
+ currentCloudSelector.select(getCloudIndex(cloud, getClouds()));
}
}
};
+ private boolean isNewCloud(DeltaCloud cloud) {
+ return currentCloud == null
+ || !currentCloud.equals(cloud);
+ }
+
public AbstractCloudElementTableView() {
lastSelectedCloudPref = new TextPreferenceValue(getSelectedCloudPrefsKey(), Activator.getDefault());
}
@@ -171,7 +175,7 @@
Composite tableArea = new Composite(container, SWT.NULL);
viewer = createTableViewer(tableArea);
- currentCloud = getCurrentCloud(currentCloudSelector.getSelectionIndex(), clouds);
+ currentCloud = getCloud(currentCloudSelector.getSelectionIndex(), clouds);
setViewerInput(currentCloud);
setFilterLabelVisible(currentCloud, filterLabel);
@@ -289,7 +293,7 @@
filterLabel.setVisible(!filter.toString().equals(IInstanceFilter.ALL_STRING));
}
- private DeltaCloud getCurrentCloud(int cloudIndex, DeltaCloud[] clouds) {
+ private DeltaCloud getCloud(int cloudIndex, DeltaCloud[] clouds) {
if (cloudIndex < 0 || cloudIndex >= clouds.length) {
return null;
}
@@ -355,7 +359,7 @@
String[] cloudNames = toCloudNames(clouds);
setCloudSelectorItems(cloudNames, currentCloudSelector);
- this.currentCloud = getCurrentCloud(index, clouds);
+ this.currentCloud = getCloud(index, clouds);
if (cloudNames.length > 0) {
currentCloudSelector.setText(cloudNames[index]);
14 years
JBoss Tools SVN: r27260 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 04:06:45 -0500 (Thu, 09 Dec 2010)
New Revision: 27260
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
added simple toString to facilitate debugging
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-09 09:01:29 UTC (rev 27259)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-09 09:06:45 UTC (rev 27260)
@@ -597,4 +597,8 @@
public void dispose() throws DeltaCloudException {
passwordStore.remove();
}
+
+ public String toString() {
+ return name;
+ }
}
14 years
JBoss Tools SVN: r27259 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 04:01:29 -0500 (Thu, 09 Dec 2010)
New Revision: 27259
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
Log:
[JBIDE-7849] removed shadowing instance variable to DeltaCloud
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-12-09 02:51:57 UTC (rev 27258)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-12-09 09:01:29 UTC (rev 27259)
@@ -1,3 +1,8 @@
+2010-12-09 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java:
+ [JBIDE-7849] removed shadowing instance variable to DeltaCloud
+
2010-12-08 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/job/AbstractCloudElementJob.java:
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-12-09 02:51:57 UTC (rev 27258)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-12-09 09:01:29 UTC (rev 27259)
@@ -25,17 +25,12 @@
public class DeltaCloudImage extends AbstractDeltaCloudElement {
private Image image;
- private DeltaCloud deltaCloud;
public DeltaCloudImage(Image image, DeltaCloud deltaCloud) {
super(deltaCloud);
this.image = image;
}
- public DeltaCloud getDeltaCloud() {
- return deltaCloud;
- }
-
public String getName() {
return image.getName();
}
14 years