Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-05-14 09:17:05 +0000
committerEike Stepper2009-05-14 09:17:05 +0000
commite21e076693091bdf7377a7da7625aef9073fdb9f (patch)
tree354c8aba5ee38f42406c2de2d531bff05962f65d
parent69113f6784e07a95c5613f8e119b0ff8524a6180 (diff)
downloadcdo-e21e076693091bdf7377a7da7625aef9073fdb9f.tar.gz
cdo-e21e076693091bdf7377a7da7625aef9073fdb9f.tar.xz
cdo-e21e076693091bdf7377a7da7625aef9073fdb9f.zip
[272190] [UI] Externalize Strings (CDO)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=272190
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java2
3 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
index 76def45370..6e9501a173 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
@@ -21,6 +21,8 @@ CDOResourceNodeImpl.5=Duplicate path: {0}
CDOSessionConfigurationImpl.0=Session is already open
CDOSessionFactory.1=Query is empty: {0}
CDOSessionImpl.0=Generated packages locally not available: {0}
+CDOSessionImpl.1=Commit notification arrived while session is inactive
+CDOSessionImpl.2=Commit notification arrived while session is inactive
CDOTransactionImpl.0=Not a ResourceFolder: {0}
CDOTransactionImpl.1=Root resource node {0} does not exist
CDOTransactionImpl.10=Duplicate ID: {0}
@@ -78,6 +80,7 @@ FSMUtil.0=View closed
FSMUtil.1=object == null
FSMUtil.2=view == null
FSMUtil.3=Legacy models not supported
+FSMUtil.4=Use CDOFactory to create dynamic object:
InvalidObjectException.0=Object {0} is not valid anymore
InvalidURIException.0=Invalid URI "{0}": {1}
ObjectNotFoundException.0=Object {0} not found (temporary = {1})
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index 9e6c7732e0..08c2590e32 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -458,7 +458,7 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
}
else
{
- OM.LOG.info("Commit notification arrived while session is inactive");
+ OM.LOG.info(Messages.getString("CDOSessionImpl.1")); //$NON-NLS-1$
}
}
}
@@ -489,7 +489,7 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
}
else
{
- OM.LOG.info("Commit notification arrived while session is inactive");
+ OM.LOG.info(Messages.getString("CDOSessionImpl.2")); //$NON-NLS-1$
}
}
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 13880ec8e4..421319aec8 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
@@ -177,7 +177,7 @@ public final class FSMUtil
{
if (object.getClass() == DynamicEObjectImpl.class)
{
- throw new IllegalArgumentException("Use CDOFactory to create dynamic object: " + object);
+ throw new IllegalArgumentException(Messages.getString("FSMUtil.4") + object); //$NON-NLS-1$
}
EList<Adapter> adapters = object.eAdapters();

Back to the top