diff options
| author | Victor Roldan Betancort | 2009-04-30 11:00:43 +0000 |
|---|---|---|
| committer | Victor Roldan Betancort | 2009-04-30 11:00:43 +0000 |
| commit | 0b4525550011e4e50648e2be75becbf41dcc085d (patch) | |
| tree | a408280cdca06155e6a9308ce86099eab04a5453 | |
| parent | 5b19e2954907d560ead1c13282016ebfb03b839e (diff) | |
| download | cdo-0b4525550011e4e50648e2be75becbf41dcc085d.tar.gz cdo-0b4525550011e4e50648e2be75becbf41dcc085d.tar.xz cdo-0b4525550011e4e50648e2be75becbf41dcc085d.zip | |
[272190] [UI] Externalize Strings (CDO)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=272190
41 files changed, 283 insertions, 177 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java index 287e3cfbf2..4e284a5973 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.id; import org.eclipse.emf.cdo.common.id.CDOID.Type; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.internal.common.bundle.OM; import org.eclipse.emf.cdo.internal.common.id.CDOIDAndVersionImpl; import org.eclipse.emf.cdo.internal.common.id.CDOIDExternalImpl; @@ -32,6 +33,7 @@ import org.eclipse.net4j.util.io.ExtendedDataInput; import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; +import java.text.MessageFormat; /** * @author Eike Stepper @@ -71,21 +73,22 @@ public final class CDOIDUtil return ((CDOIDLongImpl)id).getLongValue(); } - throw new IllegalArgumentException("Unknown CDOIDObject implementation: " + id.getClass().getName()); + throw new IllegalArgumentException(MessageFormat.format( + Messages.getString("CDOIDUtil.0"), id.getClass().getName())); //$NON-NLS-1$ case META: return ((CDOIDMeta)id).getLongValue(); case TEMP_META: case TEMP_OBJECT: - throw new IllegalArgumentException("id instanceof CDOIDTemp"); + throw new IllegalArgumentException(Messages.getString("CDOIDUtil.1")); //$NON-NLS-1$ case EXTERNAL_OBJECT: case EXTERNAL_TEMP_OBJECT: - throw new IllegalArgumentException("Can't get long id from external ID types."); + throw new IllegalArgumentException(Messages.getString("CDOIDUtil.2")); //$NON-NLS-1$ default: - throw new ImplementationError("Invalid CDOID type: " + id.getClass().getName()); + throw new ImplementationError(MessageFormat.format(Messages.getString("CDOIDUtil.3"), id.getClass().getName())); //$NON-NLS-1$ } } @@ -142,7 +145,7 @@ public final class CDOIDUtil try { String type = Type.values()[ordinal].toString(); - TRACER.format("Reading CDOID of type {0} ({1})", ordinal, type); + TRACER.format("Reading CDOID of type {0} ({1})", ordinal, type); //$NON-NLS-1$ } catch (RuntimeException ex) { @@ -180,7 +183,7 @@ public final class CDOIDUtil } default: - throw new IllegalArgumentException("Invalid ID type : " + uriFragment); + throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOIDUtil.5"), uriFragment)); //$NON-NLS-1$ } } @@ -204,7 +207,7 @@ public final class CDOIDUtil int ordinal = type.ordinal(); if (TRACER.isEnabled()) { - TRACER.format("Writing CDOID of type {0} ({1})", ordinal, type); + TRACER.format("Writing CDOID of type {0} ({1})", ordinal, type); //$NON-NLS-1$ } builder.append(ordinal); @@ -221,7 +224,7 @@ public final class CDOIDUtil throw new ImplementationError(); } - builder.append("/" + id.toURIFragment()); + builder.append("/" + id.toURIFragment()); //$NON-NLS-1$ } public static CDOIDMeta createMeta(long value) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/messages/Messages.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/messages/Messages.java new file mode 100644 index 0000000000..43ff528de4 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/messages/Messages.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ +package org.eclipse.emf.cdo.common.messages; + +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +/** + * @author Eike Stepper + */ +public class Messages +{ + private static final String BUNDLE_NAME = "org.eclipse.emf.cdo.common.messages.messages"; //$NON-NLS-1$ + + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); + + private Messages() + { + } + + public static String getString(String key) + { + try + { + return RESOURCE_BUNDLE.getString(key); + } + catch (MissingResourceException e) + { + return '!' + key + '!'; + } + } +} diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/messages/messages.properties b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/messages/messages.properties new file mode 100644 index 0000000000..dfdbeaf92c --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/messages/messages.properties @@ -0,0 +1,31 @@ +AbstractCDORevision.0=EClass is abstract: {0} +AbstractCDORevision.1=CDOID is null +AbstractCDORevision.2=Missing ID mapping for {0} +AbstractCDORevision.20=Could not find feature {0} in class {1} +CDOClassifierRef.0=Package not found: {0} +CDODataInputImpl.5=Invalid CDOFeatureDelta type +CDODataOutputImpl.5=Temporary ID not supported: {0} +CDODataOutputImpl.6=No type for object of class {0} +CDOIDLibraryProviderImpl.0=Unknown library: {0} +CDOIDLibraryProviderImpl.2=Not a JAR: {0} +CDOIDUtil.0=Unknown CDOIDObject implementation: {0} +CDOIDUtil.1=id instanceof CDOIDTemp +CDOIDUtil.2=Can not get long id from external ID types +CDOIDUtil.3=Invalid CDOID type: {0} +CDOIDUtil.5=Invalid ID type: {0} +CDOModelUtil.6=No type for id {0} +CDOModelUtil.7=Not a primitive type nor String nor Date: {0} +CDOPackageRegistryImpl.0=No package unit available for: {0} +CDOPackageRegistryImpl.1=No meta instance mapped for {0} +CDOPackageRegistryImpl.10=Unknown meta instance ID: {0} +CDOPackageRegistryImpl.6=No meta ID mapped for {0}\nContaining package: {1} +CDOPackageUnit.0=Package unit type is unknown +CDOPackageUnitImpl.0=UNINITIALIZED +CDOPackageUnitImpl.1=Package unit not initialized +CDORevisionUtil.0=UNINITIALIZED +CDOTypeImpl.23=Cannot find the enum literal {0} +DLRevisionList.0=Cannot assign to a different list while linked to a list +DLRevisionList.3=Holder {0} is still linked in different list +DLRevisionList.5=Holder {0} does not belong to this list +LRURevisionHolder.0=Not a {0}: {1} +MEMRevisionCache.1=Invalid referenceType: {0} diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java index 00983df749..e807c69726 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassifierRef.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.model; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EPackage; @@ -73,7 +74,7 @@ public final class CDOClassifierRef EPackage ePackage = packageRegistry.getEPackage(packageURI); if (ePackage == null) { - throw new IllegalStateException("Package not found: " + packageURI); + throw new IllegalStateException(MessageFormat.format(Messages.getString("CDOClassifierRef.0"), packageURI)); //$NON-NLS-1$ } return EMFUtil.getClassifier(ePackage, classifierID); @@ -82,6 +83,6 @@ public final class CDOClassifierRef @Override public String toString() { - return MessageFormat.format("EClassRef({0}, {1})", packageURI, classifierID); + return MessageFormat.format("EClassRef({0}, {1})", packageURI, classifierID); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelConstants.java index ced2f65a80..aa44ce423e 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelConstants.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelConstants.java @@ -10,6 +10,7 @@ */ package org.eclipse.emf.cdo.common.model; + /** * @author Eike Stepper * @noimplement This interface is not intended to be implemented by clients. @@ -18,5 +19,5 @@ package org.eclipse.emf.cdo.common.model; public interface CDOModelConstants { - public static final String RESOURCE_NODE_NAME_ATTRIBUTE = "name"; + public static final String RESOURCE_NODE_NAME_ATTRIBUTE = "name"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java index ef9d1efbc5..ddf296afb7 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java @@ -10,6 +10,7 @@ */ package org.eclipse.emf.cdo.common.model; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.internal.common.model.CDOClassInfoImpl; import org.eclipse.emf.cdo.internal.common.model.CDOPackageInfoImpl; import org.eclipse.emf.cdo.internal.common.model.CDOPackageUnitImpl; @@ -30,6 +31,7 @@ import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.util.EcoreUtil; import java.io.IOException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -43,32 +45,32 @@ public final class CDOModelUtil /** * @since 2.0 */ - public static final String CORE_PACKAGE_URI = "http://www.eclipse.org/emf/2002/Ecore"; + public static final String CORE_PACKAGE_URI = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$ /** * @since 2.0 */ - public static final String RESOURCE_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Eresource/2.0.0"; + public static final String RESOURCE_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Eresource/2.0.0"; //$NON-NLS-1$ /** * @since 2.0 */ - public static final String RESOURCE_NODE_CLASS_NAME = "CDOResourceNode"; + public static final String RESOURCE_NODE_CLASS_NAME = "CDOResourceNode"; //$NON-NLS-1$ /** * @since 2.0 */ - public static final String RESOURCE_FOLDER_CLASS_NAME = "CDOResourceFolder"; + public static final String RESOURCE_FOLDER_CLASS_NAME = "CDOResourceFolder"; //$NON-NLS-1$ /** * @since 2.0 */ - public static final String RESOURCE_CLASS_NAME = "CDOResource"; + public static final String RESOURCE_CLASS_NAME = "CDOResource"; //$NON-NLS-1$ /** * @since 2.0 */ - public static final String ROOT_CLASS_NAME = "EObject"; + public static final String ROOT_CLASS_NAME = "EObject"; //$NON-NLS-1$ private static CDOType[] coreTypes; @@ -179,7 +181,7 @@ public final class CDOModelUtil CDOTypeImpl type = CDOTypeImpl.ids.get(typeID); if (type == null) { - throw new IllegalStateException("No type for id " + typeID); + throw new IllegalStateException(MessageFormat.format(Messages.getString("CDOModelUtil.6"), typeID)); //$NON-NLS-1$ } return type; @@ -279,7 +281,7 @@ public final class CDOModelUtil return CDOType.CHAR; } - throw new IllegalArgumentException("Not a primitive type nor String nor Date: " + primitiveType); + throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOModelUtil.7"), primitiveType)); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java index dca950f4b4..a095c642dd 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java @@ -32,11 +32,11 @@ public final class CDOPackageTypeRegistry { public static final CDOPackageTypeRegistry INSTANCE = new CDOPackageTypeRegistry(); - private static final String ECORE_ID = "org.eclipse.emf.ecore"; + private static final String ECORE_ID = "org.eclipse.emf.ecore"; //$NON-NLS-1$ private static final String PPID = EcorePlugin.GENERATED_PACKAGE_PPID; - private static final String MARKER_FILE = "META-INF/CDO.MF"; + private static final String MARKER_FILE = "META-INF/CDO.MF"; //$NON-NLS-1$ private Map<String, CDOPackageUnit.Type> types = new HashMap<String, CDOPackageUnit.Type>(); @@ -150,7 +150,7 @@ public final class CDOPackageTypeRegistry org.eclipse.core.runtime.IExtensionRegistry registry = org.eclipse.core.runtime.Platform.getExtensionRegistry(); for (org.eclipse.core.runtime.IConfigurationElement element : registry.getConfigurationElementsFor(ECORE_ID, PPID)) { - String uri = element.getAttribute("uri"); + String uri = element.getAttribute("uri"); //$NON-NLS-1$ if (ObjectUtil.equals(uri, packageURI)) { return element.getContributor().getName(); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java index 7fd84af6b1..b9e8aa0938 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java @@ -10,6 +10,8 @@ */ package org.eclipse.emf.cdo.common.model; +import org.eclipse.emf.cdo.common.messages.Messages; + import org.eclipse.emf.ecore.EPackage; /** @@ -65,7 +67,7 @@ public interface CDOPackageUnit extends Comparable<CDOPackageUnit> { if (this == UNKNOWN) { - throw new IllegalStateException("Package unit type is unknown"); + throw new IllegalStateException(Messages.getString("CDOPackageUnit.0")); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java index 5d68c398fb..2e0e50d6a6 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java @@ -174,7 +174,7 @@ public final class EMFUtil public static ResourceSet newResourceSet(Resource.Factory resourceFactory) { ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory); //$NON-NLS-1$ return resourceSet; } @@ -425,8 +425,8 @@ public final class EMFUtil resourceSet.setPackageRegistry(packageRegistry); Resource.Factory resourceFactory = new EcoreResourceFactoryImpl(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory); - resourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("*", resourceFactory); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory); //$NON-NLS-1$ + resourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("*", resourceFactory); //$NON-NLS-1$ return resourceSet.createResource(URI.createURI(uri)); } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java index 7a83b607f0..d6b332b057 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java @@ -13,6 +13,7 @@ */ package org.eclipse.emf.cdo.common.protocol; + /** * @author Eike Stepper * @noimplement This interface is not intended to be implemented by clients. @@ -20,7 +21,7 @@ package org.eclipse.emf.cdo.common.protocol; */ public interface CDOProtocolConstants { - public static final String PROTOCOL_NAME = "cdo"; + public static final String PROTOCOL_NAME = "cdo"; //$NON-NLS-1$ // ////////////////////////////////////////////////////////////////////// // Signal IDs @@ -104,11 +105,11 @@ public interface CDOProtocolConstants // ////////////////////////////////////////////////////////////////////// // Query Support - public static final String QUERY_LANGUAGE_RESOURCES = "resources"; + public static final String QUERY_LANGUAGE_RESOURCES = "resources"; //$NON-NLS-1$ - public static final String QUERY_LANGUAGE_RESOURCES_FOLDER_ID = "folder"; + public static final String QUERY_LANGUAGE_RESOURCES_FOLDER_ID = "folder"; //$NON-NLS-1$ - public static final String QUERY_LANGUAGE_RESOURCES_EXACT_MATCH = "exactMatch"; + public static final String QUERY_LANGUAGE_RESOURCES_EXACT_MATCH = "exactMatch"; //$NON-NLS-1$ // ////////////////////////////////////////////////////////////////////// // Locking Objects diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java index 7a8d2d725e..3bdb355be3 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.revision; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDTemp; import org.eclipse.emf.cdo.common.io.CDODataInput; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.internal.common.revision.CDORevisionImpl; import org.eclipse.emf.ecore.EClass; @@ -64,7 +65,7 @@ public final class CDORevisionUtil @Override public String toString() { - return "UNINITIALIZED"; + return Messages.getString("CDORevisionUtil.0"); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDAndVersionImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDAndVersionImpl.java index 15c3722a90..67f9874b45 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDAndVersionImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDAndVersionImpl.java @@ -81,6 +81,6 @@ public final class CDOIDAndVersionImpl implements CDOIDAndVersion @Override public String toString() { - return MessageFormat.format("{0}v{1}", id, version); + return MessageFormat.format("{0}v{1}", id, version); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java index c3bf705487..93252bfa6c 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java @@ -48,7 +48,7 @@ public class CDOIDExternalImpl extends AbstractCDOID implements CDOIDExternal @Override public String toString() { - return "oid:" + toURIFragment(); + return "oid:" + toURIFragment(); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaImpl.java index a100939aad..10da7bb1bb 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaImpl.java @@ -34,7 +34,7 @@ public class CDOIDMetaImpl extends AbstractCDOIDLong implements CDOIDMeta @Override public String toString() { - return "MID" + getLongValue(); + return "MID" + getLongValue(); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaRangeImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaRangeImpl.java index 8b3fc26363..514e790150 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaRangeImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDMetaRangeImpl.java @@ -31,7 +31,7 @@ public final class CDOIDMetaRangeImpl implements CDOIDMetaRange { if (size < 0) { - throw new IllegalArgumentException("size < 0"); + throw new IllegalArgumentException("size < 0"); //$NON-NLS-1$ } this.lowerBound = lowerBound; @@ -52,7 +52,7 @@ public final class CDOIDMetaRangeImpl implements CDOIDMetaRange { if (index < 0 || index >= size) { - throw new IllegalArgumentException("ids < 0 || ids >= size"); + throw new IllegalArgumentException("ids < 0 || ids >= size"); //$NON-NLS-1$ } if (isTemporary()) @@ -79,7 +79,7 @@ public final class CDOIDMetaRangeImpl implements CDOIDMetaRange { if (id.getType() != Type.TEMP_META) { - throw new IllegalArgumentException("id.getType() != Type.TEMP_META"); + throw new IllegalArgumentException("id.getType() != Type.TEMP_META"); //$NON-NLS-1$ } int index = ((CDOIDTempMetaImpl)id).getIntValue() - ((CDOIDTempMetaImpl)lowerBound).getIntValue(); @@ -88,7 +88,7 @@ public final class CDOIDMetaRangeImpl implements CDOIDMetaRange if (id.getType() != Type.META) { - throw new IllegalArgumentException("id.getType() != Type.META"); + throw new IllegalArgumentException("id.getType() != Type.META"); //$NON-NLS-1$ } long index = ((CDOIDMetaImpl)id).getLongValue() - ((CDOIDMetaImpl)lowerBound).getLongValue(); @@ -113,6 +113,6 @@ public final class CDOIDMetaRangeImpl implements CDOIDMetaRange @Override public String toString() { - return MessageFormat.format("[{0}:{1}]", lowerBound, getUpperBound()); + return MessageFormat.format("[{0}:{1}]", lowerBound, getUpperBound()); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java index 7858c98303..3326893c86 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java @@ -53,7 +53,7 @@ public final class CDOIDNullImpl extends AbstractCDOID implements CDOIDMeta, CDO public String toURIFragment() { - return "NULL"; + return "NULL"; //$NON-NLS-1$ } @Override @@ -89,7 +89,7 @@ public final class CDOIDNullImpl extends AbstractCDOID implements CDOIDMeta, CDO @Override public String toString() { - return "NULL"; + return "NULL"; //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempMetaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempMetaImpl.java index bf1840095e..c0aafd3537 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempMetaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempMetaImpl.java @@ -35,7 +35,7 @@ public class CDOIDTempMetaImpl extends AbstractCDOIDInteger implements CDOIDTemp @Override public String toString() { - return "mid" + getIntValue(); + return "mid" + getIntValue(); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java index e1397f207f..e619d1330a 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java @@ -34,7 +34,7 @@ public class CDOIDTempObjectImpl extends AbstractCDOIDInteger implements CDOIDTe @Override public String toString() { - return "oid" + getIntValue(); + return "oid" + getIntValue(); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java index 63bab7c3db..2b9e2aad09 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java @@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDObject; import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; import org.eclipse.emf.cdo.common.id.CDOID.Type; import org.eclipse.emf.cdo.common.io.CDODataInput; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.common.model.CDOClassifierRef; import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.cdo.common.model.CDOPackageInfo; @@ -66,6 +67,7 @@ import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EStructuralFeature; import java.io.IOException; +import java.text.MessageFormat; /** * @author Eike Stepper @@ -91,7 +93,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl int size = readInt(); if (TRACER.isEnabled()) { - TRACER.format("Reading {0} package units", size); + TRACER.format("Reading {0} package units", size); //$NON-NLS-1$ } CDOPackageUnit[] packageUnits = new CDOPackageUnit[size]; @@ -153,7 +155,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl type = ex.getMessage(); } - TRACER.format("Reading CDOID of type {0} ({1})", ordinal, type); + TRACER.format("Reading CDOID of type {0} ({1})", ordinal, type); //$NON-NLS-1$ } Type type = Type.values()[ordinal]; @@ -226,7 +228,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl referenceChunk = readInt(); if (TRACER.isEnabled()) { - TRACER.format("Read feature {0}: size={1}, referenceChunk={2}", feature.getName(), size, referenceChunk); + TRACER.format("Read feature {0}: size={1}, referenceChunk={2}", feature.getName(), size, referenceChunk); //$NON-NLS-1$ } } else @@ -234,7 +236,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl referenceChunk = size; if (TRACER.isEnabled()) { - TRACER.format("Read feature {0}: size={1}", feature.getName(), size); + TRACER.format("Read feature {0}: size={1}", feature.getName(), size); //$NON-NLS-1$ } } @@ -246,7 +248,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl list.set(j, value); if (TRACER.isEnabled()) { - TRACER.trace(" " + value); + TRACER.trace(" " + value); //$NON-NLS-1$ } } @@ -303,7 +305,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl return new CDOUnsetFeatureDeltaImpl(this, eClass); default: - throw new IOException("Invalid type " + typeOrdinal); + throw new IOException(MessageFormat.format(Messages.getString("CDODataInputImpl.5"), typeOrdinal)); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataOutputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataOutputImpl.java index 00da894be8..e7edfe0fb3 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataOutputImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataOutputImpl.java @@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.id.CDOID.Type; import org.eclipse.emf.cdo.common.io.CDODataOutput; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.common.model.CDOClassifierRef; import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.cdo.common.model.CDOPackageInfo; @@ -46,6 +47,7 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; import java.io.IOException; +import java.text.MessageFormat; /** * @author Eike Stepper @@ -70,7 +72,7 @@ public abstract class CDODataOutputImpl extends ExtendedDataOutput.Delegating im writeInt(size); if (TRACER.isEnabled()) { - TRACER.format("Writing {0} package units", size); + TRACER.format("Writing {0} package units", size); //$NON-NLS-1$ } for (CDOPackageUnit packageUnit : packageUnits) @@ -120,7 +122,7 @@ public abstract class CDODataOutputImpl extends ExtendedDataOutput.Delegating im int ordinal = type.ordinal(); if (TRACER.isEnabled()) { - TRACER.format("Writing CDOID of type {0} ({1})", ordinal, type); + TRACER.format("Writing CDOID of type {0} ({1})", ordinal, type); //$NON-NLS-1$ } writeByte(ordinal); @@ -185,7 +187,7 @@ public abstract class CDODataOutputImpl extends ExtendedDataOutput.Delegating im // This happens only on server-side if (TRACER.isEnabled()) { - TRACER.format("Writing feature {0}: size={1}, referenceChunk={2}", feature.getName(), size, referenceChunk); + TRACER.format("Writing feature {0}: size={1}, referenceChunk={2}", feature.getName(), size, referenceChunk); //$NON-NLS-1$ } writeInt(-size); @@ -196,7 +198,7 @@ public abstract class CDODataOutputImpl extends ExtendedDataOutput.Delegating im { if (TRACER.isEnabled()) { - TRACER.format("Writing feature {0}: size={1}", feature.getName(), size); + TRACER.format("Writing feature {0}: size={1}", feature.getName(), size); //$NON-NLS-1$ } writeInt(size); @@ -212,7 +214,7 @@ public abstract class CDODataOutputImpl extends ExtendedDataOutput.Delegating im if (TRACER.isEnabled()) { - TRACER.trace(" " + value); + TRACER.trace(" " + value); //$NON-NLS-1$ } writeCDOFeatureValue(value, feature); @@ -278,7 +280,7 @@ public abstract class CDODataOutputImpl extends ExtendedDataOutput.Delegating im CDOID id = (CDOID)value; if (id.isTemporary()) { - throw new IllegalArgumentException("Temporary ID not supported: " + value); + throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDODataOutputImpl.5"), value)); //$NON-NLS-1$ } type = CDOType.OBJECT; @@ -288,7 +290,8 @@ public abstract class CDODataOutputImpl extends ExtendedDataOutput.Delegating im type = CDOModelUtil.getPrimitiveType(value.getClass()); if (type == null) { - throw new IllegalArgumentException("No type for object of class " + value.getClass()); + throw new IllegalArgumentException(MessageFormat.format( + Messages.getString("CDODataOutputImpl.6"), value.getClass())); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java index 5f18e61c3f..31efa20947 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java @@ -91,7 +91,7 @@ public class CDOPackageInfoImpl extends AdapterImpl implements InternalCDOPackag { if (TRACER.isEnabled()) { - TRACER.format("Writing {0}", this); + TRACER.format("Writing {0}", this); //$NON-NLS-1$ } out.writeCDOPackageURI(packageURI); @@ -106,7 +106,7 @@ public class CDOPackageInfoImpl extends AdapterImpl implements InternalCDOPackag metaIDRange = in.readCDOIDMetaRange(); if (TRACER.isEnabled()) { - TRACER.format("Read {0}", this); + TRACER.format("Read {0}", this); //$NON-NLS-1$ } } @@ -160,7 +160,7 @@ public class CDOPackageInfoImpl extends AdapterImpl implements InternalCDOPackag @Override public String toString() { - return MessageFormat.format("CDOPackageInfo[packageURI={0}, parentURI={1}, metaIDRange={2}]", packageURI, + return MessageFormat.format("CDOPackageInfo[packageURI={0}, parentURI={1}, metaIDRange={2}]", packageURI, //$NON-NLS-1$ parentURI, metaIDRange); } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java index 9cc90d0c49..ec2849ac39 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java @@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.id.CDOIDTemp; import org.eclipse.emf.cdo.common.id.CDOIDTempMeta; import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.cdo.common.model.CDOPackageInfo; import org.eclipse.emf.cdo.common.model.CDOPackageUnit; @@ -133,7 +134,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte LifecycleUtil.checkActive(this); if (TRACER.isEnabled()) { - TRACER.format("Registering {0} --> {1}", nsURI, value); + TRACER.format("Registering {0} --> {1}", nsURI, value); //$NON-NLS-1$ } if (packageProcessor != null) @@ -301,7 +302,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte packageInfo = getPackageInfo(ePackage); if (packageInfo == null) { - throw new ImplementationError("No package unit available for: " + ePackage); + throw new ImplementationError(MessageFormat.format(Messages.getString("CDOPackageRegistryImpl.0"), ePackage)); //$NON-NLS-1$ } } @@ -357,7 +358,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte @Override public String toString() { - return MessageFormat.format("{0}[packageLoader={1}]", getClass().getSimpleName(), getPackageLoader()); + return MessageFormat.format("{0}[packageLoader={1}]", getClass().getSimpleName(), getPackageLoader()); //$NON-NLS-1$ } public synchronized boolean isActive() @@ -374,7 +375,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte { if (!active) { - CheckUtil.checkState(packageLoader, "packageLoader"); + CheckUtil.checkState(packageLoader, "packageLoader"); //$NON-NLS-1$ active = true; } } @@ -491,7 +492,8 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte } } - throw new IllegalStateException("No meta instance mapped for " + id + "\n" + dump()); + throw new IllegalStateException( + MessageFormat.format(Messages.getString("CDOPackageRegistryImpl.1"), id) + "\n" + dump()); //$NON-NLS-1$ //$NON-NLS-2$ } public synchronized CDOID lookupMetaInstanceID(InternalEObject metaInstance) @@ -531,8 +533,8 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte } } - throw new IllegalStateException("No meta ID mapped for " + metaInstance + "\nContaining package: " + ePackage - + "\n" + dump()); + throw new IllegalStateException(MessageFormat.format( + Messages.getString("CDOPackageRegistryImpl.6"), metaInstance, ePackage) + "\n" + dump()); //$NON-NLS-1$ //$NON-NLS-2$ } private EPackage getContainingPackage(InternalEObject metaInstance) @@ -564,7 +566,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte range = map((InternalEObject)ePackage, range); if (range.size() != metaIDRange.size()) { - throw new IllegalStateException("range.size() != metaIDRange.size()"); + throw new IllegalStateException("range.size() != metaIDRange.size()"); //$NON-NLS-1$ } } @@ -587,12 +589,12 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte InternalEObject metaInstance = idToMetaInstanceMap.remove(oldID); if (metaInstance == null) { - throw new IllegalArgumentException("Unknown meta instance ID: " + oldID); + throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOPackageRegistryImpl.10"), oldID)); //$NON-NLS-1$ } if (METAID_TRACER.isEnabled()) { - METAID_TRACER.format("Remapping meta instance: {0} --> {1} <-> {2}", oldID, newID, metaInstance); + METAID_TRACER.format("Remapping meta instance: {0} --> {1} <-> {2}", oldID, newID, metaInstance); //$NON-NLS-1$ } map(newID, metaInstance); @@ -627,7 +629,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte for (Map.Entry<CDOID, InternalEObject> entry : list) { - stream.println(" " + entry.getKey() + " --> " + entry.getValue()); + stream.println(" " + entry.getKey() + " --> " + entry.getValue()); //$NON-NLS-1$ //$NON-NLS-2$ } return baos.toString(); @@ -646,7 +648,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte CDOID id = range.getUpperBound(); if (METAID_TRACER.isEnabled()) { - METAID_TRACER.format("Registering meta instance: {0} <-> {1}", id, metaInstance); + METAID_TRACER.format("Registering meta instance: {0} <-> {1}", id, metaInstance); //$NON-NLS-1$ } idToMetaInstanceMap.put(id, metaInstance); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java index f782fcc60a..0cf2ebfc40 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.internal.common.model; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.cdo.common.model.CDOPackageTypeRegistry; import org.eclipse.emf.cdo.common.model.CDOPackageUnit; @@ -72,7 +73,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit } catch (RuntimeException ex) { - return "UNINITIALIZED"; + return Messages.getString("CDOPackageUnitImpl.0"); //$NON-NLS-1$ } } @@ -142,7 +143,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit { if (packageInfos == null || packageInfos.length == 0) { - throw new IllegalStateException("Package unit not initialized"); + throw new IllegalStateException(Messages.getString("CDOPackageUnitImpl.1")); //$NON-NLS-1$ } return packageInfos[0]; @@ -254,7 +255,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit { if (TRACER.isEnabled()) { - TRACER.format("Writing {0}", this); + TRACER.format("Writing {0}", this); //$NON-NLS-1$ } out.writeBoolean(withPackages); @@ -298,7 +299,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit if (TRACER.isEnabled()) { - TRACER.format("Read {0}", this); + TRACER.format("Read {0}", this); //$NON-NLS-1$ } } @@ -310,7 +311,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit @Override public String toString() { - String fmt = "CDOPackageUnit[id={0}, state={1}, type={2}, originalType={3}, timeStamp={4,date} {4,time}]"; + String fmt = "CDOPackageUnit[id={0}, state={1}, type={2}, originalType={3}, timeStamp={4,date} {4,time}]"; //$NON-NLS-1$ return MessageFormat.format(fmt, getID(), getState(), getType(), getOriginalType(), getTimeStamp()); } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java index 45d407aa88..b1699c876e 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.common.model; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.common.model.CDOType; import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; @@ -26,6 +27,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; +import java.text.MessageFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -60,7 +62,7 @@ public abstract class CDOTypeImpl implements CDOType public static final Short SHORT_DEFAULT = new Short(SHORT_DEFAULT_PRIMITIVE); - public static final CDOType BOOLEAN = new CDOTypeImpl("BOOLEAN", EcorePackage.EBOOLEAN, false, BOOLEAN_DEFAULT) + public static final CDOType BOOLEAN = new CDOTypeImpl("BOOLEAN", EcorePackage.EBOOLEAN, false, BOOLEAN_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -75,7 +77,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType BYTE = new CDOTypeImpl("BYTE", EcorePackage.EBYTE, false, BYTE_DEFAULT) + public static final CDOType BYTE = new CDOTypeImpl("BYTE", EcorePackage.EBYTE, false, BYTE_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -88,7 +90,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType CHAR = new CDOTypeImpl("CHAR", EcorePackage.ECHAR, false, CHARACTER_DEFAULT) + public static final CDOType CHAR = new CDOTypeImpl("CHAR", EcorePackage.ECHAR, false, CHARACTER_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -101,7 +103,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType DOUBLE = new CDOTypeImpl("DOUBLE", EcorePackage.EDOUBLE, false, DOUBLE_DEFAULT) + public static final CDOType DOUBLE = new CDOTypeImpl("DOUBLE", EcorePackage.EDOUBLE, false, DOUBLE_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -114,7 +116,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType FLOAT = new CDOTypeImpl("FLOAT", EcorePackage.EFLOAT, false, FLOAT_DEFAULT) + public static final CDOType FLOAT = new CDOTypeImpl("FLOAT", EcorePackage.EFLOAT, false, FLOAT_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -127,7 +129,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType INT = new CDOTypeImpl("INT", EcorePackage.EINT, false, INTEGER_DEFAULT) + public static final CDOType INT = new CDOTypeImpl("INT", EcorePackage.EINT, false, INTEGER_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -140,7 +142,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType LONG = new CDOTypeImpl("LONG", EcorePackage.ELONG, false, LONG_DEFAULT) + public static final CDOType LONG = new CDOTypeImpl("LONG", EcorePackage.ELONG, false, LONG_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -153,7 +155,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType SHORT = new CDOTypeImpl("SHORT", EcorePackage.ESHORT, false, SHORT_DEFAULT) + public static final CDOType SHORT = new CDOTypeImpl("SHORT", EcorePackage.ESHORT, false, SHORT_DEFAULT) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -166,7 +168,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType BIG_DECIMAL = new CDOTypeImpl("BIG_DECIMAL", EcorePackage.EBIG_DECIMAL, true) + public static final CDOType BIG_DECIMAL = new CDOTypeImpl("BIG_DECIMAL", EcorePackage.EBIG_DECIMAL, true) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -196,7 +198,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType BIG_INTEGER = new CDOTypeImpl("BIG_INTEGER", EcorePackage.EBIG_INTEGER, true) + public static final CDOType BIG_INTEGER = new CDOTypeImpl("BIG_INTEGER", EcorePackage.EBIG_INTEGER, true) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -222,7 +224,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType OBJECT = new CDOTypeImpl("OBJECT", EcorePackage.EOBJECT, true, CDOID.NULL) + public static final CDOType OBJECT = new CDOTypeImpl("OBJECT", EcorePackage.EOBJECT, true, CDOID.NULL) //$NON-NLS-1$ { public void writeValue(CDODataOutput out, Object value) throws IOException { @@ -241,7 +243,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType BOOLEAN_OBJECT = new ObjectType("BOOLEAN_OBJECT", EcorePackage.EBOOLEAN_OBJECT) + public static final CDOType BOOLEAN_OBJECT = new ObjectType("BOOLEAN_OBJECT", EcorePackage.EBOOLEAN_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -256,7 +258,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType BYTE_OBJECT = new ObjectType("BYTE_OBJECT", EcorePackage.EBYTE_OBJECT) + public static final CDOType BYTE_OBJECT = new ObjectType("BYTE_OBJECT", EcorePackage.EBYTE_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -271,7 +273,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType CHARACTER_OBJECT = new ObjectType("CHARACTER_OBJECT", EcorePackage.ECHARACTER_OBJECT) + public static final CDOType CHARACTER_OBJECT = new ObjectType("CHARACTER_OBJECT", EcorePackage.ECHARACTER_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -286,7 +288,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType DATE = new ObjectType("DATE", EcorePackage.EDATE) + public static final CDOType DATE = new ObjectType("DATE", EcorePackage.EDATE) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -301,7 +303,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType DOUBLE_OBJECT = new ObjectType("DOUBLE_OBJECT", EcorePackage.EDOUBLE_OBJECT) + public static final CDOType DOUBLE_OBJECT = new ObjectType("DOUBLE_OBJECT", EcorePackage.EDOUBLE_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -316,7 +318,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType FLOAT_OBJECT = new ObjectType("FLOAT_OBJECT", EcorePackage.EFLOAT_OBJECT) + public static final CDOType FLOAT_OBJECT = new ObjectType("FLOAT_OBJECT", EcorePackage.EFLOAT_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -331,7 +333,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType INTEGER_OBJECT = new ObjectType("INTEGER_OBJECT", EcorePackage.EINTEGER_OBJECT) + public static final CDOType INTEGER_OBJECT = new ObjectType("INTEGER_OBJECT", EcorePackage.EINTEGER_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -346,7 +348,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType LONG_OBJECT = new ObjectType("LONG_OBJECT", EcorePackage.ELONG_OBJECT) + public static final CDOType LONG_OBJECT = new ObjectType("LONG_OBJECT", EcorePackage.ELONG_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -361,7 +363,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType SHORT_OBJECT = new ObjectType("SHORT_OBJECT", EcorePackage.ESHORT_OBJECT) + public static final CDOType SHORT_OBJECT = new ObjectType("SHORT_OBJECT", EcorePackage.ESHORT_OBJECT) //$NON-NLS-1$ { @Override protected void doWriteValue(CDODataOutput out, Object value) throws IOException @@ -376,7 +378,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType STRING = new CDOTypeImpl("STRING", EcorePackage.ESTRING, true) + public static final CDOType STRING = new CDOTypeImpl("STRING", EcorePackage.ESTRING, true) //$NON-NLS-1$ { @SuppressWarnings("cast") @Override @@ -396,7 +398,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType BYTE_ARRAY = new CDOTypeImpl("BYTE_ARRAY", EcorePackage.EBYTE_ARRAY, true) + public static final CDOType BYTE_ARRAY = new CDOTypeImpl("BYTE_ARRAY", EcorePackage.EBYTE_ARRAY, true) //$NON-NLS-1$ { @Override public Object copyValue(Object value) @@ -426,7 +428,7 @@ public abstract class CDOTypeImpl implements CDOType /** * TODO Transfer integers! */ - public static final CDOType ENUM = new ObjectType("ENUM", 998) + public static final CDOType ENUM = new ObjectType("ENUM", 998) //$NON-NLS-1$ { @SuppressWarnings("cast") @Override @@ -458,7 +460,7 @@ public abstract class CDOTypeImpl implements CDOType } } - throw new IllegalStateException("Cannot find the enum literal " + value); + throw new IllegalStateException(MessageFormat.format(Messages.getString("CDOTypeImpl.23"), value)); //$NON-NLS-1$ } @Override @@ -468,7 +470,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType CUSTOM = new CDOTypeImpl("CUSTOM", 999, true) + public static final CDOType CUSTOM = new CDOTypeImpl("CUSTOM", 999, true) //$NON-NLS-1$ { @SuppressWarnings("cast") @Override @@ -501,7 +503,7 @@ public abstract class CDOTypeImpl implements CDOType } }; - public static final CDOType FEATURE_MAP_ENTRY = new CDOTypeImpl("FEATURE_MAP_ENTRY", EcorePackage.EFEATURE_MAP_ENTRY, + public static final CDOType FEATURE_MAP_ENTRY = new CDOTypeImpl("FEATURE_MAP_ENTRY", EcorePackage.EFEATURE_MAP_ENTRY, //$NON-NLS-1$ false) { @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/GenUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/GenUtil.java index ec293041e9..3344bdb754 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/GenUtil.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/GenUtil.java @@ -65,7 +65,7 @@ public final class GenUtil String capName = StringUtil.cap(featureName); // if (isMapEntryFeature()) // return "getTyped" + capName; - String result = isBooleanType ? "is" + capName : "get" + ("Class".equals(capName) ? "Class_" : capName); + String result = isBooleanType ? "is" + capName : "get" + ("Class".equals(capName) ? "Class_" : capName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ // if (isListType() && !isFeatureMapType() && !isMapType() && // getGenModel().isArrayAccessors()) @@ -142,7 +142,7 @@ public final class GenUtil { result.append(prefix); } - return leadingSeparators != null ? "_" + result.toString() : result.toString(); + return leadingSeparators != null ? "_" + result.toString() : result.toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/TestTransfer.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/TestTransfer.java index 1acec9e6eb..b059a8209c 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/TestTransfer.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/TestTransfer.java @@ -40,34 +40,34 @@ public class TestTransfer // Create packageA // EAttribute attributeA = EcoreFactory.eINSTANCE.createEAttribute(); - attributeA.setName("attributeA"); + attributeA.setName("attributeA"); //$NON-NLS-1$ attributeA.setEType(EcorePackage.eINSTANCE.getEString()); EClass classA = EcoreFactory.eINSTANCE.createEClass(); - classA.setName("classA"); + classA.setName("classA"); //$NON-NLS-1$ classA.getEStructuralFeatures().add(attributeA); EPackage packageA = EcoreFactory.eINSTANCE.createEPackage(); - packageA.setName("packageA"); - packageA.setNsPrefix("packageA"); - packageA.setNsURI("http://packageA"); + packageA.setName("packageA"); //$NON-NLS-1$ + packageA.setNsPrefix("packageA"); //$NON-NLS-1$ + packageA.setNsURI("http://packageA"); //$NON-NLS-1$ packageA.getEClassifiers().add(classA); // Create packageB // EAttribute attributeB = EcoreFactory.eINSTANCE.createEAttribute(); - attributeB.setName("attributeB"); + attributeB.setName("attributeB"); //$NON-NLS-1$ attributeB.setEType(EcorePackage.eINSTANCE.getEString()); EClass classB = EcoreFactory.eINSTANCE.createEClass(); - classB.setName("classA"); + classB.setName("classA"); //$NON-NLS-1$ classB.getEStructuralFeatures().add(attributeB); classB.getESuperTypes().add(classA); EPackage packageB = EcoreFactory.eINSTANCE.createEPackage(); - packageB.setName("packageB"); - packageB.setNsPrefix("packageB"); - packageB.setNsURI("http://packageB"); + packageB.setName("packageB"); //$NON-NLS-1$ + packageB.setNsPrefix("packageB"); //$NON-NLS-1$ + packageB.setNsURI("http://packageB"); //$NON-NLS-1$ packageB.getEClassifiers().add(classB); // Simulate generated global packages @@ -99,8 +99,8 @@ public class TestTransfer Resource.Factory resourceFactory = new EcoreResourceFactoryImpl(); ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory); - resourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("*", resourceFactory); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory); //$NON-NLS-1$ + resourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("*", resourceFactory); //$NON-NLS-1$ return resourceSet.createResource(URI.createURI(uri)); } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java index 21073a061d..88161216ff 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java @@ -88,7 +88,7 @@ public abstract class CDORevisionResolverImpl extends Lifecycle implements CDORe { if (TRACER.isEnabled()) { - TRACER.format("Loading revision {0}", id); + TRACER.format("Loading revision {0}", id); //$NON-NLS-1$ } revision = loadRevision(id, referenceChunk); @@ -122,7 +122,7 @@ public abstract class CDORevisionResolverImpl extends Lifecycle implements CDORe { if (TRACER.isEnabled()) { - TRACER.format("Loading revision {0} by time {1,date} {1,time}", id, timeStamp); + TRACER.format("Loading revision {0} by time {1,date} {1,time}", id, timeStamp); //$NON-NLS-1$ } revision = loadRevisionByTime(id, referenceChunk, timeStamp); @@ -156,7 +156,7 @@ public abstract class CDORevisionResolverImpl extends Lifecycle implements CDORe { if (TRACER.isEnabled()) { - TRACER.format("Loading revision {0} by version {1}", id, version); + TRACER.format("Loading revision {0} by version {1}", id, version); //$NON-NLS-1$ } revision = loadRevisionByVersion(id, referenceChunk, version); @@ -239,7 +239,7 @@ public abstract class CDORevisionResolverImpl extends Lifecycle implements CDORe return cache.addRevision(revision); } - throw new IllegalArgumentException("revision == null"); + throw new IllegalArgumentException("revision == null"); //$NON-NLS-1$ } public void removeCachedRevision(CDOID id, int version) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/DLRevisionList.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/DLRevisionList.java index f11d85275d..3710d11a84 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/DLRevisionList.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/DLRevisionList.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.internal.common.revision.cache.lru; import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import java.text.MessageFormat; @@ -54,7 +55,7 @@ public class DLRevisionList extends DLRevisionHolder { if (getPrev() != null || getDLNext() != null || getDLList() != null) { - throw new IllegalStateException("Cannot assign to a different list while linked to a list"); + throw new IllegalStateException(Messages.getString("DLRevisionList.0")); //$NON-NLS-1$ } super.setDLList(list); @@ -69,7 +70,7 @@ public class DLRevisionList extends DLRevisionHolder { if (index < 0 || index >= size) { - throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size); + throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size); //$NON-NLS-1$ //$NON-NLS-2$ } DLRevisionHolder holder = this; @@ -100,7 +101,7 @@ public class DLRevisionList extends DLRevisionHolder { if (holder.getDLList() != null) { - throw new IllegalArgumentException("Holder " + holder + " is still linked in different list"); + throw new IllegalArgumentException(MessageFormat.format(Messages.getString("DLRevisionList.3"), holder)); //$NON-NLS-1$ } } @@ -108,7 +109,7 @@ public class DLRevisionList extends DLRevisionHolder { if (holder.getDLList() != this) { - throw new IllegalArgumentException("Holder " + holder + " does not belong to this list"); + throw new IllegalArgumentException(MessageFormat.format(Messages.getString("DLRevisionList.5"), holder)); //$NON-NLS-1$ } } @@ -156,7 +157,7 @@ public class DLRevisionList extends DLRevisionHolder @Override public String toString() { - return MessageFormat.format("DLRevisionList[size={0}]", size); + return MessageFormat.format("DLRevisionList[size={0}]", size); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionCache.java index c75b431460..eaf5ba0279 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionCache.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionCache.java @@ -162,7 +162,7 @@ public class LRURevisionCache extends Lifecycle implements CDORevisionCache { if (TRACER.isEnabled()) { - TRACER.format("Adding revision: {0}, created={1,date} {1,time}, revised={2,date} {2,time}, current={3}", + TRACER.format("Adding revision: {0}, created={1,date} {1,time}, revised={2,date} {2,time}, current={3}", //$NON-NLS-1$ revision, revision.getCreated(), revision.getRevised(), revision.isCurrent()); } @@ -419,7 +419,7 @@ public class LRURevisionCache extends Lifecycle implements CDORevisionCache @Override public String toString() { - return MessageFormat.format("LRU[size={0}, capacity={1}]", size(), capacity()); + return MessageFormat.format("LRU[size={0}, capacity={1}]", size(), capacity()); //$NON-NLS-1$ } @Override @@ -427,7 +427,7 @@ public class LRURevisionCache extends Lifecycle implements CDORevisionCache { if (TRACER.isEnabled()) { - TRACER.format("Evicting revision {0}v{1}", holder.getID(), holder.getVersion()); + TRACER.format("Evicting revision {0}v{1}", holder.getID(), holder.getVersion()); //$NON-NLS-1$ } // Remember some values before the holder may be changed diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionHolder.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionHolder.java index af265f76f7..61997456dd 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionHolder.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionHolder.java @@ -10,8 +10,11 @@ */ package org.eclipse.emf.cdo.internal.common.revision.cache.lru; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import java.text.MessageFormat; + /** * @author Eike Stepper */ @@ -40,7 +43,8 @@ public class LRURevisionHolder extends DLRevisionHolder } else { - throw new IllegalArgumentException("Not a " + LRURevisionList.class.getName() + ": " + list); + throw new IllegalArgumentException(MessageFormat.format( + Messages.getString("LRURevisionHolder.0"), LRURevisionList.class.getName(), list)); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionList.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionList.java index a0362a81fa..900de5be47 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionList.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/LRURevisionList.java @@ -49,7 +49,7 @@ public class LRURevisionList extends DLRevisionList @Override public String toString() { - return MessageFormat.format("LRURevisionList[size={0}, capacity={1}]", size(), capacity); + return MessageFormat.format("LRURevisionList[size={0}, capacity={1}]", size(), capacity); //$NON-NLS-1$ } protected void eviction() diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/RevisionHolder.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/RevisionHolder.java index 8ca231ba29..2b82146b30 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/RevisionHolder.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/lru/RevisionHolder.java @@ -124,6 +124,6 @@ public class RevisionHolder @Override public String toString() { - return MessageFormat.format("RevisionHolder[{0}]", revision); + return MessageFormat.format("RevisionHolder[{0}]", revision); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/mem/MEMRevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/mem/MEMRevisionCache.java index f0e23fdf64..e5deef0a4c 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/mem/MEMRevisionCache.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/mem/MEMRevisionCache.java @@ -15,6 +15,7 @@ package org.eclipse.emf.cdo.internal.common.revision.cache.mem; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.common.model.CDOModelConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache; @@ -36,6 +37,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import java.lang.ref.Reference; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -171,7 +173,7 @@ public class MEMRevisionCache extends ReferenceQueueWorker<InternalCDORevision> cacheLists.remove(id); if (TRACER.isEnabled()) { - TRACER.format("Removed cache list of {0}", id); + TRACER.format("Removed cache list of {0}", id); //$NON-NLS-1$ } } } @@ -253,7 +255,7 @@ public class MEMRevisionCache extends ReferenceQueueWorker<InternalCDORevision> } } - throw new IllegalStateException("Invalid referenceType: " + referenceType); + throw new IllegalStateException(MessageFormat.format(Messages.getString("MEMRevisionCache.1"), referenceType)); //$NON-NLS-1$ } /** @@ -354,7 +356,7 @@ public class MEMRevisionCache extends ReferenceQueueWorker<InternalCDORevision> it.remove(); if (TRACER.isEnabled()) { - TRACER.format("Removed version {0} from cache list of {1}", version, key.getID()); + TRACER.format("Removed version {0} from cache list of {1}", version, key.getID()); //$NON-NLS-1$ } break; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/two/TwoLevelRevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/two/TwoLevelRevisionCache.java index 152c332fba..94cbcb9751 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/two/TwoLevelRevisionCache.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/two/TwoLevelRevisionCache.java @@ -175,7 +175,7 @@ public class TwoLevelRevisionCache extends Lifecycle implements CDORevisionCache level2.addRevision(revision); if (TRACER.isEnabled()) { - TRACER.format("Recached revision {0}", revision); + TRACER.format("Recached revision {0}", revision); //$NON-NLS-1$ } } @@ -187,8 +187,8 @@ public class TwoLevelRevisionCache extends Lifecycle implements CDORevisionCache protected void doBeforeActivate() throws Exception { super.doBeforeActivate(); - checkState(level1, "level1"); - checkState(level2, "level2"); + checkState(level1, "level1"); //$NON-NLS-1$ + checkState(level2, "level2"); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java index 7f1798bb5c..382e54b0ed 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java @@ -114,7 +114,7 @@ public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements @Override public String toString() { - return "CONTAINER_FEATURE"; + return "CONTAINER_FEATURE"; //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDInteger.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDInteger.java index 618b8539c4..e309922304 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDInteger.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDInteger.java @@ -34,7 +34,7 @@ public abstract class AbstractCDOIDInteger extends AbstractCDOID { if (value == 0) { - throw new IllegalArgumentException("value == 0"); + throw new IllegalArgumentException("value == 0"); //$NON-NLS-1$ } this.value = value; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDLong.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDLong.java index ebfaba2b33..d7551bdb80 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDLong.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDLong.java @@ -37,7 +37,7 @@ public abstract class AbstractCDOIDLong extends AbstractCDOID { if (value == NULL_VALUE) { - throw new IllegalArgumentException("value == NULL_VALUE"); + throw new IllegalArgumentException("value == NULL_VALUE"); //$NON-NLS-1$ } this.value = value; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryDescriptorImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryDescriptorImpl.java index 3e5a43c436..f9e3082855 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryDescriptorImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryDescriptorImpl.java @@ -42,13 +42,13 @@ public class CDOIDLibraryDescriptorImpl implements CDOIDLibraryDescriptor factoryName = in.readString(); if (TRACER.isEnabled()) { - TRACER.format("Read factory name: {0}", factoryName); + TRACER.format("Read factory name: {0}", factoryName); //$NON-NLS-1$ } int size = in.readInt(); if (TRACER.isEnabled()) { - TRACER.format("Reading {0} library names", size); + TRACER.format("Reading {0} library names", size); //$NON-NLS-1$ } libraryNames = new String[size]; @@ -57,7 +57,7 @@ public class CDOIDLibraryDescriptorImpl implements CDOIDLibraryDescriptor libraryNames[i] = in.readString(); if (TRACER.isEnabled()) { - TRACER.format("Read library name: {0}", libraryNames[i]); + TRACER.format("Read library name: {0}", libraryNames[i]); //$NON-NLS-1$ } } } @@ -76,13 +76,13 @@ public class CDOIDLibraryDescriptorImpl implements CDOIDLibraryDescriptor { if (TRACER.isEnabled()) { - TRACER.format("Writing factory name: {0}", factoryName); + TRACER.format("Writing factory name: {0}", factoryName); //$NON-NLS-1$ } out.writeString(factoryName); if (TRACER.isEnabled()) { - TRACER.format("Writing {0} library names", libraryNames.length); + TRACER.format("Writing {0} library names", libraryNames.length); //$NON-NLS-1$ } out.writeInt(libraryNames.length); @@ -90,7 +90,7 @@ public class CDOIDLibraryDescriptorImpl implements CDOIDLibraryDescriptor { if (TRACER.isEnabled()) { - TRACER.format("Writing library name: {0}", libraryName); + TRACER.format("Writing library name: {0}", libraryName); //$NON-NLS-1$ } out.writeString(libraryName); @@ -102,23 +102,23 @@ public class CDOIDLibraryDescriptorImpl implements CDOIDLibraryDescriptor { StringBuilder builder = new StringBuilder(); builder.append(getClass().getSimpleName()); - builder.append("["); + builder.append("["); //$NON-NLS-1$ builder.append(factoryName); if (libraryNames.length != 0) { - builder.append(" -> "); + builder.append(" -> "); //$NON-NLS-1$ for (int i = 0; i < libraryNames.length; i++) { if (i != 0) { - builder.append(", "); + builder.append(", "); //$NON-NLS-1$ } builder.append(libraryNames[i]); } } - builder.append("]"); + builder.append("]"); //$NON-NLS-1$ return builder.toString(); } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryProviderImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryProviderImpl.java index 7f7dbd26db..227b0ea7ce 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryProviderImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLibraryProviderImpl.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.spi.common.id; import org.eclipse.emf.cdo.common.id.CDOIDLibraryDescriptor; import org.eclipse.emf.cdo.common.id.CDOIDLibraryProvider; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.net4j.util.io.ExtendedDataInput; import org.eclipse.net4j.util.io.IOUtil; @@ -21,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -70,7 +72,8 @@ public class CDOIDLibraryProviderImpl implements CDOIDLibraryProvider OMBundle bundle = bundles.get(libraryName); if (bundle == null) { - throw new IllegalStateException("Unknown library: " + libraryName); + throw new IllegalStateException(MessageFormat.format( + Messages.getString("CDOIDLibraryProviderImpl.0"), libraryName)); //$NON-NLS-1$ } URL url = bundle.getBaseURL(); @@ -80,12 +83,13 @@ public class CDOIDLibraryProviderImpl implements CDOIDLibraryProvider file = new File(file, libraryName); } - if (file.exists() && file.isFile() && file.getName().endsWith(".jar")) + if (file.exists() && file.isFile() && file.getName().endsWith(".jar")) //$NON-NLS-1$ { return file; } - throw new IllegalStateException("Not a JAR: " + file.getAbsolutePath()); + throw new IllegalStateException(MessageFormat.format( + Messages.getString("CDOIDLibraryProviderImpl.2"), file.getAbsolutePath())); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLongImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLongImpl.java index 358ddd31a6..55badc7205 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLongImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/CDOIDLongImpl.java @@ -38,7 +38,7 @@ public class CDOIDLongImpl extends AbstractCDOIDLong implements CDOIDObject @Override public String toString() { - return "OID" + getLongValue(); + return "OID" + getLongValue(); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java index 0a5e308461..fa34d0f82b 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java @@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDTemp; import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; +import org.eclipse.emf.cdo.common.messages.Messages; import org.eclipse.emf.cdo.common.model.CDOClassInfo; import org.eclipse.emf.cdo.common.model.CDOClassifierRef; import org.eclipse.emf.cdo.common.model.CDOModelUtil; @@ -40,6 +41,7 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; import java.io.IOException; +import java.text.MessageFormat; import java.util.Map; /** @@ -74,12 +76,12 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (eClass.isAbstract()) { - throw new IllegalArgumentException("EClass is abstract: " + eClass); + throw new IllegalArgumentException(MessageFormat.format(Messages.getString("AbstractCDORevision.0"), eClass)); //$NON-NLS-1$ } if (CDOIDUtil.isNull(id)) { - throw new IllegalArgumentException("CDOID is null"); + throw new IllegalArgumentException(Messages.getString("AbstractCDORevision.1")); //$NON-NLS-1$ } classAdapter = CDOModelUtil.getClassInfo(eClass); @@ -125,7 +127,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { TRACER .format( - "Reading revision: ID={0}, className={1}, version={2}, created={3}, revised={4}, resource={5}, container={6}, featureID={7}", + "Reading revision: ID={0}, className={1}, version={2}, created={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$ id, getEClass().getName(), version, created, revised, resourceID, containerID, containingFeatureID); } @@ -140,7 +142,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { TRACER .format( - "Writing revision: ID={0}, className={1}, version={2}, created={3}, revised={4}, resource={5}, container={6}, featureID={7}", + "Writing revision: ID={0}, className={1}, version={2}, created={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$ id, getEClass().getName(), getVersion(), created, revised, resourceID, containerID, containingFeatureID); } @@ -176,7 +178,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting ID: {0}", id); + TRACER.format("Setting ID: {0}", id); //$NON-NLS-1$ } this.id = id; @@ -191,7 +193,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting version for {0}: v{1}", this, version); + TRACER.format("Setting version for {0}: v{1}", this, version); //$NON-NLS-1$ } this.version = version; @@ -206,7 +208,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting transactional {0}: v{1}", this, -(version + 1)); + TRACER.format("Setting transactional {0}: v{1}", this, -(version + 1)); //$NON-NLS-1$ } version = -(version + 1); @@ -217,7 +219,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting untransactional {0}: v{1}", this, Math.abs(version)); + TRACER.format("Setting untransactional {0}: v{1}", this, Math.abs(version)); //$NON-NLS-1$ } version = Math.abs(version); @@ -232,7 +234,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting created {0}: {1,date} {1,time}", this, created); + TRACER.format("Setting created {0}: {1,date} {1,time}", this, created); //$NON-NLS-1$ } this.created = created; @@ -247,12 +249,12 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (revised != UNSPECIFIED_DATE && revised < Math.max(0, created)) { - throw new IllegalArgumentException("created=" + created + ", revised=" + revised); + throw new IllegalArgumentException("created=" + created + ", revised=" + revised); //$NON-NLS-1$ //$NON-NLS-2$ } if (TRACER.isEnabled()) { - TRACER.format("Setting revised {0}: {1,date} {1,time}", this, revised); + TRACER.format("Setting revised {0}: {1,date} {1,time}", this, revised); //$NON-NLS-1$ } this.revised = revised; @@ -313,7 +315,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting resourceID {0}: {1}", this, resourceID); + TRACER.format("Setting resourceID {0}: {1}", this, resourceID); //$NON-NLS-1$ } this.resourceID = resourceID; @@ -328,7 +330,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting containerID {0}: {1}", this, containerID); + TRACER.format("Setting containerID {0}: {1}", this, containerID); //$NON-NLS-1$ } this.containerID = containerID; @@ -343,7 +345,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Setting containingFeatureID {0}: {1}", this, containingFeatureID); + TRACER.format("Setting containingFeatureID {0}: {1}", this, containingFeatureID); //$NON-NLS-1$ } this.containingFeatureID = containingFeatureID; @@ -403,7 +405,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (!feature.isMany()) { - throw new IllegalStateException("!feature.isMany()"); + throw new IllegalStateException("!feature.isMany()"); //$NON-NLS-1$ } return getList(feature).toArray(); @@ -413,7 +415,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (!feature.isMany()) { - throw new IllegalStateException("!feature.isMany()"); + throw new IllegalStateException("!feature.isMany()"); //$NON-NLS-1$ } return getList(feature).toArray(array); @@ -468,7 +470,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision { if (TRACER.isEnabled()) { - TRACER.format("Adjusting references for revision {0}", this); + TRACER.format("Adjusting references for revision {0}", this); //$NON-NLS-1$ } resourceID = (CDOID)revisionAdjuster.adjustReference(resourceID); @@ -501,7 +503,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision @Override public String toString() { - return getEClass().getName() + "@" + id + "v" + version; + return getEClass().getName() + "@" + id + "v" + version; //$NON-NLS-1$ //$NON-NLS-2$ } public Object getValue(EStructuralFeature feature) @@ -551,7 +553,8 @@ public abstract class AbstractCDORevision implements InternalCDORevision } catch (ArrayIndexOutOfBoundsException ex) { - throw new IllegalArgumentException("Could not find feature " + feature + " in class " + classAdapter, ex); + throw new IllegalArgumentException(MessageFormat.format( + Messages.getString("AbstractCDORevision.20"), feature, classAdapter), ex); //$NON-NLS-1$ } } @@ -615,7 +618,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision setValue(i, in.readCDOFeatureValue(feature)); if (TRACER.isEnabled()) { - TRACER.format("Read feature {0}: {1}", feature.getName(), getValue(i)); + TRACER.format("Read feature {0}: {1}", feature.getName(), getValue(i)); //$NON-NLS-1$ } } } @@ -641,7 +644,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision if (TRACER.isEnabled()) { - TRACER.format("Writing feature {0}: {1}", feature.getName(), value); + TRACER.format("Writing feature {0}: {1}", feature.getName(), value); //$NON-NLS-1$ } out.writeCDOFeatureValue(value, feature); @@ -659,12 +662,12 @@ public abstract class AbstractCDORevision implements InternalCDORevision CDOID newID = idMappings.get(oldID); if (newID == null) { - throw new IllegalStateException("Missing ID mapping for " + oldID); + throw new IllegalStateException(MessageFormat.format(Messages.getString("AbstractCDORevision.2"), oldID)); //$NON-NLS-1$ } if (TRACER.isEnabled()) { - TRACER.format("Adjusting ID: {0} --> {1}", oldID, newID); + TRACER.format("Adjusting ID: {0} --> {1}", oldID, newID); //$NON-NLS-1$ } return newID; |