From 8ecfa57bb81f3a69ee70d9d631aaa6de050f173d Mon Sep 17 00:00:00 2001 From: Victor Roldan Betancort Date: Thu, 30 Apr 2009 08:45:33 +0000 Subject: [272190] [UI] Externalize Strings (CDO) https://bugs.eclipse.org/bugs/show_bug.cgi?id=272190 --- .../eclipse/emf/internal/cdo/util/CompletePackageClosure.java | 9 ++++++--- .../src/org/eclipse/emf/internal/cdo/util/FSMUtil.java | 9 +++++---- .../src/org/eclipse/emf/internal/cdo/util/PackageClosure.java | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util') diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java index 01bc3fbeb7..07123f48cd 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java @@ -11,6 +11,8 @@ */ package org.eclipse.emf.internal.cdo.util; +import org.eclipse.emf.cdo.messages.Messages; + import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; @@ -26,6 +28,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.ETypeParameter; import org.eclipse.emf.ecore.EcorePackage; +import java.text.MessageFormat; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -76,13 +79,13 @@ public class CompletePackageClosure extends PackageClosure { if (TRACER.isEnabled()) { - TRACER.trace("Found package " + p.getNsURI()); + TRACER.trace("Found package " + p.getNsURI()); //$NON-NLS-1$ } } } else { - OM.LOG.warn("Package == null for " + eClass.getName()); + OM.LOG.warn(MessageFormat.format(Messages.getString("CompletePackageClosure.0"), eClass.getName())); //$NON-NLS-1$ } } } @@ -126,7 +129,7 @@ public class CompletePackageClosure extends PackageClosure { if (TRACER.isEnabled()) { - TRACER.trace("Found class " + eClass.getName()); + TRACER.trace("Found class " + eClass.getName()); //$NON-NLS-1$ } handleEStructuralFeatures(eClass.getEStructuralFeatures(), visited); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java index d4515e90bd..cea170ccb0 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java @@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.messages.Messages; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry; import org.eclipse.emf.cdo.util.InvalidObjectException; import org.eclipse.emf.cdo.util.ObjectNotFoundException; @@ -96,7 +97,7 @@ public final class FSMUtil { if (view.isClosed()) { - throw new IllegalStateException("View closed"); + throw new IllegalStateException(Messages.getString("FSMUtil.0")); //$NON-NLS-1$ } if (object instanceof InternalCDOObject) @@ -106,7 +107,7 @@ public final class FSMUtil if (object == null) { - throw new IllegalArgumentException("object == null"); + throw new IllegalArgumentException(Messages.getString("FSMUtil.1")); //$NON-NLS-1$ } if (isMeta(object)) @@ -126,7 +127,7 @@ public final class FSMUtil { if (view == null) { - throw new IllegalArgumentException("view == null"); + throw new IllegalArgumentException(Messages.getString("FSMUtil.2")); //$NON-NLS-1$ } if (object.eIsProxy()) @@ -153,7 +154,7 @@ public final class FSMUtil public static InternalCDOObject adaptLegacy(InternalEObject object) { // TODO LEGACY - throw new UnsupportedOperationException("Legacy models not supported"); + throw new UnsupportedOperationException(Messages.getString("FSMUtil.3")); //$NON-NLS-1$ // EList readListeners = object.eReadListeners(); // CDOLegacyWrapper wrapper = getLegacyWrapper(readListeners); // if (wrapper == null) diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java index 2ad5eb566f..a5acf0dbe2 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java @@ -59,7 +59,7 @@ public abstract class PackageClosure implements IPackageClosure { if (TRACER.isEnabled()) { - TRACER.trace("Package closure for " + ePackage.getNsURI()); + TRACER.trace("Package closure for " + ePackage.getNsURI()); //$NON-NLS-1$ } collectContents(ePackage, visited); for (EPackage subPackage : ePackage.getESubpackages()) -- cgit v1.2.3