From 1b98dcc1af83209eb0583409a0b9bddc45212d21 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 7 May 2013 13:31:12 -0500 Subject: Remove unused NSL messages --- .../internal/core/ExternalMessages.properties | 25 --------- .../eclipse/osgi/framework/internal/core/Msg.java | 31 ------------ .../location/EclipseAdaptorMessages.properties | 59 ---------------------- .../osgi/internal/location/EclipseAdaptorMsg.java | 51 ------------------- 4 files changed, 166 deletions(-) (limited to 'bundles/org.eclipse.osgi/supplement') diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties index 7174046a1..add5e3a54 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties @@ -10,31 +10,9 @@ ############################################################################### #External Messages for EN locale -OSGI_SYSTEMBUNDLE_CREATE_EXCEPTION=Exception while creating System Bundle: {0} -OSGI_SYSTEMBUNDLE_DESCRIPTION_ERROR=Unable to construct System Bundle description. -OSGI_INTERNAL_ERROR=Internal Error in the OSGi framework. Please report this problem. -BUNDLE_INSTALL_RECURSION_EXCEPTION=Bundle is already being installed -BUNDLE_INSTALL_SAME_UNIQUEID=Bundle \"{0}\" version \"{1}\" has already been installed from: {2} -BUNDLE_UNINSTALLED_EXCEPTION=Bundle \"{0}\" has been uninstalled BUNDLE_CONTEXT_INVALID_EXCEPTION=BundleContext is no longer valid -BUNDLE_STATE_CHANGE_EXCEPTION=State change in progress for bundle \"{0}\" by thread \"{1}\". -BUNDLE_REFRESH_FAILURE=PackageAdmin.refreshPackages failed to complete BUNDLE_ACTIVATOR_EXCEPTION=Exception in {0}.{1}() of bundle {2}. -BUNDLE_INVALID_ACTIVATOR_EXCEPTION=The activator {0} for bundle {1} is invalid -BUNDLE_UNRESOLVED_EXCEPTION=The bundle \"{0}\" could not be resolved -BUNDLE_UNRESOLVED_STATE_CONFLICT=The state indicates the bundle is resolved -BUNDLE_UNRESOLVED_UNSATISFIED_CONSTRAINT_EXCEPTION=The bundle \"{0}\" could not be resolved. Reason: {1} BUNDLE_SYSTEMBUNDLE_UNINSTALL_EXCEPTION=The System Bundle cannot be uninstalled -BUNDLE_READ_EXCEPTION=An error occurred trying to read the bundle -BUNDLE_NO_CLASSPATH_MATCH=The Bundle-ClassPath does not have any matching entries -BUNDLE_NOT_IN_FRAMEWORK=The bundle does not exist in the framework: {0} -BUNDLE_LOADER_ATTACHMENT_ERROR=Cannot attach fragment bundle \"{0}\" to resolved host \"{1}\". Try refreshing the host bundle. -BUNDLE_FRAGMENT_CNFE=A fragment bundle cannot load classes: {0} -BUNDLE_FRAGMENT_START=A fragment bundle cannot be started: {0} -BUNDLE_FRAGMENT_STOP=A fragment bundle cannot be stopped: {0} -BUNDLE_TRANSIENT_START_ERROR=The bundle''s start level is not met. Cannot transient start the bundle: {0} -BUNDLE_EXTENSION_PERMISSION=Extension bundles must have AllPermission assigned. -BUNDLE_CNFE_NOT_RESOLVED=Cannot load \"{0}"\ because the bundle \"{1}\" cannot be resolved. MANIFEST_INVALID_SPACE=The manifest line \"{0}\" has an invalid leading space '' '' character. MANIFEST_INVALID_LINE_NOCOLON=The manifest line \"{0}\" is invalid; it has no colon '':'' character after the header key. MANIFEST_INVALID_HEADER_EXCEPTION=Invalid manifest header {0}: \"{1}\" @@ -57,14 +35,11 @@ FILTER_INVALID_OPERATOR=Invalid operator at \"{0}\" FILTER_MISSING_ATTR=Missing attr at \"{0}\" FILTER_MISSING_VALUE=Missing value at \"{0}\" FILTER_INVALID_VALUE=Invalid value at \"{0}\" -STARTLEVEL_EXCEPTION_INVALID_REQUESTED_STARTLEVEL=The requested start level of {0} is invalid. The value must be a positive integer. -STARTLEVEL_CANT_CHANGE_SYSTEMBUNDLE_STARTLEVEL=The System Bundle's start level can not be modified. CANNOT_SET_CONTEXTFINDER=The context finder has not been installed. URL_HANDLER_INCORRECT_TYPE=The service property "{0}" is not the correct type for the service "{1}" registered by the bundle "{2}" -HEADER_REQUIRED=The \"{0}\" header must be specified HEADER_PACKAGE_DUPLICATES=Cannot import a package more than once \"{0}\" HEADER_PACKAGE_JAVA=Cannot specify java.* packages in Import/Export headers \"{0}\" HEADER_VERSION_ERROR=The attributes \"{0}\" and \"{1}\" must match diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java index a09bc6ee7..e27634b34 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java @@ -16,13 +16,6 @@ public class Msg extends NLS { private static final String BUNDLE_NAME = "org.eclipse.osgi.framework.internal.core.ExternalMessages"; //$NON-NLS-1$ public static String MANIFEST_INVALID_HEADER_EXCEPTION; - public static String BUNDLE_STATE_CHANGE_EXCEPTION; - public static String BUNDLE_UNINSTALLED_EXCEPTION; - public static String BUNDLE_UNRESOLVED_EXCEPTION; - public static String BUNDLE_UNRESOLVED_STATE_CONFLICT; - public static String BUNDLE_UNRESOLVED_UNSATISFIED_CONSTRAINT_EXCEPTION; - public static String BUNDLE_INVALID_ACTIVATOR_EXCEPTION; - public static String BUNDLE_EXTENSION_PERMISSION; public static String SERVICE_ARGUMENT_NULL_EXCEPTION; public static String SERVICE_EMPTY_CLASS_LIST_EXCEPTION; @@ -31,17 +24,6 @@ public class Msg extends NLS { public static String BUNDLE_ACTIVATOR_EXCEPTION; public static String BUNDLE_CONTEXT_INVALID_EXCEPTION; - public static String BUNDLE_READ_EXCEPTION; - public static String BUNDLE_FRAGMENT_CNFE; - public static String BUNDLE_FRAGMENT_START; - public static String BUNDLE_FRAGMENT_STOP; - public static String BUNDLE_TRANSIENT_START_ERROR; - - public static String BUNDLE_CNFE_NOT_RESOLVED; - public static String BUNDLE_LOADER_ATTACHMENT_ERROR; - - public static String BUNDLE_NO_CLASSPATH_MATCH; - public static String FILTER_TERMINATED_ABRUBTLY; public static String FILTER_TRAILING_CHARACTERS; public static String FILTER_MISSING_LEFTPAREN; @@ -51,15 +33,6 @@ public class Msg extends NLS { public static String FILTER_INVALID_VALUE; public static String FILTER_MISSING_VALUE; - public static String OSGI_SYSTEMBUNDLE_CREATE_EXCEPTION; - public static String BUNDLE_INSTALL_RECURSION_EXCEPTION; - public static String BUNDLE_INSTALL_SAME_UNIQUEID; - - public static String OSGI_INTERNAL_ERROR; - public static String BUNDLE_NOT_IN_FRAMEWORK; - public static String BUNDLE_REFRESH_FAILURE; - public static String OSGI_SYSTEMBUNDLE_DESCRIPTION_ERROR; - public static String SERVICE_ALREADY_UNREGISTERED_EXCEPTION; public static String SERVICE_FACTORY_EXCEPTION; @@ -67,9 +40,6 @@ public class Msg extends NLS { public static String SERVICE_FACTORY_RECURSION; public static String SERVICE_USE_OVERFLOW; - public static String STARTLEVEL_EXCEPTION_INVALID_REQUESTED_STARTLEVEL; - public static String STARTLEVEL_CANT_CHANGE_SYSTEMBUNDLE_STARTLEVEL; - public static String BUNDLE_SYSTEMBUNDLE_UNINSTALL_EXCEPTION; public static String HEADER_DUPLICATE_KEY_EXCEPTION; @@ -81,7 +51,6 @@ public class Msg extends NLS { public static String URL_HANDLER_INCORRECT_TYPE; - public static String HEADER_REQUIRED; public static String HEADER_PACKAGE_DUPLICATES; public static String HEADER_PACKAGE_JAVA; public static String HEADER_VERSION_ERROR; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMessages.properties b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMessages.properties index 4e67bcb00..ce29cd962 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMessages.properties +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMessages.properties @@ -11,15 +11,8 @@ #External Messages for EN locale -#EclipseAdaptor messages -ECLIPSE_ADAPTOR_ERROR_XML_SERVICE=Error registering XML parser services. -ECLIPSE_ADAPTOR_RUNTIME_ERROR=An unexpected runtime error has occurred. -ECLIPSE_ADAPTOR_EXITING=The application will terminate. - #EclipseStarter messages ECLIPSE_STARTUP_BUNDLE_NOT_FOUND=Bundle {0} not found. -ECLIPSE_STARTUP_ROOTS_NOT_RESOLVED=One or more bundles are not resolved because the following root constraints are not resolved: -ECLIPSE_STARTUP_ALL_NOT_RESOLVED=The following is a complete list of bundles which are not resolved, see the prior log entry for the root cause if it exists: ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_RESOLVED=Bundle {0} was not resolved. ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_ACTIVE=Bundle {0} is not active. ECLIPSE_STARTUP_ERROR_NO_APPLICATION=Unable to acquire application service. Ensure that the org.eclipse.core.runtime bundle is resolved and started (see config.ini). @@ -33,64 +26,12 @@ ECLIPSE_STARTUP_SHUTDOWN_ERROR=Shutdown error ECLIPSE_STARTUP_FAILED_INSTALL=Error installing bundle: {0} ECLIPSE_STARTUP_FAILED_UNINSTALL=Error uninstalling bundle: {0} ECLIPSE_STARTUP_FAILED_START=Error starting bundle: {0} -ECLIPSE_STARTUP_FILEMANAGER_OPEN_ERROR=Error reading configuration: {0} ECLIPSE_STARTUP_PROPS_NOT_SET=Cannot start without the following system properties set: {0} -#EclipseBundleData messages -ECLIPSE_DATA_MANIFEST_NOT_FOUND=Manifest not found: {0} -ECLIPSE_DATA_ERROR_READING_MANIFEST=Error reading manifest for bundle at the location: {0} - -#Console extension -ECLIPSE_CONSOLE_NO_BUNDLE_SPECIFIED_ERROR=No bundle specified! -ECLIPSE_CONSOLE_CANNOT_FIND_BUNDLE_ERROR=Cannot find bundle {0}. -ECLIPSE_CONSOLE_NO_CONSTRAINTS_NO_PLATFORM_ADMIN_MESSAGE=No unresolved constraints [PlatformAdmin service is not registered]. -ECLIPSE_CONSOLE_NO_CONSTRAINTS=No unresolved constraints. -ECLIPSE_CONSOLE_DIRECT_CONSTRAINTS=Direct constraints which are unresolved: -ECLIPSE_CONSOLE_LEAF_CONSTRAINTS=Leaf constraints in the dependency chain which are unresolved: -ECLIPSE_CONSOLE_COMMANDS_HEADER=Eclipse Runtime commands -ECLIPSE_CONSOLE_HELP_DIAG_COMMAND_DESCRIPTION=Displays unsatisfied constraints for the specified bundle(s). -ECLIPSE_CONSOLE_HELP_ENABLE_COMMAND_DESCRIPTION=enable the specified bundle(s) -ECLIPSE_CONSOLE_HELP_DISABLE_COMMAND_DESCRIPTION=disable the specified bundle(s) -ECLIPSE_CONSOLE_HELP_LD_COMMAND_DESCRIPTION=list disabled bundles in the system -ECLIPSE_CONSOLE_BUNDLE_DISABLED_MESSAGE=Bundle disabled at console -ECLIPSE_CONSOLE_DISABLED_COUNT_MESSAGE={0} disabled bundle(s) in the system -ECLIPSE_CONSOLE_DISABLED_BUNDLE_HEADER=Bundle :\t{0} (id={1}) -ECLIPSE_CONSOLE_DISABLED_BUNDLE_REASON1=Reason(s):\t{0} (policy={1}) - -#Bundle resolution messages -ECLIPSE_MISSING_OPTIONAL_REQUIRED_BUNDLE=Missing optionally required bundle {0}. -ECLIPSE_MISSING_REQUIRED_BUNDLE=Missing required bundle {0}. -ECLIPSE_MISSING_IMPORTED_PACKAGE=Missing imported package {0}. -ECLIPSE_MISSING_OPTIONAL_IMPORTED_PACKAGE=Missing optionally imported package {0}. -ECLIPSE_MISSING_DYNAMIC_IMPORTED_PACKAGE=Missing dynamically imported package {0}. -ECLIPSE_MISSING_HOST=Missing host {0}. -ECLIPSE_MISSING_NATIVECODE=Missing native code match {0}. -ECLIPSE_MISSING_REQUIRED_CAPABILITY=Missing required capability {0}. -ECLIPSE_MISSING_REQUIREMENT=Missing the requirement {0}. - -#Conversion messages -ECLIPSE_CONVERTER_ERROR_CONVERTING=Error converting plugin at {0}. -ECLIPSE_CONVERTER_ERROR_CREATING_BUNDLE_MANIFEST=Error creating bundle manifest file for {0} at {1}. -ECLIPSE_CONVERTER_ERROR_PARSING_PLUGIN_MANIFEST=Error parsing plugin manifest file {0} at {1}. -ECLIPSE_CONVERTER_MISSING_ATTRIBUTE=Error parsing {0} manifest. Missing attribute \"{1}\" in element \"{2}\". -ECLIPSE_CONVERTER_PLUGIN_LIBRARY_IGNORED=Plugin library {0} ignored when creating manifest for {1}. -ECLIPSE_CONVERTER_NO_SAX_FACTORY=No SAX factory parser has been found. -ECLIPSE_CONVERTER_PARSE_UNKNOWNTOP_ELEMENT = Unknown element \"{0}\", found at the top level, ignored. -ECLIPSE_CONVERTER_FILENOTFOUND = Could not find a META-INF/MANIFEST.MF, plugin.xml or a fragment.xml in {0}. -parse_error=Error parsing manifest: {0} -parse_errorNameLineColumn=Error parsing manifest at \"{0}\" line \"{1}\" column \"{2}\": {3} - #Classloader messages -ECLIPSE_CLASSLOADER_CANNOT_GET_HEADERS=Error loading bundle manifest for {0}. Using default auto-activation settings. ECLIPSE_CLASSLOADER_CONCURRENT_STARTUP=While loading class "{1}", thread "{0}" timed out waiting ({4}ms) for thread "{2}" to finish starting bundle "{3}". To avoid deadlock, thread "{0}" is proceeding but "{1}" may not be fully initialized. ECLIPSE_CLASSLOADER_ACTIVATION=An error occurred while automatically activating bundle {0} ({1}). -#CachedManifest messages -ECLIPSE_CACHEDMANIFEST_UNEXPECTED_EXCEPTION=Unexpected exception occurred loading manifest for bundle at the location: {0}. - -#BundleStopper messages -ECLIPSE_BUNDLESTOPPER_CYCLES_FOUND=Info: cycle(s) found while stopping bundles: {0}. - #Location message ECLIPSE_CANNOT_CHANGE_LOCATION = Cannot change the location once it is set. diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMsg.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMsg.java index 4d84d8cbd..2131d1ec3 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMsg.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMsg.java @@ -15,60 +15,22 @@ import org.eclipse.osgi.util.NLS; public class EclipseAdaptorMsg extends NLS { private static final String BUNDLE_NAME = "org.eclipse.osgi.internal.location.EclipseAdaptorMessages"; //$NON-NLS-1$ - public static String ECLIPSE_MISSING_IMPORTED_PACKAGE; - public static String ECLIPSE_MISSING_OPTIONAL_IMPORTED_PACKAGE; - public static String ECLIPSE_MISSING_DYNAMIC_IMPORTED_PACKAGE; - public static String ECLIPSE_MISSING_OPTIONAL_REQUIRED_BUNDLE; - public static String ECLIPSE_MISSING_REQUIRED_BUNDLE; - public static String ECLIPSE_MISSING_HOST; - public static String ECLIPSE_MISSING_NATIVECODE; - public static String ECLIPSE_MISSING_REQUIRED_CAPABILITY; - public static String ECLIPSE_MISSING_REQUIREMENT; public static String ECLIPSE_CANNOT_CHANGE_LOCATION; - public static String ECLIPSE_BUNDLESTOPPER_CYCLES_FOUND; - public static String ECLIPSE_CACHEDMANIFEST_UNEXPECTED_EXCEPTION; public static String fileManager_cannotLock; public static String fileManager_updateFailed; public static String fileManager_illegalInReadOnlyMode; public static String fileManager_notOpen; - public static String ECLIPSE_ADAPTOR_ERROR_XML_SERVICE; - public static String ECLIPSE_ADAPTOR_RUNTIME_ERROR; - public static String ECLIPSE_ADAPTOR_EXITING; - - public static String ECLIPSE_DATA_MANIFEST_NOT_FOUND; - public static String ECLIPSE_CONVERTER_ERROR_CONVERTING; - public static String ECLIPSE_DATA_ERROR_READING_MANIFEST; - public static String ECLIPSE_CLASSLOADER_CANNOT_GET_HEADERS; - public static String ECLIPSE_CLASSLOADER_CONCURRENT_STARTUP; public static String ECLIPSE_CLASSLOADER_ACTIVATION; - public static String ECLIPSE_CONSOLE_COMMANDS_HEADER; - public static String ECLIPSE_CONSOLE_HELP_DIAG_COMMAND_DESCRIPTION; - public static String ECLIPSE_CONSOLE_HELP_ENABLE_COMMAND_DESCRIPTION; - public static String ECLIPSE_CONSOLE_HELP_DISABLE_COMMAND_DESCRIPTION; - public static String ECLIPSE_CONSOLE_HELP_LD_COMMAND_DESCRIPTION; - public static String ECLIPSE_CONSOLE_NO_BUNDLE_SPECIFIED_ERROR; - public static String ECLIPSE_CONSOLE_NO_CONSTRAINTS_NO_PLATFORM_ADMIN_MESSAGE; - public static String ECLIPSE_CONSOLE_CANNOT_FIND_BUNDLE_ERROR; - public static String ECLIPSE_CONSOLE_NO_CONSTRAINTS; - public static String ECLIPSE_CONSOLE_DIRECT_CONSTRAINTS; - public static String ECLIPSE_CONSOLE_LEAF_CONSTRAINTS; - public static String ECLIPSE_CONSOLE_BUNDLE_DISABLED_MESSAGE; - public static String ECLIPSE_CONSOLE_DISABLED_COUNT_MESSAGE; - public static String ECLIPSE_CONSOLE_DISABLED_BUNDLE_HEADER; - public static String ECLIPSE_CONSOLE_DISABLED_BUNDLE_REASON1; - public static String ECLIPSE_STARTUP_ALREADY_RUNNING; public static String ECLIPSE_STARTUP_STARTUP_ERROR; public static String ECLIPSE_STARTUP_SHUTDOWN_ERROR; public static String ECLIPSE_STARTUP_ERROR_CHECK_LOG; public static String ECLIPSE_STARTUP_NOT_RUNNING; public static String ECLIPSE_STARTUP_ERROR_NO_APPLICATION; - public static String ECLIPSE_STARTUP_ROOTS_NOT_RESOLVED; - public static String ECLIPSE_STARTUP_ALL_NOT_RESOLVED; public static String ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_ACTIVE; public static String ECLIPSE_STARTUP_ERROR_BUNDLE_NOT_RESOLVED; public static String ECLIPSE_STARTUP_BUNDLE_NOT_FOUND; @@ -76,7 +38,6 @@ public class EclipseAdaptorMsg extends NLS { public static String ECLIPSE_STARTUP_FAILED_INSTALL; public static String ECLIPSE_STARTUP_FAILED_START; public static String ECLIPSE_STARTUP_APP_ERROR; - public static String ECLIPSE_STARTUP_FILEMANAGER_OPEN_ERROR; public static String ECLIPSE_STARTUP_PROPS_NOT_SET; public static String error_badNL; @@ -88,18 +49,6 @@ public class EclipseAdaptorMsg extends NLS { public static String location_notFileProtocol; public static String location_noLockFile; - public static String ECLIPSE_CONVERTER_FILENOTFOUND; - public static String ECLIPSE_CONVERTER_ERROR_CREATING_BUNDLE_MANIFEST; - public static String ECLIPSE_CONVERTER_PLUGIN_LIBRARY_IGNORED; - - public static String ECLIPSE_CONVERTER_ERROR_PARSING_PLUGIN_MANIFEST; - public static String ECLIPSE_CONVERTER_MISSING_ATTRIBUTE; - public static String parse_error; - public static String parse_errorNameLineColumn; - - public static String ECLIPSE_CONVERTER_NO_SAX_FACTORY; - public static String ECLIPSE_CONVERTER_PARSE_UNKNOWNTOP_ELEMENT; - public static String ECLIPSE_PLUGIN_EXTRACTION_PROBLEM; static { -- cgit v1.2.3