Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-09-17 04:43:56 +0000
committerEike Stepper2012-09-17 04:43:56 +0000
commit62b333cfb5af5b0695d468a4b498594b6f703990 (patch)
tree0f983a84d2c3c888fa0ef242fdebf04471232cfb /plugins
parente8539fb3937305a12d648f7eb85952a11e7d71e1 (diff)
downloadcdo-62b333cfb5af5b0695d468a4b498594b6f703990.tar.gz
cdo-62b333cfb5af5b0695d468a4b498594b6f703990.tar.xz
cdo-62b333cfb5af5b0695d468a4b498594b6f703990.zip
UI overhaul: actions, menus, labels, icons
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties30
4 files changed, 23 insertions, 23 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
index b9131f9f34..de7e3f242b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties
@@ -13,10 +13,10 @@ providerName = Eclipse Modeling Project
wizard.name = CDO
navigatorContent.name = CDO Repository Content
action.label = Disconnect
-action.label.0 = New Resource...
+action.label.0 = New Model Resource...
action.label.1 = New Folder...
action.label.2 = Remove
-action.label.3 = New Resource...
+action.label.3 = New Model Resource...
action.label.4 = New Folder...
action.label.15 = New Text Resource...
action.label.16 = New Binary Resource...
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
index d3a1e51086..2fb00bcffc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
@@ -40,8 +40,8 @@ public class NewResourceNodeAction extends ViewAction
private String resourceNodeName;
- public NewResourceNodeAction(CDOItemProvider itemProvider, IWorkbenchPage page, CDOView view,
- CDOResourceNode node, Type type)
+ public NewResourceNodeAction(CDOItemProvider itemProvider, IWorkbenchPage page, CDOView view, CDOResourceNode node,
+ Type type)
{
super(page, type.getTitle() + INTERACTIVE, type.getTooltip(), type.getImageDescriptor(), view);
selectedNode = node;
@@ -52,7 +52,7 @@ public class NewResourceNodeAction extends ViewAction
@Override
protected void preRun() throws Exception
{
- InputDialog dialog = new InputDialog(getShell(), type.getTitle(), Messages.getString("CreateResourceNodeAction.8"),
+ InputDialog dialog = new InputDialog(getShell(), type.getTitle(), Messages.getString("NewResourceNodeAction.8"),
(type == Type.FOLDER ? "folder" : "resource") + (ViewAction.lastResourceNumber + 1),
new ResourceNodeNameInputValidator(selectedNode));
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
index f121cd2225..4bf0144f88 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
@@ -40,13 +40,13 @@ public class ResourceNodeNameInputValidator implements IInputValidator
// Do not allow empty names
if (StringUtil.isEmpty(newText))
{
- return isFolder ? Messages.getString("CreateResourceNodeAction.3") : Messages.getString("CreateResourceNodeAction.4"); //$NON-NLS-1$ //$NON-NLS-2$
+ return isFolder ? Messages.getString("NewResourceNodeAction.3") : Messages.getString("NewResourceNodeAction.4"); //$NON-NLS-1$ //$NON-NLS-2$
}
// Do not allow "/"
if (newText.contains("/") || newText.contains("\\")) //$NON-NLS-1$ //$NON-NLS-2$
{
- return Messages.getString("CreateResourceNodeAction.2"); //$NON-NLS-1$
+ return Messages.getString("NewResourceNodeAction.2"); //$NON-NLS-1$
}
for (EObject nodeObject : node.eContents())
@@ -54,7 +54,7 @@ public class ResourceNodeNameInputValidator implements IInputValidator
CDOResourceNode node = (CDOResourceNode)nodeObject;
if (node.getName().equals(newText))
{
- return isFolder ? Messages.getString("CreateResourceNodeAction.5") + " " + newText : Messages.getString("CreateResourceNodeAction.6") //$NON-NLS-1$ //$NON-NLS-2$
+ return isFolder ? Messages.getString("NewResourceNodeAction.5") + " " + newText : Messages.getString("NewResourceNodeAction.6") //$NON-NLS-1$ //$NON-NLS-2$
+ " " + newText;
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
index 2a7cd987b8..3c51aa1314 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
@@ -118,12 +118,12 @@ Tooltip.Text=Create a new text resource
Title.Binary=New Binary Resource
Tooltip.Binary=Create a new binary resource
-CreateResourceNodeAction.2=Relative names not allowed
-CreateResourceNodeAction.3=Folder name cannot be empty
-CreateResourceNodeAction.4=Resource name cannot be empty
-CreateResourceNodeAction.5=There exists a folder with name
-CreateResourceNodeAction.6=There exists a resource with name
-CreateResourceNodeAction.8=Please enter the name:
+NewResourceNodeAction.2=Relative names not allowed
+NewResourceNodeAction.3=Folder name cannot be empty
+NewResourceNodeAction.4=Resource name cannot be empty
+NewResourceNodeAction.5=There exists a folder with name
+NewResourceNodeAction.6=There exists a resource with name
+NewResourceNodeAction.8=Please enter the name:
ExportResourceAction.1=Export Resource
ExportResourceAction.2=Export a CDO resource
ExportResourceAction.3=A single URI must be entered\!
@@ -142,12 +142,12 @@ ManagePackagesAction.0=Package Registry
ManagePackagesAction.1=Browse and register model packages
CreateBranchAction.0=Create Branch
CreateBranchAction.1=Create a new branch
-OpenAuditAction.0=Open Audit
-OpenAuditAction.1=Open a historical CDO view
-OpenAuditDialog.0=Open Audit
+OpenAuditAction.0=Open Audit View...
+OpenAuditAction.1=Open a new audit view
+OpenAuditDialog.0=Open Audit View
OpenAuditDialog.1=Target Time:
OpenDurableViewAction.0=Open Durable View
-OpenDurableViewAction.1=Open a durable CDO view
+OpenDurableViewAction.1=Open an existing durable view
OpenDurableViewDialog.0=Open Durable View
OpenDurableViewDialog.1=Area ID:
OpenFileEditorAction.0=Open File Editor
@@ -155,15 +155,15 @@ OpenFileEditorAction.1=Open a file editor for this resource
OpenResourceEditorAction.0=Open Editor
OpenResourceEditorAction.1=Open a model editor for this resource
OpenResourcesDialog.0=Open Resources
-OpenSessionAction.0=Open a new CDO session
+OpenSessionAction.0=Open a new session
OpenSessionAction.3=Unable to open a session on the specified repository.\n\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
+OpenTransactionAction.1=Open a new read-write view
+OpenViewAction.0=Open Read-Only View
+OpenViewAction.1=Open a new read-only view
OpenViewEditorAction.0=Open Editor
-OpenViewEditorAction.1=Open a CDO editor for this view
+OpenViewEditorAction.1=Open an editor on the resource set of this view
PackageRegistryDialog.0=CDO Package Registry
PackageRegistryDialog.1=Package
PackageRegistryDialog.2=State

Back to the top