Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-05-16 10:04:08 +0000
committerAxel Richard2013-05-16 10:04:08 +0000
commit5f1687db0ac7d46b231ca7e75e44c360e08efdde (patch)
tree7a6cfd48a5ca7a79604998e1df0ac98d29841cad
parent6d8c26f40ae5f84894c372ccb2bfed02470659b2 (diff)
downloadorg.eclipse.emf.compare-5f1687db0ac7d46b231ca7e75e44c360e08efdde.tar.gz
org.eclipse.emf.compare-5f1687db0ac7d46b231ca7e75e44c360e08efdde.tar.xz
org.eclipse.emf.compare-5f1687db0ac7d46b231ca7e75e44c360e08efdde.zip
Rename SubDiffElementsFilter as CascadingDifferencesFilter
Rename in class and in plugin.xml
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java (renamed from plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/SubDiffElementsFilter.java)5
3 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
index a40a684f5..ee6ee9416 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
@@ -48,7 +48,7 @@ import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.IMergeViewer;
import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.IMergeViewer.MergeViewerSide;
import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.IMergeViewerItem;
import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.IDifferenceFilter;
-import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.SubDiffElementsFilter;
+import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.CascadingDifferencesFilter;
import org.eclipse.emf.compare.utils.EMFComparePredicates;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
@@ -630,7 +630,7 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im
} else {
selectedFilters = (Collection<IDifferenceFilter>)property;
for (IDifferenceFilter iDifferenceFilter : selectedFilters) {
- if (iDifferenceFilter instanceof SubDiffElementsFilter) {
+ if (iDifferenceFilter instanceof CascadingDifferencesFilter) {
return true;
}
}
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
index a326a32fe..015ea8072 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
@@ -48,8 +48,8 @@
</filter>
<filter
activeByDefault="true"
- class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.SubDiffElementsFilter"
- label="Sub diff elements">
+ class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.CascadingDifferencesFilter"
+ label="Cascading differences">
</filter>
</extension>
<extension
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/SubDiffElementsFilter.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java
index 6bdc07a61..8426b6b4e 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/SubDiffElementsFilter.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java
@@ -22,12 +22,13 @@ import org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec;
import org.eclipse.emf.ecore.EObject;
/**
- * A filter used by default that filtered out sub differences.
+ * A filter used by default that filtered out cascading differences (differences located under differences,
+ * also known as sub differences).
*
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
* @since 3.0
*/
-public class SubDiffElementsFilter extends AbstractDifferenceFilter {
+public class CascadingDifferencesFilter extends AbstractDifferenceFilter {
/**
* The predicate use by this filter when it is selected.

Back to the top