Bug 237776 Replace URL by URI

3 files changed, 24 insertions, 24 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java
index b544f6946..6c5d761bb 100644
--- a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java
+++ b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.tools;
 
-import java.net.URL;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Comparator;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -43,8 +43,8 @@ public class MetadataCompareApplication implements IApplication {
 		}
 	};
 
-	private URL sourceLocation;
-	private URL targetLocation;
+	private URI sourceLocation;
+	private URI targetLocation;
 	private boolean compare = false;
 	private boolean list = false;
 
@@ -61,7 +61,7 @@ public class MetadataCompareApplication implements IApplication {
 		return IApplication.EXIT_OK;
 	}
 
-	private void list(URL location) throws ProvisionException {
+	private void list(URI location) throws ProvisionException {
 		if (location == null)
 			return;
 		IMetadataRepository locationRepo = repoManager.getRepository(location);
@@ -79,7 +79,7 @@ public class MetadataCompareApplication implements IApplication {
 	}
 
 	private void compareMetadataRepositories() throws ProvisionException {
-		System.out.println("\n" + sourceLocation.toExternalForm() + " -> " + targetLocation.toExternalForm()); //$NON-NLS-1$ //$NON-NLS-2$
+		System.out.println("\n" + sourceLocation + " -> " + targetLocation); //$NON-NLS-1$ //$NON-NLS-2$
 		compare(sourceRepo, targetRepo);
 	}
 
@@ -226,9 +226,9 @@ public class MetadataCompareApplication implements IApplication {
 			String arg = args[++i];
 
 			if (args[i - 1].equalsIgnoreCase("-source")) //$NON-NLS-1$
-				sourceLocation = new URL(arg);
+				sourceLocation = new URI(arg);
 			if (args[i - 1].equalsIgnoreCase("-target")) //$NON-NLS-1$
-				targetLocation = new URL(arg);
+				targetLocation = new URI(arg);
 		}
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/MirrorApplication.java b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/MirrorApplication.java
index dd6e9e9f2..749507c33 100644
--- a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/MirrorApplication.java
+++ b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/MirrorApplication.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.tools.mirror;
 
-import java.net.URL;
+import java.net.URI;
 import java.util.*;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
@@ -24,10 +24,10 @@ public class MirrorApplication implements IApplication {
 	private static final String COMMA_SEPARATOR = ","; //$NON-NLS-1$
 	private String[] iuSpecs;
 	private String[] artifactSpecs;
-	private URL metadataSourceLocation;
-	private URL metadataDestinationLocation;
-	private URL artifactSourceLocation;
-	private URL artifactDestinationLocation;
+	private URI metadataSourceLocation;
+	private URI metadataDestinationLocation;
+	private URI artifactSourceLocation;
+	private URI artifactDestinationLocation;
 	private boolean referencedIUs = false;
 	private boolean raw = false;
 	private boolean overwrite = false;
@@ -112,21 +112,21 @@ public class MirrorApplication implements IApplication {
 			String arg = args[++i];
 
 			if (args[i - 1].equalsIgnoreCase("-source")) { //$NON-NLS-1$
-				metadataSourceLocation = new URL(arg);
-				artifactSourceLocation = new URL(arg);
+				metadataSourceLocation = new URI(arg);
+				artifactSourceLocation = new URI(arg);
 			}
 			if (args[i - 1].equalsIgnoreCase("-destination")) { //$NON-NLS-1$
-				metadataDestinationLocation = new URL(arg);
-				artifactDestinationLocation = new URL(arg);
+				metadataDestinationLocation = new URI(arg);
+				artifactDestinationLocation = new URI(arg);
 			}
 			if (args[i - 1].equalsIgnoreCase("-metadatadestination")) //$NON-NLS-1$
-				metadataDestinationLocation = new URL(arg);
+				metadataDestinationLocation = new URI(arg);
 			if (args[i - 1].equalsIgnoreCase("-metadatasource")) //$NON-NLS-1$
-				metadataSourceLocation = new URL(arg);
+				metadataSourceLocation = new URI(arg);
 			if (args[i - 1].equalsIgnoreCase("-artifactdestination")) //$NON-NLS-1$
-				artifactDestinationLocation = new URL(arg);
+				artifactDestinationLocation = new URI(arg);
 			if (args[i - 1].equalsIgnoreCase("-artifactsource")) //$NON-NLS-1$
-				artifactSourceLocation = new URL(arg);
+				artifactSourceLocation = new URI(arg);
 			if (args[i - 1].equalsIgnoreCase("-ius")) //$NON-NLS-1$
 				if (arg.equalsIgnoreCase("all")) //$NON-NLS-1$ 
 					iuSpecs = new String[0];
diff --git a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java
index 59d852747..987a439c5 100644
--- a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java
+++ b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/mirror/RepositoryMirroring.java
@@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.tools.mirror;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.URL;
+import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -50,7 +50,7 @@ public class RepositoryMirroring {
 	private boolean verbose = false;
 	private boolean compressed = false;
 
-	public RepositoryMirroring(URL metadataSourceLocation, URL metadataDestinationLocation, URL artifactSourceLocation, URL artifactDestinationLocation, boolean overwrite, boolean compressed) throws ProvisionException {
+	public RepositoryMirroring(URI metadataSourceLocation, URI metadataDestinationLocation, URI artifactSourceLocation, URI artifactDestinationLocation, boolean overwrite, boolean compressed) throws ProvisionException {
 		this.overwrite = overwrite;
 		this.compressed = compressed;
 		if (metadataSourceLocation != null && metadataDestinationLocation != null) {
@@ -181,7 +181,7 @@ public class RepositoryMirroring {
 		return true;
 	}
 
-	private IMetadataRepository initializeMetadataDestination(MetadataRepositoryManager manager, URL destinationLocation) throws ProvisionException {
+	private IMetadataRepository initializeMetadataDestination(MetadataRepositoryManager manager, URI destinationLocation) throws ProvisionException {
 		IMetadataRepository repository;
 		try {
 			String repositoryName = destinationLocation + " - metadata"; //$NON-NLS-1$
@@ -206,7 +206,7 @@ public class RepositoryMirroring {
 		return repository;
 	}
 
-	private IArtifactRepository initializeArtifactDestination(ArtifactRepositoryManager repoManager, URL destinationLocation) throws ProvisionException {
+	private IArtifactRepository initializeArtifactDestination(ArtifactRepositoryManager repoManager, URI destinationLocation) throws ProvisionException {
 		IArtifactRepositoryManager manager = (IArtifactRepositoryManager) ServiceHelper.getService(Activator.getContext(), IArtifactRepositoryManager.class.getName());
 		IArtifactRepository repository;
 		try {