Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Roldan Betancort2009-04-28 11:47:50 +0000
committerVictor Roldan Betancort2009-04-28 11:47:50 +0000
commita970826e7695bd4d3c67b87a3bb770bfb164cdb3 (patch)
tree2e5e408611a4bfd958af5633d723efd50794d19c
parent20f07bcde664b78b07fd42b89af9a006932aa96a (diff)
downloadcdo-a970826e7695bd4d3c67b87a3bb770bfb164cdb3.tar.gz
cdo-a970826e7695bd4d3c67b87a3bb770bfb164cdb3.tar.xz
cdo-a970826e7695bd4d3c67b87a3bb770bfb164cdb3.zip
[272190] [UI] Externalize Strings (CDO)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=272190
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.properties10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.xml12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java21
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java75
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java59
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/messages/Messages.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/messages/messages.properties190
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java13
52 files changed, 591 insertions, 265 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
index 4736fc04c3..5f7b74779a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
@@ -71,3 +71,13 @@ _UI_CDOLabelDecorator_label = CDOObject Label Decorator
_UI_CDOEditorFilenameExtensions = cdo
_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+# ==============================================================================
+# plugin.xml strings
+# ==============================================================================
+
+category.name.0 = CDO
+view.name.0 = CDO Sessions
+view.name.1 = CDO Watch List
+editor.name.0 = CDO Editor
+page.name.0 = CDO
+page.name.1 = User Interface \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
index 6dfb59dcee..bf1b64306b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
@@ -23,21 +23,21 @@
point="org.eclipse.ui.views">
<category
id="org.eclipse.emf.cdo"
- name="CDO">
+ name="%category.name.0">
</category>
<view
category="org.eclipse.emf.cdo"
class="org.eclipse.emf.cdo.internal.ui.views.CDOSessionsView"
icon="icons/full/view16/cdo_sessions.gif"
id="org.eclipse.emf.cdo.CDOSessionsView"
- name="CDO Sessions">
+ name="%view.name.0">
</view>
<view
category="org.eclipse.emf.cdo"
class="org.eclipse.emf.cdo.internal.ui.views.CDOWatchListView"
icon="icons/full/view16/watch_list.gif"
id="org.eclipse.emf.cdo.CDOWatchListView"
- name="CDO Watch List">
+ name="%view.name.1">
</view>
</extension>
@@ -57,7 +57,7 @@
<extension point = "org.eclipse.ui.editors">
<editor
id = "org.eclipse.emf.cdo.ui.CDOEditor"
- name = "CDO Editor"
+ name = "%editor.name.0"
icon = "icons/full/obj16/cdo_editor.gif"
extensions = "*"
class = "org.eclipse.emf.cdo.internal.ui.editor.CDOEditor"
@@ -70,13 +70,13 @@
<page
class="org.eclipse.emf.cdo.internal.ui.preferences.CDOPreferencePage"
id="org.eclipse.emf.cdo.ui.CDOPreferencePage"
- name="CDO">
+ name="%page.name.0">
</page>
<page
category="org.eclipse.emf.cdo.ui.CDOPreferencePage"
class="org.eclipse.emf.cdo.internal.ui.preferences.CDOUIPreferencePage"
id="org.eclipse.emf.cdo.ui.CDOUIPreferencePage"
- name="User Interface">
+ name="%page.name.1">
</page>
</extension>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java
index 4cafdbbbee..e96c068ef9 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.ui;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.ui.CDOEditorInput;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOAudit;
import org.eclipse.emf.cdo.view.CDOView;
@@ -106,7 +107,7 @@ public class CDOEditorInputImpl extends PlatformObject implements CDOEditorInput
{
if (view.isClosed())
{
- return "View closed";
+ return Messages.getString("CDOEditorInputImpl.0"); //$NON-NLS-1$
}
CDOSession session = view.getSession();
@@ -119,20 +120,20 @@ public class CDOEditorInputImpl extends PlatformObject implements CDOEditorInput
builder.append(resourcePath);
}
- builder.append(" [");
+ builder.append(" ["); //$NON-NLS-1$
builder.append(session.getSessionID());
- builder.append(":");
+ builder.append(":"); //$NON-NLS-1$
builder.append(view.getViewID());
- builder.append("]");
+ builder.append("]"); //$NON-NLS-1$
if (view.getViewType() != CDOView.Type.TRANSACTION)
{
- builder.append(" readonly");
+ builder.append(" readonly"); //$NON-NLS-1$
}
if (view instanceof CDOAudit)
{
- builder.append(MessageFormat.format(" {0,date} {0,time}", ((CDOAudit)view).getTimeStamp()));
+ builder.append(MessageFormat.format(" {0,date} {0,time}", ((CDOAudit)view).getTimeStamp())); //$NON-NLS-1$
}
return builder.toString();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java
index f094e88890..770371f03d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java
@@ -26,45 +26,45 @@ public class SharedIcons
{
private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
- private static final String ETOOL = "etool16/";
+ private static final String ETOOL = "etool16/"; //$NON-NLS-1$
- private static final String OBJ = "obj16/";
+ private static final String OBJ = "obj16/"; //$NON-NLS-1$
- private static final String VIEW = "view16/";
+ private static final String VIEW = "view16/"; //$NON-NLS-1$
- private static final String WIZBAN = "wizban/";
+ private static final String WIZBAN = "wizban/"; //$NON-NLS-1$
- public static final String ETOOL_OPEN_SESSION = ETOOL + "open_session";
+ public static final String ETOOL_OPEN_SESSION = ETOOL + "open_session"; //$NON-NLS-1$
- public static final String ETOOL_OPEN_EDITOR = ETOOL + "open_editor";
+ public static final String ETOOL_OPEN_EDITOR = ETOOL + "open_editor"; //$NON-NLS-1$
- public static final String OBJ_SESSION = OBJ + "cdo_session";
+ public static final String OBJ_SESSION = OBJ + "cdo_session"; //$NON-NLS-1$
- public static final String OBJ_EDITOR = OBJ + "cdo_editor";
+ public static final String OBJ_EDITOR = OBJ + "cdo_editor"; //$NON-NLS-1$
- public static final String OBJ_EDITOR_READWRITE = OBJ + "cdo_editor_readwrite";
+ public static final String OBJ_EDITOR_READWRITE = OBJ + "cdo_editor_readwrite"; //$NON-NLS-1$
- public static final String OBJ_EDITOR_READONLY = OBJ + "cdo_editor_readonly";
+ public static final String OBJ_EDITOR_READONLY = OBJ + "cdo_editor_readonly"; //$NON-NLS-1$
- public static final String OBJ_EDITOR_HISTORICAL = OBJ + "cdo_editor_historical";
+ public static final String OBJ_EDITOR_HISTORICAL = OBJ + "cdo_editor_historical"; //$NON-NLS-1$
- public static final String OBJ_EPACKAGE = OBJ + "EPackage";
+ public static final String OBJ_EPACKAGE = OBJ + "EPackage"; //$NON-NLS-1$
- public static final String OBJ_EPACKAGE_CONVERTED = OBJ + "EPackageConverted";
+ public static final String OBJ_EPACKAGE_CONVERTED = OBJ + "EPackageConverted"; //$NON-NLS-1$
- public static final String OBJ_EPACKAGE_LEGACY = OBJ + "EPackageLegacy";
+ public static final String OBJ_EPACKAGE_LEGACY = OBJ + "EPackageLegacy"; //$NON-NLS-1$
- public static final String OBJ_EPACKAGE_NATIVE = OBJ + "EPackageNative";
+ public static final String OBJ_EPACKAGE_NATIVE = OBJ + "EPackageNative"; //$NON-NLS-1$
- public static final String OBJ_EPACKAGE_DYNAMIC = OBJ + "EPackageDynamic";
+ public static final String OBJ_EPACKAGE_DYNAMIC = OBJ + "EPackageDynamic"; //$NON-NLS-1$
- public static final String OBJ_EPACKAGE_UNKNOWN = OBJ + "EPackageUnknown";
+ public static final String OBJ_EPACKAGE_UNKNOWN = OBJ + "EPackageUnknown"; //$NON-NLS-1$
- public static final String OBJ_ECLASS = OBJ + "EClass";
+ public static final String OBJ_ECLASS = OBJ + "EClass"; //$NON-NLS-1$
- public static final String VIEW_SESSIONS = VIEW + "cdo_sessions";
+ public static final String VIEW_SESSIONS = VIEW + "cdo_sessions"; //$NON-NLS-1$
- public static final String WIZBAN_PACKAGE_MANAGER = WIZBAN + "PackageManager";
+ public static final String WIZBAN_PACKAGE_MANAGER = WIZBAN + "PackageManager"; //$NON-NLS-1$
public static Image getImage(String key)
{
@@ -121,7 +121,7 @@ public class SharedIcons
if (display == null)
{
- throw new IllegalStateException("display == null");
+ throw new IllegalStateException("display == null"); //$NON-NLS-1$
}
return display;
@@ -129,6 +129,6 @@ public class SharedIcons
private static String mangleKey(String key)
{
- return "icons/full/" + key + ".gif";
+ return "icons/full/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
index 7d3cfe1f16..fee99e3527 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.CDOLock;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.spi.cdo.InternalCDOObject;
@@ -88,7 +89,7 @@ public abstract class AbstractLockObjectsAction extends EditingDomainAction
{
public void run()
{
- MessageDialog.openError(getShell(), "Error", "Cannot obtain locks");
+ MessageDialog.openError(getShell(), Messages.getString("AbstractLockObjectsAction.0"), Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$ //$NON-NLS-2$
}
});
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java
index 6b861ce606..ec07b2bc73 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java
@@ -11,6 +11,7 @@
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
@@ -25,9 +26,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
*/
public class ChangePassiveUpdateAction extends EditingDomainAction
{
- public static final String ID = "change-passiveupdate";
+ public static final String ID = "change-passiveupdate"; //$NON-NLS-1$
- private static final String TITLE = "Passive Updates";
+ private static final String TITLE = Messages.getString("ChangePassiveUpdateAction.1"); //$NON-NLS-1$
private CDOSession session;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
index bd33579f2d..ad3ec386d2 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -24,9 +25,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class CloseSessionAction extends SessionAction
{
- private static final String TITLE = "Close";
+ private static final String TITLE = Messages.getString("CloseSessionAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Close the CDO session";
+ private static final String TOOL_TIP = Messages.getString("CloseSessionAction.1"); //$NON-NLS-1$
public CloseSessionAction(IWorkbenchPage page, CDOSession session)
{
@@ -39,7 +40,7 @@ public final class CloseSessionAction extends SessionAction
if (CDOUtil.isSessionDirty(getSession()))
{
MessageDialog dialog = new MessageDialog(getShell(), TITLE, null,
- "You have uncommitted changes. Do you want to discard them?", MessageDialog.QUESTION, new String[] {
+ Messages.getString("CloseSessionAction.2"), MessageDialog.QUESTION, new String[] { //$NON-NLS-1$
IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
if (dialog.open() != MessageDialog.OK)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
index 476f752f9b..1b0612f7ba 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
@@ -11,6 +11,7 @@
*/
package org.eclipse.emf.cdo.internal.ui.actions;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -23,9 +24,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class CloseViewAction extends ViewAction
{
- private static final String TITLE = "Close";
+ private static final String TITLE = Messages.getString("CloseViewAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Close the CDO view";
+ private static final String TOOL_TIP = Messages.getString("CloseViewAction.1"); //$NON-NLS-1$
public CloseViewAction(IWorkbenchPage page, CDOView view)
{
@@ -38,7 +39,7 @@ public final class CloseViewAction extends ViewAction
if (getView().isDirty())
{
MessageDialog dialog = new MessageDialog(getShell(), TITLE, null,
- "You have uncommitted changes. Do you want to discard them?", MessageDialog.QUESTION, new String[] {
+ Messages.getString("CloseViewAction.2"), MessageDialog.QUESTION, new String[] { //$NON-NLS-1$
IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
if (dialog.open() != MessageDialog.OK)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
index 2fdf7c29c9..7a47d29780 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
@@ -7,9 +7,11 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -20,9 +22,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class CommitTransactionAction extends ViewAction
{
- private static final String TITLE = "Commit";
+ private static final String TITLE = Messages.getString("CommitTransactionAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Commit this transaction";
+ private static final String TOOL_TIP = Messages.getString("CommitTransactionAction.1"); //$NON-NLS-1$
public CommitTransactionAction(IWorkbenchPage page, CDOView view)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java
index 1805be232f..e635b65a7e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.net4j.util.ui.UIUtil;
@@ -27,9 +28,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class CreateResourceAction extends ViewAction
{
- private static final String TITLE = "Create Resource";
+ private static final String TITLE = Messages.getString("CreateResourceAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Create a CDO resource";
+ private static final String TOOL_TIP = Messages.getString("CreateResourceAction.1"); //$NON-NLS-1$
private String resourcePath;
@@ -41,7 +42,7 @@ public final class CreateResourceAction extends ViewAction
@Override
protected void preRun() throws Exception
{
- InputDialog dialog = new InputDialog(getShell(), TITLE, "Enter resource path:", "/res"
+ InputDialog dialog = new InputDialog(getShell(), TITLE, Messages.getString("CreateResourceAction.2"), "/res" //$NON-NLS-1$ //$NON-NLS-2$
+ (ViewAction.lastResourceNumber + 1), null);
if (dialog.open() == InputDialog.OK)
{
@@ -65,8 +66,8 @@ public final class CreateResourceAction extends ViewAction
{
public void run()
{
- getOrCreate[0] = MessageDialog.openQuestion(new Shell(), "Resource already exists",
- "There already exists a resource with path \"" + resourcePath + "\". Do you want to edit the resource?");
+ getOrCreate[0] = MessageDialog.openQuestion(new Shell(), Messages.getString("CreateResourceAction.4"), String.format( //$NON-NLS-1$
+ Messages.getString("CreateResourceAction.5"), resourcePath)); //$NON-NLS-1$
}
});
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
index 6edaaaf394..0b4b911add 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.internal.ui.dialogs.ExportResourceDialog;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.common.util.URI;
@@ -32,13 +33,13 @@ import java.util.List;
*/
public class ExportResourceAction extends ViewAction
{
- public static final String ID = "export-resource";
+ public static final String ID = "export-resource"; //$NON-NLS-1$
- private static final String TITLE = "Export Resource";
+ private static final String TITLE = Messages.getString("ExportResourceAction.1"); //$NON-NLS-1$
public ExportResourceAction(IWorkbenchPage page, CDOView view)
{
- super(page, TITLE + INTERACTIVE, "Export a CDO resource", null, view);
+ super(page, TITLE + INTERACTIVE, Messages.getString("ExportResourceAction.2"), null, view); //$NON-NLS-1$
setId(ID);
}
@@ -60,7 +61,7 @@ public class ExportResourceAction extends ViewAction
}
else
{
- MessageDialog.openError(getShell(), TITLE, "A single URI must be entered!");
+ MessageDialog.openError(getShell(), TITLE, Messages.getString("ExportResourceAction.3")); //$NON-NLS-1$
cancel();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
index 446fb95264..ab3427818a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
@@ -7,12 +7,14 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.dialogs.ImportResourceDialog;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.common.util.EList;
@@ -37,9 +39,9 @@ import java.util.Map;
*/
public class ImportResourceAction extends ViewAction
{
- public static final String ID = "import-resource";
+ public static final String ID = "import-resource"; //$NON-NLS-1$
- private static final String TITLE = "Import Resource";
+ private static final String TITLE = Messages.getString("ImportResourceAction.1"); //$NON-NLS-1$
private URI sourceURI;
@@ -47,7 +49,7 @@ public class ImportResourceAction extends ViewAction
public ImportResourceAction(IWorkbenchPage page, CDOView view)
{
- super(page, TITLE + INTERACTIVE, "Import a CDO resource", null, view);
+ super(page, TITLE + INTERACTIVE, Messages.getString("ImportResourceAction.2"), null, view); //$NON-NLS-1$
setId(ID);
}
@@ -65,7 +67,7 @@ public class ImportResourceAction extends ViewAction
}
else
{
- MessageDialog.openError(getShell(), TITLE, "A single URI must be entered!");
+ MessageDialog.openError(getShell(), TITLE, Messages.getString("ImportResourceAction.3")); //$NON-NLS-1$
cancel();
}
}
@@ -83,7 +85,7 @@ public class ImportResourceAction extends ViewAction
// Source ResourceSet
ResourceSet sourceSet = new ResourceSetImpl();
Map<String, Object> map = sourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
- map.put("*", new XMIResourceFactoryImpl());
+ map.put("*", new XMIResourceFactoryImpl()); //$NON-NLS-1$
sourceSet.setPackageRegistry(transaction.getSession().getPackageRegistry());
// Source Resource
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
index df390311c1..d3f380c507 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
@@ -7,12 +7,14 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.common.ui.dialogs.ResourceDialog;
@@ -33,9 +35,9 @@ import java.util.List;
*/
public class ImportRootsAction extends EditingDomainAction
{
- public static final String ID = "import-roots";
+ public static final String ID = "import-roots"; //$NON-NLS-1$
- private static final String TITLE = "Import Roots";
+ private static final String TITLE = Messages.getString("ImportRootsAction.1"); //$NON-NLS-1$
private CDOResource targetResource;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
index 2747a90666..4b28b29506 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
@@ -7,10 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -22,20 +24,20 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class LoadResourceAction extends ViewAction
{
- private static final String TITLE = "Load Resource";
+ private static final String TITLE = Messages.getString("LoadResourceAction.0"); //$NON-NLS-1$
private String resourcePath;
public LoadResourceAction(IWorkbenchPage page, CDOView view)
{
- super(page, TITLE + INTERACTIVE, "Load a CDO resource", null, view);
+ super(page, TITLE + INTERACTIVE, Messages.getString("LoadResourceAction.1"), null, view); //$NON-NLS-1$
}
@Override
protected void preRun() throws Exception
{
- String uri = ViewAction.lastResourceNumber == 0 ? "" : "/res" + ViewAction.lastResourceNumber;
- InputDialog dialog = new InputDialog(getShell(), TITLE, "Enter resource path:", uri, null);
+ String uri = ViewAction.lastResourceNumber == 0 ? "" : "/res" + ViewAction.lastResourceNumber; //$NON-NLS-1$ //$NON-NLS-2$
+ InputDialog dialog = new InputDialog(getShell(), TITLE, Messages.getString("LoadResourceAction.4"), uri, null); //$NON-NLS-1$
if (dialog.open() == InputDialog.OK)
{
resourcePath = dialog.getValue();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
index a189320969..de25e6a8cc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
@@ -7,11 +7,13 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.dialogs.PackageRegistryDialog;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.IWorkbenchPage;
@@ -21,9 +23,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public class ManagePackagesAction extends SessionAction
{
- private static final String TITLE = "Package Registry";
+ private static final String TITLE = Messages.getString("ManagePackagesAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Browse and register model packages";
+ private static final String TOOL_TIP = Messages.getString("ManagePackagesAction.1"); //$NON-NLS-1$
public ManagePackagesAction(IWorkbenchPage page, CDOSession session)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
index d40f9fe893..5b8aaf4df6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
@@ -7,12 +7,14 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.dialogs.OpenAuditDialog;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -24,9 +26,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class OpenAuditAction extends AbstractOpenViewAction
{
- private static final String TITLE = "Open Audit";
+ private static final String TITLE = Messages.getString("OpenAuditAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Open a historical CDO view";
+ private static final String TOOL_TIP = Messages.getString("OpenAuditAction.1"); //$NON-NLS-1$
private long timeStamp;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
index 240bf9afe3..c89c680f77 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -24,9 +25,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class OpenResourceEditorAction extends ResourceNodeAction
{
- private static final String TITLE = "Open Editor";
+ private static final String TITLE = Messages.getString("OpenResourceEditorAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Open a CDO editor for this resource";
+ private static final String TOOL_TIP = Messages.getString("OpenResourceEditorAction.1"); //$NON-NLS-1$
public OpenResourceEditorAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
CDOResourceNode resourceNode)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
index d645a012e6..ead35cdcbe 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistryPopulator;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.internal.ui.dialogs.OpenSessionDialog;
import org.eclipse.emf.cdo.internal.ui.views.CDOSessionsView;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.ui.widgets.SessionComposite;
import org.eclipse.net4j.util.container.IPluginContainer;
@@ -33,7 +34,7 @@ public final class OpenSessionAction extends LongRunningAction
{
private static final String TITLE = OpenSessionDialog.TITLE;
- private static final String TOOL_TIP = "Open a new CDO session";
+ private static final String TOOL_TIP = Messages.getString("OpenSessionAction.0"); //$NON-NLS-1$
private SessionComposite sessionComposite;
@@ -63,8 +64,8 @@ public final class OpenSessionAction extends LongRunningAction
try
{
String description = sessionComposite.getSessionDescription();
- final InternalCDOSession session = (InternalCDOSession)getContainer().getElement("org.eclipse.emf.cdo.sessions",
- "cdo", description);
+ final InternalCDOSession session = (InternalCDOSession)getContainer().getElement("org.eclipse.emf.cdo.sessions", //$NON-NLS-1$
+ "cdo", description); //$NON-NLS-1$
if (sessionComposite.isAutomaticRegistry())
{
@@ -78,7 +79,7 @@ public final class OpenSessionAction extends LongRunningAction
{
public void run()
{
- MessageDialog.openError(getShell(), getText(), "Unable to open a session on the specified repository.\n"
+ MessageDialog.openError(getShell(), getText(), Messages.getString("OpenSessionAction.3") //$NON-NLS-1$
+ ex.getMessage());
}
});
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
index d1d81903f0..577477a738 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
@@ -7,11 +7,13 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.IWorkbenchPage;
@@ -21,9 +23,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class OpenTransactionAction extends AbstractOpenViewAction
{
- private static final String TITLE = "Open Transaction";
+ private static final String TITLE = Messages.getString("OpenTransactionAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Open a read-write CDO view";
+ private static final String TOOL_TIP = Messages.getString("OpenTransactionAction.1"); //$NON-NLS-1$
public OpenTransactionAction(IWorkbenchPage page, CDOSession session)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
index 081a674e6c..dc99f1369a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
@@ -7,11 +7,13 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -23,9 +25,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class OpenViewAction extends AbstractOpenViewAction
{
- private static final String TITLE = "Open View";
+ private static final String TITLE = Messages.getString("OpenViewAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Open a read-only CDO view";
+ private static final String TOOL_TIP = Messages.getString("OpenViewAction.1"); //$NON-NLS-1$
public OpenViewAction(IWorkbenchPage page, CDOSession session)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
index 5ebf85a99b..de81245811 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -22,9 +23,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class OpenViewEditorAction extends ViewAction
{
- private static final String TITLE = "Open Editor";
+ private static final String TITLE = Messages.getString("OpenViewEditorAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Open a CDO editor for this view";
+ private static final String TOOL_TIP = Messages.getString("OpenViewEditorAction.1"); //$NON-NLS-1$
public OpenViewEditorAction(IWorkbenchPage page, CDOView view)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java
index 7a0dbd1930..062cfe0e64 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java
@@ -8,10 +8,12 @@
* Contributors:
* Simon McDuff - initial API and implementation
* Eike Stepper - maintenance
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.CDOLock;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.spi.cdo.InternalCDOObject;
@@ -20,11 +22,11 @@ import org.eclipse.emf.spi.cdo.InternalCDOObject;
*/
public class ReadLockObjectsAction extends AbstractLockObjectsAction
{
- public static final String ID = "readlock-objects";
+ public static final String ID = "readlock-objects"; //$NON-NLS-1$
public ReadLockObjectsAction()
{
- super("ReadLock");
+ super(Messages.getString("ReadLockObjectsAction.1")); //$NON-NLS-1$
setId(ID);
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
index 93522bdda5..29a8ccc623 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
@@ -7,11 +7,13 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EPackage;
@@ -32,14 +34,15 @@ import java.util.List;
*/
public class RegisterFilesystemPackagesAction extends RegisterPackagesAction
{
- private static final String TITLE = "Register Filesystem Packages";
+ private static final String TITLE = Messages.getString("RegisterFilesystemPackagesAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Register dynamic packages from the filesystem";
+ private static final String TOOL_TIP = Messages.getString("RegisterFilesystemPackagesAction.1"); //$NON-NLS-1$
- private static final String[] FILTER_NAMES = { "Ecore models (*.ecore)", "XMI files (*.xmi)", "XML files (*.xml)",
- "All files (*.*)" };
+ private static final String[] FILTER_NAMES = {
+ Messages.getString("RegisterFilesystemPackagesAction.2"), Messages.getString("RegisterFilesystemPackagesAction.3"), Messages.getString("RegisterFilesystemPackagesAction.4"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ Messages.getString("RegisterFilesystemPackagesAction.5") }; //$NON-NLS-1$
- private static final String[] FILTER_EXTENSIONS = { "ecore", "xmi", "xml", null };
+ private static final String[] FILTER_EXTENSIONS = { "ecore", "xmi", "xml", null }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
public RegisterFilesystemPackagesAction(IWorkbenchPage page, CDOSession session)
{
@@ -51,7 +54,7 @@ public class RegisterFilesystemPackagesAction extends RegisterPackagesAction
{
Shell shell = page.getWorkbenchWindow().getShell();
FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI);
- dialog.setFileName("*.ecore");
+ dialog.setFileName("*.ecore"); //$NON-NLS-1$
dialog.setFilterNames(FILTER_NAMES);
dialog.setFilterExtensions(FILTER_EXTENSIONS);
if (dialog.open() != null)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
index e75b253ef9..48c6922355 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.internal.ui.dialogs.SelectPackageDialog;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.ecore.EPackage;
@@ -30,9 +31,9 @@ import java.util.Set;
*/
public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
{
- private static final String TITLE = "Register Generated Packages";
+ private static final String TITLE = Messages.getString("RegisterGeneratedPackagesAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Register native and legacy packages";
+ private static final String TOOL_TIP = Messages.getString("RegisterGeneratedPackagesAction.1"); //$NON-NLS-1$
private EPackage.Registry registry = EPackage.Registry.INSTANCE;
@@ -45,8 +46,8 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
protected List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session)
{
Shell shell = page.getWorkbenchWindow().getShell();
- SelectPackageDialog dialog = new SelectPackageDialog(shell, "Generated Packages",
- "Select one or more packages for registration with the CDO package registry", session.getPackageRegistry()
+ SelectPackageDialog dialog = new SelectPackageDialog(shell, Messages.getString("RegisterGeneratedPackagesAction.2"), //$NON-NLS-1$
+ Messages.getString("RegisterGeneratedPackagesAction.3"), session.getPackageRegistry() //$NON-NLS-1$
.keySet());
if (dialog.open() == SelectPackageDialog.OK)
@@ -81,10 +82,9 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
{
if (uri == null || uri.length() == 0)
{
- return "";
+ return ""; //$NON-NLS-1$
}
-
- return registry.containsKey(uri) ? null : "Package " + uri + " not found.";
+ return registry.containsKey(uri) ? null : String.format(Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
index c70e4b079f..d57c8112fb 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
@@ -7,12 +7,14 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EPackage;
@@ -76,7 +78,7 @@ public abstract class RegisterPackagesAction extends SessionAction
}
else
{
- OM.LOG.error("Failed to register package " + uri, ex);
+ OM.LOG.error(Messages.getString("RegisterPackagesAction.0") + uri, ex); //$NON-NLS-1$
}
}
}
@@ -84,7 +86,8 @@ public abstract class RegisterPackagesAction extends SessionAction
postRegistration(ePackages);
if (errors != 0)
{
- final String label = String.valueOf(errors) + (errors == 1 ? " package has" : " packages have");
+ final String label = String.valueOf(errors)
+ + (errors == 1 ? Messages.getString("RegisterPackagesAction.1") : Messages.getString("RegisterPackagesAction.2")); //$NON-NLS-1$ //$NON-NLS-2$
getDisplay().asyncExec(new Runnable()
{
public void run()
@@ -92,8 +95,7 @@ public abstract class RegisterPackagesAction extends SessionAction
Shell shell = getShell();
if (!shell.isDisposed())
{
- MessageDialog.openError(shell, getText(), label
- + " not been registered due to errors.\nSee the log for details.");
+ MessageDialog.openError(shell, getText(), label + Messages.getString("RegisterPackagesAction.3")); //$NON-NLS-1$
}
}
});
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
index 8daeccd859..417c338140 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageTypeRegistry;
import org.eclipse.emf.cdo.common.model.CDOPackageUnit.Type;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.ecore.EPackage;
@@ -35,7 +36,7 @@ public class RegisterSinglePackageAction extends RegisterPackagesAction
public RegisterSinglePackageAction(IWorkbenchPage page, CDOSession session, String packageURI)
{
- super(page, packageURI, "Register the package " + packageURI, getDescriptor(packageURI), session);
+ super(page, packageURI, Messages.getString("RegisterSinglePackageAction.0") + packageURI, getDescriptor(packageURI), session); //$NON-NLS-1$
this.packageURI = packageURI;
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
index 30fcb0fc30..52b4240fb4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
@@ -7,12 +7,14 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.internal.ui.dialogs.OpenResourcesDialog;
import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EPackage;
@@ -31,9 +33,9 @@ import java.util.List;
*/
public class RegisterWorkspacePackagesAction extends RegisterPackagesAction
{
- private static final String TITLE = "Register Workspace Packages";
+ private static final String TITLE = Messages.getString("RegisterWorkspacePackagesAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Register dynamic packages from the workspace";
+ private static final String TOOL_TIP = Messages.getString("RegisterWorkspacePackagesAction.1"); //$NON-NLS-1$
public RegisterWorkspacePackagesAction(IWorkbenchPage page, CDOSession session)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java
index 6549a7531e..f1ba53b62b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.internal.cdo.CDOStateMachine;
@@ -31,9 +32,9 @@ import java.util.List;
*/
public class ReloadObjectsAction extends EditingDomainAction
{
- public static final String ID = "reload-objects";
+ public static final String ID = "reload-objects"; //$NON-NLS-1$
- private static final String TITLE = "Reload";
+ private static final String TITLE = Messages.getString("ReloadObjectsAction.1"); //$NON-NLS-1$
private List<InternalCDOObject> objects = new ArrayList<InternalCDOObject>();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java
index 1bb1a60f2a..eb38499b17 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java
@@ -8,11 +8,11 @@
* Contributors:
* Eike Stepper - initial API and implementation
* Victor Roldan Betancort - maintenance
- *
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -23,9 +23,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class ReloadViewAction extends ViewAction
{
- private static final String TITLE = "Reload";
+ private static final String TITLE = Messages.getString("ReloadViewAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Reload this view";
+ private static final String TOOL_TIP = Messages.getString("ReloadViewAction.1"); //$NON-NLS-1$
public ReloadViewAction(IWorkbenchPage page, CDOView view)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
index 095c784642..9e59a596c0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
@@ -7,11 +7,13 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.dialogs.RollbackTransactionDialog;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -22,9 +24,9 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public final class RollbackTransactionAction extends ViewAction
{
- private static final String TITLE = "Rollback";
+ private static final String TITLE = Messages.getString("RollbackTransactionAction.0"); //$NON-NLS-1$
- private static final String TOOL_TIP = "Rollback this transaction";
+ private static final String TOOL_TIP = Messages.getString("RollbackTransactionAction.1"); //$NON-NLS-1$
public RollbackTransactionAction(IWorkbenchPage page, CDOView view)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java
index 4c5c331d90..9a31ad23b4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java
@@ -8,10 +8,12 @@
* Contributors:
* Simon McDuff - initial API and implementation
* Eike Stepper - maintenance
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.CDOLock;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.spi.cdo.InternalCDOObject;
@@ -20,11 +22,11 @@ import org.eclipse.emf.spi.cdo.InternalCDOObject;
*/
public class WriteLockObjectsAction extends AbstractLockObjectsAction
{
- public static final String ID = "writelock-objects";
+ public static final String ID = "writelock-objects"; //$NON-NLS-1$
public WriteLockObjectsAction()
{
- super("WriteLock");
+ super(Messages.getString("WriteLockObjectsAction.1")); //$NON-NLS-1$
setId(ID);
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java
index 35dc1c14b9..0523d27e49 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java
@@ -7,9 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
+import org.eclipse.emf.cdo.ui.messages.Messages;
+
import org.eclipse.net4j.util.ui.StaticContentProvider;
import org.eclipse.net4j.util.ui.UIUtil;
@@ -42,7 +45,7 @@ import java.util.List;
*/
public class BulkAddDialog extends TitleAreaDialog
{
- public static final String TITLE = "Bulk Add";
+ public static final String TITLE = Messages.getString("BulkAddDialog.0"); //$NON-NLS-1$
private IWorkbenchPage page;
@@ -94,10 +97,10 @@ public class BulkAddDialog extends TitleAreaDialog
composite.setLayoutData(UIUtil.createGridData());
composite.setLayout(new GridLayout(2, false));
- setTitle("Select a child type and number of child instances");
+ setTitle(Messages.getString("BulkAddDialog.1")); //$NON-NLS-1$
Label label = new Label(composite, SWT.NONE);
- label.setText("Type:");
+ label.setText(Messages.getString("BulkAddDialog.2")); //$NON-NLS-1$
label.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false));
final TableViewer featureViewer = new TableViewer(composite, SWT.BORDER | SWT.SINGLE);
@@ -123,7 +126,7 @@ public class BulkAddDialog extends TitleAreaDialog
}
});
- new Label(composite, SWT.NONE).setText("Instances:");
+ new Label(composite, SWT.NONE).setText(Messages.getString("BulkAddDialog.3")); //$NON-NLS-1$
final Text instancesText = new Text(composite, SWT.BORDER);
instancesText.setLayoutData(UIUtil.createGridData(true, false));
instancesText.setText(String.valueOf(instances));
@@ -166,13 +169,13 @@ public class BulkAddDialog extends TitleAreaDialog
getButton(IDialogConstants.OK_ID).setEnabled(false);
if (feature == null)
{
- setErrorMessage("Select a feature");
+ setErrorMessage(Messages.getString("BulkAddDialog.4")); //$NON-NLS-1$
return;
}
if (instances == 0)
{
- setErrorMessage("Enter a valid number of instances (>0)");
+ setErrorMessage(Messages.getString("BulkAddDialog.5")); //$NON-NLS-1$
return;
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java
index 71e2e93b54..94437606b6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java
@@ -11,6 +11,8 @@
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
+import org.eclipse.emf.cdo.ui.messages.Messages;
+
import org.eclipse.emf.common.ui.dialogs.ResourceDialog;
import org.eclipse.swt.SWT;
@@ -29,7 +31,7 @@ import org.eclipse.swt.widgets.Text;
*/
public class ExportResourceDialog extends ResourceDialog
{
- private String targetPath = "/";
+ private String targetPath = "/"; //$NON-NLS-1$
private Text targetText;
@@ -63,7 +65,7 @@ public class ExportResourceDialog extends ResourceDialog
}
Label label = new Label(composite, SWT.NONE);
- label.setText("Source path:");
+ label.setText(Messages.getString("ExportResourceDialog.1")); //$NON-NLS-1$
{
FormData data = new FormData();
data.top = new FormAttachment(separatorLabel1, CONTROL_OFFSET);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java
index d4063056e9..afe2c297ee 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java
@@ -7,9 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
+import org.eclipse.emf.cdo.ui.messages.Messages;
+
import org.eclipse.emf.common.ui.dialogs.ResourceDialog;
import org.eclipse.swt.SWT;
@@ -28,7 +31,7 @@ import org.eclipse.swt.widgets.Text;
*/
public class ImportResourceDialog extends ResourceDialog
{
- private String targetPath = "/";
+ private String targetPath = "/"; //$NON-NLS-1$
private Text targetText;
@@ -62,7 +65,7 @@ public class ImportResourceDialog extends ResourceDialog
}
Label label = new Label(composite, SWT.NONE);
- label.setText("Target path:");
+ label.setText(Messages.getString("ImportResourceDialog.1")); //$NON-NLS-1$
{
FormData data = new FormData();
data.top = new FormAttachment(separatorLabel1, CONTROL_OFFSET);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
index abddbf9006..a6394bfb81 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
@@ -7,10 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.net4j.util.ui.UIUtil;
@@ -32,7 +34,7 @@ import java.util.GregorianCalendar;
*/
public class OpenAuditDialog extends TitleAreaDialog
{
- public static final String TITLE = "Open Audit";
+ public static final String TITLE = Messages.getString("OpenAuditDialog.0"); //$NON-NLS-1$
private IWorkbenchPage page;
@@ -76,7 +78,7 @@ public class OpenAuditDialog extends TitleAreaDialog
setTitle(TITLE);
setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PACKAGE_MANAGER));
- new Label(composite, SWT.NONE).setText("Target Time:");
+ new Label(composite, SWT.NONE).setText(Messages.getString("OpenAuditDialog.1")); //$NON-NLS-1$
dateControl = new DateTime(composite, SWT.DATE);
timeControl = new DateTime(composite, SWT.TIME);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java
index 33b01b4332..1b17d31937 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java
@@ -7,9 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
+import org.eclipse.emf.cdo.ui.messages.Messages;
+
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.swt.widgets.Shell;
@@ -20,7 +23,7 @@ public class OpenResourcesDialog extends FilteredResourcesSelectionDialog
public OpenResourcesDialog(Shell parentShell)
{
super(parentShell, true, ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE);
- setTitle("Open Resources");
- setInitialPattern("*.ecore");
+ setTitle(Messages.getString("OpenResourcesDialog.0")); //$NON-NLS-1$
+ setInitialPattern("*.ecore"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
index 215ec312f1..38c1f206fd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
@@ -7,10 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.ui.widgets.SessionComposite;
import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -25,7 +27,7 @@ import org.eclipse.ui.IWorkbenchPage;
*/
public class OpenSessionDialog extends TitleAreaDialog
{
- public static final String TITLE = "Open Session";
+ public static final String TITLE = Messages.getString("OpenSessionDialog.0"); //$NON-NLS-1$
private IWorkbenchPage page;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
index c6ad9464b9..2a92c75d01 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.cdo.internal.ui.actions.RegisterGeneratedPackagesAction;
import org.eclipse.emf.cdo.internal.ui.actions.RegisterWorkspacePackagesAction;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.ui.CDOItemProvider;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.ui.UIUtil;
@@ -65,7 +66,7 @@ public class PackageRegistryDialog extends TitleAreaDialog
private static final int REGISTER_FILESYSTEM_PACKAGES_ID = IDialogConstants.CLIENT_ID + 3;
- private static final String TITLE = "CDO Package Registry";
+ private static final String TITLE = Messages.getString("PackageRegistryDialog.0"); //$NON-NLS-1$
private static final Color GRAY = UIUtil.getDisplay().getSystemColor(SWT.COLOR_GRAY);
@@ -102,10 +103,10 @@ public class PackageRegistryDialog extends TitleAreaDialog
table.setHeaderVisible(true);
table.setLayoutData(UIUtil.createGridData());
- addColumn(table, "Package", 450, SWT.LEFT);
- addColumn(table, "State", 80, SWT.CENTER);
- addColumn(table, "Type", 80, SWT.CENTER);
- addColumn(table, "Original", 80, SWT.CENTER);
+ addColumn(table, Messages.getString("PackageRegistryDialog.1"), 450, SWT.LEFT); //$NON-NLS-1$
+ addColumn(table, Messages.getString("PackageRegistryDialog.2"), 80, SWT.CENTER); //$NON-NLS-1$
+ addColumn(table, Messages.getString("PackageRegistryDialog.3"), 80, SWT.CENTER); //$NON-NLS-1$
+ addColumn(table, Messages.getString("PackageRegistryDialog.4"), 80, SWT.CENTER); //$NON-NLS-1$
viewer.setContentProvider(new EPackageContentProvider());
viewer.setLabelProvider(new EPackageLabelProvider());
@@ -117,11 +118,11 @@ public class PackageRegistryDialog extends TitleAreaDialog
@Override
protected void createButtonsForButtonBar(Composite parent)
{
- Button button = createButton(parent, REGISTER_GENERATED_PACKAGES_ID, "Generated...", false);
+ Button button = createButton(parent, REGISTER_GENERATED_PACKAGES_ID, Messages.getString("PackageRegistryDialog.5"), false); //$NON-NLS-1$
button.setEnabled(isGlobalPackageAvaliable());
- createButton(parent, REGISTER_WORKSPACE_PACKAGES_ID, "Workspace...", false);
- createButton(parent, REGISTER_FILESYSTEM_PACKAGES_ID, "Filesystem...", false);
+ createButton(parent, REGISTER_WORKSPACE_PACKAGES_ID, Messages.getString("PackageRegistryDialog.6"), false); //$NON-NLS-1$
+ createButton(parent, REGISTER_FILESYSTEM_PACKAGES_ID, Messages.getString("PackageRegistryDialog.7"), false); //$NON-NLS-1$
createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL, false);
}
@@ -232,7 +233,7 @@ public class PackageRegistryDialog extends TitleAreaDialog
case 2:
if (packageInfo.getPackageUnit().getType() == Type.UNKNOWN)
{
- return "?";
+ return Messages.getString("PackageRegistryDialog.8"); //$NON-NLS-1$
}
return packageInfo.getPackageUnit().getType().toString();
@@ -248,7 +249,7 @@ public class PackageRegistryDialog extends TitleAreaDialog
return entry.getKey();
default:
- return "";
+ return ""; //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
index fbab15a59d..d2f0baeabc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
@@ -7,10 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.dialogs;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.net4j.util.ui.UIUtil;
@@ -79,29 +81,35 @@ public class RollbackTransactionDialog extends TitleAreaDialog
protected String formatMessage()
{
StringBuilder builder = new StringBuilder();
- builder.append("This transaction contains:\n");
+ builder.append(Messages.getString("RollbackTransactionDialog.0")); //$NON-NLS-1$
+ builder.append("\n"); //$NON-NLS-1$
- append(builder, transaction.getNewResources().size(), "new resource");
- append(builder, transaction.getNewObjects().size(), "new object");
- append(builder, transaction.getDirtyObjects().size(), "dirty object");
- append(builder, transaction.getDetachedObjects().size(), "detached object");
+ append(builder, transaction.getNewResources().size(), Messages.getString("RollbackTransactionDialog.2"), Messages.getString("RollbackTransactionDialog.3")); //$NON-NLS-1$ //$NON-NLS-2$
+ append(builder, transaction.getNewObjects().size(), Messages.getString("RollbackTransactionDialog.4"), Messages.getString("RollbackTransactionDialog.5")); //$NON-NLS-1$ //$NON-NLS-2$
+ append(builder, transaction.getDirtyObjects().size(), Messages.getString("RollbackTransactionDialog.6"), Messages.getString("RollbackTransactionDialog.7")); //$NON-NLS-1$ //$NON-NLS-2$
+ append(builder, transaction.getDetachedObjects().size(), Messages.getString("RollbackTransactionDialog.8"), Messages.getString("RollbackTransactionDialog.9")); //$NON-NLS-1$ //$NON-NLS-2$
- builder.append("\n\nAre you sure to rollback this transaction?");
+ builder.append("\n\n"); //$NON-NLS-1$
+ builder.append(Messages.getString("RollbackTransactionDialog.11")); //$NON-NLS-1$
return builder.toString();
}
- private void append(StringBuilder builder, int count, String label)
+ private void append(StringBuilder builder, int count, String labelSingular, String labelPlural)
{
if (count > 0)
{
- builder.append("\n- ");
+ builder.append("\n- "); //$NON-NLS-1$
builder.append(count);
- builder.append(" ");
- builder.append(label);
+ builder.append(" "); //$NON-NLS-1$
if (count > 1)
{
- builder.append("s");
+ builder.append(labelPlural);
}
+ else
+ {
+ builder.append(labelSingular);
+ }
+
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
index d5af1560e8..3eb11e4706 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.editor;
@@ -62,17 +63,17 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
*
* @generated
*/
- public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; //$NON-NLS-1$
/**
* @ADDED
*/
- public static final String LOAD_RESOURCE_ID = "load-resource";
+ public static final String LOAD_RESOURCE_ID = "load-resource"; //$NON-NLS-1$
/**
* @ADDED
*/
- public static final String REFRESH_VIEWER_ID = "refresh-viewer";
+ public static final String REFRESH_VIEWER_ID = "refresh-viewer"; //$NON-NLS-1$
/**
* @ADDED
@@ -119,14 +120,14 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
* @generated
*/
protected IAction showPropertiesViewAction = new Action(PluginDelegator.INSTANCE
- .getString("_UI_ShowPropertiesView_menu_item"))
+ .getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
{
@Override
public void run()
{
try
{
- getPage().showView("org.eclipse.ui.views.PropertySheet");
+ getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
}
catch (PartInitException exception)
{
@@ -141,7 +142,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
*
* @generated
*/
- protected IAction refreshViewerAction = new Action(PluginDelegator.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+ protected IAction refreshViewerAction = new Action(PluginDelegator.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
{
@Override
public boolean isEnabled()
@@ -227,8 +228,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
@Override
public void contributeToToolBar(IToolBarManager toolBarManager)
{
- toolBarManager.add(new Separator("cdo-settings"));
- toolBarManager.add(new Separator("cdo-additions"));
+ toolBarManager.add(new Separator("cdo-settings")); //$NON-NLS-1$
+ toolBarManager.add(new Separator("cdo-additions")); //$NON-NLS-1$
}
/**
@@ -242,23 +243,23 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
{
super.contributeToMenu(menuManager);
- IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"),
- "org.eclipse.emf.cdo.internal.ui.editorMenuID");
- menuManager.insertAfter("additions", submenuManager);
- submenuManager.add(new Separator("settings"));
- submenuManager.add(new Separator("actions"));
- submenuManager.add(new Separator("additions"));
- submenuManager.add(new Separator("additions-end"));
+ IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"), //$NON-NLS-1$
+ "org.eclipse.emf.cdo.internal.ui.editorMenuID"); //$NON-NLS-1$
+ menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+ submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+ submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+ submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+ submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
// Prepare for CreateChild item addition or removal.
//
- createChildMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
- submenuManager.insertBefore("additions", createChildMenuManager);
+ createChildMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+ submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
// Prepare for CreateSibling item addition or removal.
//
- createSiblingMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
- submenuManager.insertBefore("additions", createSiblingMenuManager);
+ createSiblingMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+ submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
// Force an update because Eclipse hides empty menus now.
//
@@ -555,13 +556,13 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
super.menuAboutToShow(menuManager);
MenuManager submenuManager = null;
- submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
populateManager(submenuManager, createChildActions, null);
- menuManager.insertBefore("edit", submenuManager);
+ menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
- submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
populateManager(submenuManager, createSiblingActions, null);
- menuManager.insertBefore("edit", submenuManager);
+ menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
}
/**
@@ -571,11 +572,11 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
*/
protected void addGlobalActionsGen(IMenuManager menuManager)
{
- menuManager.insertAfter("additions-end", new Separator("ui-actions"));
- menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+ menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+ menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
- menuManager.insertAfter("ui-actions", refreshViewerAction);
+ menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
super.addGlobalActions(menuManager);
}
@@ -586,26 +587,26 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
@Override
protected void addGlobalActions(IMenuManager menuManager)
{
- menuManager.insertAfter("additions-end", new Separator("ui-actions"));
- menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+ menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+ menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
refreshViewerAction.setId(REFRESH_VIEWER_ID);
- menuManager.insertAfter("ui-actions", refreshViewerAction);
+ menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
menuManager.insertBefore(refreshViewerAction.getId(), reloadObjectsAction);
- MenuManager lockingSubMenu = new MenuManager("Locking");
- lockingSubMenu.add(new Separator("ui-actions"));
+ MenuManager lockingSubMenu = new MenuManager("Locking"); //$NON-NLS-1$
+ lockingSubMenu.add(new Separator("ui-actions")); //$NON-NLS-1$
- lockingSubMenu.insertAfter("ui-actions", writeLockObjectsAction);
+ lockingSubMenu.insertAfter("ui-actions", writeLockObjectsAction); //$NON-NLS-1$
writeLockObjectsAction.update();
- lockingSubMenu.insertAfter("ui-actions", readLockObjectsAction);
+ lockingSubMenu.insertAfter("ui-actions", readLockObjectsAction); //$NON-NLS-1$
readLockObjectsAction.update();
- menuManager.insertAfter("ui-actions", lockingSubMenu);
+ menuManager.insertAfter("ui-actions", lockingSubMenu); //$NON-NLS-1$
- menuManager.insertAfter("ui-actions", changePassiveUpdateAction);
+ menuManager.insertAfter("ui-actions", changePassiveUpdateAction); //$NON-NLS-1$
changePassiveUpdateAction.update();
changePassiveUpdateAction.setEnabled(true);
@@ -622,10 +623,10 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
{
if (importRootsAction != null)
{
- menuManager.insertBefore("additions-end", importRootsAction);
+ menuManager.insertBefore("additions-end", importRootsAction); //$NON-NLS-1$
}
- menuManager.insertBefore("additions-end", new Separator());
+ menuManager.insertBefore("additions-end", new Separator()); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index 6bb7bf00fc..f7df9791ae 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.ui.CDOEditorInput;
import org.eclipse.emf.cdo.ui.CDOEventHandler;
import org.eclipse.emf.cdo.ui.CDOLabelProvider;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.util.CDOURIUtil;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.view.CDOView;
@@ -182,12 +183,12 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
*
* @generated
*/
- public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; //$NON-NLS-1$
/**
* @ADDED
*/
- public static final String EDITOR_ID = "org.eclipse.emf.cdo.ui.CDOEditor";
+ public static final String EDITOR_ID = "org.eclipse.emf.cdo.ui.CDOEditor"; //$NON-NLS-1$
/**
* @ADDED
@@ -636,7 +637,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
if (updateProblemIndication)
{
- BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.ui.editor", 0, null,
+ BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.ui.editor", 0, null, //$NON-NLS-1$
new Object[] { editingDomain.getResourceSet() });
for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
{
@@ -698,8 +699,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
*/
protected boolean handleDirtyConflict()
{
- return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
- getString("_WARN_FileConflict"));
+ return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), //$NON-NLS-1$
+ getString("_WARN_FileConflict")); //$NON-NLS-1$
}
/**
@@ -969,8 +970,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
*/
protected void createContextMenuFor(StructuredViewer viewer)
{
- MenuManager contextMenu = new MenuManager("#PopUp");
- contextMenu.add(new Separator("additions"));
+ MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+ contextMenu.add(new Separator("additions")); //$NON-NLS-1$
contextMenu.setRemoveAllWhenShown(true);
contextMenu.addMenuListener(this);
Menu menu = contextMenu.createContextMenu(viewer.getControl());
@@ -1102,16 +1103,16 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
{
- BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui.editor", 0,
- getString("_UI_CreateModelError_message", resource.getURI()),
+ BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui.editor", 0, //$NON-NLS-1$
+ getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
new Object[] { exception == null ? (Object)resource : exception });
basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
return basicDiagnostic;
}
else if (exception != null)
{
- return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui.editor", 0, getString(
- "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
+ return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui.editor", 0, getString( //$NON-NLS-1$
+ "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception }); //$NON-NLS-1$
}
else
{
@@ -1150,7 +1151,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
createContextMenuFor(selectionViewer);
int pageIndex = addPage(tree);
- setPageText(pageIndex, getString("_UI_SelectionPage_label"));
+ setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
getSite().getShell().getDisplay().asyncExec(new Runnable()
{
@@ -1218,7 +1219,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
createContextMenuFor(selectionViewer);
int pageIndex = addPage(tree);
- setPageText(pageIndex, getString("_UI_SelectionPage_label"));
+ setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
setActivePage(0);
@@ -1294,7 +1295,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
try
{
- getSite().getPage().showView("org.eclipse.ui.views.PropertySheet");
+ getSite().getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
}
catch (PartInitException ex)
{
@@ -1349,7 +1350,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
if (getPageCount() <= 1)
{
- setPageText(0, "");
+ setPageText(0, ""); //$NON-NLS-1$
if (getContainer() != null && !getContainer().isDisposed() && getContainer() instanceof CTabFolder)
{
((CTabFolder)getContainer()).setTabHeight(1);
@@ -1369,7 +1370,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
if (getPageCount() > 1)
{
- setPageText(0, getString("_UI_SelectionPage_label"));
+ setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
if (getContainer() != null && !getContainer().isDisposed() && getContainer() instanceof CTabFolder)
{
((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
@@ -1658,7 +1659,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
boolean first = true;
EList<Resource> resources = CDOUtil.getResources(editingDomain.getResourceSet());
- monitor.beginTask("", resources.size());
+ monitor.beginTask("", resources.size()); //$NON-NLS-1$
try
{
for (Resource resource : resources)
@@ -1681,8 +1682,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
public void run()
{
CDOTransaction transaction = (CDOTransaction)view;
- String title = "Transaction Error";
- String message = "An error occured while committing the transaction.\nSee Error Log for details.";
+ String title = Messages.getString("CDOEditor.17"); //$NON-NLS-1$
+ String message = Messages.getString("CDOEditor.18"); //$NON-NLS-1$
RollbackTransactionDialog dialog = new RollbackTransactionDialog(getEditorSite().getPage(), title,
message, transaction);
if (dialog.open() == RollbackTransactionDialog.OK)
@@ -1954,25 +1955,25 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
case 0:
{
- statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+ statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
break;
}
case 1:
{
String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
- statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+ statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
break;
}
default:
{
- statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+ statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
break;
}
}
}
else
{
- statusLineManager.setMessage("");
+ statusLineManager.setMessage(""); //$NON-NLS-1$
}
}
}
@@ -2014,10 +2015,10 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
public void menuAboutToShow(IMenuManager menuManager)
{
menuAboutToShowGen(menuManager);
- MenuManager submenuManager = new MenuManager("New Root");
+ MenuManager submenuManager = new MenuManager(Messages.getString("CDOEditor.23")); //$NON-NLS-1$
if (populateNewRoot(submenuManager))
{
- menuManager.insertBefore("edit", submenuManager);
+ menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
}
if (OM.TEST_BULK_ADD.isEnabled())
@@ -2041,7 +2042,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
if (!features.isEmpty())
{
final IWorkbenchPage page = getSite().getPage();
- menuManager.insertBefore("edit", new LongRunningAction(page, "Bulk Add" + SafeAction.INTERACTIVE)
+ menuManager.insertBefore("edit", new LongRunningAction(page, Messages.getString("CDOEditor.26") + SafeAction.INTERACTIVE) //$NON-NLS-1$ //$NON-NLS-2$
{
private EReference feature;
@@ -2124,7 +2125,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
ImageDescriptor imageDescriptor = SharedIcons.getDescriptor(SharedIcons.OBJ_EPACKAGE_UNKNOWN);
final MenuManager submenuManager = new MenuManager(nsURI, imageDescriptor, nsURI);
submenuManager.setRemoveAllWhenShown(true);
- submenuManager.add(new Action("Calculating...")
+ submenuManager.add(new Action(Messages.getString("CDOEditor.27")) //$NON-NLS-1$
{
});
submenuManager.addMenuListener(new IMenuListener()
@@ -2140,7 +2141,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
}
else
{
- OM.LOG.warn("Can't find " + nsURI + " in CDOPackageRegistry");
+ OM.LOG.warn(String.format(Messages.getString("CDOEditor.28"), nsURI)); //$NON-NLS-1$
}
}
});
@@ -2200,7 +2201,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
{
}
- return "";
+ return ""; //$NON-NLS-1$
}
private Object getLabelImage(Object object)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
index 6516cf3160..d918133161 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
@@ -27,7 +27,7 @@ public final class PluginDelegator extends EMFPlugin
*
* @generated
*/
- public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; //$NON-NLS-1$
/**
* Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java
index 29573f8bb3..913cf0ecac 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOObjectFilter.java
@@ -20,7 +20,7 @@ public abstract class CDOObjectFilter extends ViewerFilter
{
private StructuredViewer viewer;
- private String pattern = "";
+ private String pattern = ""; //$NON-NLS-1$
public CDOObjectFilter(StructuredViewer viewer)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java
index f74120a9e4..bb2f40b103 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/filters/CDOStateFilter.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.ui.filters;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.CDOState;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.Viewer;
@@ -22,6 +23,16 @@ import org.eclipse.jface.viewers.Viewer;
*/
public class CDOStateFilter extends CDOObjectFilter
{
+ private static final String STATE_CONFLICT = Messages.getString("CDOStateFilter.0"); //$NON-NLS-1$
+
+ private static final String STATE_TRANSIENT = Messages.getString("CDOStateFilter.1"); //$NON-NLS-1$
+
+ private static final String STATE_NEW = Messages.getString("CDOStateFilter.2"); //$NON-NLS-1$
+
+ private static final String STATE_CLEAN = Messages.getString("CDOStateFilter.3"); //$NON-NLS-1$
+
+ private static final String STATE_DIRTY = Messages.getString("CDOStateFilter.4"); //$NON-NLS-1$
+
private CDOState stateFilter;
public CDOStateFilter(StructuredViewer viewer)
@@ -32,23 +43,23 @@ public class CDOStateFilter extends CDOObjectFilter
@Override
protected void parsePattern(String pattern)
{
- if (pattern.compareToIgnoreCase("dirty") == 0)
+ if (pattern.compareToIgnoreCase(STATE_DIRTY) == 0)
{
stateFilter = CDOState.DIRTY;
}
- else if (pattern.compareToIgnoreCase("clean") == 0)
+ else if (pattern.compareToIgnoreCase(STATE_CLEAN) == 0)
{
stateFilter = CDOState.CLEAN;
}
- else if (pattern.compareToIgnoreCase("new") == 0)
+ else if (pattern.compareToIgnoreCase(STATE_NEW) == 0)
{
stateFilter = CDOState.NEW;
}
- else if (pattern.compareToIgnoreCase("transient") == 0)
+ else if (pattern.compareToIgnoreCase(STATE_TRANSIENT) == 0)
{
stateFilter = CDOState.TRANSIENT;
}
- else if (pattern.compareToIgnoreCase("conflict") == 0)
+ else if (pattern.compareToIgnoreCase(STATE_CONFLICT) == 0)
{
stateFilter = CDOState.CONFLICT;
}
@@ -71,12 +82,13 @@ public class CDOStateFilter extends CDOObjectFilter
@Override
public String getDescription()
{
- return "Specify a state to filter: dirty | clean | transient | new | conflict";
+ return String.format(Messages.getString("CDOStateFilter.5"), STATE_DIRTY, STATE_CLEAN, //$NON-NLS-1$
+ STATE_TRANSIENT, STATE_NEW, STATE_CONFLICT);
}
@Override
public String getTitle()
{
- return "CDOState filter";
+ return Messages.getString("CDOStateFilter.6"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
index 4c1eea9565..e717af3a5e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
@@ -7,10 +7,12 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
+ * Victor Roldan Betancort - maintenance
*/
package org.eclipse.emf.cdo.internal.ui.preferences;
import org.eclipse.emf.cdo.common.revision.CDORevision;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.net4j.util.ui.UIUtil;
@@ -57,36 +59,36 @@ public class CDOPreferencePage extends OMPreferencePage
Group sessionGroup = new Group(composite, SWT.NONE);
sessionGroup.setLayout(new GridLayout(2, false));
- sessionGroup.setText("Session Defaults");
+ sessionGroup.setText(Messages.getString("CDOPreferencePage.0")); //$NON-NLS-1$
sessionGroup.setLayoutData(UIUtil.createGridData(true, false));
- new Label(sessionGroup, SWT.NONE).setText("Repository name:");
+ new Label(sessionGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.1")); //$NON-NLS-1$
repositoryName = new Text(sessionGroup, SWT.BORDER);
repositoryName.setLayoutData(UIUtil.createGridData(true, false));
- new Label(sessionGroup, SWT.NONE).setText("User name:");
+ new Label(sessionGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.2")); //$NON-NLS-1$
userName = new Text(sessionGroup, SWT.BORDER);
userName.setLayoutData(UIUtil.createGridData(true, false));
- new Label(sessionGroup, SWT.NONE).setText("Connector description:");
+ new Label(sessionGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.3")); //$NON-NLS-1$
connectorDescription = new Text(sessionGroup, SWT.BORDER);
connectorDescription.setLayoutData(UIUtil.createGridData(true, false));
- new Label(sessionGroup, SWT.NONE).setText("Reference chunk size:");
+ new Label(sessionGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.4")); //$NON-NLS-1$
referenceChunkSize = new TextAndDisable(sessionGroup, SWT.BORDER, String.valueOf(CDORevision.UNCHUNKED));
referenceChunkSize.setLayoutData(UIUtil.createGridData(true, false));
Group viewGroup = new Group(composite, SWT.NONE);
viewGroup.setLayout(new GridLayout(2, false));
- viewGroup.setText("View Defaults");
+ viewGroup.setText(Messages.getString("CDOPreferencePage.5")); //$NON-NLS-1$
viewGroup.setLayoutData(UIUtil.createGridData(true, false));
- new Label(viewGroup, SWT.NONE).setText("Preload chunk size:");
+ new Label(viewGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.6")); //$NON-NLS-1$
preloadChunkSize = new TextAndDisable(viewGroup, SWT.BORDER, String
.valueOf(CDOView.Options.NO_REVISION_PREFETCHING));
preloadChunkSize.setLayoutData(UIUtil.createGridData(true, false));
- new Label(viewGroup, SWT.NONE).setText("EMF invalidation notifications:");
+ new Label(viewGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.7")); //$NON-NLS-1$
invalidationNotifications = new Button(viewGroup, SWT.CHECK);
initValues();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java
index 6c8441f125..7029962bbc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.ui.preferences;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.ui.CDOLabelDecorator;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.net4j.util.ui.UIUtil;
import org.eclipse.net4j.util.ui.prefs.OMPreferencePage;
@@ -51,7 +52,7 @@ public class CDOUIPreferencePage extends OMPreferencePage
Composite composite = UIUtil.createGridComposite(parent, 2);
composite.setLayoutData(UIUtil.createGridData());
- new Label(composite, SWT.NONE).setText("Label decoration:");
+ new Label(composite, SWT.NONE).setText(Messages.getString("CDOUIPreferencePage.0")); //$NON-NLS-1$
decoration = new TextAndDisable(composite, SWT.BORDER, CDOLabelDecorator.NO_DECORATION)
{
@Override
@@ -66,16 +67,16 @@ public class CDOUIPreferencePage extends OMPreferencePage
StringBuffer tags = new StringBuffer();
for (String tag : CDOLabelDecorator.DECORATION_PROPOSALS)
{
- tags.append(tag + " ");
+ tags.append(tag + " "); //$NON-NLS-1$
}
- text.setToolTipText("Available tags: " + tags.toString());
+ text.setToolTipText(Messages.getString("CDOUIPreferencePage.2") + tags.toString()); //$NON-NLS-1$
IControlContentAdapter contentAdapter = new TextContentAdapter();
IContentProposalProvider provider = new SimpleContentProposalProvider(CDOLabelDecorator.DECORATION_PROPOSALS);
new ContentAssistCommandAdapter(text, contentAdapter, provider, null, new char[] { '$' }, true);
UIUtil.addDecorationMargin(text);
autoReload = new Button(composite, SWT.CHECK);
- autoReload.setText("Enable CDOEditor Auto-Reload");
+ autoReload.setText(Messages.getString("CDOUIPreferencePage.1")); //$NON-NLS-1$
autoReload.setLayoutData(UIUtil.createGridData(false, false));
UIUtil.setIndentation(autoReload, -1, 10);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
index 3bf42b1fb5..9654a754af 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.cdo.internal.ui.dnd.CDOObjectDropAdapter;
import org.eclipse.emf.cdo.transaction.CDOCommitContext;
import org.eclipse.emf.cdo.transaction.CDODefaultTransactionHandler;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
import org.eclipse.emf.cdo.view.CDOView;
@@ -96,7 +97,7 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public class CDOWatchListView extends ViewPart implements ISelectionProvider
{
- private static final String[] columnNames = { "Object", "Resource", "Time", "Changes" };
+ private static final String[] columnNames = { Messages.getString("CDOWatchListView.0"), Messages.getString("CDOWatchListView.1"), Messages.getString("CDOWatchListView.2"), Messages.getString("CDOWatchListView.3") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
private static final int[] columnWidths = { 110, 280, 170, 230 };
@@ -160,29 +161,29 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
{
ISharedImages platformImages = PlatformUI.getWorkbench().getSharedImages();
removeAction = new RemoveContainerItemAction<CDOObject>(container, viewer);
- removeAction.setText("Remove");
+ removeAction.setText(Messages.getString("CDOWatchListView.4")); //$NON-NLS-1$
removeAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
removeAction.setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
- removeAction.setToolTipText("Remove selected subscriptions");
+ removeAction.setToolTipText(Messages.getString("CDOWatchListView.5")); //$NON-NLS-1$
removeAllAction = new RemoveAllContainerItemAction<CDOObject>(container);
- removeAllAction.setText("Remove All");
+ removeAllAction.setText(Messages.getString("CDOWatchListView.6")); //$NON-NLS-1$
removeAllAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
- removeAllAction.setToolTipText("Remove all subscriptions");
+ removeAllAction.setToolTipText(Messages.getString("CDOWatchListView.7")); //$NON-NLS-1$
resetNotificationAction = new ResetNotificationAction();
- resetNotificationAction.setText("Reset Changes");
+ resetNotificationAction.setText(Messages.getString("CDOWatchListView.8")); //$NON-NLS-1$
resetNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
resetNotificationAction.setDisabledImageDescriptor(platformImages
.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
- resetNotificationAction.setToolTipText("Reset all change notifications from the selected subscriptions");
+ resetNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.9")); //$NON-NLS-1$
resetAllNotificationAction = new ResetAllNotificationAction();
- resetAllNotificationAction.setText("Reset All Changes");
+ resetAllNotificationAction.setText(Messages.getString("CDOWatchListView.10")); //$NON-NLS-1$
resetAllNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
resetAllNotificationAction.setDisabledImageDescriptor(platformImages
.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
- resetAllNotificationAction.setToolTipText("Reset all change notifications of the subscriptions in the view");
+ resetAllNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.11")); //$NON-NLS-1$
}
private void createToolbarButtons()
@@ -198,7 +199,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
private void createContextMenu()
{
- MenuManager menuMgr = new MenuManager("#PopupMenu");
+ MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
menuMgr.addMenuListener(new IMenuListener()
{
@@ -747,8 +748,8 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
{
private final Color YELLOW = UIUtil.getDisplay().getSystemColor(SWT.COLOR_YELLOW);
- private final String[] eventTypes = { "CREATE", "SET", "UNSET", "ADD", "REMOVE", "ADD MANY", "REMOVE MANY", "MOVE",
- "REMOVING ADAPTER", "RESOLVE" };
+ private final String[] eventTypes = { Messages.getString("CDOWatchListView.12"), Messages.getString("CDOWatchListView.25"), Messages.getString("CDOWatchListView.26"), Messages.getString("CDOWatchListView.27"), Messages.getString("CDOWatchListView.28"), Messages.getString("CDOWatchListView.29"), Messages.getString("CDOWatchListView.30"), Messages.getString("CDOWatchListView.31"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+ Messages.getString("CDOWatchListView.32"), Messages.getString("CDOWatchListView.33") }; //$NON-NLS-1$ //$NON-NLS-2$
private AdapterFactory adapterFactory;
@@ -813,7 +814,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
}
}
- return "?";
+ return "?"; //$NON-NLS-1$
case 3:
Notification notification = getDataRegistry().getNotification(element);
@@ -855,9 +856,9 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
builder.append(eventTypes[event]);
}
- builder.append(": ");
+ builder.append(": "); //$NON-NLS-1$
builder.append(((EStructuralFeature)notification.getFeature()).getName());
- builder.append(" = ");
+ builder.append(" = "); //$NON-NLS-1$
builder.append(notification.getNewValue().toString());
return builder.toString();
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
index 28bdb169b9..f61557fb65 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.cdo.internal.ui.actions.ReloadViewAction;
import org.eclipse.emf.cdo.internal.ui.actions.RollbackTransactionAction;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.emf.cdo.view.CDOAudit;
import org.eclipse.emf.cdo.view.CDOView;
@@ -157,7 +158,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
*/
public static String getSessionLabel(CDOSession session)
{
- return "Session " + session.repository().getName() + " [" + session.getSessionID() + "]";
+ return Messages.getString("CDOItemProvider.0") + session.repository().getName() + " [" + session.getSessionID() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
/**
@@ -168,16 +169,16 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
if (view instanceof CDOTransaction)
{
CDOTransaction transaction = (CDOTransaction)view;
- return MessageFormat.format("{0}Transaction [{1}]", transaction.isDirty() ? "*" : "", transaction.getViewID());
+ return MessageFormat.format(Messages.getString("CDOItemProvider.3"), transaction.isDirty() ? "*" : "", transaction.getViewID()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if (view instanceof CDOAudit)
{
CDOAudit audit = (CDOAudit)view;
- return MessageFormat.format("Audit [{0,date} {0,time}]", audit.getTimeStamp());
+ return MessageFormat.format(Messages.getString("CDOItemProvider.6"), audit.getTimeStamp()); //$NON-NLS-1$
}
- return MessageFormat.format("View [{0}]", view.getViewID());
+ return MessageFormat.format(Messages.getString("CDOItemProvider.7"), view.getViewID()); //$NON-NLS-1$
}
@Override
@@ -209,7 +210,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
manager.add(new Separator());
manager.add(new ManagePackagesAction(page, session));
- MenuManager generatedManager = new MenuManager("Register Generated Package");
+ MenuManager generatedManager = new MenuManager(Messages.getString("CDOItemProvider.8")); //$NON-NLS-1$
if (fillGenerated(generatedManager, session))
{
manager.add(generatedManager);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
index 52b0f31a97..d73cd1e28d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
@@ -40,15 +40,15 @@ import java.text.MessageFormat;
*/
public class CDOLabelDecorator implements ILabelDecorator
{
- public static final String[] DECORATION_PROPOSALS = { "${element}", "${id}", "${state}", "${created}", "${revised}" };
+ public static final String[] DECORATION_PROPOSALS = { "${element}", "${id}", "${state}", "${created}", "${revised}" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- public static final String DEFAULT_DECORATION = DECORATION_PROPOSALS[0] + " [" + DECORATION_PROPOSALS[1] + "]";
+ public static final String DEFAULT_DECORATION = DECORATION_PROPOSALS[0] + " [" + DECORATION_PROPOSALS[1] + "]"; //$NON-NLS-1$ //$NON-NLS-2$
public static final String NO_DECORATION = DECORATION_PROPOSALS[0];
- private static final String[] DECORATION_ARGS = { "{0}", "{1}", "{2}", "{3,date} {3,time}", "{4,date} {4,time}" };
+ private static final String[] DECORATION_ARGS = { "{0}", "{1}", "{2}", "{3,date} {3,time}", "{4,date} {4,time}" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- public static final String DECORATOR_ID = "org.eclipse.emf.cdo.ui.cdolabeldecorator";
+ public static final String DECORATOR_ID = "org.eclipse.emf.cdo.ui.cdolabeldecorator"; //$NON-NLS-1$
private String pattern;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/messages/Messages.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/messages/Messages.java
new file mode 100644
index 0000000000..5f0746a2f4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/messages/Messages.java
@@ -0,0 +1,41 @@
+/**
+ * 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:
+ * Victor Roldan Betancort - initial API and implementation
+ * Eike Stepper - maintenance
+ */
+package org.eclipse.emf.cdo.ui.messages;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.eclipse.emf.cdo.ui.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.ui/src/org/eclipse/emf/cdo/ui/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/messages/messages.properties
new file mode 100644
index 0000000000..d3f7c6facc
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/messages/messages.properties
@@ -0,0 +1,190 @@
+# ==============================================================================
+# 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:
+# Victor Roldan Betancort - initial API and implementation
+# Eike Stepper - maintenance
+# ==============================================================================
+
+# ==============================================================================
+# This properties file contains all strings subject to be shown in the UI.
+# ==============================================================================
+
+AbstractLockObjectsAction.0=Error
+AbstractLockObjectsAction.1=Cannot obtain locks
+BulkAddDialog.0=Bulk Add
+BulkAddDialog.1=Select a child type and number of child instances
+BulkAddDialog.2=Type:
+BulkAddDialog.3=Instances:
+BulkAddDialog.4=Select a feature
+BulkAddDialog.5=Enter a valid number of instances (>0)
+CDOEditor.17=Transaction Error
+CDOEditor.18=An error occured while committing the transaction.\nSee Error Log for details.
+CDOEditor.23=New Root
+CDOEditor.26=Bulk Add
+CDOEditor.27=Calculating...
+CDOEditor.28=Can't find %s in CDOPackageRegistry
+CDOEditorInputImpl.0=View closed
+CDOItemProvider.0=Session
+CDOItemProvider.3={0}Transaction [{1}]
+CDOItemProvider.6=Audit [{0,date} {0,time}]
+CDOItemProvider.7=View [{0}]
+CDOItemProvider.8=Register Generated Package
+CDOPreferencePage.0=Session Defaults
+CDOPreferencePage.1=Repository name:
+CDOPreferencePage.2=User name:
+CDOPreferencePage.3=Connector description:
+CDOPreferencePage.4=Reference chunk size:
+CDOPreferencePage.5=View Defaults
+CDOPreferencePage.6=Preload chunk size:
+CDOPreferencePage.7=EMF invalidation notifications:
+CDOStateFilter.0=conflict
+CDOStateFilter.1=transient
+CDOStateFilter.2=new
+CDOStateFilter.3=clean
+CDOStateFilter.4=dirty
+CDOStateFilter.5=Specify a state to filter: %s | %s | %s | %s | %s
+CDOStateFilter.6=CDOState filter
+CDOUIPreferencePage.0=Label decoration:
+CDOUIPreferencePage.1=Enable CDOEditor Auto-Reload
+CDOUIPreferencePage.2=Available tags:
+CDOWatchListView.0=Remove All
+CDOWatchListView.0=Object
+CDOWatchListView.1=Object
+CDOWatchListView.1=Resource
+CDOWatchListView.10=Reset All Changes
+CDOWatchListView.10=Reset All Changes
+CDOWatchListView.11=Reset all change notifications of the subscriptions in the view
+CDOWatchListView.11=Reset all change notifications of the subscriptions in the view
+CDOWatchListView.12=CREATE
+CDOWatchListView.13=CREATE
+CDOWatchListView.14=SET
+CDOWatchListView.15=UNSET
+CDOWatchListView.16=ADD
+CDOWatchListView.17=REMOVE
+CDOWatchListView.18=ADD MANY
+CDOWatchListView.19=REMOVE MANY
+CDOWatchListView.2=Resource
+CDOWatchListView.2=Time
+CDOWatchListView.20=MOVE
+CDOWatchListView.21=REMOVING ADAPTER
+CDOWatchListView.22=RESOLVE
+CDOWatchListView.25=SET
+CDOWatchListView.26=UNSET
+CDOWatchListView.27=ADD
+CDOWatchListView.28=REMOVE
+CDOWatchListView.29=ADD MANY
+CDOWatchListView.3=Time
+CDOWatchListView.3=Changes
+CDOWatchListView.30=REMOVE MANY
+CDOWatchListView.31=MOVE
+CDOWatchListView.32=REMOVING ADAPTER
+CDOWatchListView.33=RESOLVE
+CDOWatchListView.4=Changes
+CDOWatchListView.4=Remove
+CDOWatchListView.5=Remove
+CDOWatchListView.5=Remove selected subscriptions
+CDOWatchListView.6=Remove selected subscriptions
+CDOWatchListView.6=Remove All
+CDOWatchListView.7=Remove all subscriptions
+CDOWatchListView.7=Remove all subscriptions
+CDOWatchListView.8=Reset Changes
+CDOWatchListView.8=Reset Changes
+CDOWatchListView.9=Reset all change notifications from the selected subscriptions
+CDOWatchListView.9=Reset all change notifications from the selected subscriptions
+ChangePassiveUpdateAction.1=Passive Updates
+CloseSessionAction.0=Close
+CloseSessionAction.1=Close the CDO session
+CloseSessionAction.2=You have uncommitted changes. Do you want to discard them?
+CloseViewAction.0=Close
+CloseViewAction.1=Close the CDO view
+CloseViewAction.2=You have uncommitted changes. Do you want to discard them?
+CommitTransactionAction.0=Commit
+CommitTransactionAction.1=Commit this transaction
+CreateResourceAction.0=Create Resource
+CreateResourceAction.1=Create a CDO resource
+CreateResourceAction.2=Enter resource path:
+CreateResourceAction.4=Resource already exists
+CreateResourceAction.5=There already exists a resource with path "%s". Do you want to edit the resource?
+ExportResourceAction.1=Export Resource
+ExportResourceAction.2=Export a CDO resource
+ExportResourceAction.3=A single URI must be entered\!
+ExportResourceDialog.1=Source path:
+ImportResourceAction.1=Import Resource
+ImportResourceAction.2=Import a CDO resource
+ImportResourceAction.3=A single URI must be entered\!
+ImportResourceDialog.1=Target path:
+ImportRootsAction.1=Import Roots
+LoadResourceAction.0=Load Resource
+LoadResourceAction.1=Load a CDO resource
+LoadResourceAction.4=Enter resource path:
+ManagePackagesAction.0=Package Registry
+ManagePackagesAction.1=Browse and register model packages
+OpenAuditAction.0=Open Audit
+OpenAuditAction.1=Open a historical CDO view
+OpenAuditDialog.0=Open Audit
+OpenAuditDialog.1=Target Time:
+OpenResourceEditorAction.0=Open Editor
+OpenResourceEditorAction.1=Open a CDO editor for this resource
+OpenResourcesDialog.0=Open Resources
+OpenSessionAction.0=Open a new CDO session
+OpenSessionAction.3=Unable to open a session on the specified repository.\n
+OpenSessionDialog.0=Open Session
+OpenTransactionAction.0=Open Transaction
+OpenTransactionAction.1=Open a read-write CDO view
+OpenViewAction.0=Open View
+OpenViewAction.1=Open a read-only CDO view
+OpenViewEditorAction.0=Open Editor
+OpenViewEditorAction.1=Open a CDO editor for this view
+PackageRegistryDialog.0=CDO Package Registry
+PackageRegistryDialog.1=Package
+PackageRegistryDialog.2=State
+PackageRegistryDialog.3=Type
+PackageRegistryDialog.4=Original
+PackageRegistryDialog.5=Generated...
+PackageRegistryDialog.6=Workspace...
+PackageRegistryDialog.7=Filesystem...
+PackageRegistryDialog.8=?
+ReadLockObjectsAction.1=ReadLock
+RegisterFilesystemPackagesAction.0=Register Filesystem Packages
+RegisterFilesystemPackagesAction.1=Register dynamic packages from the filesystem
+RegisterFilesystemPackagesAction.2=Ecore models (*.ecore)
+RegisterFilesystemPackagesAction.3=XMI files (*.xmi)
+RegisterFilesystemPackagesAction.4=XML files (*.xml)
+RegisterFilesystemPackagesAction.5=All files (*.*)
+RegisterGeneratedPackagesAction.0=Register Generated Packages
+RegisterGeneratedPackagesAction.1=Register native and legacy packages
+RegisterGeneratedPackagesAction.2=Generated Packages
+RegisterGeneratedPackagesAction.3=Select one or more packages for registration with the CDO package registry
+RegisterGeneratedPackagesAction.5=Package %s not found.
+RegisterPackagesAction.0=Failed to register package
+RegisterPackagesAction.1=\ package has
+RegisterPackagesAction.2=\ packages have
+RegisterPackagesAction.3=\ not been registered due to errors.\nSee the log for details.
+RegisterSinglePackageAction.0=Register the package
+RegisterWorkspacePackagesAction.0=Register Workspace Packages
+RegisterWorkspacePackagesAction.1=Register dynamic packages from the workspace
+ReloadObjectsAction.1=Reload
+ReloadViewAction.0=Reload
+ReloadViewAction.1=Reload this view
+RollbackTransactionAction.0=Rollback
+RollbackTransactionAction.1=Rollback this transaction
+RollbackTransactionDialog.0=This transaction contains:
+RollbackTransactionDialog.11=Are you sure to rollback this transaction?
+RollbackTransactionDialog.2=new resource
+RollbackTransactionDialog.3=new resources
+RollbackTransactionDialog.4=new object
+RollbackTransactionDialog.5=new objects
+RollbackTransactionDialog.6=dirty object
+RollbackTransactionDialog.7=dirty objects
+RollbackTransactionDialog.8=detached object
+RollbackTransactionDialog.9=detached objects
+SessionComposite.0=Server Description:
+SessionComposite.1=for example 'tcp://dev.eclipse.org:2036'
+SessionComposite.2=Repository Name:
+SessionComposite.3=Automatic Package Registry
+WriteLockObjectsAction.1=WriteLock
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
index 57a615f8d3..3626d536bd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.cdo.ui.widgets;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
+import org.eclipse.emf.cdo.ui.messages.Messages;
import org.eclipse.net4j.util.collection.IHistory;
import org.eclipse.net4j.util.collection.PreferenceHistory;
@@ -61,7 +62,7 @@ public class SessionComposite extends Composite
setLayoutData(UIUtil.createGridData());
setLayout(new GridLayout(2, false));
- new Label(this, SWT.NONE).setText("Server Description:");
+ new Label(this, SWT.NONE).setText(Messages.getString("SessionComposite.0")); //$NON-NLS-1$
connectorText = new HistoryText(this, SWT.BORDER | SWT.SINGLE, connectorHistory);
connectorText.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
connectorText.getCombo().addModifyListener(new ModifyListener()
@@ -76,11 +77,11 @@ public class SessionComposite extends Composite
{
new Label(this, SWT.NONE);
exampleLabel = new Label(this, SWT.NONE);
- exampleLabel.setText("for example 'tcp://dev.eclipse.org:2036'");
+ exampleLabel.setText(Messages.getString("SessionComposite.1")); //$NON-NLS-1$
exampleLabel.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
}
- new Label(this, SWT.NONE).setText("Repository Name:");
+ new Label(this, SWT.NONE).setText(Messages.getString("SessionComposite.2")); //$NON-NLS-1$
repositoryText = new HistoryText(this, SWT.BORDER | SWT.SINGLE, repositoryHistory);
repositoryText.getCombo().setLayoutData(new GridData(150, SWT.DEFAULT));
repositoryText.getCombo().addModifyListener(new ModifyListener()
@@ -92,7 +93,7 @@ public class SessionComposite extends Composite
});
new Label(this, SWT.NONE);
- automaticButton = new PreferenceButton(this, SWT.CHECK, "Automatic Package Registry",
+ automaticButton = new PreferenceButton(this, SWT.CHECK, Messages.getString("SessionComposite.3"), //$NON-NLS-1$
OM.PREF_AUTOMATIC_PACKAGE_REGISTRY);
automaticButton.getButton().addSelectionListener(new SelectionAdapter()
{
@@ -167,11 +168,11 @@ public class SessionComposite extends Composite
{
StringBuilder builder = new StringBuilder();
builder.append(connectorDescription);
- builder.append("?repositoryName=");
+ builder.append("?repositoryName="); //$NON-NLS-1$
builder.append(repositoryName);
if (automaticRegistry)
{
- builder.append("&automaticPackageRegistry=true");
+ builder.append("&automaticPackageRegistry=true"); //$NON-NLS-1$
}
return builder.toString();

Back to the top