Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.compare/.checkstyle18
-rw-r--r--plugins/org.eclipse.emf.compare/.project80
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/about.html0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/about.ini0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/about.mappings0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/about.properties2
-rw-r--r--plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyle5Configuration.xml335
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCodeTemplates.xml0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/modeling32.pngbin2414 -> 2414 bytes
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFCompareMessages.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/FactoryException.java0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties0
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/ClassUtils.java0
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EFactory.java3
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EMFCompareMap.java16
16 files changed, 397 insertions, 57 deletions
diff --git a/plugins/org.eclipse.emf.compare/.checkstyle b/plugins/org.eclipse.emf.compare/.checkstyle
index 6dc7fd7fe..3c18dcbac 100644
--- a/plugins/org.eclipse.emf.compare/.checkstyle
+++ b/plugins/org.eclipse.emf.compare/.checkstyle
@@ -1,9 +1,13 @@
<?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="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>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <local-check-config name="EMF Compare" location="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="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>
</fileset-config>
diff --git a/plugins/org.eclipse.emf.compare/.project b/plugins/org.eclipse.emf.compare/.project
index 2add6f944..de7ef3d3e 100644
--- a/plugins/org.eclipse.emf.compare/.project
+++ b/plugins/org.eclipse.emf.compare/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.compare</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>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare</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.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</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/about.html b/plugins/org.eclipse.emf.compare/about.html
index 670d10856..670d10856 100755..100644
--- a/plugins/org.eclipse.emf.compare/about.html
+++ b/plugins/org.eclipse.emf.compare/about.html
diff --git a/plugins/org.eclipse.emf.compare/about.ini b/plugins/org.eclipse.emf.compare/about.ini
index eec22440e..eec22440e 100755..100644
--- a/plugins/org.eclipse.emf.compare/about.ini
+++ b/plugins/org.eclipse.emf.compare/about.ini
diff --git a/plugins/org.eclipse.emf.compare/about.mappings b/plugins/org.eclipse.emf.compare/about.mappings
index a28390a75..a28390a75 100755..100644
--- a/plugins/org.eclipse.emf.compare/about.mappings
+++ b/plugins/org.eclipse.emf.compare/about.mappings
diff --git a/plugins/org.eclipse.emf.compare/about.properties b/plugins/org.eclipse.emf.compare/about.properties
index 0c7a23c4e..b883fa782 100755..100644
--- a/plugins/org.eclipse.emf.compare/about.properties
+++ b/plugins/org.eclipse.emf.compare/about.properties
@@ -1,7 +1,7 @@
# /**
# * <copyright>
# *
-# * Copyright (c) 2006-2009 Obeo and others.
+# * Copyright (c) 2006, 2009 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
diff --git a/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyle5Configuration.xml b/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyle5Configuration.xml
new file mode 100644
index 000000000..bb5416869
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyle5Configuration.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+ This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+ Checkstyle-Configuration: EMF Compare CS5
+ Description:
+Checkstyle 5.0 compatible
+-->
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <module name="FileContentsHolder"/>
+ <module name="RegexpSinglelineJava">
+ <property name="id" value="illegal.regex.equals"/>
+ <property name="format" value="[^&quot;]\.equals\(&quot;"/>
+ <property name="message" value="This kind of expression can easily throw NPEs. Receiver and argument should be inverted."/>
+ <property name="ignoreComments" value="true"/>
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="id" value="illegal.regex.redundantnullcheck"/>
+ <property name="format" value="([^\n]*?) != null &amp;&amp; \1 instanceof [^\n]*?"/>
+ <property name="message" value="redundant null check"/>
+ <property name="ignoreComments" value="true"/>
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="id" value="illegal.regex.badpractices"/>
+ <property name="format" value="^.*?(System\.(out|err)\.print|printStackTrace).*?$"/>
+ <property name="message" value="These are for debug/batch applications launches only. Remove them from production build."/>
+ <property name="ignoreComments" value="true"/>
+ </module>
+ <module name="JavadocMethod">
+ <property name="severity" value="error"/>
+ <property name="allowMissingPropertyJavadoc" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="JavadocStyle">
+ <property name="severity" value="error"/>
+ <property name="checkEmptyJavadoc" value="true"/>
+ </module>
+ <module name="JavadocType">
+ <property name="severity" value="error"/>
+ <property name="authorFormat" value="(&lt;a\shref=\&quot;mailto:[a-z.]+@[a-z.]+\.[a-z]{2,4}\&quot;&gt;)?[A-Z][a-z]+\s[A-Z][a-z]+(&lt;/a&gt;)?"/>
+ <property name="allowUnknownTags" value="true"/>
+ </module>
+ <module name="JavadocVariable">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="AbstractClassName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ConstantName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="LocalFinalVariableName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="LocalVariableName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="MemberName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="MethodName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="PackageName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ParameterName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="StaticVariableName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="TypeName">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="AvoidStarImport">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="IllegalImport">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ImportOrder">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="RedundantImport">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="UnusedImports">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="AnonInnerLength">
+ <property name="severity" value="error"/>
+ <property name="max" value="25"/>
+ </module>
+ <module name="ExecutableStatementCount">
+ <property name="severity" value="error"/>
+ <property name="max" value="60"/>
+ <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/>
+ </module>
+ <module name="MethodLength">
+ <property name="severity" value="error"/>
+ <property name="max" value="100"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="EmptyForInitializerPad">
+ <property name="severity" value="error"/>
+ <property name="option" value="space"/>
+ </module>
+ <module name="EmptyForIteratorPad">
+ <property name="severity" value="error"/>
+ <property name="option" value="space"/>
+ </module>
+ <module name="NoWhitespaceBefore">
+ <property name="severity" value="error"/>
+ <property name="allowLineBreaks" value="true"/>
+ <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
+ </module>
+ <module name="MethodParamPad">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ParenPad">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="TypecastParenPad">
+ <property name="severity" value="error"/>
+ <property name="tokens" value="RPAREN,TYPECAST"/>
+ </module>
+ <module name="WhitespaceAfter">
+ <property name="severity" value="error"/>
+ <property name="tokens" value="COMMA,SEMI"/>
+ </module>
+ <module name="WhitespaceAround">
+ <property name="severity" value="error"/>
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
+ </module>
+ <module name="ModifierOrder">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="RedundantModifier">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="AvoidNestedBlocks">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="EmptyBlock">
+ <property name="severity" value="error"/>
+ <property name="option" value="text"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="RightCurly">
+ <property name="severity" value="error"/>
+ <property name="tokens" value="LITERAL_CATCH,LITERAL_FINALLY,LITERAL_ELSE"/>
+ </module>
+ <module name="AvoidInlineConditionals">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="NoWhitespaceAfter">
+ <property name="severity" value="error"/>
+ <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS,TYPECAST"/>
+ </module>
+ <module name="CovariantEquals">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="DefaultComesLast">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="DeclarationOrder">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="DoubleCheckedLocking">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="EmptyStatement">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="EqualsHashCode">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ExplicitInitialization">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="FallThrough">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="FinalLocalVariable">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="HiddenField">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="IllegalCatch">
+ <property name="severity" value="error"/>
+ <property name="illegalClassNames" value="java.lang.Exception, java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
+ </module>
+ <module name="IllegalThrows">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="InnerAssignment">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="JUnitTestCase">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="MagicNumber">
+ <property name="severity" value="error"/>
+ <property name="ignoreNumbers" value="-100, -10, -1, -0.75, -0.5, -0.1, 0, 0.1, 0.5, 0.75, 1, 2, 3, 4, 5, 6, 10, 11, 13, 100, 1000"/>
+ </module>
+ <module name="MissingSwitchDefault">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ModifiedControlVariable">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="MultipleStringLiterals">
+ <property name="severity" value="error"/>
+ <property name="allowedDuplicates" value="2"/>
+ </module>
+ <module name="MultipleVariableDeclarations">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="NestedIfDepth">
+ <property name="severity" value="error"/>
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="severity" value="error"/>
+ <property name="max" value="2"/>
+ </module>
+ <module name="PackageDeclaration">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ParameterAssignment">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="RedundantThrows">
+ <property name="severity" value="error"/>
+ <property name="allowUnchecked" value="true"/>
+ <property name="allowSubclasses" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="ReturnCount">
+ <property name="severity" value="error"/>
+ <property name="format" value="^insertionIndexFor$"/>
+ </module>
+ <module name="SimplifyBooleanExpression">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="SimplifyBooleanReturn">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="StringLiteralEquality">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="SuperClone">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="SuperFinalize">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ArrayTrailingComma">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="UnnecessaryParentheses">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="FinalClass">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="HideUtilityClassConstructor">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="MutableException">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ThrowsCount">
+ <property name="severity" value="error"/>
+ <property name="max" value="3"/>
+ </module>
+ <module name="VisibilityModifier">
+ <property name="severity" value="error"/>
+ <property name="packageAllowed" value="true"/>
+ <property name="protectedAllowed" value="true"/>
+ </module>
+ <module name="BooleanExpressionComplexity">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ClassDataAbstractionCoupling">
+ <property name="severity" value="info"/>
+ <property name="max" value="12"/>
+ </module>
+ <module name="ClassFanOutComplexity">
+ <property name="severity" value="info"/>
+ <property name="max" value="30"/>
+ </module>
+ <module name="CyclomaticComplexity">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="NPathComplexity">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="ArrayTypeStyle">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="UpperEll">
+ <property name="severity" value="error"/>
+ </module>
+ </module>
+ <module name="FileLength">
+ <property name="severity" value="error"/>
+ <property name="max" value="2100"/>
+ </module>
+ <module name="RegexpSingleline">
+ <property name="severity" value="error"/>
+ <property name="format" value="Copyright\s\(c\)\s(20[0-9]{2},?\s)+"/>
+ <property name="message" value="Copyright must be present in the file with the pattern &quot;Copyright (c) 2006, 2009 Obeo.&quot;"/>
+ <property name="minimum" value="1"/>
+ <property name="maximum" value="1"/>
+ </module>
+ <module name="RegexpSingleline">
+ <property name="severity" value="error"/>
+ <property name="id" value="illegal.regex.encoding"/>
+ <property name="format" value="[^a-zA-Z0-9_!:;,\.\+\(\)/\\\]\[{}\-\*&lt;&gt;%@\&amp; \|\t\n&quot;' =$#\r\?éèàê\^]"/>
+ <property name="message" value="Character could cause encoding issue."/>
+ </module>
+ <module name="SuppressionCommentFilter"/>
+</module>
diff --git a/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml b/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml
index 987692ccf..987692ccf 100755..100644
--- a/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml
+++ b/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml
diff --git a/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCodeTemplates.xml b/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCodeTemplates.xml
index aa4df7c0b..aa4df7c0b 100755..100644
--- a/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCodeTemplates.xml
+++ b/plugins/org.eclipse.emf.compare/codeStyle/EMFCompareCodeTemplates.xml
diff --git a/plugins/org.eclipse.emf.compare/modeling32.png b/plugins/org.eclipse.emf.compare/modeling32.png
index 6b08de2ad..6b08de2ad 100755..100644
--- a/plugins/org.eclipse.emf.compare/modeling32.png
+++ b/plugins/org.eclipse.emf.compare/modeling32.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFCompareMessages.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFCompareMessages.java
index 19335c046..19335c046 100755..100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFCompareMessages.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFCompareMessages.java
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/FactoryException.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/FactoryException.java
index 5217700e3..5217700e3 100755..100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/FactoryException.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/FactoryException.java
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties
index 80b4ec5b3..80b4ec5b3 100755..100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/ClassUtils.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/ClassUtils.java
index 182323871..182323871 100755..100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/ClassUtils.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/ClassUtils.java
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EFactory.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EFactory.java
index 80b7c8399..53574ff06 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EFactory.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EFactory.java
@@ -30,8 +30,9 @@ import org.eclipse.emf.ecore.EStructuralFeature;
* instances of classifiers.
*
* @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 EFactory {
+public abstract class EFactory {
/**
* Utility classes don't need to (and shouldn't) be instantiated.
*/
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EMFCompareMap.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EMFCompareMap.java
index de07c83d4..fd61b624e 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EMFCompareMap.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/util/EMFCompareMap.java
@@ -24,8 +24,8 @@ import org.eclipse.emf.compare.EMFCompareMessages;
/**
* Implementation of a map that stores its content using an hash table.
* <p>
- * <it>Initial capacity</it> and <it>load factor</it> greatly affect the map's performances. <it>Capacity</it>
- * is the number of elements the map can contain and the <it>load factor</it> represents how much the hash
+ * <em>Initial capacity</em> and <em>load factor</em> greatly affect the map's performances. <em>Capacity</em>
+ * is the number of elements the map can contain and the <em>load factor</em> represents how much the hash
* table can be filled before it is automatically rehashed.
* </p>
* <p>
@@ -212,7 +212,7 @@ public class EMFCompareMap<K, V> implements Map<K, V>, Serializable, Cloneable {
result = true;
break;
} else if (value != null
- && (values[i] == value || (values[i] != null && values[i].equals(value)))) {
+ && (values[i] == value || values[i] != null && values[i].equals(value))) {
result = true;
break;
}
@@ -448,7 +448,7 @@ public class EMFCompareMap<K, V> implements Map<K, V>, Serializable, Cloneable {
* Desired number of additional elements.
*/
protected void checkCapacity(int desiredSlots) {
- if (desiredSlots > (threshold - size())) {
+ if (desiredSlots > threshold - size()) {
resize(getNearestPrime((int)Math.ceil(desiredSlots + size() / loadFactor) + 1));
}
}
@@ -493,7 +493,7 @@ public class EMFCompareMap<K, V> implements Map<K, V>, Serializable, Cloneable {
} else if ((isPrime & 1) == 0) {
nearestPrime = getNearestPrime(isPrime + 1);
} else if (isPrime % 6 != 1 && isPrime % 6 != 5) {
- nearestPrime = getNearestPrime(isPrime + 5 - (isPrime % 6));
+ nearestPrime = getNearestPrime(isPrime + 5 - isPrime % 6);
} else {
for (final int prime : FIRST_PRIMES) {
if (isPrime % prime == 0) {
@@ -525,7 +525,7 @@ public class EMFCompareMap<K, V> implements Map<K, V>, Serializable, Cloneable {
boolean pass = false;
for (int j = 1; j < r; j++) {
- if (y != (isPrime - 1)) {
+ if (y != isPrime - 1) {
pass = true;
break;
}
@@ -565,7 +565,7 @@ public class EMFCompareMap<K, V> implements Map<K, V>, Serializable, Cloneable {
K current = keys[index];
if (current != null && (current == REMOVED_ENTRY || !equal(current, effectiveKey))) {
- final int hashProbe = 1 + (hash % (length - 2));
+ final int hashProbe = 1 + hash % (length - 2);
while (current != null && (current == REMOVED_ENTRY || !equal(current, effectiveKey))) {
index -= hashProbe;
@@ -606,7 +606,7 @@ public class EMFCompareMap<K, V> implements Map<K, V>, Serializable, Cloneable {
return -index - 1;
else {
// This slot is already associated.
- final int hashProbe = 1 + (hash % (length - 2));
+ final int hashProbe = 1 + hash % (length - 2);
if (current != REMOVED_ENTRY) {
while (current != null && current != REMOVED_ENTRY && !equal(current, key)) {

Back to the top