Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Coulon2015-12-01 13:52:27 +0000
committerJeff Johnston2015-12-03 00:46:00 +0000
commit7726582fa9334be4113f4f31f78986150672d114 (patch)
tree0b5e347755fb4deeef874e61233b7c21971b4917 /containers/org.eclipse.linuxtools.docker.core/src/org/eclipse
parentd7cedd4b8a0f3a894ebcdb8ef07dc3138e922ece (diff)
downloadorg.eclipse.linuxtools-7726582fa9334be4113f4f31f78986150672d114.tar.gz
org.eclipse.linuxtools-7726582fa9334be4113f4f31f78986150672d114.tar.xz
org.eclipse.linuxtools-7726582fa9334be4113f4f31f78986150672d114.zip
Remove previously added methods in public API
Method implementations are kept but not exposed in the API which is a violation of the minor release contract. These methods will be added back in the API in the next major release. Change-Id: Icd0692bfc89ce48c515efacc75249c73b79d4274 Signed-off-by: Xavier Coulon <xcoulon@redhat.com> Reviewed-on: https://git.eclipse.org/r/61650 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> (cherry picked from commit d23cf77228fd43b41f912c766b31623565ecd06c) Reviewed-on: https://git.eclipse.org/r/61836
Diffstat (limited to 'containers/org.eclipse.linuxtools.docker.core/src/org/eclipse')
-rw-r--r--containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java23
-rw-r--r--containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainer.java16
-rw-r--r--containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java19
-rw-r--r--containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java16
4 files changed, 32 insertions, 42 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java
index 4af2dee9e0..7be3d641fb 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java
@@ -13,7 +13,6 @@ package org.eclipse.linuxtools.docker.core;
import java.io.OutputStream;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import org.eclipse.core.runtime.IPath;
import org.eclipse.linuxtools.internal.docker.core.DockerContainerRefreshManager;
@@ -212,28 +211,6 @@ public interface IDockerConnection {
String createContainer(IDockerContainerConfig c, IDockerHostConfig hc)
throws DockerException, InterruptedException;
- /**
- * Builds an {@link IDockerImage}
- *
- * @param path
- * path to the build context
- * @param name
- * optional name and tag of the image to build
- * @param handler
- * progress handler
- * @param buildOptions
- * build options
- * @return the id of the {@link IDockerImage} that was build
- * @throws DockerException
- * if building image failed
- * @throws InterruptedException
- * if the thread was interrupted
- */
- String buildImage(final IPath path, final String name,
- final IDockerProgressHandler handler,
- final Map<String, Object> buildOptions)
- throws DockerException, InterruptedException;
-
public String createContainer(final IDockerContainerConfig config,
final IDockerHostConfig hc, final String containerName)
throws DockerException, InterruptedException;
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainer.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainer.java
index a38e7ab73e..0da63c4b22 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainer.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainer.java
@@ -49,12 +49,6 @@ public interface IDockerContainer {
public IDockerConnection getConnection();
/**
- * @return <code>true</code> if the {@link IDockerContainerInfo} has been
- * loaded, <code>false</code> otherwise.
- */
- public boolean isInfoLoaded();
-
- /**
* @return the {@link IDockerContainerInfo} by calling the Docker daemon
* using the {@link IDockerConnection} associated with this
* {@link IDockerContainer} if it was not loaded before, otherwise
@@ -62,15 +56,5 @@ public interface IDockerContainer {
*/
public IDockerContainerInfo info();
- /**
- * @param force
- * <code>true</code> to force refresh, <code>false</code> to use
- * existing {@link IDockerContainerInfo} if it was loaded before.
- * @return the {@link IDockerContainerInfo} by calling the Docker daemon
- * using the {@link IDockerConnection} associated with this
- * {@link IDockerContainer}.
- */
- public IDockerContainerInfo info(boolean force);
-
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
index 226e07fae3..52ace62931 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
@@ -852,7 +852,24 @@ public class DockerConnection implements IDockerConnection, Closeable {
}
}
- @Override
+ /**
+ * Builds an {@link IDockerImage}
+ *
+ * @param path
+ * path to the build context
+ * @param name
+ * optional name and tag of the image to build
+ * @param handler
+ * progress handler
+ * @param buildOptions
+ * build options
+ * @return the id of the {@link IDockerImage} that was build
+ * @throws DockerException
+ * if building image failed
+ * @throws InterruptedException
+ * if the thread was interrupted
+ */
+ // TODO: add this method in the public interface
public String buildImage(final IPath path, final String name,
final IDockerProgressHandler handler,
final Map<String, Object> buildOptions)
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java
index 5f3728e6dd..48f2397b39 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java
@@ -123,7 +123,15 @@ public class DockerContainer implements IDockerContainer {
return info(false);
}
- @Override
+ /**
+ * @param force
+ * <code>true</code> to force refresh, <code>false</code> to use
+ * existing {@link IDockerContainerInfo} if it was loaded before.
+ * @return the {@link IDockerContainerInfo} by calling the Docker daemon
+ * using the {@link IDockerConnection} associated with this
+ * {@link IDockerContainer}.
+ */
+ // TODO: add this method in the public interface
public IDockerContainerInfo info(final boolean force) {
if (force || isInfoLoaded()) {
this.containerInfo = this.parent.getContainerInfo(id);
@@ -131,7 +139,11 @@ public class DockerContainer implements IDockerContainer {
return this.containerInfo;
}
- @Override
+ /**
+ * @return <code>true</code> if the {@link IDockerContainerInfo} has been
+ * loaded, <code>false</code> otherwise.
+ */
+ // TODO: add this method in the public interface
public boolean isInfoLoaded() {
return this.containerInfo != null;
}

Back to the top