Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/plugin.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/GraphicalInstallAdvisor.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java (renamed from bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java)18
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java (renamed from bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallAdvisor.java (renamed from bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallAdvisor.java)14
6 files changed, 22 insertions, 24 deletions
diff --git a/bundles/org.eclipse.equinox.p2.installer/plugin.xml b/bundles/org.eclipse.equinox.p2.installer/plugin.xml
index a0ac59065..f8d2beea2 100644
--- a/bundles/org.eclipse.equinox.p2.installer/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.installer/plugin.xml
@@ -7,7 +7,7 @@
point="org.eclipse.core.runtime.applications">
<application>
<run
- class="org.eclipse.equinox.p2.installer.InstallApplication">
+ class="org.eclipse.equinox.internal.p2.installer.InstallApplication">
</run>
</application>
</extension>
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/GraphicalInstallAdvisor.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/GraphicalInstallAdvisor.java
index ee2de82bf..6e68c0c36 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/GraphicalInstallAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/GraphicalInstallAdvisor.java
@@ -11,7 +11,7 @@
package org.eclipse.equinox.internal.p2.installer;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.p2.installer.IInstallAdvisor;
+import org.eclipse.equinox.p2.installer.InstallAdvisor;
import org.eclipse.equinox.p2.installer.IInstallDescription;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Shell;
/**
* Install context that creates a GUI and interacts with a user.
*/
-public class GraphicalInstallAdvisor implements IInstallAdvisor {
+public class GraphicalInstallAdvisor extends InstallAdvisor {
private ProgressMonitorDialog window;
private boolean stopped = false;
private boolean started = false;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
index 396e68933..9f5e11a34 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
@@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.p2.core.helpers.LogHelper;
-import org.eclipse.equinox.p2.installer.IInstallAdvisor;
+import org.eclipse.equinox.p2.installer.InstallAdvisor;
import org.eclipse.equinox.p2.installer.IInstallDescription;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -23,7 +23,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
/**
* A headless install advisor that prints everything to a log.
*/
-public class HeadlessInstallAdvisor implements IInstallAdvisor {
+public class HeadlessInstallAdvisor extends InstallAdvisor {
class HeadlessProgressMonitor implements IProgressMonitor {
private boolean canceled;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java
index 66d3fcfee..270d615eb 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.p2.installer;
+package org.eclipse.equinox.internal.p2.installer;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -22,11 +22,9 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.equinox.internal.p2.installer.GraphicalInstallAdvisor;
-import org.eclipse.equinox.internal.p2.installer.InstallDescription;
-import org.eclipse.equinox.internal.p2.installer.InstallDescriptionParser;
-import org.eclipse.equinox.internal.p2.installer.InstallerActivator;
import org.eclipse.equinox.p2.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.installer.IInstallDescription;
+import org.eclipse.equinox.p2.installer.InstallAdvisor;
/**
* This is a simple installer application built using P2. The application must be given
@@ -45,12 +43,12 @@ public class InstallApplication implements IApplication {
* A property whose value is the URL of an install description. An install description is a file
* that contains all the information required to complete the install.
*/
- private static final String SYS_PROP_INSTALL_DESCRIPTION = "org.eclipse.equinox.p2.installDescription";
+ private static final String SYS_PROP_INSTALL_DESCRIPTION = "org.eclipse.equinox.p2.installDescription"; //$NON-NLS-1$
/**
* The install advisor. This field is non null while the install application is running.
*/
- private IInstallAdvisor advisor;
+ private InstallAdvisor advisor;
/**
* Throws an exception of severity error with the given error message.
@@ -81,9 +79,9 @@ public class InstallApplication implements IApplication {
return description;
}
- private IInstallAdvisor createInstallContext() {
+ private InstallAdvisor createInstallContext() {
//TODO create an appropriate advisor depending on whether headless or GUI install is desired.
- IInstallAdvisor result = new GraphicalInstallAdvisor();
+ InstallAdvisor result = new GraphicalInstallAdvisor();
result.start();
return result;
}
@@ -184,7 +182,7 @@ public class InstallApplication implements IApplication {
*/
public void stop() {
//note this method can be called from another thread
- IInstallAdvisor tempContext = advisor;
+ InstallAdvisor tempContext = advisor;
if (tempContext != null) {
tempContext.stop();
advisor = null;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
index a8e83d661..4ceb765a1 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.p2.installer;
+package org.eclipse.equinox.internal.p2.installer;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -26,12 +26,12 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.equinox.internal.p2.installer.InstallerActivator;
import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager;
import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.p2.director.IDirector;
import org.eclipse.equinox.p2.engine.IProfileRegistry;
import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.installer.IInstallDescription;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallAdvisor.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallAdvisor.java
index 4dd443508..bcc91aded 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallAdvisor.java
@@ -17,32 +17,32 @@ import org.eclipse.jface.operation.IRunnableContext;
* The install advisor helps to make decisions during install, and is the conduit
* for reporting progress and results back to an end user or log.
*/
-public interface IInstallAdvisor {
+public abstract class InstallAdvisor {
/**
* Updates a local file system location in which to install. Returns <code>null</code>
* if no location could be determined
* @return The install location.
*/
- public String getInstallLocation(IInstallDescription description);
+ public abstract String getInstallLocation(IInstallDescription description);
- public IRunnableContext getRunnableContext();
+ public abstract IRunnableContext getRunnableContext();
/**
* Reports some result information to the context. The status may be
* information, warning, or an error.
*/
- public void reportStatus(IStatus status);
+ public abstract void reportStatus(IStatus status);
/**
* Initializes the install advisor. This method must be called before calling any
* other methods on the advisor are called. Subsequent invocations of this
* method are ignored.
*/
- public void start();
+ public abstract void start();
/**
- * Stops the install context. The advisor becomes invalid after it has been
+ * Stops the install advisor. The advisor becomes invalid after it has been
* stopped; a stopped advisor cannot be restarted.
*/
- public void stop();
+ public abstract void stop();
}

Back to the top