clean up warnings

4 files changed, 11 insertions, 7 deletions

diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java
index d318b67fc..80380db60 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java
@@ -20,11 +20,11 @@ public class Activator implements BundleActivator {
 		return context;
 	}
 
-	public void start(BundleContext context) throws Exception {
-		Activator.context = context;
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
 	}
 
-	public void stop(BundleContext context) throws Exception {
+	public void stop(BundleContext bundleContext) throws Exception {
 		Activator.context = null;
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
index ed027a03f..76e321431 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
@@ -26,6 +26,8 @@ public class Messages extends NLS {
 	public static String exception_noFeaturesOrLocations;
 	public static String exception_invalidSiteReference;
 	public static String exception_invalidSiteReferenceInFeature;
+	public static String exception_repoMustBeURL;
+	public static String exception_sourcePath;
 
 	public static String message_generatingMetadata;
 	public static String message_generationCompleted;
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
index 330779019..6b2547f6e 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
@@ -33,14 +33,14 @@ public class ExecutablesDescriptor {
 		// TODO this may need to get more intelligent
 		// if MacOS its going to be baseName.app/Contents/MacOS/baseName
 		if (Constants.OS_MACOSX.equals(os)) {
-			return new File(root, baseName + ".app/Contents/MacOS/" + baseName);
+			return new File(root, baseName + ".app/Contents/MacOS/" + baseName); //$NON-NLS-1$
 		}
 		// if it is not Mac and not Windows it must be a UNIX flavor
 		if (!Constants.OS_WIN32.equals(os)) {
 			return new File(root, baseName);
 		}
 		// otherwise we are left with windows
-		return new File(root, baseName + ".exe");
+		return new File(root, baseName + ".exe"); //$NON-NLS-1$
 	}
 
 	/**
@@ -56,10 +56,10 @@ public class ExecutablesDescriptor {
 		if (executablesFeatureLocation == null || !executablesFeatureLocation.exists())
 			return null;
 		String[] config = AbstractPublisherAction.parseConfigSpec(configSpec);
-		File result = new File(executablesFeatureLocation, "bin/" + config[0] + "/" + config[1] + "/" + config[2]);
+		File result = new File(executablesFeatureLocation, "bin/" + config[0] + "/" + config[1] + "/" + config[2]); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		if (!result.exists())
 			return null;
-		return new ExecutablesDescriptor(config[1], "launcher", result, new File[] {result});
+		return new ExecutablesDescriptor(config[1], "launcher", result, new File[] {result}); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
index caa619101..88ab7a43d 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
@@ -21,6 +21,8 @@ exception_noArtifactRepo=An artifact repository must be specified in order to pu
 exception_noMetadataRepo=A metadata repository must be specified.
 exception_invalidSiteReference=Invalid site reference: {0}
 exception_invalidSiteReferenceInFeature=Invalid site reference {0} in feature {1}.
+exception_repoMustBeURL=Repository location ({0}) must be a URL.
+exception_sourcePath=Source location ({0}) must be a valid file-system path.
 message_generatingMetadata = Generating metadata for {0}.
 message_generationCompleted = Generation completed with success [{0} seconds].
 message_noSimpleconfigurator = Could not find simpleconfigurator bundle.