Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2011-05-09 09:52:37 +0000
committerlgoubet2011-05-09 09:52:37 +0000
commit0fdeac1546ebe7aa009900ab681f78a40d5275b4 (patch)
treece55d50074333a1283b88ce14a206e6c52dca24d
parent8f2a53d55e716d021729ba3cdcc4bc7fddde099b (diff)
downloadorg.eclipse.emf.compare-0fdeac1546ebe7aa009900ab681f78a40d5275b4.tar.gz
org.eclipse.emf.compare-0fdeac1546ebe7aa009900ab681f78a40d5275b4.tar.xz
org.eclipse.emf.compare-0fdeac1546ebe7aa009900ab681f78a40d5275b4.zip
eGit bug, trying to resolve "changed but not changed" files
-rw-r--r--plugins/org.eclipse.emf.compare.diff/.checkstyle24
-rw-r--r--plugins/org.eclipse.emf.compare.diff/.project80
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/about.html0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/icons/DiffEngine.gifbin200 -> 200 bytes
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/schema/org.eclipse.emf.compare.diff.engine.exsd0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/EMFCompareDiffMessages.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/GenericDiffEngine.java23
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/IDiffEngine.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeLeftTargetMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeRightTargetMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeLeftTargetMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeRightTargetMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/MoveModelElementMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeLeftTargetMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeRightTargetMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateAttributeMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateReferenceMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/service/DiffExtensionDescriptor.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/DefaultMerger.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/service/MergeFactory.java7
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/service/DiffEngineDescriptor.java0
22 files changed, 70 insertions, 64 deletions
diff --git a/plugins/org.eclipse.emf.compare.diff/.checkstyle b/plugins/org.eclipse.emf.compare.diff/.checkstyle
index 896c33b73..91bc0b57a 100644
--- a/plugins/org.eclipse.emf.compare.diff/.checkstyle
+++ b/plugins/org.eclipse.emf.compare.diff/.checkstyle
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml" type="project" description="">
- <additional-data name="protect-config-file" value="false"/>
- </local-check-config>
- <fileset name="tous" enabled="true" check-config-name="EMF Compare" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
- <filter name="FilesFromPackage" enabled="true">
- <filter-data value="src/org/eclipse/emf/compare/diff/metamodel"/>
- </filter>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <local-check-config name="EMF Compare CS5" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyle5Configuration.xml" type="project" description="Checkstyle 5.0 compatible">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="EMF Compare CS5" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="FilesFromPackage" enabled="true">
+ <filter-data value="src/org/eclipse/emf/compare/diff/metamodel"/>
+ </filter>
</fileset-config>
diff --git a/plugins/org.eclipse.emf.compare.diff/.project b/plugins/org.eclipse.emf.compare.diff/.project
index d3ec6600f..09677bebc 100644
--- a/plugins/org.eclipse.emf.compare.diff/.project
+++ b/plugins/org.eclipse.emf.compare.diff/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.compare.diff</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.diff</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.compare.diff/about.html b/plugins/org.eclipse.emf.compare.diff/about.html
index 670d10856..670d10856 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/about.html
+++ b/plugins/org.eclipse.emf.compare.diff/about.html
diff --git a/plugins/org.eclipse.emf.compare.diff/icons/DiffEngine.gif b/plugins/org.eclipse.emf.compare.diff/icons/DiffEngine.gif
index 17f927e9a..17f927e9a 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/icons/DiffEngine.gif
+++ b/plugins/org.eclipse.emf.compare.diff/icons/DiffEngine.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.compare.diff/schema/org.eclipse.emf.compare.diff.engine.exsd b/plugins/org.eclipse.emf.compare.diff/schema/org.eclipse.emf.compare.diff.engine.exsd
index f6e34d7de..f6e34d7de 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/schema/org.eclipse.emf.compare.diff.engine.exsd
+++ b/plugins/org.eclipse.emf.compare.diff/schema/org.eclipse.emf.compare.diff.engine.exsd
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/EMFCompareDiffMessages.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/EMFCompareDiffMessages.java
index c8670a3cf..c8670a3cf 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/EMFCompareDiffMessages.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/EMFCompareDiffMessages.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties
index 0b3b7770b..0b3b7770b 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/GenericDiffEngine.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/GenericDiffEngine.java
index 275895720..5c6e948ce 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/GenericDiffEngine.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/GenericDiffEngine.java
@@ -79,13 +79,14 @@ public class GenericDiffEngine implements IDiffEngine {
}
/**
- * {@inheritDoc}
+ * {@inheritDoc}.
*
* @see org.eclipse.emf.compare.diff.engine.IDiffEngine#doDiff(org.eclipse.emf.compare.match.metamodel.MatchModel,
* boolean)
*/
public DiffModel doDiff(MatchModel match, boolean threeWay) {
matchCrossReferencer = new EcoreUtil.CrossReferencer(match) {
+ /** Generic Serial ID. */
private static final long serialVersionUID = 1L;
/** initializer. */
@@ -247,8 +248,8 @@ public class GenericDiffEngine implements IDiffEngine {
final EObject leftElement = matchElement.getLeftElement();
final EObject rightElement = matchElement.getRightElement();
if (leftElement.eContainmentFeature() != null && rightElement.eContainmentFeature() != null) {
- if (!leftElement.eContainmentFeature().getName().equals(
- rightElement.eContainmentFeature().getName())
+ if (!leftElement.eContainmentFeature().getName()
+ .equals(rightElement.eContainmentFeature().getName())
&& getMatchedEObject(leftElement.eContainer()).equals(rightElement.eContainer())) {
createUpdateContainmentOperation(current, leftElement, rightElement);
}
@@ -275,21 +276,21 @@ public class GenericDiffEngine implements IDiffEngine {
final boolean leftChangedContainment = originElement.eContainmentFeature() != null
&& leftElement.eContainmentFeature() != null
- && !leftElement.eContainmentFeature().getName().equals(
- originElement.eContainmentFeature().getName())
+ && !leftElement.eContainmentFeature().getName()
+ .equals(originElement.eContainmentFeature().getName())
&& getMatchedEObject(leftElement.eContainer(), ANCESTOR_OBJECT).equals(
originElement.eContainer());
final boolean rightChangedContainment = originElement.eContainmentFeature() != null
&& rightElement.eContainmentFeature() != null
- && !rightElement.eContainmentFeature().getName().equals(
- originElement.eContainmentFeature().getName())
+ && !rightElement.eContainmentFeature().getName()
+ .equals(originElement.eContainmentFeature().getName())
&& getMatchedEObject(rightElement.eContainer(), ANCESTOR_OBJECT).equals(
originElement.eContainer());
// effective change
if (getMatchedEObject(leftElement.eContainer()).equals(rightElement.eContainer())
- && !leftElement.eContainmentFeature().getName().equals(
- rightElement.eContainmentFeature().getName())) {
+ && !leftElement.eContainmentFeature().getName()
+ .equals(rightElement.eContainmentFeature().getName())) {
// conflicting change
if (leftChangedContainment && rightChangedContainment) {
final UpdateContainmentFeature updateContainment = DiffFactory.eINSTANCE
@@ -616,8 +617,8 @@ public class GenericDiffEngine implements IDiffEngine {
*/
protected final EObject getMatchedEObject(EObject from, int side) throws IllegalArgumentException {
if (side != LEFT_OBJECT && side != RIGHT_OBJECT && side != ANCESTOR_OBJECT) {
- throw new IllegalArgumentException(EMFCompareDiffMessages
- .getString("GenericDiffEngine.IllegalSide")); //$NON-NLS-1$
+ throw new IllegalArgumentException(
+ EMFCompareDiffMessages.getString("GenericDiffEngine.IllegalSide")); //$NON-NLS-1$
}
EObject matchedEObject = null;
final Collection<EStructuralFeature.Setting> settings = matchCrossReferencer.get(from);
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/IDiffEngine.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/IDiffEngine.java
index 431fac876..431fac876 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/IDiffEngine.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/engine/IDiffEngine.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeLeftTargetMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeLeftTargetMerger.java
index 0ee2b1b0f..0ee2b1b0f 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeLeftTargetMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeLeftTargetMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeRightTargetMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeRightTargetMerger.java
index 7ab92832b..7ab92832b 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeRightTargetMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/AttributeChangeRightTargetMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeLeftTargetMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeLeftTargetMerger.java
index 4ba042074..4ba042074 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeLeftTargetMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeLeftTargetMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeRightTargetMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeRightTargetMerger.java
index 9f269a5f1..9f269a5f1 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeRightTargetMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ModelElementChangeRightTargetMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/MoveModelElementMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/MoveModelElementMerger.java
index 912c85b6d..912c85b6d 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/MoveModelElementMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/MoveModelElementMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeLeftTargetMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeLeftTargetMerger.java
index d88450cab..d88450cab 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeLeftTargetMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeLeftTargetMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeRightTargetMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeRightTargetMerger.java
index 44c81fe41..44c81fe41 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeRightTargetMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/ReferenceChangeRightTargetMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateAttributeMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateAttributeMerger.java
index b0210468d..b0210468d 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateAttributeMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateAttributeMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateReferenceMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateReferenceMerger.java
index 2f582813f..2f582813f 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateReferenceMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/UpdateReferenceMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/service/DiffExtensionDescriptor.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/service/DiffExtensionDescriptor.java
index 269b88283..269b88283 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/service/DiffExtensionDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/service/DiffExtensionDescriptor.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/DefaultMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/DefaultMerger.java
index e0c570c63..e0c570c63 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/DefaultMerger.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/DefaultMerger.java
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/service/MergeFactory.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/service/MergeFactory.java
index 10fa79003..66d3c4b49 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/service/MergeFactory.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/service/MergeFactory.java
@@ -35,8 +35,9 @@ import org.eclipse.emf.ecore.EObject;
* The merge factory allows the creation of a merger from any kind of {@link DiffElement}.
*
* @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
-public final class MergeFactory {
+public abstract class MergeFactory {
/** Wild card for file extensions. */
private static final String ALL_EXTENSIONS = "*"; //$NON-NLS-1$
@@ -204,8 +205,8 @@ public final class MergeFactory {
*/
private static void parseExtensionMetadata() {
if (EMFPlugin.IS_ECLIPSE_RUNNING) {
- final IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(
- MERGER_PROVIDER_EXTENSION_POINT).getExtensions();
+ final IExtension[] extensions = Platform.getExtensionRegistry()
+ .getExtensionPoint(MERGER_PROVIDER_EXTENSION_POINT).getExtensions();
for (int i = 0; i < extensions.length; i++) {
final IConfigurationElement[] configElements = extensions[i].getConfigurationElements();
for (int j = 0; j < configElements.length; j++) {
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/service/DiffEngineDescriptor.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/service/DiffEngineDescriptor.java
index dff7e5391..dff7e5391 100755..100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/service/DiffEngineDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/service/DiffEngineDescriptor.java

Back to the top