From bcc43b1277536d6806f09f5b7f61f154e58ced92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Mon, 6 Nov 2023 15:33:06 +0100 Subject: [PATCH] fix NON-NLS warnings --- .../equinox/EclipseLauncherParser.java | 4 +- .../equinox/EquinoxManipulatorImpl.java | 2 +- .../artifact/repository/ArtifactRequest.java | 2 +- .../p2/console/ProvCommandProvider.java | 1 + .../p2/core/helpers/TarInputStream.java | 4 +- .../p2/engine/SharedProfilePreferences.java | 2 +- .../p2/engine/SimpleProfileRegistry.java | 2 +- .../metadata/repository/ant/AddChildTask.java | 11 ++--- ...CreateCompositeMetadataRepositoryTask.java | 1 + .../repository/ant/RemoveChildTask.java | 4 +- .../internal/p2/operations/RequestFlexer.java | 2 +- .../pde/internal/publishing/Utils.java | 2 +- .../repository/tools/Repo2Runnable.java | 45 ++++--------------- .../tools/RepositoryAnalyzerApplication.java | 1 + .../tools/analyzer/CopyrightAnalyzer.java | 1 + .../tools/analyzer/HostCheckAnalyzer.java | 2 +- .../repository/tools/analyzer/IUCounting.java | 8 ++-- .../tools/analyzer/LicenseAnalyzer.java | 1 + .../tools/analyzer/UniqueIUAnalyzer.java | 4 +- .../analyzer/UnzipFeatureJarAnalyzer.java | 10 ++--- .../tools/analyzer/VersionAnalyzer.java | 1 + ...CreateCompositeArtifactRepositoryTask.java | 1 + .../RepositoryDiscoveryStrategy.java | 2 +- .../scheduler/migration/MigrationPage.java | 4 +- .../scheduler/migration/MigrationSupport.java | 2 +- .../migration/MigrationWizardDialog.java | 4 +- .../SimpleConfiguratorManipulatorImpl.java | 2 +- 27 files changed, 52 insertions(+), 73 deletions(-) diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java index 829753a253..4ed2e2ac86 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java @@ -51,11 +51,11 @@ private void setInstall(List lines, LauncherData launcherData, File laun } File folder = ParserUtils.fromOSGiJarToOSGiInstallArea(launcherData.getFwJar().getAbsolutePath()); if (Constants.OS_MACOSX.equals(launcherData.getOS())) { - folder = new File(folder, "../MacOS"); + folder = new File(folder, "../MacOS"); //$NON-NLS-1$ } if (!folder.equals(launcherFolder)) { // Launcher will replace "@launcher.dir" with actual path. See bug 572890. - ParserUtils.setValueForArgument(EquinoxConstants.OPTION_INSTALL, "@launcher.dir/", lines); + ParserUtils.setValueForArgument(EquinoxConstants.OPTION_INSTALL, "@launcher.dir/", lines); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java index 83b54fa804..c3693112c1 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java @@ -219,7 +219,7 @@ static File toFile(URL url) { File file = URIUtil.toFile(uri); if (file == null) { // fall back to path of URL in catch block - throw new URISyntaxException(uri.toString(), "file URL does not represent a local file"); + throw new URISyntaxException(uri.toString(), "file URL does not represent a local file"); //$NON-NLS-1$ } return file; } catch (URISyntaxException e) { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java index 6c0da4efee..f300ef9e60 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java @@ -50,7 +50,7 @@ public IArtifactKey getArtifactKey() { @Override public IStatus getResult() { if (result == DEFAULT_STATUS) - return new Status(IStatus.ERROR, Activator.ID, "No repository found containing: " + getArtifactKey().toString()); + return new Status(IStatus.ERROR, Activator.ID, "No repository found containing: " + getArtifactKey().toString()); //$NON-NLS-1$ return result; } diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java index bfb6d1cd9d..e7d823fdfc 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java @@ -40,6 +40,7 @@ * An OSGi console command provider that adds various commands for interacting * with the provisioning system. */ +@SuppressWarnings("nls") public class ProvCommandProvider implements CommandProvider { private static final String WILDCARD_ANY = "*"; //$NON-NLS-1$ public static final String NEW_LINE = "\r\n"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/TarInputStream.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/TarInputStream.java index a99d17bd02..6bc9482f8b 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/TarInputStream.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/TarInputStream.java @@ -228,7 +228,7 @@ TarEntry getNextEntryInternal() throws TarException, IOException { long fileMode = Long.decode(mode.toString()).longValue(); entry.setMode(fileMode); } catch (NumberFormatException nfe) { - throw new TarException("Not a valid TAR format.", nfe); + throw new TarException("Not a valid TAR format.", nfe); //$NON-NLS-1$ } pos = 100 + 24; @@ -249,7 +249,7 @@ TarEntry getNextEntryInternal() throws TarException, IOException { try { fileSize = Integer.decode(size.toString()).intValue(); } catch (NumberFormatException nfe) { - throw new TarException("Not a valid TAR format.", nfe); + throw new TarException("Not a valid TAR format.", nfe); //$NON-NLS-1$ } entry.setSize(fileSize); diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java index bc73e027e4..93472c9c22 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java @@ -83,7 +83,7 @@ protected IEclipsePreferences getLoadLevel() { @Override protected synchronized void save() throws BackingStoreException { - throw new BackingStoreException("Can't store in shared install"); + throw new BackingStoreException("Can't store in shared install"); //$NON-NLS-1$ } @Override diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java index 647bc13406..cb15a71c7d 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java @@ -238,7 +238,7 @@ public synchronized long[] listProfileTimestamps(String id) { if (!profileDirectory.isDirectory()) return new long[0]; - File[] profileFiles = profileDirectory.listFiles((FileFilter) pathname -> (pathname.getName().endsWith(PROFILE_EXT) || pathname.getName().endsWith(PROFILE_GZ_EXT)) && pathname.isFile() && !pathname.getName().startsWith("._")); + File[] profileFiles = profileDirectory.listFiles((FileFilter) pathname -> (pathname.getName().endsWith(PROFILE_EXT) || pathname.getName().endsWith(PROFILE_GZ_EXT)) && pathname.isFile() && !pathname.getName().startsWith("._")); //$NON-NLS-1$ long[] timestamps = new long[profileFiles.length]; for (int i = 0; i < profileFiles.length; i++) { diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java index bd40bb0fa5..9b5f17c860 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/AddChildTask.java @@ -34,16 +34,17 @@ public void execute() { validate(); IMetadataRepositoryManager manager = getAgent().getService(IMetadataRepositoryManager.class); if (manager == null) - throw new BuildException("Unable to aquire metadata repository manager service."); + throw new BuildException("Unable to aquire metadata repository manager service."); //$NON-NLS-1$ // load the composite repository CompositeMetadataRepository repo = null; try { repo = (CompositeMetadataRepository) manager.loadRepository(location, null); } catch (ClassCastException e) { - throw new BuildException("Repository at location: " + location + " is not a composite metadata repository."); + throw new BuildException( + "Repository at location: " + location + " is not a composite metadata repository."); //$NON-NLS-1$ //$NON-NLS-2$ } catch (ProvisionException e) { - throw new BuildException("Error occurred while loading repository.", e); + throw new BuildException("Error occurred while loading repository.", e); //$NON-NLS-1$ } // add the child @@ -56,9 +57,9 @@ public void execute() { */ private void validate() { if (location == null) - throw new BuildException("Need to specify the composite repository location."); + throw new BuildException("Need to specify the composite repository location."); //$NON-NLS-1$ if (child == null) - throw new BuildException("Need to specify the child repository location."); + throw new BuildException("Need to specify the child repository location."); //$NON-NLS-1$ } /* diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java index d1f4806332..ada5bf1a19 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/CreateCompositeMetadataRepositoryTask.java @@ -29,6 +29,7 @@ /** * Ant task for creating a new composite metadata repository. */ +@SuppressWarnings("nls") public class CreateCompositeMetadataRepositoryTask extends AbstractMDRTask { URI location; // desired location of the composite repository diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java index 2cec610ffd..620ded2644 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src_ant/org/eclipse/equinox/internal/p2/metadata/repository/ant/RemoveChildTask.java @@ -35,13 +35,13 @@ public class RemoveChildTask extends AbstractMDRTask { public void execute() { IMetadataRepositoryManager manager = getAgent().getService(IMetadataRepositoryManager.class); if (manager == null) - throw new BuildException("Unable to aquire metadata repository manager service."); + throw new BuildException("Unable to aquire metadata repository manager service."); //$NON-NLS-1$ CompositeMetadataRepository repo; try { repo = (CompositeMetadataRepository) manager.loadRepository(location, null); } catch (ProvisionException e) { - throw new BuildException("Error occurred while loading repository.", e); + throw new BuildException("Error occurred while loading repository.", e); //$NON-NLS-1$ } // remove all the children repositories if requested, otherwise diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java index 491f6cc42a..2dc8bcb28f 100644 --- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java +++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java @@ -373,7 +373,7 @@ private Set getRoots() { Set allRoots = profile.query(new IUProfilePropertyQuery(INCLUSION_RULES, IUProfilePropertyQuery.ANY), null).toSet(); if (!honorSharedSettings) return allRoots; - IQueryResult baseRoots = profile.query(new IUProfilePropertyQuery("org.eclipse.equinox.p2.base", Boolean.TRUE.toString()), null); + IQueryResult baseRoots = profile.query(new IUProfilePropertyQuery("org.eclipse.equinox.p2.base", Boolean.TRUE.toString()), null); //$NON-NLS-1$ allRoots.removeAll(baseRoots.toUnmodifiableSet()); return allRoots; } diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java index bb2a79bc0e..24004afd36 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/publishing/Utils.java @@ -78,7 +78,7 @@ public static boolean guessUnpack(BundleDescription bundle, String[] classpath) return false; for (String classpath1 : classpath) { - if (classpath1.equals(".")) { + if (classpath1.equals(".")) { //$NON-NLS-1$ return false; } } diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java index 0fd0ce5bcb..18fb44d07b 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java @@ -15,55 +15,25 @@ *******************************************************************************/ package org.eclipse.equinox.p2.internal.repository.tools; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.core.runtime.URIUtil; +import java.util.*; +import org.eclipse.core.runtime.*; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.frameworkadmin.BundleInfo; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.internal.p2.engine.DownloadManager; -import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand; -import org.eclipse.equinox.internal.p2.engine.InstallableUnitPhase; -import org.eclipse.equinox.internal.p2.engine.Phase; -import org.eclipse.equinox.internal.p2.engine.PhaseSet; -import org.eclipse.equinox.internal.p2.engine.ProfileWriter; -import org.eclipse.equinox.internal.p2.engine.ProfileXMLConstants; +import org.eclipse.equinox.internal.p2.engine.*; import org.eclipse.equinox.internal.p2.engine.phases.Collect; import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IEngine; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.engine.IProvisioningPlan; -import org.eclipse.equinox.p2.engine.ProvisioningContext; +import org.eclipse.equinox.p2.engine.*; import org.eclipse.equinox.p2.engine.spi.ProvisioningAction; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.IProvidedCapability; +import org.eclipse.equinox.p2.metadata.*; import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.QueryUtil; -import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; -import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.repository.artifact.IArtifactRequest; +import org.eclipse.equinox.p2.repository.artifact.*; import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator; @@ -75,6 +45,7 @@ * * @since 1.0 */ +@SuppressWarnings("nls") public class Repo2Runnable extends AbstractApplication implements IApplication { private static final String NATIVE_ARTIFACTS = "nativeArtifacts"; //$NON-NLS-1$ private static final String NATIVE_TYPE = "org.eclipse.equinox.p2.native"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryAnalyzerApplication.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryAnalyzerApplication.java index 93fd4d994d..51561db6c8 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryAnalyzerApplication.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RepositoryAnalyzerApplication.java @@ -25,6 +25,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager; +@SuppressWarnings("nls") public class RepositoryAnalyzerApplication implements IApplication { private URI uri = null; diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/CopyrightAnalyzer.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/CopyrightAnalyzer.java index d1265076f8..d283b69ffe 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/CopyrightAnalyzer.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/CopyrightAnalyzer.java @@ -22,6 +22,7 @@ /** * This service checks that all Group IUs have a copyright. */ +@SuppressWarnings("nls") public class CopyrightAnalyzer extends IUAnalyzer { @Override diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/HostCheckAnalyzer.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/HostCheckAnalyzer.java index e12e6baaf3..2425c7ba83 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/HostCheckAnalyzer.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/HostCheckAnalyzer.java @@ -46,7 +46,7 @@ public void analyzeIU(IInstallableUnit iu) { VersionRange range = RequiredCapability.extractRange(hostMatch); IQueryResult results = repository.query(QueryUtil.createIUQuery(name, range), new NullProgressMonitor()); if (results.isEmpty()) { - error(iu, "IU Fragment: " + iu.getId() + " cannot find host" + name + " : " + range); + error(iu, "IU Fragment: " + iu.getId() + " cannot find host" + name + " : " + range); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return; } } diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/IUCounting.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/IUCounting.java index 418e316e16..ee36494ac3 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/IUCounting.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/IUCounting.java @@ -47,10 +47,10 @@ public void analyzeIU(IInstallableUnit iu) { @Override public IStatus postAnalysis() { - System.out.println("Total IUs: " + totalIUs); - System.out.println(" Total Groups: " + totalGroups); - System.out.println(" Total Fragments: " + totalFragments); - System.out.println(" Total Categories: " + totalCategories); + System.out.println("Total IUs: " + totalIUs); //$NON-NLS-1$ + System.out.println(" Total Groups: " + totalGroups); //$NON-NLS-1$ + System.out.println(" Total Fragments: " + totalFragments); //$NON-NLS-1$ + System.out.println(" Total Categories: " + totalCategories); //$NON-NLS-1$ return null; } diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/LicenseAnalyzer.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/LicenseAnalyzer.java index b306929da6..31e4f261ea 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/LicenseAnalyzer.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/LicenseAnalyzer.java @@ -24,6 +24,7 @@ /** * This service checks that each IU has a license. */ +@SuppressWarnings("nls") public class LicenseAnalyzer extends IUAnalyzer { @Override diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UniqueIUAnalyzer.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UniqueIUAnalyzer.java index dec8378bdb..e785b79060 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UniqueIUAnalyzer.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UniqueIUAnalyzer.java @@ -30,9 +30,9 @@ public class UniqueIUAnalyzer extends IUAnalyzer { @Override public void analyzeIU(IInstallableUnit iu) { // Create a unique name / version pair and cache it - String uniqueID = iu.getId() + ":" + iu.getVersion().toString(); + String uniqueID = iu.getId() + ":" + iu.getVersion().toString(); //$NON-NLS-1$ if (versionedNames.contains(uniqueID)) { - error(iu, "[ERROR]" + iu.getId() + " with version: " + iu.getVersion() + " already exists in the repository"); + error(iu, "[ERROR]" + iu.getId() + " with version: " + iu.getVersion() + " already exists in the repository"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return; } versionedNames.add(uniqueID); diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java index b19425036f..4797ab1f05 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java @@ -26,19 +26,19 @@ public class UnzipFeatureJarAnalyzer extends IUAnalyzer { @Override public void analyzeIU(IInstallableUnit iu) { - if (iu.getId().indexOf("feature.jar") > -1) { + if (iu.getId().indexOf("feature.jar") > -1) { //$NON-NLS-1$ Collection touchpointData = iu.getTouchpointData(); if (touchpointData.size() == 0) { - error(iu, "[ERROR] No unzip touchpoint for: " + iu.getId()); + error(iu, "[ERROR] No unzip touchpoint for: " + iu.getId()); //$NON-NLS-1$ } else { boolean found = false; for (ITouchpointData td : touchpointData) { - ITouchpointInstruction instruction = td.getInstruction("zipped"); - if (instruction.getBody().equals("true")) + ITouchpointInstruction instruction = td.getInstruction("zipped"); //$NON-NLS-1$ + if (instruction.getBody().equals("true")) //$NON-NLS-1$ found = true; } if (!found) { - error(iu, "[ERROR] No unzip touchpoint for: " + iu.getId()); + error(iu, "[ERROR] No unzip touchpoint for: " + iu.getId()); //$NON-NLS-1$ } } } diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/VersionAnalyzer.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/VersionAnalyzer.java index 1a5441f82c..ab12c6671c 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/VersionAnalyzer.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/VersionAnalyzer.java @@ -24,6 +24,7 @@ * 1. No 0.0.0 * 2. No x.y.z.qualifier (each qualifier has been replaced) */ +@SuppressWarnings("nls") public class VersionAnalyzer extends IUAnalyzer { @Override diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/CreateCompositeArtifactRepositoryTask.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/CreateCompositeArtifactRepositoryTask.java index 7775f92899..245dee9401 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/CreateCompositeArtifactRepositoryTask.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/CreateCompositeArtifactRepositoryTask.java @@ -30,6 +30,7 @@ /** * Ant task for creating a new composite artifact repository. */ +@SuppressWarnings("nls") public class CreateCompositeArtifactRepositoryTask extends Task { URI location; // desired location of the composite repository diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java index 9bdee681ac..e2d2224b07 100644 --- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java +++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java @@ -172,7 +172,7 @@ private CatalogItem processCatalogItem(IMetadataRepository repository, IInstalla public String getProperty(IInstallableUnit candidate, String key) { String value = TranslationSupport.getInstance().getIUProperty(candidate, key); - return (value != null) ? value : ""; + return (value != null) ? value : ""; //$NON-NLS-1$ } private AbstractCatalogSource getSource(IMetadataRepository repository) { diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationPage.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationPage.java index b265e3577d..a49188eeda 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationPage.java @@ -68,7 +68,7 @@ public class MigrationPage extends WizardPage implements ISelectableIUsPage, Lis static IProvisioningAgent agent = null; protected Button updateToLatest; - public static final String REMIND_ME_LATER = "remindMeToMigrateLater"; + public static final String REMIND_ME_LATER = "remindMeToMigrateLater"; //$NON-NLS-1$ IProfile profile = null; @@ -944,7 +944,7 @@ public static boolean loadCustomizedSetting() { IScopeContext[] contexts = new IScopeContext[] { InstanceScope.INSTANCE, DefaultScope.INSTANCE, BundleDefaultsScope.INSTANCE, ConfigurationScope.INSTANCE }; boolean updateToLatest = Platform.getPreferencesService().getBoolean(AutomaticUpdatePlugin.PLUGIN_ID, - "updateToLatest", false, contexts); + "updateToLatest", false, contexts); //$NON-NLS-1$ return updateToLatest; } diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java index 8d67ce4983..ad78515815 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java @@ -194,7 +194,7 @@ protected Collection findUnitstoMigrate(IProfile previousProfi private Set getUserRoots(IProfile previousProfile) { IQueryResult allRoots = previousProfile.query(new UserVisibleRootQuery(), null); Set rootsFromTheBase = previousProfile - .query(new IUProfilePropertyQuery("org.eclipse.equinox.p2.base", "true"), null).toUnmodifiableSet(); + .query(new IUProfilePropertyQuery("org.eclipse.equinox.p2.base", "true"), null).toUnmodifiableSet(); //$NON-NLS-1$ //$NON-NLS-2$ Set userRoots = allRoots.toSet(); userRoots.removeAll(rootsFromTheBase); return userRoots; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizardDialog.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizardDialog.java index e130e01af8..6a884fef42 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizardDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizardDialog.java @@ -43,8 +43,8 @@ protected IDialogSettings getDialogBoundsSettings() { if (section == null) { section = settings.addNewSection(wizard.getDialogSettingsSectionName()); // Set initial bound values for the MigrationWizardDialog so that it does not cover all the height of the screen when migrating a large set of IUs. - section.put("DIALOG_WIDTH", 883); - section.put("DIALOG_HEIGHT", 691); + section.put("DIALOG_WIDTH", 883); //$NON-NLS-1$ + section.put("DIALOG_HEIGHT", 691); //$NON-NLS-1$ } return section; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java index c85cd3c09b..a2d3483da7 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java @@ -564,7 +564,7 @@ public void updateBundles(Manipulator manipulator) throws IOException { Properties properties = new Properties(); String[] jvmArgs = manipulator.getLauncherData().getJvmArgs(); for (String jvmArg : jvmArgs) { - if (jvmArg.startsWith("-D")) { + if (jvmArg.startsWith("-D")) { //$NON-NLS-1$ // $NON-NLS-1$ int index = jvmArg.indexOf("="); //$NON-NLS-1$ if (index > 0 && jvmArg.length() > 2) {