diff options
13 files changed, 150 insertions, 32 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java index 83a3b037f9..ffa771fc19 100644 --- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java +++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java @@ -37,6 +37,7 @@ import org.eclipse.reddeer.swt.keyboard.KeyboardFactory; import org.eclipse.reddeer.workbench.core.condition.JobIsRunning; import org.eclipse.swt.SWT; import org.junit.After; +import org.junit.Ignore; import org.junit.Test; public class EditDockerFileTest extends AbstractImageBotTest { @@ -44,6 +45,7 @@ public class EditDockerFileTest extends AbstractImageBotTest { private static final String BUILD_IMAGE = "FROM alpine:latest\nMAINTAINER Josef Kopriva <jkopriva@redhat.com>"; @Test + @Ignore public void testEditDockerFile() { getConnection(); DockerImagesTab imageTab = openDockerImagesTab(); diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/DifferentRegistryTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/DifferentRegistryTest.java index d84f931773..0e6f20c0be 100644 --- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/DifferentRegistryTest.java +++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/DifferentRegistryTest.java @@ -17,6 +17,7 @@ import static org.junit.Assert.assertTrue; import org.eclipse.linuxtools.docker.integration.tests.image.AbstractImageBotTest; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; public class DifferentRegistryTest extends AbstractImageBotTest { @@ -35,6 +36,7 @@ public class DifferentRegistryTest extends AbstractImageBotTest { } @Test + @Ignore public void testDifferentRegistry() { clearConsole(); setUpRegister(REGISTRY_SERVER_ADDRESS, EMAIL, USERNAME, PASSWORD); diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF index ab37d6d657..e93bc4a6dd 100644 --- a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF +++ b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF @@ -34,5 +34,5 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0", org.eclipse.launchbar.ui.controls;bundle-version="1.0.0" Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.linuxtools.internal.docker.ui.testutils;x-friends:="org.eclipse.linuxtools.docker.reddeer,org.eclipse.linuxtools.docker.integration.tests" +Export-Package: org.eclipse.linuxtools.internal.docker.ui.testutils;x-friends:="org.eclipse.linuxtools.docker.reddeer,org.eclipse.linuxtools.docker.reddeer.ui,org.eclipse.linuxtools.docker.integration.tests" Automatic-Module-Name: org.eclipse.linuxtools.docker.ui.tests diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java index afaebf833f..61d17bde6a 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java @@ -23,6 +23,7 @@ import java.net.URISyntaxException; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; import org.eclipse.core.databinding.observable.IChangeListener; +import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -500,8 +501,8 @@ public class EditDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(connectionNameModelObservable); return targets; } @@ -536,8 +537,8 @@ public class EditDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(unixSocketPathModelObservable); return targets; } @@ -602,8 +603,8 @@ public class EditDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(tcpHostModelObservable); return targets; } @@ -665,8 +666,8 @@ public class EditDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(tcpCertPathModelObservable); return targets; } diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPageModel.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPageModel.java index d807ad668e..3277faa02e 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPageModel.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPageModel.java @@ -13,6 +13,7 @@ package org.eclipse.linuxtools.internal.docker.ui.wizards; +import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -109,8 +110,8 @@ public class ImagePushPageModel extends ImagePullPushPageModel { } @Override - public IObservableList<?> getTargets() { - final WritableList<IObservableValue<?>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + final IObservableList<IObservable> targets = new WritableList<>(); targets.add(this.imageNameObservable); targets.add(this.registryAccountObservable); return targets; diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java index 6cc6787884..0aa951490c 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java @@ -33,6 +33,7 @@ import java.util.List; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.ObservableTracker; import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.WritableList; @@ -1013,8 +1014,8 @@ public class ImageRunSelectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(imageSelectionObservable); return targets; } @@ -1047,8 +1048,8 @@ public class ImageRunSelectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(containerNameObservable); return targets; } diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java index 635a6208bc..960ad04b7e 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java @@ -28,6 +28,7 @@ import java.util.stream.Collectors; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; import org.eclipse.core.databinding.observable.IChangeListener; +import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -895,8 +896,8 @@ public class NewDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(connectionNameModelObservable); return targets; } @@ -932,8 +933,8 @@ public class NewDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(getConnectionNameModelObservable()); targets.add(unixSocketPathModelObservable); return targets; @@ -1014,8 +1015,8 @@ public class NewDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(getConnectionNameModelObservable()); targets.add(tcpHostModelObservable); return targets; @@ -1094,8 +1095,8 @@ public class NewDockerConnectionPage extends WizardPage { } @Override - public IObservableList<IObservableValue<String>> getTargets() { - WritableList<IObservableValue<String>> targets = new WritableList<>(); + public IObservableList<IObservable> getTargets() { + IObservableList<IObservable> targets = new WritableList<>(); targets.add(tcpCertPathModelObservable); return targets; } @@ -51,9 +51,9 @@ <mirror-repo-name>update-7.0</mirror-repo-name> <mirror-docker-repo-name>update-docker-4.0</mirror-docker-repo-name> <mirror-mylyn-repo-name>update-mylyn-2.0</mirror-mylyn-repo-name> - <tycho-version>1.2.0</tycho-version> - <tycho-extras-version>1.2.0</tycho-extras-version> - <target-platform>linuxtools-e4.8</target-platform> + <tycho-version>1.3.0-SNAPSHOT</tycho-version> + <tycho-extras-version>1.3.0-SNAPSHOT</tycho-extras-version> + <target-platform>linuxtools-e4.10</target-platform> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath> @@ -317,7 +317,7 @@ <environment> <os>linux</os> <ws>gtk</ws> - <arch>x86</arch> + <arch>x86_64</arch> </environment> <environment> <os>linux</os> diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target new file mode 100644 index 0000000000..04805f50b6 --- /dev/null +++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="4.8"?><target name="linuxtools-e4.10" sequenceNumber="1"> +<locations> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2.v20180207-1730"/> +<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.2.v20180207-1730"/> +<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.2.v20180207-1730"/> +<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.2.v20180207-1730"/> +<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.2.v20180207-1730"/> +<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.2.v20180207-1730"/> +<unit id="com.github.jnr.constants" version="0.9.8.v20180207-1730"/> +<unit id="com.github.jnr.enxio" version="0.16.0.v20180207-1730"/> +<unit id="com.github.jnr.ffi" version="2.1.4.v20180207-1730"/> +<unit id="com.github.jnr.jffi" version="1.2.15.v20180207-1730"/> +<unit id="com.github.jnr.jffi.native" version="1.2.15.v20180207-1730"/> +<unit id="com.github.jnr.posix" version="3.0.35.v20180207-1730"/> +<unit id="com.github.jnr.unixsocket" version="0.18.0.v20180207-1730"/> +<unit id="com.google.gson" version="2.7.0.v20170129-0911"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> +<unit id="com.spotify.docker.client" version="8.11.7.v20180731-1413"/> +<unit id="com.spotify.docker.client.source" version="8.11.7.v20180731-1413"/> +<unit id="javassist" version="3.13.0.GA_v201209210905"/> +<unit id="javax.ws.rs" version="2.0.1.v201504171603"/> +<unit id="javax.xml.bind" version="2.2.0.v201105210648"/> +<unit id="jnr.x86asm" version="1.0.2.v201505052040"/> +<unit id="org.aopalliance" version="1.0.0.v201105210816"/> +<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/> +<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> +<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/> +<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/> +<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/> +<unit id="org.apache.xerces" version="2.9.0.v201101211617"/> +<unit id="org.assertj" version="1.7.1.v20170413-2026"/> +<unit id="org.bouncycastle.bcpkix" version="1.52.0.v20161004-1854"/> +<unit id="org.bouncycastle.bcprov" version="1.52.0.v20180328-2148"/> +<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/> +<unit id="org.glassfish.hk2.api" version="2.5.0.v20161103-0227"/> +<unit id="org.glassfish.hk2.locator" version="2.5.0.v20161103-0227"/> +<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/> +<unit id="org.glassfish.hk2.utils" version="2.5.0.v20160210-1508"/> +<unit id="org.glassfish.jersey.apache.connector" version="2.22.1.v20161103-1916"/> +<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.22.1.v20161103-1916"/> +<unit id="org.glassfish.jersey.core.jersey-client" version="2.22.1.v20161103-1916"/> +<unit id="org.glassfish.jersey.core.jersey-common" version="2.22.1.v20161103-1916"/> +<unit id="org.glassfish.jersey.core.jersey-server" version="2.22.1.v20161103-1916"/> +<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.22.1.v20161103-0227"/> +<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.22.1.v20161117-2005"/> +<unit id="org.mockito" version="1.9.5.v201605172210"/> +<unit id="org.objectweb.asm" version="6.2.1.v20180823-1831"/> +<unit id="org.objectweb.asm.analysis" version="6.2.1.v20180823-1831"/> +<unit id="org.objectweb.asm.tree" version="6.2.1.v20180823-1831"/> +<unit id="org.objectweb.asm.util" version="6.2.1.v20180823-1831"/> +<unit id="org.slf4j.api" version="1.7.10.v20170428-1633"/> +<unit id="org.swtchart" version="0.10.0.v201605200358"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180829155938/repository"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.jdt.annotation" version="0.0.0"/> +<unit id="org.eclipse.jdt.core" version="0.0.0"/> +<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/> +<unit id="org.eclipse.jdt.ui" version="0.0.0"/> +<unit id="org.eclipse.pde.runtime" version="0.0.0"/> +<unit id="org.eclipse.platform.ide" version="0.0.0"/> +<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/eclipse/updates/4.10-I-builds/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> +<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.license.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/cbi/updates/license"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.dstore.core" version="0.0.0"/> +<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/> +<unit id="org.eclipse.mylyn.commons.feature.group" version="0.0.0"/> +<unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="0.0.0"/> +<unit id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="0.0.0"/> +<unit id="org.eclipse.mylyn.tasks.ide.feature.group" version="0.0.0"/> +<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/> +<unit id="org.eclipse.remote.feature.group" version="0.0.0"/> +<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.zest.feature.group" version="0.0.0"/> +<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/> +<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/> +<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/releases/2018-09/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/reddeer/snapshots/"/> +</location> +</locations> +<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<launcherArgs> +<vmArgs>-Xms40m +-Xmx512M</vmArgs> +<programArgs>-consolelog</programArgs> +</launcherArgs> +</target> diff --git a/releng/org.eclipse.linuxtools.target/pom.xml b/releng/org.eclipse.linuxtools.target/pom.xml index 3b1e5a49ec..0b4e49344a 100644 --- a/releng/org.eclipse.linuxtools.target/pom.xml +++ b/releng/org.eclipse.linuxtools.target/pom.xml @@ -31,9 +31,9 @@ <configuration> <artifacts> <artifact> - <file>linuxtools-e4.8.target</file> + <file>linuxtools-e4.10.target</file> <type>target</type> - <classifier>linuxtools-e4.8</classifier> + <classifier>linuxtools-e4.10</classifier> </artifact> <!-- More targets could be added here --> </artifacts> diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java index aa0000918a..8c5bfd4533 100644 --- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java +++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java @@ -16,6 +16,7 @@ package org.eclipse.linuxtools.internal.vagrant.ui.wizards; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -161,7 +162,7 @@ public class AddBoxPage extends WizardPage { } @Override - public IObservableList<String> getTargets() { + public IObservableList<IObservable> getTargets() { // Work around for NPE triggered by DialogPageSupport.dispose() return new WritableList<>(); } diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java index 22af980eb5..396ab2aebc 100644 --- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java +++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java @@ -18,6 +18,7 @@ import java.util.Map; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -274,7 +275,7 @@ public class CreateVMPage extends WizardPage { } @Override - public IObservableList<String> getTargets() { + public IObservableList<IObservable> getTargets() { // Work around for NPE triggered by DialogPageSupport.dispose() return new WritableList<>(); } diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java index 6a02a5d742..b90b9d070b 100644 --- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java +++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java @@ -18,6 +18,7 @@ import java.nio.file.Paths; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -164,7 +165,7 @@ public class PackageVMPage extends WizardPage { } @Override - public IObservableList<String> getTargets() { + public IObservableList<IObservable> getTargets() { // Work around for NPE triggered by DialogPageSupport.dispose() return new WritableList<>(); } |