Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/plugin.properties5
-rwxr-xr-xplugins/org.eclipse.emf.compare.egit.ui/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/plugin.properties17
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/plugin.xml26
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties10
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java16
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties23
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml38
9 files changed, 99 insertions, 45 deletions
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/plugin.properties b/plugins/org.eclipse.emf.compare.egit.ui/plugin.properties
index d0d7a4902..4b51cbb9d 100644
--- a/plugins/org.eclipse.emf.compare.egit.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.egit.ui/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2015 Obeo.
+# Copyright (c) 2015, 2019 Obeo 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
@@ -7,6 +7,9 @@
#
# Contributors:
# Obeo - initial API and implementation
+# Christian W. Damus - bug 547139
################################################################################
pluginName = EMF Compare EGit UI integration
providerName = Eclipse Modeling Project
+
+modelMergeTool.label = Model Merge Tool (with EMFCompare)
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/plugin.xml b/plugins/org.eclipse.emf.compare.egit.ui/plugin.xml
index 8edd4d268..e64dd7925 100755
--- a/plugins/org.eclipse.emf.compare.egit.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.egit.ui/plugin.xml
@@ -28,7 +28,7 @@
class="org.eclipse.emf.compare.egit.ui.internal.actions.ModelMergeToolAction"
icon="icons/obj16/modelmergetool.png"
id="org.eclipse.emf.compare.egit.ui.internal.actions.ModelMergeTool"
- label="Model Merge Tool (with EMFCompare)"
+ label="%modelMergeTool.label"
menubarPath="team.main/group4">
</action>
</objectContribution>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
index 0b77e3b29..44cc2e79a 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2016 Obeo.
+# Copyright (c) 2006, 2019 Obeo 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
@@ -7,6 +7,7 @@
#
# Contributors:
# Obeo - initial API and implementation
+# Christian W. Damus - bug 547139
################################################################################
pluginName = EMF Compare IDE UI
providerName = Eclipse Modeling Project
@@ -30,3 +31,17 @@ command.each.other.emfComparisonSource = Each Other (EMF Compare)
compare.with.label = Compare With
resolver.threadedModelResolver.label = Cross reference resolver
resolver.threadedModelResolver.description = Resolve the cross referenced resources of the selected resource, then crawl the given scope for incoming references to that resource, by default, only crawls the selected file's container.
+
+propertiesCompare.label = Properties Compare
+category.name = EMF Compare
+logicalModelView.name = Logical Model View
+compareInDialog.name = Compare in Dialog
+compareInEditor.name = Compare in new Editor
+compareEachOther.name = Each Other
+modelprovider.name = EMF Compare
+page.resolutionStrategy.name = Resolution Strategy
+page.merge.name = Merge
+page.editor.name = Editor
+command.comparisonSource.name = Compare EMF Comparison Source
+command.nextUnresolved.name = Select Next Unresolved Diff
+command.prevUnresolved.name = Select Previous Unresolved Diff
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
index 378fa58a1..9b26a007a 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
@@ -126,7 +126,7 @@
org.eclipse.emf.compare.rcp.ui.eNoVisibleItem,
org.eclipse.emf.compare.rcp.ui.eOnlyPseudoConflicts"
id="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.property.PropertyContentMergeViewerCreator"
- label="Properties Compare">
+ label="%propertiesCompare.label">
</viewer>
<contentTypeBinding
contentTypeId="org.eclipse.emf.ecore.xmi"
@@ -149,7 +149,7 @@
point="org.eclipse.ui.views">
<category
id="org.eclipse.emf.compare.category"
- name="EMF Compare">
+ name="%category.name">
</category>
<view
allowMultiple="false"
@@ -157,7 +157,7 @@
class="org.eclipse.emf.compare.ide.ui.internal.logical.view.LogicalModelView"
icon="icons/full/eobj16/emfcompare-icon.gif"
id="org.eclipse.emf.compare.ide.ui.logicalmodel.view"
- name="Logical Model View"
+ name="%logicalModelView.name"
restorable="true">
</view>
</extension>
@@ -288,16 +288,16 @@
<command
categoryId="org.eclipse.compare.ui.category.compare"
id="org.eclipse.emf.compare.ide.ui.compareInDialog"
- name="Compare in Dialog">
+ name="%compareInDialog.name">
</command>
<command
categoryId="org.eclipse.compare.ui.category.compare"
id="org.eclipse.emf.compare.ide.ui.compareInEditor"
- name="Compare in new Editor">
+ name="%compareInEditor.name">
</command>
<command
id="org.eclipse.team.ui.compareWithEachOther"
- name="Each Other">
+ name="%compareEachOther.name">
</command>
</extension>
<extension
@@ -393,7 +393,7 @@
</extension>
<extension
id="org.eclipse.emf.compare.model.provider"
- name="EMF Compare"
+ name="%modelprovider.name"
point="org.eclipse.core.resources.modelProviders">
<modelProvider
class="org.eclipse.emf.compare.ide.ui.internal.logical.EMFModelProvider">
@@ -439,19 +439,19 @@
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.ide.ui.internal.preferences.ModelResolutionPreferencePage"
id="org.eclipse.emf.compare.ide.ui.preferencepage.resolvers"
- name="Resolution Strategy">
+ name="%page.resolutionStrategy.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.ide.ui.internal.preferences.MergePreferencesPage"
id="org.eclipse.emf.compare.ide.ui.preferencepage.merge"
- name="Merge">
+ name="%page.merge.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.ide.ui.internal.preferences.EditorPreferencePage"
id="org.eclipse.emf.compare.ide.ui.preferencepage.editor"
- name="Editor">
+ name="%page.editor.name">
</page>
</extension>
<extension
@@ -526,15 +526,15 @@
point="org.eclipse.ui.commands">
<command
id="org.eclipse.emf.compare.ide.ui.emfComparisonSourceCompareCommand"
- name="Compare EMFComparisonSource">
+ name="%command.comparisonSource.name">
</command>
<command
id="org.eclipse.emf.compare.ide.ui.selectNextUnresolvedDiff"
- name="SelectNextUnresolvedDiff">
+ name="%command.nextUnresolved.name">
</command>
<command
id="org.eclipse.emf.compare.ide.ui.selectPreviousUnresolvedDiff"
- name="SelectPreviousUnresolvedDiff">
+ name="%command.prevUnresolved.name">
</command>
</extension>
<extension
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties
index f5cce4f7e..1e79c1889 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2012, 2017 Obeo and others.
+# Copyright (c) 2012, 2019 Obeo 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
@@ -10,6 +10,7 @@
# Philip Langer - log msgs, bugs 462884, 508855, 521948, 522372, 508526, 527567
# Stefan Dirix - bug 456699, 474723
# Michael Borkowski - bug 467191
+# Christian W. Damus - bug 547139
################################################################################
## ! note ! double the apostrophes if you need one in the printed String
EMFSynchronizationModel.resolving = Creating EMF Synchronization Model
@@ -27,6 +28,11 @@ ModelResolver.coherenceWarning = Some models were accessible from multiple compa
resource.not.serializable = Resource is not serializable.
save.model.tooltip = Save Comparison Model
+save.model.replace=Replace
+save.model.cancel=Cancel
+save.model.fileExistsTitle=File Already Exists
+save.model.fileExistsMsg=File "{0}" already exists. Do you want to replace the existing one?
+
next.diff.tooltip = Next Difference
next.unresolved.diff.tooltip = Next Unresolved Difference
previous.diff.tooltip = Previous Difference
@@ -119,6 +125,8 @@ EMFCompareStructureMergeViewer.tabItem.0.title = Differences
EMFCompareStructureMergeViewer.computingModelDifferences = Computing Model Differences
EMFCompareStructureMergeViewer.operationCanceled = Comparison computation has been canceled
+EMFCompareStructureMergeViewerLabelProvider.pleaseWait=Please wait while computing the element to display...
+
ComparisonScopeBuilder.left = left
ComparisonScopeBuilder.right = right
ComparisonScopeBuilder.ancestor = ancestor
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
index 3c13c8b50..2f57b56bd 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012, 2014 Obeo.
+ * Copyright (c) 2012, 2019 Obeo 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
@@ -7,12 +7,14 @@
*
* Contributors:
* Obeo - initial API and implementation
+ * Christian W. Damus - bug 547139
*******************************************************************************/
package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages;
import org.eclipse.emf.compare.ide.ui.internal.util.StyledStringConverter;
import org.eclipse.emf.compare.provider.EMFCompareEditPlugin;
import org.eclipse.emf.compare.provider.IItemStyledLabelProvider;
@@ -141,7 +143,8 @@ public class EMFCompareStructureMergeViewerLabelProvider extends AdapterFactoryL
} else if (element instanceof ICompareInput) {
ret = getStyledTextFromObject(((ICompareInput)element).getName());
} else if (element instanceof PendingUpdateAdapter) {
- ret = new StyledString("Please wait while computing the element to display...");
+ ret = new StyledString(EMFCompareIDEUIMessages
+ .getString("EMFCompareStructureMergeViewerLabelProvider.pleaseWait")); //$NON-NLS-1$
} else {
ret = getStyledTextFromObject(element);
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java
index 798fdb264..53a40c8c0 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2016 Obeo and others.
+ * Copyright (c) 2013, 2019 Obeo 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
@@ -8,6 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
* Stefan Dirix - bug 473985
+ * Christian W. Damus - bug 547139
*******************************************************************************/
package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions;
@@ -56,7 +57,9 @@ import org.eclipse.ui.statushandlers.StatusManager;
public class SaveComparisonModelAction extends Action {
/** The dialog buttons. */
- private static final ImmutableList<String> DIALOG_BUTTON_LABELS = ImmutableList.of("Replace", "Cancel");
+ private static final ImmutableList<String> DIALOG_BUTTON_LABELS = ImmutableList.of(
+ EMFCompareIDEUIMessages.getString("save.model.replace"), //$NON-NLS-1$
+ EMFCompareIDEUIMessages.getString("save.model.cancel")); //$NON-NLS-1$
/** The compare configuration object used to get the compare model. */
private IEMFCompareConfiguration configuration;
@@ -88,13 +91,14 @@ public class SaveComparisonModelAction extends Action {
if (filePath != null) {
File file = new File(filePath);
if (file.exists()) {
- MessageDialog messageDialog = new MessageDialog(parent, "File already exists", null,
- "File \"" + file.toString()
- + "\" already exists. Do you want to replace the existing one?",
+ MessageDialog messageDialog = new MessageDialog(parent,
+ EMFCompareIDEUIMessages.getString("save.model.fileExistsTitle"), null, //$NON-NLS-1$
+ EMFCompareIDEUIMessages.getString("save.model.fileExistsMsg", file), //$NON-NLS-1$
MessageDialog.WARNING,
DIALOG_BUTTON_LABELS.toArray(new String[DIALOG_BUTTON_LABELS.size()]), 1);
int open = messageDialog.open();
- if (open == DIALOG_BUTTON_LABELS.indexOf("Replace")) {
+ if (open == DIALOG_BUTTON_LABELS
+ .indexOf(EMFCompareIDEUIMessages.getString("save.model.replace"))) { //$NON-NLS-1$
saveComparison(file);
refreshLocation(filePath);
} // else do nothing
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties
index e2497b1f6..8ba77b95f 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2012, 2014 Obeo.
+# Copyright (c) 2012, 2019 Obeo 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
@@ -7,6 +7,7 @@
#
# Contributors:
# Obeo - initial API and implementation
+# Christian W. Damus - bug 547139
################################################################################
pluginName = EMF Compare RCP UI
providerName = Eclipse Modeling Project
@@ -22,3 +23,23 @@ emf.compare.technicalities.filter = Technical elements
emf.compare.technicalities.filter.description = Filters technical elements (pseudo conflicts, identical elements, feature maps and empty match resources).
emf.compare.cascading.differences.filter = Cascading differences
emf.compare.cascading.differences.filter.description = Filters out differences that are part of the addition or deletion of a model element and all its children. Only the 'root' addition or deletion is left unfiltered.
+
+themeElementCategory.label = EMF Compare
+themeElementCategory.description = Set of colors for EMF Compare viewers
+incomingColor.label = Incoming change color
+incomingColor.desc = The color used to indicate an incoming change in EMF Compare and merge tools.
+conflictingColor.label = Conflicting change color
+conflictingColor.desc = The color used to indicate a conflicting change in EMF Compare and merge tools
+outgoingColor.label = Outgoing change color
+outgoingColor.desc = The color used to indicate an outgoing change in EMF Compare and merge tools.
+requiredColor.label = Required change color
+requiredColor.desc = The color used to indicate a change to be merged in the same direction as the selected "highlight consequences" mode along with the selected one.
+mergeColor.label = Merge conflict color
+mergeColor.desc = The color used to indicate a conflictual change to be merged in the opposite direction as the selected "highlight consequences" mode along with the selected one.
+page.name = EMF Compare
+page.engines.name = Engines
+page.postProcessors.name = Post Processors
+page.filters.name = Filters
+page.groups.name = Groups
+page.itemProviders.name = Item Providers
+page.logging.name = Logging
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
index 2b7ca616f..734848266 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
@@ -110,59 +110,59 @@
point="org.eclipse.ui.themes">
<themeElementCategory
id="org.eclipse.emf.compare.themeCategory"
- label="EMF Compare">
+ label="%themeElementCategory.label">
<description>
- Set of colors for EMF Compare viewers
+ %themeElementCategory.description
</description>
</themeElementCategory>
<colorDefinition
categoryId="org.eclipse.emf.compare.themeCategory"
id="org.eclipse.emf.compare.incomingChangeColor"
isEditable="true"
- label="Incoming change color"
+ label="%incomingColor.label"
value="COLOR_BLUE">
<description>
- The color used to indicate an incoming change in EMF Compare and merge tools.
+ %incomingColor.desc
</description>
</colorDefinition>
<colorDefinition
categoryId="org.eclipse.emf.compare.themeCategory"
id="org.eclipse.emf.compare.conflictingChangeColor"
isEditable="true"
- label="Conflicting change color"
+ label="%conflictingColor.label"
value="COLOR_RED">
<description>
- The color used to indicate a conflicting change in EMF Compare and merge tools
+ %conflictingColor.desc
</description>
</colorDefinition>
<colorDefinition
categoryId="org.eclipse.emf.compare.themeCategory"
id="org.eclipse.emf.compare.outgoingChangeColor"
isEditable="true"
- label="Outgoing change color"
+ label="%outgoingColor.label"
value="COLOR_BLACK">
<description>
- The color used to indicate an outgoing change in EMF Compare and merge tools.
+ %outgoingColor.desc
</description>
</colorDefinition>
<colorDefinition
categoryId="org.eclipse.emf.compare.themeCategory"
id="org.eclipse.emf.compare.requiredChangeColor"
isEditable="true"
- label="Required change color"
+ label="%requiredColor.label"
value="215, 255, 200">
<description>
- The color used to indicate a change to be merged in the same direction as the selected "highlight consequences" mode along with the selected one.
+ %requiredColor.desc
</description>
</colorDefinition>
<colorDefinition
categoryId="org.eclipse.emf.compare.themeCategory"
id="org.eclipse.emf.compare.unmergeableChangeColor"
isEditable="true"
- label="Merge conflict color"
+ label="%mergeColor.label"
value="255, 205, 180">
<description>
- The color used to indicate a conflictual change to be merged in the opposite direction as the selected "highlight consequences" mode along with the selected one.
+ %mergeColor.desc
</description>
</colorDefinition>
</extension>
@@ -171,43 +171,43 @@
<page
class="org.eclipse.emf.compare.rcp.ui.internal.preferences.EMFComparePreferencePage"
id="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
- name="EMF Compare">
+ name="%page.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.rcp.ui.internal.preferences.EnginesPreferencePage"
id="org.eclipse.emf.compare.rcp.ui.preferencePage.engines"
- name="Engines">
+ name="%page.engines.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.rcp.ui.internal.preferences.PostProcessorPreferencePage"
id="org.eclipse.emf.compare.rcp.ui.preferencePage.postProcessors"
- name="Post Processors">
+ name="%page.postProcessors.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.rcp.ui.internal.preferences.FiltersPreferencePage"
id="org.eclipse.emf.compare.rcp.ui.preferencePage.filters"
- name="Filters">
+ name="%page.filters.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.rcp.ui.internal.preferences.GroupsPreferencePage"
id="org.eclipse.emf.compare.rcp.ui.preferencePage.groups"
- name="Groups">
+ name="%page.groups.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.rcp.ui.internal.preferences.AdapterFactoriesPreferencePage"
id="org.eclipse.emf.compare.rcp.ui.preferencePage.adapterfactories"
- name="Item Providers">
+ name="%page.itemProviders.name">
</page>
<page
category="org.eclipse.emf.compare.rcp.ui.preferencePage.global"
class="org.eclipse.emf.compare.rcp.ui.internal.preferences.LoggingPreferencePage"
id="org.eclipse.emf.compare.rcp.ui.preferencePage.logging"
- name="Logging">
+ name="%page.logging.name">
</page>
</extension>
<extension

Back to the top