diff options
| author | lgoubet | 2012-06-01 14:13:07 +0000 |
|---|---|---|
| committer | lgoubet | 2012-06-01 14:27:38 +0000 |
| commit | d2aaf203678a693848c3ba35728c662578ca1e6b (patch) | |
| tree | c55f1d108ad94c5c0eb9ee6b7cf93643d04cecd7 | |
| parent | a7ca278f3d0cf82599a7aa2d19761299fede027a (diff) | |
| download | org.eclipse.emf.compare-d2aaf203678a693848c3ba35728c662578ca1e6b.tar.gz org.eclipse.emf.compare-d2aaf203678a693848c3ba35728c662578ca1e6b.tar.xz org.eclipse.emf.compare-d2aaf203678a693848c3ba35728c662578ca1e6b.zip | |
Acting the change to CRLF since all projects' settings set this as the file delimiter.
Adding the necessary logic to determine the insertion index when merging reference and attribute values.
104 files changed, 3948 insertions, 3228 deletions
diff --git a/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.resources.prefs b/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.runtime.prefs +++ b/org.eclipse.emf.compare-parent/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/org.eclipse.emf.compare-parent/README.textile b/org.eclipse.emf.compare-parent/README.textile index abc01fa31..1e465d5b3 100644 --- a/org.eclipse.emf.compare-parent/README.textile +++ b/org.eclipse.emf.compare-parent/README.textile @@ -1,10 +1,10 @@ -h1. Building - -producing binaries - -mvn clean package -Pindigo - -checking the tests - -mvn verify -Pindigo --fail-at-end -Dmaven.test.failure.ignore=true - +h1. Building
+
+producing binaries
+
+mvn clean package -Pindigo
+
+checking the tests
+
+mvn verify -Pindigo --fail-at-end -Dmaven.test.failure.ignore=true
+
diff --git a/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle5Configuration.xml b/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle5Configuration.xml index 424f9ba08..951a6c236 100644 --- a/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle5Configuration.xml +++ b/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle5Configuration.xml @@ -1,344 +1,344 @@ -<?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 - Description: none ---> -<module name="Checker"> - <property name="severity" value="warning"/> - <module name="TreeWalker"> - <module name="FileContentsHolder"/> - <module name="JavadocMethod"> - <property name="severity" value="error"/> - <property name="allowUndeclaredRTE" value="true"/> - <property name="allowMissingPropertyJavadoc" value="true"/> - <property name="suppressLoadErrors" value="true"/> - </module> - <module name="JavadocStyle"> - <property name="severity" value="error"/> - <property name="checkEmptyJavadoc" value="true"/> - <property name="checkHtml" value="false"/> - </module> - <module name="JavadocType"> - <property name="severity" value="error"/> - <property name="authorFormat" value="(<a href="mailto:[a-z.]+@[a-z.]+\.[a-z]{2,4}\">)?[A-Z][a-z]+\s[A-Z][a-z]+(</a>)?"/> - <property name="allowUnknownTags" value="true"/> - </module> - <module name="JavadocVariable"> - <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="MethodTypeParameterName"> - <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"/> - <property name="option" value="top"/> - </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="70"/> - <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="120"/> - </module> - <module name="ParameterNumber"> - <property name="severity" value="error"/> - </module> - <module name="OuterTypeNumber"> - <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="ignore"/> - <property name="option" value="space"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </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_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,WILDCARD_TYPE"/> - </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="NeedBraces"> - <property name="severity" value="error"/> - </module> - <module name="RightCurly"> - <property name="severity" value="error"/> - </module> - <module name="RightCurly"/> - <module name="LeftCurly"> - <property name="severity" value="error"/> - </module> - <module name="AvoidInlineConditionals"> - <property name="severity" value="error"/> - </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="FinalLocalVariable"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="DoubleCheckedLocking"> - <property name="severity" value="error"/> - </module> - <module name="EmptyStatement"> - <property name="severity" value="error"/> - </module> - <module name="EqualsAvoidNull"> - <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="HiddenField"> - <property name="severity" value="error"/> - <property name="ignoreConstructorParameter" value="true"/> - <property name="ignoreSetter" value="true"/> - </module> - <module name="IllegalInstantiation"> - <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, 10000"/> - </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="NestedForDepth"> - <property name="severity" value="error"/> - <property name="max" value="2"/> - </module> - <module name="NestedIfDepth"> - <property name="severity" value="error"/> - <property name="max" value="2"/> - </module> - <module name="NestedTryDepth"> - <property name="severity" value="error"/> - <property name="max" value="2"/> - </module> - <module name="NoClone"> - <property name="severity" value="error"/> - </module> - <module name="NoFinalizer"> - <property name="severity" value="error"/> - </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="^$"/> - </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="OneStatementPerLine"> - <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="JavaNCSS"> - <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 name="OuterTypeFilename"> - <property name="severity" value="error"/> - </module> - <module name="AbstractClassName"> - <property name="severity" value="error"/> - <property name="format" value="^Abstract.*$"/> - </module> - </module> - <module name="FileLength"> - <property name="severity" value="error"/> - <property name="max" value="2500"/> - </module> - <module name="SuppressionCommentFilter"/> -</module> +<?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
+ Description: none
+-->
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <module name="FileContentsHolder"/>
+ <module name="JavadocMethod">
+ <property name="severity" value="error"/>
+ <property name="allowUndeclaredRTE" value="true"/>
+ <property name="allowMissingPropertyJavadoc" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="JavadocStyle">
+ <property name="severity" value="error"/>
+ <property name="checkEmptyJavadoc" value="true"/>
+ <property name="checkHtml" value="false"/>
+ </module>
+ <module name="JavadocType">
+ <property name="severity" value="error"/>
+ <property name="authorFormat" value="(<a href="mailto:[a-z.]+@[a-z.]+\.[a-z]{2,4}\">)?[A-Z][a-z]+\s[A-Z][a-z]+(</a>)?"/>
+ <property name="allowUnknownTags" value="true"/>
+ </module>
+ <module name="JavadocVariable">
+ <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="MethodTypeParameterName">
+ <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"/>
+ <property name="option" value="top"/>
+ </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="70"/>
+ <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="120"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="OuterTypeNumber">
+ <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="ignore"/>
+ <property name="option" value="space"/>
+ <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+ </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_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,WILDCARD_TYPE"/>
+ </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="NeedBraces">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="RightCurly">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="RightCurly"/>
+ <module name="LeftCurly">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="AvoidInlineConditionals">
+ <property name="severity" value="error"/>
+ </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="FinalLocalVariable">
+ <property name="severity" value="ignore"/>
+ <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+ </module>
+ <module name="DoubleCheckedLocking">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="EmptyStatement">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="EqualsAvoidNull">
+ <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="HiddenField">
+ <property name="severity" value="error"/>
+ <property name="ignoreConstructorParameter" value="true"/>
+ <property name="ignoreSetter" value="true"/>
+ </module>
+ <module name="IllegalInstantiation">
+ <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, 10000"/>
+ </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="NestedForDepth">
+ <property name="severity" value="error"/>
+ <property name="max" value="2"/>
+ </module>
+ <module name="NestedIfDepth">
+ <property name="severity" value="error"/>
+ <property name="max" value="2"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="severity" value="error"/>
+ <property name="max" value="2"/>
+ </module>
+ <module name="NoClone">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="NoFinalizer">
+ <property name="severity" value="error"/>
+ </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="^$"/>
+ </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="OneStatementPerLine">
+ <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="JavaNCSS">
+ <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 name="OuterTypeFilename">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="AbstractClassName">
+ <property name="severity" value="error"/>
+ <property name="format" value="^Abstract.*$"/>
+ </module>
+ </module>
+ <module name="FileLength">
+ <property name="severity" value="error"/>
+ <property name="max" value="2500"/>
+ </module>
+ <module name="SuppressionCommentFilter"/>
+</module>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target index 2e890b457..bd2d86ee1 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target @@ -1,21 +1,21 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.6"?> - -<target name="EMF Compare based on Juno with 4.2 Platform" sequenceNumber="34"> -<locations> -<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="com.google.guava" version="10.0.1.v201203051515"/> -<unit id="org.junit" version="4.8.2.v4_8_2_v20110321-1705"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20120308061416/repository/"/> -</location> -<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.platform.sdk" version="4.2.0.I20120321-0610"/> -<repository location="http://download.eclipse.org/eclipse/updates/4.2-I-builds"/> -</location> -<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.jdt.feature.group" version="3.8.0.v20111130-1318-8-8lFpEFNOfwRe0lvGVLmVw9B15B"/> -<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.0.v20120319-0555"/> -<repository location="http://download.eclipse.org/releases/juno"/> -</location> -</locations> -</target> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="EMF Compare based on Juno with 4.2 Platform" sequenceNumber="34">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="10.0.1.v201203051515"/>
+<unit id="org.junit" version="4.8.2.v4_8_2_v20110321-1705"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20120308061416/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.sdk" version="4.2.0.I20120321-0610"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.2-I-builds"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.feature.group" version="3.8.0.v20111130-1318-8-8lFpEFNOfwRe0lvGVLmVw9B15B"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.0.v20120319-0555"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
+</locations>
+</target>
diff --git a/packaging/org.eclipse.emf.compare-feature/.project b/packaging/org.eclipse.emf.compare-feature/.project index 16c7ad32f..c30e4d2c3 100644 --- a/packaging/org.eclipse.emf.compare-feature/.project +++ b/packaging/org.eclipse.emf.compare-feature/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.emf.compare-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.resources.prefs b/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.resources.prefs +++ b/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.runtime.prefs b/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.runtime.prefs +++ b/packaging/org.eclipse.emf.compare-feature/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/packaging/org.eclipse.emf.compare-feature/copyright.txt b/packaging/org.eclipse.emf.compare-feature/copyright.txt index d7cc12528..fc6df856c 100644 --- a/packaging/org.eclipse.emf.compare-feature/copyright.txt +++ b/packaging/org.eclipse.emf.compare-feature/copyright.txt @@ -1,8 +1,8 @@ -Copyright (c) 2006, 2012 Obeo. -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 -http://www.eclipse.org/legal/epl-v10.html - -Contributors: +Copyright (c) 2006, 2012 Obeo.
+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
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
Obeo - initial API and implementation
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare-feature/license.html b/packaging/org.eclipse.emf.compare-feature/license.html index f19c483b9..5ef681156 100644 --- a/packaging/org.eclipse.emf.compare-feature/license.html +++ b/packaging/org.eclipse.emf.compare-feature/license.html @@ -1,108 +1,108 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> +<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.project b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.project index b9ef9eb17..69f2742d8 100644 --- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.project +++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.emf.compare.diagram.ecoretools-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.diagram.ecoretools-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.resources.prefs b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.resources.prefs +++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.runtime.prefs b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.runtime.prefs +++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/license.html b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/license.html index f19c483b9..5ef681156 100644 --- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/license.html +++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/license.html @@ -1,108 +1,108 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> +<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.project b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.project index 02df55a6a..2af9f90a5 100644 --- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.project +++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.emf.compare.diagram.gmf-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.diagram.gmf-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.resources.prefs b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.resources.prefs +++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.runtime.prefs b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.runtime.prefs +++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/license.html b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/license.html index f19c483b9..5ef681156 100644 --- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/license.html +++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/license.html @@ -1,108 +1,108 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> +<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.project b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.project index 6520d223e..23aac3227 100644 --- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.project +++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.emf.compare.diagram.papyrus-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.diagram.papyrus-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.resources.prefs b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.resources.prefs +++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.runtime.prefs b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.runtime.prefs +++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/license.html b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/license.html index f19c483b9..5ef681156 100644 --- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/license.html +++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/license.html @@ -1,108 +1,108 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> +<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/.project b/packaging/org.eclipse.emf.compare.ide.ui-feature/.project index 07157e1bb..57ab627e0 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/.project +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.emf.compare.ide.ui-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.ide.ui-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/about.html b/packaging/org.eclipse.emf.compare.ide.ui-feature/about.html index 670d10856..34ab520ee 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/about.html +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/about.html @@ -1,106 +1,106 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
</html>
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/build.properties b/packaging/org.eclipse.emf.compare.ide.ui-feature/build.properties index c7ab0dbd7..4753c8669 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/build.properties +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/build.properties @@ -1,17 +1,17 @@ -################################################################################ -# Copyright (c) 2006, 2012 Obeo. -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Obeo - initial API and implementation -################################################################################ -bin.includes = modeling32.png,\ - epl-v10.html,\ - feature.properties,\ - feature.xml,\ - license.html,\ - copyright.txt,\ - about.html +################################################################################
+# Copyright (c) 2006, 2012 Obeo.
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Obeo - initial API and implementation
+################################################################################
+bin.includes = modeling32.png,\
+ epl-v10.html,\
+ feature.properties,\
+ feature.xml,\
+ license.html,\
+ copyright.txt,\
+ about.html
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/copyright.txt b/packaging/org.eclipse.emf.compare.ide.ui-feature/copyright.txt index d7cc12528..fc6df856c 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/copyright.txt +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/copyright.txt @@ -1,8 +1,8 @@ -Copyright (c) 2006, 2012 Obeo. -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 -http://www.eclipse.org/legal/epl-v10.html - -Contributors: +Copyright (c) 2006, 2012 Obeo.
+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
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
Obeo - initial API and implementation
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/epl-v10.html b/packaging/org.eclipse.emf.compare.ide.ui-feature/epl-v10.html index 670d10856..34ab520ee 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/epl-v10.html +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/epl-v10.html @@ -1,106 +1,106 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
</html>
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.properties b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.properties index 18e0b330b..de5f3eb24 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.properties +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.properties @@ -1,153 +1,153 @@ -################################################################################ -# Copyright (c) 2006, 2012 Obeo. -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Obeo - initial API and implementation -################################################################################ -featureName = EMF Compare IDE UI -providerName = Eclipse Modeling Project - -description = This will provide EMF Compare with an UI integrated with the standard, \ -Team actions for comparison. - -copyrightURL = copyright.txt -copyright = Copyright (c) 2006, 2012 Obeo, France. \n\ -All rights reserved. This program and the accompanying materials \n\ -are made available under the terms of the Eclipse Public License v1.0 \n\ -which accompanies this distribution, and is available at \n\ -http://www.eclipse.org/legal/epl-v10.html \n\ - \n\ -Contributors: \n\ - Obeo - initial API and implementation - -licenseURL=license.html -license=\ -Eclipse Foundation Software User Agreement\n\ -February 1, 2011\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the\n\ -Eclipse Foundation is provided to you under the terms and conditions of\n\ -the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse Foundation source code\n\ -repository ("Repository") in software modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ -Update License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties" found within a Feature.\n\ -Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ -terms and conditions (or references to such terms and conditions) that\n\ -govern your use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -\n\Use of Provisioning Technology\n\ -\n\ -The Eclipse Foundation makes available provisioning software, examples of which include,\n\ -but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ -the purpose of allowing users to install software, documentation, information and/or\n\ -other materials (collectively "Installable Software"). This capability is provided with\n\ -the intent of allowing such users to install, extend and update Eclipse-based products.\n\ -Information about packaging Installable Software is available at\n\ -http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ -\n\ -You may use Provisioning Technology to allow other parties to install Installable Software.\n\ -You shall be responsible for enabling the applicable license agreements relating to the\n\ -Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ -in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ -making it available in accordance with the Specification, you further acknowledge your\n\ -agreement to, and the acquisition of all necessary rights to permit the following:\n\ -\n\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use, and\n\ -re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n -########### end of license property ########################################## - +################################################################################
+# Copyright (c) 2006, 2012 Obeo.
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Obeo - initial API and implementation
+################################################################################
+featureName = EMF Compare IDE UI
+providerName = Eclipse Modeling Project
+
+description = This will provide EMF Compare with an UI integrated with the standard, \
+Team actions for comparison.
+
+copyrightURL = copyright.txt
+copyright = Copyright (c) 2006, 2012 Obeo, France. \n\
+All rights reserved. This program and the accompanying materials \n\
+are made available under the terms of the Eclipse Public License v1.0 \n\
+which accompanies this distribution, and is available at \n\
+http://www.eclipse.org/legal/epl-v10.html \n\
+ \n\
+Contributors: \n\
+ Obeo - initial API and implementation
+
+licenseURL=license.html
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
+
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml index 4fb1beb2b..2eadb6277 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml @@ -1,53 +1,53 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.emf.compare.ide.ui" - label="%featureName" - version="2.0.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.emf.compare"> - - <description> - %description - </description> - - <copyright url="%copyrightURL"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.eclipse.emf.compare" version="2.0.0.qualifier"/> - </requires> - - <plugin - id="org.eclipse.emf.compare.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.compare.ide" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.compare.ide.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.compare.doc" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.compare.ide.ui"
+ label="%featureName"
+ version="2.0.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.emf.compare">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.emf.compare" version="2.0.0.qualifier"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.emf.compare.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.ide"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.ide.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/license.html b/packaging/org.eclipse.emf.compare.ide.ui-feature/license.html index f19c483b9..5ef681156 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/license.html +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/license.html @@ -1,108 +1,108 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> +<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml index a4dc56918..c0fba4a26 100644 --- a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml @@ -1,15 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>emf.compare-parent</artifactId> - <groupId>org.eclipse.emf.compare</groupId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> - </parent> - <groupId>org.eclipse.emf.compare.features</groupId> - <artifactId>org.eclipse.emf.compare.ide.ui</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-feature</packaging> -</project> +<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.ide.ui</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/.project b/packaging/org.eclipse.emf.compare.rcp.ui-feature/.project index a218c9410..83f5b9f3f 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/.project +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.emf.compare.rcp.ui-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.rcp.ui-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/about.html b/packaging/org.eclipse.emf.compare.rcp.ui-feature/about.html index 670d10856..34ab520ee 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/about.html +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/about.html @@ -1,106 +1,106 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
</html>
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/build.properties b/packaging/org.eclipse.emf.compare.rcp.ui-feature/build.properties index c7ab0dbd7..4753c8669 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/build.properties +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/build.properties @@ -1,17 +1,17 @@ -################################################################################ -# Copyright (c) 2006, 2012 Obeo. -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Obeo - initial API and implementation -################################################################################ -bin.includes = modeling32.png,\ - epl-v10.html,\ - feature.properties,\ - feature.xml,\ - license.html,\ - copyright.txt,\ - about.html +################################################################################
+# Copyright (c) 2006, 2012 Obeo.
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Obeo - initial API and implementation
+################################################################################
+bin.includes = modeling32.png,\
+ epl-v10.html,\
+ feature.properties,\
+ feature.xml,\
+ license.html,\
+ copyright.txt,\
+ about.html
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/copyright.txt b/packaging/org.eclipse.emf.compare.rcp.ui-feature/copyright.txt index d7cc12528..fc6df856c 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/copyright.txt +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/copyright.txt @@ -1,8 +1,8 @@ -Copyright (c) 2006, 2012 Obeo. -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 -http://www.eclipse.org/legal/epl-v10.html - -Contributors: +Copyright (c) 2006, 2012 Obeo.
+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
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
Obeo - initial API and implementation
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/epl-v10.html b/packaging/org.eclipse.emf.compare.rcp.ui-feature/epl-v10.html index 670d10856..34ab520ee 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/epl-v10.html +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/epl-v10.html @@ -1,106 +1,106 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
</html>
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.properties b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.properties index 2543f0925..172f51848 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.properties +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.properties @@ -1,153 +1,153 @@ -################################################################################ -# Copyright (c) 2006, 2012 Obeo. -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Obeo - initial API and implementation -################################################################################ -featureName = EMF Compare RCP UI -providerName = Eclipse Modeling Project - -description = This will provide EMF Compare with an UI that can be used in an RCP \ -application, with no dependencies towards the Eclipse IDE. - -copyrightURL = copyright.txt -copyright = Copyright (c) 2006, 2012 Obeo, France. \n\ -All rights reserved. This program and the accompanying materials \n\ -are made available under the terms of the Eclipse Public License v1.0 \n\ -which accompanies this distribution, and is available at \n\ -http://www.eclipse.org/legal/epl-v10.html \n\ - \n\ -Contributors: \n\ - Obeo - initial API and implementation - -licenseURL=license.html -license=\ -Eclipse Foundation Software User Agreement\n\ -February 1, 2011\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the\n\ -Eclipse Foundation is provided to you under the terms and conditions of\n\ -the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse Foundation source code\n\ -repository ("Repository") in software modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ -Update License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties" found within a Feature.\n\ -Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ -terms and conditions (or references to such terms and conditions) that\n\ -govern your use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -\n\Use of Provisioning Technology\n\ -\n\ -The Eclipse Foundation makes available provisioning software, examples of which include,\n\ -but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ -the purpose of allowing users to install software, documentation, information and/or\n\ -other materials (collectively "Installable Software"). This capability is provided with\n\ -the intent of allowing such users to install, extend and update Eclipse-based products.\n\ -Information about packaging Installable Software is available at\n\ -http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ -\n\ -You may use Provisioning Technology to allow other parties to install Installable Software.\n\ -You shall be responsible for enabling the applicable license agreements relating to the\n\ -Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ -in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ -making it available in accordance with the Specification, you further acknowledge your\n\ -agreement to, and the acquisition of all necessary rights to permit the following:\n\ -\n\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use, and\n\ -re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n -########### end of license property ########################################## - +################################################################################
+# Copyright (c) 2006, 2012 Obeo.
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Obeo - initial API and implementation
+################################################################################
+featureName = EMF Compare RCP UI
+providerName = Eclipse Modeling Project
+
+description = This will provide EMF Compare with an UI that can be used in an RCP \
+application, with no dependencies towards the Eclipse IDE.
+
+copyrightURL = copyright.txt
+copyright = Copyright (c) 2006, 2012 Obeo, France. \n\
+All rights reserved. This program and the accompanying materials \n\
+are made available under the terms of the Eclipse Public License v1.0 \n\
+which accompanies this distribution, and is available at \n\
+http://www.eclipse.org/legal/epl-v10.html \n\
+ \n\
+Contributors: \n\
+ Obeo - initial API and implementation
+
+licenseURL=license.html
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
+
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml index f1bc34ddb..cc83f7253 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml @@ -1,39 +1,39 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.emf.compare.rcp.ui" - label="%featureName" - version="2.0.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.emf.compare"> - - <description> - %description - </description> - - <copyright url="%copyrightURL"> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import feature="org.eclipse.emf.compare" version="2.0.0.qualifier"/> - </requires> - - <plugin - id="org.eclipse.emf.compare.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.emf.compare.rcp.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.compare.rcp.ui"
+ label="%featureName"
+ version="2.0.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.eclipse.emf.compare">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.emf.compare" version="2.0.0.qualifier"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.emf.compare.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.compare.rcp.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/license.html b/packaging/org.eclipse.emf.compare.rcp.ui-feature/license.html index f19c483b9..5ef681156 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/license.html +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/license.html @@ -1,108 +1,108 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> +<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml index 3481ddf1c..6f25eec45 100644 --- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml +++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml @@ -1,15 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>emf.compare-parent</artifactId> - <groupId>org.eclipse.emf.compare</groupId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> - </parent> - <groupId>org.eclipse.emf.compare.features</groupId> - <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-feature</packaging> -</project> +<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare.features</groupId>
+ <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.resources.prefs b/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.resources.prefs +++ b/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.runtime.prefs b/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.runtime.prefs +++ b/packaging/org.eclipse.emf.compare.sysml-feature/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.resources.prefs b/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.resources.prefs +++ b/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.runtime.prefs b/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.runtime.prefs +++ b/packaging/org.eclipse.emf.compare.uml2-feature/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/copyright.txt b/packaging/org.eclipse.emf.compare.uml2-feature/copyright.txt index d7cc12528..fc6df856c 100644 --- a/packaging/org.eclipse.emf.compare.uml2-feature/copyright.txt +++ b/packaging/org.eclipse.emf.compare.uml2-feature/copyright.txt @@ -1,8 +1,8 @@ -Copyright (c) 2006, 2012 Obeo. -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 -http://www.eclipse.org/legal/epl-v10.html - -Contributors: +Copyright (c) 2006, 2012 Obeo.
+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
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
Obeo - initial API and implementation
\ No newline at end of file diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/license.html b/packaging/org.eclipse.emf.compare.uml2-feature/license.html index f19c483b9..5ef681156 100644 --- a/packaging/org.eclipse.emf.compare.uml2-feature/license.html +++ b/packaging/org.eclipse.emf.compare.uml2-feature/license.html @@ -1,108 +1,108 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> +<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.resources.prefs b/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.resources.prefs +++ b/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.runtime.prefs b/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.runtime.prefs +++ b/packaging/org.eclipse.emf.compare.update/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.pde.api.tools.prefs index 5d324dc0b..1ab3f1ca8 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.pde.api.tools.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools/.settings/org.eclipse.pde.api.tools.prefs @@ -1,150 +1,150 @@ -#Wed Apr 08 15:06:07 CEST 2009 -ANNOTATION_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_METHOD=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITHOUT_DEFAULT_VALUE=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITH_DEFAULT_VALUE=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Warning -API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Warning -CLASS_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -CLASS_ELEMENT_TYPE_ADDED_METHOD=Warning -CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -CLASS_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERCLASS_SET=Warning -CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -CLASS_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning -CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -CLASS_ELEMENT_TYPE_CHANGED_SUPERCLASS=Warning -CLASS_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning -CLASS_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning -CLASS_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning -CLASS_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Warning -CLASS_ELEMENT_TYPE_REMOVED_FIELD=Warning -CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -CLASS_ELEMENT_TYPE_REMOVED_METHOD=Warning -CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -ENUM_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -ENUM_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning -ENUM_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning -ENUM_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning -ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Warning -ENUM_ELEMENT_TYPE_REMOVED_FIELD=Warning -ENUM_ELEMENT_TYPE_REMOVED_METHOD=Warning -ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning -FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Warning -FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning -FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning -FIELD_ELEMENT_TYPE_CHANGED_TYPE=Warning -FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning -FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENTS=Warning -FIELD_ELEMENT_TYPE_REMOVED_VALUE=Warning -ILLEGAL_EXTEND=Warning -ILLEGAL_IMPLEMENT=Warning -ILLEGAL_INSTANTIATE=Warning -ILLEGAL_OVERRIDE=Warning -ILLEGAL_REFERENCE=Warning -INTERFACE_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Warning -INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Warning -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETERS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -INVALID_JAVADOC_TAG=Ignore -LEAK_EXTEND=Warning -LEAK_FIELD_DECL=Warning -LEAK_IMPLEMENT=Warning -LEAK_METHOD_PARAM=Warning -LEAK_METHOD_RETURN_TYPE=Warning -METHOD_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -METHOD_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -METHOD_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning -METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning -METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning -METHOD_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning -METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning -METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning -METHOD_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -eclipse.preferences.version=1 -incompatible_api_component_version=Warning -incompatible_api_component_version_include_major_without_breaking_change=Disabled -incompatible_api_component_version_include_minor_without_api_change=Disabled -invalid_since_tag_version=Error -malformed_since_tag=Error -missing_since_tag=Error +#Wed Apr 08 15:06:07 CEST 2009
+ANNOTATION_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITHOUT_DEFAULT_VALUE=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITH_DEFAULT_VALUE=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Warning
+CLASS_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Warning
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+CLASS_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERCLASS_SET=Warning
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+CLASS_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+CLASS_ELEMENT_TYPE_CHANGED_SUPERCLASS=Warning
+CLASS_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning
+CLASS_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning
+CLASS_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning
+CLASS_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Warning
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Warning
+CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Warning
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+ENUM_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+ENUM_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning
+ENUM_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning
+ENUM_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Warning
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Warning
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Warning
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Warning
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENTS=Warning
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Warning
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETERS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+INVALID_JAVADOC_TAG=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+METHOD_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+METHOD_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning
+METHOD_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning
+METHOD_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
diff --git a/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.papyrus/META-INF/MANIFEST.MF index e290edb6b..da99e1fa9 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/META-INF/MANIFEST.MF @@ -1,30 +1,30 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Papyrus Diagram Comparison Support -Bundle-SymbolicName: org.eclipse.emf.compare.diagram.papyrus;singleton:=true -Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.emf.compare.diagram.papyrus.Activator -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.compare, - org.eclipse.emf.compare.diagram, - org.eclipse.emf.compare.diagram.ui, - org.eclipse.emf.compare.ui, - org.eclipse.gmf.runtime.notation, - org.eclipse.papyrus.uml.diagram.activity, - org.eclipse.papyrus.uml.diagram.clazz, - org.eclipse.papyrus.uml.diagram.communication, - org.eclipse.papyrus.uml.diagram.component, - org.eclipse.papyrus.uml.diagram.composite, - org.eclipse.papyrus.uml.diagram.deployment, - org.eclipse.papyrus.uml.diagram.profile, - org.eclipse.papyrus.uml.diagram.sequence, - org.eclipse.papyrus.uml.diagram.statemachine, - org.eclipse.papyrus.uml.diagram.usecase, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.papyrus.uml.diagram.common, - org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="0.9.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: Eclipse Modeling Project -Export-Package: org.eclipse.emf.compare.diagram.papyrus, - org.eclipse.emf.compare.diagram.papyrus.ui +Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus Diagram Comparison Support
+Bundle-SymbolicName: org.eclipse.emf.compare.diagram.papyrus;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.emf.compare.diagram.papyrus.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.compare,
+ org.eclipse.emf.compare.diagram,
+ org.eclipse.emf.compare.diagram.ui,
+ org.eclipse.emf.compare.ui,
+ org.eclipse.gmf.runtime.notation,
+ org.eclipse.papyrus.uml.diagram.activity,
+ org.eclipse.papyrus.uml.diagram.clazz,
+ org.eclipse.papyrus.uml.diagram.communication,
+ org.eclipse.papyrus.uml.diagram.component,
+ org.eclipse.papyrus.uml.diagram.composite,
+ org.eclipse.papyrus.uml.diagram.deployment,
+ org.eclipse.papyrus.uml.diagram.profile,
+ org.eclipse.papyrus.uml.diagram.sequence,
+ org.eclipse.papyrus.uml.diagram.statemachine,
+ org.eclipse.papyrus.uml.diagram.usecase,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.papyrus.uml.diagram.common,
+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: Eclipse Modeling Project
+Export-Package: org.eclipse.emf.compare.diagram.papyrus,
+ org.eclipse.emf.compare.diagram.papyrus.ui
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/plugin.xml b/plugins/org.eclipse.emf.compare.diagram.papyrus/plugin.xml index 6218dc1eb..23805a6cd 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/plugin.xml +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/plugin.xml @@ -1,84 +1,84 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<plugin> - <extension - point="org.eclipse.core.contenttype.contentTypes"> - <content-type - base-type="org.eclipse.emf.compare.diagram.gmfcontenttype" - describer="org.eclipse.emf.compare.diagram.papyrus.DiContentDescriptor" - file-extensions="di" - id="org.eclipse.emf.compare.papyrus.ui.papyruscontenttype" - name="Papyrus DI Content Type" - priority="normal"> - </content-type> - <content-type - base-type="org.eclipse.emf.compare.diagram.gmfcontenttype" - file-extensions="notation" - id="org.eclipse.emf.compare.papyrus.ui.papyruscontenttype.notation" - name="Papyrus Notation Content Type" - priority="normal"> - </content-type> - </extension> - - <extension - point="org.eclipse.emf.compare.diagram.viewLabelProvider"> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.ActivityViewLabelProvider" - diagramType="PapyrusUMLActivityDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.ClazzViewLabelProvider" - diagramType="PapyrusUMLClassDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.CommunicationViewLabelProvider" - diagramType="PapyrusUMLCommunicationDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.ComponentViewLabelProvider" - diagramType="PapyrusUMLComponentDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.CompositeViewLabelProvider" - diagramType="CompositeStructure"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.DeploymentViewLabelProvider" - diagramType="PapyrusUMLDeploymentDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.ProfileViewLabelProvider" - diagramType="PapyrusUMLProfileDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.SequenceViewLabelProvider" - diagramType="PapyrusUMLSequenceDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.StateMachineViewLabelProvider" - diagramType="PapyrusUMLStateMachineDiagram"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.UseCaseViewLabelProvider" - diagramType="UseCase"> - </provider> - <provider - class="org.eclipse.emf.compare.diagram.papyrus.PackageViewLabelProvider" - diagramType="Package"> - </provider> - </extension> - - <extension - point="org.eclipse.compare.contentMergeViewers"> - <viewer - class="org.eclipse.emf.compare.diagram.papyrus.ui.PapyrusContentMergeViewerCreator" - id="org.eclipse.emf.compare.ui.papyrus.contentviewer" - label="GMF Compare"> - </viewer> - <contentTypeBinding - contentMergeViewerId="org.eclipse.emf.compare.ui.papyrus.contentviewer" - contentTypeId="org.eclipse.emf.compare.papyrus.ui.papyruscontenttype"> - </contentTypeBinding> - </extension> - -</plugin> +<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.core.contenttype.contentTypes">
+ <content-type
+ base-type="org.eclipse.emf.compare.diagram.gmfcontenttype"
+ describer="org.eclipse.emf.compare.diagram.papyrus.DiContentDescriptor"
+ file-extensions="di"
+ id="org.eclipse.emf.compare.papyrus.ui.papyruscontenttype"
+ name="Papyrus DI Content Type"
+ priority="normal">
+ </content-type>
+ <content-type
+ base-type="org.eclipse.emf.compare.diagram.gmfcontenttype"
+ file-extensions="notation"
+ id="org.eclipse.emf.compare.papyrus.ui.papyruscontenttype.notation"
+ name="Papyrus Notation Content Type"
+ priority="normal">
+ </content-type>
+ </extension>
+
+ <extension
+ point="org.eclipse.emf.compare.diagram.viewLabelProvider">
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.ActivityViewLabelProvider"
+ diagramType="PapyrusUMLActivityDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.ClazzViewLabelProvider"
+ diagramType="PapyrusUMLClassDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.CommunicationViewLabelProvider"
+ diagramType="PapyrusUMLCommunicationDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.ComponentViewLabelProvider"
+ diagramType="PapyrusUMLComponentDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.CompositeViewLabelProvider"
+ diagramType="CompositeStructure">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.DeploymentViewLabelProvider"
+ diagramType="PapyrusUMLDeploymentDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.ProfileViewLabelProvider"
+ diagramType="PapyrusUMLProfileDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.SequenceViewLabelProvider"
+ diagramType="PapyrusUMLSequenceDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.StateMachineViewLabelProvider"
+ diagramType="PapyrusUMLStateMachineDiagram">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.UseCaseViewLabelProvider"
+ diagramType="UseCase">
+ </provider>
+ <provider
+ class="org.eclipse.emf.compare.diagram.papyrus.PackageViewLabelProvider"
+ diagramType="Package">
+ </provider>
+ </extension>
+
+ <extension
+ point="org.eclipse.compare.contentMergeViewers">
+ <viewer
+ class="org.eclipse.emf.compare.diagram.papyrus.ui.PapyrusContentMergeViewerCreator"
+ id="org.eclipse.emf.compare.ui.papyrus.contentviewer"
+ label="GMF Compare">
+ </viewer>
+ <contentTypeBinding
+ contentMergeViewerId="org.eclipse.emf.compare.ui.papyrus.contentviewer"
+ contentTypeId="org.eclipse.emf.compare.papyrus.ui.papyruscontenttype">
+ </contentTypeBinding>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeTabFolder.java b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeTabFolder.java index 3f2214455..f3272cee8 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeTabFolder.java +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeTabFolder.java @@ -1,54 +1,54 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Obeo. - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ - -package org.eclipse.emf.compare.diagram.papyrus.ui; - -import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeTabFolder; -import org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeViewer; -import org.eclipse.emf.compare.ui.viewer.content.part.IModelContentMergeViewerTab; -import org.eclipse.swt.widgets.Composite; - -/** - * Define a ModelContentMergeTabFolder for Papyrus comparison. - * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a> - */ -public class PapyrusContentMergeTabFolder extends GMFContentMergeTabFolder { - - /** - * Constructor. - * - * @param viewer - * Parent viewer of this viewer part. - * @param composite - * Parent {@link Composite} for this part. - * @param side - * Comparison side of this part. - */ - public PapyrusContentMergeTabFolder(ModelContentMergeViewer viewer, Composite composite, int side) { - super(viewer, composite, side); - } - - - /** - * Handles the creation of the gmf tab of this viewer part given the parent {@link Composite} under which - * to create it. - * - * @param parent - * Parent {@link Composite} of the graphical viewer to create. - * @return The graphical part displayed by this viewer part's graphical tab. - */ - @Override - protected IModelContentMergeViewerTab createGmfPart(Composite parent) { - final IModelContentMergeViewerTab gmfPart = new PapyrusContentMergeViewerTab(parent, partSide, this); - return gmfPart; - } - -} +/*******************************************************************************
+ * Copyright (c) 2011, 2012 Obeo.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.emf.compare.diagram.papyrus.ui;
+
+import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeTabFolder;
+import org.eclipse.emf.compare.ui.viewer.content.ModelContentMergeViewer;
+import org.eclipse.emf.compare.ui.viewer.content.part.IModelContentMergeViewerTab;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Define a ModelContentMergeTabFolder for Papyrus comparison.
+ * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a>
+ */
+public class PapyrusContentMergeTabFolder extends GMFContentMergeTabFolder {
+
+ /**
+ * Constructor.
+ *
+ * @param viewer
+ * Parent viewer of this viewer part.
+ * @param composite
+ * Parent {@link Composite} for this part.
+ * @param side
+ * Comparison side of this part.
+ */
+ public PapyrusContentMergeTabFolder(ModelContentMergeViewer viewer, Composite composite, int side) {
+ super(viewer, composite, side);
+ }
+
+
+ /**
+ * Handles the creation of the gmf tab of this viewer part given the parent {@link Composite} under which
+ * to create it.
+ *
+ * @param parent
+ * Parent {@link Composite} of the graphical viewer to create.
+ * @return The graphical part displayed by this viewer part's graphical tab.
+ */
+ @Override
+ protected IModelContentMergeViewerTab createGmfPart(Composite parent) {
+ final IModelContentMergeViewerTab gmfPart = new PapyrusContentMergeViewerTab(parent, partSide, this);
+ return gmfPart;
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewer.java b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewer.java index 658c087f8..048d856c3 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewer.java @@ -1,58 +1,58 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Obeo. - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ -package org.eclipse.emf.compare.diagram.papyrus.ui; - -import org.eclipse.compare.CompareConfiguration; -import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewer; -import org.eclipse.emf.compare.ui.viewer.content.part.ModelContentMergeTabFolder; -import org.eclipse.swt.widgets.Composite; - -/** - * GMFContentMergeViewer for Papyrus. - * - * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a> - */ -public class PapyrusContentMergeViewer extends GMFContentMergeViewer { - - /** - * Constructor. - * - * @param parent - * The parent composite - * @param config - * The compare configuration. - */ - public PapyrusContentMergeViewer(Composite parent, CompareConfiguration config) { - super(parent, config); - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewer#getTitle() - */ - @Override - public String getTitle() { - // FIXME Externalize this - return "Papyrus differences"; //$NON-NLS-1$ - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.compare.ui.viewer.content.ParameterizedContentMergeViewer#createModelContentMergeTabFolder(org.eclipse.swt.widgets.Composite, - * int) - */ - @Override - protected ModelContentMergeTabFolder createModelContentMergeTabFolder(Composite composite, int side) { - return new PapyrusContentMergeTabFolder(this, composite, side); - } -} +/*******************************************************************************
+ * Copyright (c) 2011, 2012 Obeo.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.diagram.papyrus.ui;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewer;
+import org.eclipse.emf.compare.ui.viewer.content.part.ModelContentMergeTabFolder;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * GMFContentMergeViewer for Papyrus.
+ *
+ * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a>
+ */
+public class PapyrusContentMergeViewer extends GMFContentMergeViewer {
+
+ /**
+ * Constructor.
+ *
+ * @param parent
+ * The parent composite
+ * @param config
+ * The compare configuration.
+ */
+ public PapyrusContentMergeViewer(Composite parent, CompareConfiguration config) {
+ super(parent, config);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewer#getTitle()
+ */
+ @Override
+ public String getTitle() {
+ // FIXME Externalize this
+ return "Papyrus differences"; //$NON-NLS-1$
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.ui.viewer.content.ParameterizedContentMergeViewer#createModelContentMergeTabFolder(org.eclipse.swt.widgets.Composite,
+ * int)
+ */
+ @Override
+ protected ModelContentMergeTabFolder createModelContentMergeTabFolder(Composite composite, int side) {
+ return new PapyrusContentMergeTabFolder(this, composite, side);
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerCreator.java b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerCreator.java index a03931754..4aed083bc 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerCreator.java +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerCreator.java @@ -1,31 +1,31 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ -package org.eclipse.emf.compare.diagram.papyrus.ui; - -import org.eclipse.compare.CompareConfiguration; -import org.eclipse.compare.IViewerCreator; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Composite; - -/** - * The content viewer creator for papyrus comparison. - * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a> - */ -public class PapyrusContentMergeViewerCreator implements IViewerCreator { - /** - * {@inheritDoc} - * - * @see org.eclipse.compare.IViewerCreator#createViewer(org.eclipse.swt.widgets.Composite, org.eclipse.compare.CompareConfiguration) - */ - public Viewer createViewer(Composite parent, CompareConfiguration config) { - return new PapyrusContentMergeViewer(parent, config); - } -} +/*******************************************************************************
+ * Copyright (c) 2009, 2012 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.diagram.papyrus.ui;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.IViewerCreator;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The content viewer creator for papyrus comparison.
+ * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a>
+ */
+public class PapyrusContentMergeViewerCreator implements IViewerCreator {
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.compare.IViewerCreator#createViewer(org.eclipse.swt.widgets.Composite, org.eclipse.compare.CompareConfiguration)
+ */
+ public Viewer createViewer(Composite parent, CompareConfiguration config) {
+ return new PapyrusContentMergeViewer(parent, config);
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerTab.java b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerTab.java index 428e093ad..50667b28b 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerTab.java +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ui/PapyrusContentMergeViewerTab.java @@ -1,111 +1,111 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Obeo. - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ - -package org.eclipse.emf.compare.diagram.papyrus.ui; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.emf.common.util.TreeIterator; -import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeTabFolder; -import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewerTab; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; -import org.eclipse.swt.widgets.Composite; - -/** - * The tab that contains the Papryus viewer. - * - * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a> - */ -public class PapyrusContentMergeViewerTab extends GMFContentMergeViewerTab { - - /** - * Constructor. - * - * @param parent - * The parent composite. - * @param side - * The side. - * @param parentFolder - * The parent folder. - */ - public PapyrusContentMergeViewerTab(Composite parent, int side, GMFContentMergeTabFolder parentFolder) { - super(parent, side, parentFolder); - } - - @Override - public void setReflectiveInput(Object object) { - if (object instanceof EObject) { - if (object instanceof Diagram) { - displayDiagram((Diagram)object); - } - } else { - // may be invoked with a resourceSet, a list of resources, or a single resource - assert object instanceof Resource || object instanceof List; - if (object instanceof List) { - for (Object item : (List<?>)object) { - assert item instanceof Resource; - } - } - if (object instanceof Resource) { - displayDiagram(getDiagramFromResource((Resource)object)); - } else if (object instanceof List && !((List<?>)object).isEmpty()) { - final Resource resource = (Resource)((List<?>)object).get(0); - displayDiagram(getDiagramFromResource(resource)); - } - } - // maintain synchronization with tree - contentMergeTabFolderParent.getTreePart().setReflectiveInput(object); - contentMergeTabFolderParent.getPropertyPart().setReflectiveInput(object); - redraw(); - } - - /** - * Get the list of diagrams from the given resource. - * - * @param resource - * The resource. - * @return The list of diagrams. - */ - public List<Diagram> getDiagrams(Resource resource) { - final List<Diagram> ret = new ArrayList<Diagram>(); - - final TreeIterator<EObject> eAllContents = resource.getAllContents(); - while (eAllContents.hasNext()) { - final EObject element = eAllContents.next(); - if (element instanceof PageRef) { - final EObject emfPageIdentifier = ((PageRef)element).getEmfPageIdentifier(); - if (emfPageIdentifier instanceof Diagram) { - final Diagram d = (Diagram)emfPageIdentifier; - ret.add(d); - eAllContents.prune(); - } - } - } - - return ret; - - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewerTab#getDiagramFromResource(org.eclipse.emf.ecore.resource.Resource) - */ - @Override - public Diagram getDiagramFromResource(final Resource resource) { - final List<Diagram> diagrams = getDiagrams(resource); - return diagrams.get(0); - } -} +/*******************************************************************************
+ * Copyright (c) 2011, 2012 Obeo.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.emf.compare.diagram.papyrus.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeTabFolder;
+import org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewerTab;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The tab that contains the Papryus viewer.
+ *
+ * @author Mickael Barbero <a href="mailto:mickael.barbero@obeo.fr">mickael.barbero@obeo.fr</a>
+ */
+public class PapyrusContentMergeViewerTab extends GMFContentMergeViewerTab {
+
+ /**
+ * Constructor.
+ *
+ * @param parent
+ * The parent composite.
+ * @param side
+ * The side.
+ * @param parentFolder
+ * The parent folder.
+ */
+ public PapyrusContentMergeViewerTab(Composite parent, int side, GMFContentMergeTabFolder parentFolder) {
+ super(parent, side, parentFolder);
+ }
+
+ @Override
+ public void setReflectiveInput(Object object) {
+ if (object instanceof EObject) {
+ if (object instanceof Diagram) {
+ displayDiagram((Diagram)object);
+ }
+ } else {
+ // may be invoked with a resourceSet, a list of resources, or a single resource
+ assert object instanceof Resource || object instanceof List;
+ if (object instanceof List) {
+ for (Object item : (List<?>)object) {
+ assert item instanceof Resource;
+ }
+ }
+ if (object instanceof Resource) {
+ displayDiagram(getDiagramFromResource((Resource)object));
+ } else if (object instanceof List && !((List<?>)object).isEmpty()) {
+ final Resource resource = (Resource)((List<?>)object).get(0);
+ displayDiagram(getDiagramFromResource(resource));
+ }
+ }
+ // maintain synchronization with tree
+ contentMergeTabFolderParent.getTreePart().setReflectiveInput(object);
+ contentMergeTabFolderParent.getPropertyPart().setReflectiveInput(object);
+ redraw();
+ }
+
+ /**
+ * Get the list of diagrams from the given resource.
+ *
+ * @param resource
+ * The resource.
+ * @return The list of diagrams.
+ */
+ public List<Diagram> getDiagrams(Resource resource) {
+ final List<Diagram> ret = new ArrayList<Diagram>();
+
+ final TreeIterator<EObject> eAllContents = resource.getAllContents();
+ while (eAllContents.hasNext()) {
+ final EObject element = eAllContents.next();
+ if (element instanceof PageRef) {
+ final EObject emfPageIdentifier = ((PageRef)element).getEmfPageIdentifier();
+ if (emfPageIdentifier instanceof Diagram) {
+ final Diagram d = (Diagram)emfPageIdentifier;
+ ret.add(d);
+ eAllContents.prune();
+ }
+ }
+ }
+
+ return ret;
+
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.diagram.ui.mergeviewer.GMFContentMergeViewerTab#getDiagramFromResource(org.eclipse.emf.ecore.resource.Resource)
+ */
+ @Override
+ public Diagram getDiagramFromResource(final Resource resource) {
+ final List<Diagram> diagrams = getDiagrams(resource);
+ return diagrams.get(0);
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.ui.tests/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.diagram.ui/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs index 5d324dc0b..1ab3f1ca8 100644 --- a/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs +++ b/plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs @@ -1,150 +1,150 @@ -#Wed Apr 08 15:06:07 CEST 2009 -ANNOTATION_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_METHOD=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning -ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning -ANNOTATION_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITHOUT_DEFAULT_VALUE=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITH_DEFAULT_VALUE=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Warning -API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Warning -CLASS_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -CLASS_ELEMENT_TYPE_ADDED_METHOD=Warning -CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -CLASS_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERCLASS_SET=Warning -CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -CLASS_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning -CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -CLASS_ELEMENT_TYPE_CHANGED_SUPERCLASS=Warning -CLASS_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning -CLASS_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning -CLASS_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning -CLASS_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Warning -CLASS_ELEMENT_TYPE_REMOVED_FIELD=Warning -CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -CLASS_ELEMENT_TYPE_REMOVED_METHOD=Warning -CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -ENUM_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -ENUM_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning -ENUM_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning -ENUM_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning -ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Warning -ENUM_ELEMENT_TYPE_REMOVED_FIELD=Warning -ENUM_ELEMENT_TYPE_REMOVED_METHOD=Warning -ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning -FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Warning -FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning -FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning -FIELD_ELEMENT_TYPE_CHANGED_TYPE=Warning -FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning -FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENTS=Warning -FIELD_ELEMENT_TYPE_REMOVED_VALUE=Warning -ILLEGAL_EXTEND=Warning -ILLEGAL_IMPLEMENT=Warning -ILLEGAL_INSTANTIATE=Warning -ILLEGAL_OVERRIDE=Warning -ILLEGAL_REFERENCE=Warning -INTERFACE_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Warning -INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Warning -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETERS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning -INTERFACE_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Warning -INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning -INVALID_JAVADOC_TAG=Ignore -LEAK_EXTEND=Warning -LEAK_FIELD_DECL=Warning -LEAK_IMPLEMENT=Warning -LEAK_METHOD_PARAM=Warning -LEAK_METHOD_RETURN_TYPE=Warning -METHOD_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning -METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning -METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning -METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning -METHOD_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning -METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning -METHOD_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning -METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning -METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning -METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning -METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning -METHOD_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning -METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning -METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning -METHOD_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning -METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning -METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning -METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning -METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning -eclipse.preferences.version=1 -incompatible_api_component_version=Warning -incompatible_api_component_version_include_major_without_breaking_change=Disabled -incompatible_api_component_version_include_minor_without_api_change=Disabled -invalid_since_tag_version=Error -malformed_since_tag=Error -missing_since_tag=Error +#Wed Apr 08 15:06:07 CEST 2009
+ANNOTATION_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning
+ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning
+ANNOTATION_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITHOUT_DEFAULT_VALUE=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITH_DEFAULT_VALUE=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Warning
+CLASS_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Warning
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+CLASS_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERCLASS_SET=Warning
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+CLASS_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+CLASS_ELEMENT_TYPE_CHANGED_SUPERCLASS=Warning
+CLASS_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning
+CLASS_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning
+CLASS_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning
+CLASS_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Warning
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Warning
+CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Warning
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+ENUM_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+ENUM_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning
+ENUM_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning
+ENUM_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Warning
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Warning
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Warning
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Warning
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Warning
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENTS=Warning
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Warning
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETERS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_TO_CLASS=Warning
+INTERFACE_ELEMENT_TYPE_CHANGED_TO_ENUM=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Warning
+INVALID_JAVADOC_TAG=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_CLASS_BOUND=Warning
+METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Warning
+METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Warning
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Warning
+METHOD_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Warning
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Warning
+METHOD_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Warning
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Warning
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Warning
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Warning
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Warning
+METHOD_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Warning
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Warning
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Warning
+METHOD_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Warning
+METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Warning
+METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Warning
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Warning
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
diff --git a/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF index 0249c3adf..5bf89662e 100644 --- a/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF @@ -1,24 +1,24 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.emf.compare.diagram;singleton:=true -Bundle-Version: 2.0.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.compare.diagram, - org.eclipse.emf.compare.diagram.diagramdiff, - org.eclipse.emf.compare.diagram.diagramdiff.impl, - org.eclipse.emf.compare.diagram.diagramdiff.util, - org.eclipse.emf.compare.diagram.diff.util, - org.eclipse.emf.compare.diagram.provider -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.compare.diff;visibility:=reexport, - org.eclipse.emf.compare.match;visibility:=reexport, - org.eclipse.gmf.runtime.notation, - org.eclipse.emf.compare, - org.eclipse.gmf.runtime.diagram.ui -Bundle-ActivationPolicy: lazy -Bundle-Activator: org.eclipse.emf.compare.diagram.GMFCompare +Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emf.compare.diagram;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.emf.compare.diagram,
+ org.eclipse.emf.compare.diagram.diagramdiff,
+ org.eclipse.emf.compare.diagram.diagramdiff.impl,
+ org.eclipse.emf.compare.diagram.diagramdiff.util,
+ org.eclipse.emf.compare.diagram.diff.util,
+ org.eclipse.emf.compare.diagram.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.compare.diff;visibility:=reexport,
+ org.eclipse.emf.compare.match;visibility:=reexport,
+ org.eclipse.gmf.runtime.notation,
+ org.eclipse.emf.compare,
+ org.eclipse.gmf.runtime.diagram.ui
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.emf.compare.diagram.GMFCompare
diff --git a/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.resources.prefs index 46f7c6290..655e07ec4 100644 --- a/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.resources.prefs @@ -1,10 +1,10 @@ -eclipse.preferences.version=1 -encoding//tutorials/Architecture-toc.xml=utf-8 -encoding//tutorials/Architecture.html=utf-8 -encoding//tutorials/EMF_Compare_Export_Tutorial-toc.xml=utf-8 -encoding//tutorials/EMF_Compare_Export_Tutorial.html=utf-8 -encoding//tutorials/User_Guide-toc.xml=utf-8 -encoding//tutorials/User_Guide.html=utf-8 -encoding//tutorials/Using_Compare_Services-toc.xml=utf-8 -encoding//tutorials/Using_Compare_Services.html=utf-8 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding//tutorials/Architecture-toc.xml=utf-8
+encoding//tutorials/Architecture.html=utf-8
+encoding//tutorials/EMF_Compare_Export_Tutorial-toc.xml=utf-8
+encoding//tutorials/EMF_Compare_Export_Tutorial.html=utf-8
+encoding//tutorials/User_Guide-toc.xml=utf-8
+encoding//tutorials/User_Guide.html=utf-8
+encoding//tutorials/Using_Compare_Services-toc.xml=utf-8
+encoding//tutorials/Using_Compare_Services.html=utf-8
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.doc/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/build.properties b/plugins/org.eclipse.emf.compare.ide.ui/build.properties index f0e00884d..997056906 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/build.properties +++ b/plugins/org.eclipse.emf.compare.ide.ui/build.properties @@ -1,7 +1,7 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - plugin.properties,\ - .,\ - about.html,\ - plugin.xml +source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ plugin.properties,\
+ .,\
+ about.html,\
+ plugin.xml
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/.classpath b/plugins/org.eclipse.emf.compare.rcp.ui/.classpath index 64c5e31b7..2d1a4302f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/.classpath +++ b/plugins/org.eclipse.emf.compare.rcp.ui/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF index f9fc8f5b7..9ab521a65 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.emf.compare.rcp.ui -Bundle-Version: 2.0.0.qualifier -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Localization: plugin +Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emf.compare.rcp.ui
+Bundle-Version: 2.0.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/about.html b/plugins/org.eclipse.emf.compare.rcp.ui/about.html index 670d10856..34ab520ee 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/about.html +++ b/plugins/org.eclipse.emf.compare.rcp.ui/about.html @@ -1,106 +1,106 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties index 286726ac7..87e7f060a 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties +++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties @@ -1,13 +1,13 @@ -################################################################################ -# Copyright (c) 2012 Obeo. -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Obeo - initial API and implementation -################################################################################ -pluginName = EMF Compare RCP UI -providerName = Eclipse Modeling Project - +################################################################################
+# Copyright (c) 2012 Obeo.
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Obeo - initial API and implementation
+################################################################################
+pluginName = EMF Compare RCP UI
+providerName = Eclipse Modeling Project
+
diff --git a/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.sysml.edit/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.sysml.tests/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.sysml/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffEngineTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffEngineTest.java index 2ef33cb1d..36d1c9587 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffEngineTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffEngineTest.java @@ -20,6 +20,8 @@ import java.util.List; import org.eclipse.emf.compare.CompareFactory;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.diff.DefaultDiffEngine;
+import org.eclipse.emf.compare.utils.DiffUtil;
+import org.eclipse.emf.compare.utils.EqualityHelper;
import org.junit.Test;
/**
@@ -35,8 +37,8 @@ public class DiffEngineTest { final List<Character> right = Lists.charactersOf("czdab");
final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
- final List<Character> lcs = new DefaultDiffEngine().longestCommonSubsequence(emptyComparison, left,
- right);
+ final List<Character> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, new EqualityHelper(),
+ left, right);
/*
* This is documented in {@link DefaultDiffEngine#longestCommonSubsequence(Comparison, List, List)}.
@@ -51,8 +53,8 @@ public class DiffEngineTest { final List<Character> right = Lists.charactersOf("ycdeb");
final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
- final List<Character> lcs = new DefaultDiffEngine().longestCommonSubsequence(emptyComparison, left,
- right);
+ final List<Character> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, new EqualityHelper(),
+ left, right);
/*
* This is documented in {@link DefaultDiffEngine#longestCommonSubsequence(Comparison, List, List)}.
@@ -67,8 +69,8 @@ public class DiffEngineTest { final List<Integer> right = Lists.newArrayList(8, 9, 2, 3, 4, 1, 0);
final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
- final List<Integer> lcs = new DefaultDiffEngine().longestCommonSubsequence(emptyComparison, left,
- right);
+ final List<Integer> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, new EqualityHelper(),
+ left, right);
// These are the origin and left sides of the "complex" conflict test case.
assertEqualContents(Lists.newArrayList(2, 3, 4), lcs);
@@ -80,8 +82,8 @@ public class DiffEngineTest { final List<Integer> right = Lists.newArrayList(6, 2, 9, 3, 0, 4, 1, 7);
final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
- final List<Integer> lcs = new DefaultDiffEngine().longestCommonSubsequence(emptyComparison, left,
- right);
+ final List<Integer> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, new EqualityHelper(),
+ left, right);
// These are the origin and right sides of the "complex" conflict test case.
assertEqualContents(Lists.newArrayList(2, 3, 4, 7), lcs);
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java new file mode 100644 index 000000000..a4ff76ed4 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java @@ -0,0 +1,386 @@ +/*******************************************************************************
+ * Copyright (c) 2012 Obeo.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.diff;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertSame;
+
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
+import org.eclipse.emf.compare.CompareFactory;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.utils.DiffUtil;
+import org.junit.Test;
+
+/**
+ * We will use this to test the utility methods exposed by the {@link DiffUtil}.
+ *
+ * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ */
+@SuppressWarnings("all")
+public class DiffUtilTest {
+ @Test
+ public void lcsTest1() {
+ final List<Character> left = Lists.charactersOf("abcde");
+ final List<Character> right = Lists.charactersOf("czdab");
+
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+ final List<Character> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, left, right);
+
+ /*
+ * This is documented in {@link DefaultDiffEngine#longestCommonSubsequence(Comparison, List, List)}.
+ * Ensure the documentation stays in sync.
+ */
+ assertEqualContents(Lists.charactersOf("cd"), lcs);
+ }
+
+ @Test
+ public void lcsTest2() {
+ final List<Character> left = Lists.charactersOf("abcde");
+ final List<Character> right = Lists.charactersOf("ycdeb");
+
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+ final List<Character> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, left, right);
+
+ /*
+ * This is documented in {@link DefaultDiffEngine#longestCommonSubsequence(Comparison, List, List)}.
+ * Ensure the documentation stays in sync.
+ */
+ assertEqualContents(Lists.charactersOf("cde"), lcs);
+ }
+
+ @Test
+ public void lcsTest3() {
+ final List<Integer> left = Lists.newArrayList(1, 2, 3, 4, 5, 6, 7);
+ final List<Integer> right = Lists.newArrayList(8, 9, 2, 3, 4, 1, 0);
+
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+ final List<Integer> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, left, right);
+
+ // These are the origin and left sides of the "complex" conflict test case.
+ assertEqualContents(Lists.newArrayList(2, 3, 4), lcs);
+ }
+
+ @Test
+ public void lcsTest4() {
+ final List<Integer> left = Lists.newArrayList(1, 2, 3, 4, 5, 6, 7);
+ final List<Integer> right = Lists.newArrayList(6, 2, 9, 3, 0, 4, 1, 7);
+
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+ final List<Integer> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, left, right);
+
+ // These are the origin and right sides of the "complex" conflict test case.
+ assertEqualContents(Lists.newArrayList(2, 3, 4, 7), lcs);
+ }
+
+ @Test
+ public void insertionIndexTest1() {
+ // Assume "left" is {8, 9, 2, 3, 4, 1, 0, 6}
+ // Assume "right" is {6, 2, 9, 3, 0, 4, 7}
+ // We'll transition "right" into "left" by "merging" the additions one after another.
+ // We'll assume the user merges all from left to right, fixing conflicts by "undoing" changes in right
+
+ // We'll go through the following changes :
+ // add "1" in right = {6, 2, 9, 3, 1, 0, 4, 7}
+ // remove 9 from right = {6, 2, 3, 1, 0, 4, 7}
+ // add "9" in right = {6, 9, 2, 3, 1, 0, 4, 7}
+ // remove "0" from right = {6, 9, 2, 3, 1, 4, 7}
+ // add "0" in right = {6, 9, 2, 3, 1, 0, 4, 7}
+ // add "8" in right = {6, 8, 9, 2, 3, 1, 0, 4, 7}
+ // remove "7" from right = {6, 8, 9, 2, 3, 1, 0, 4}
+ // remove "4" from right = {6, 8, 9, 2, 3, 1, 0}
+ // add "4" in right = {6, 8, 9, 2, 3, 4, 1, 0}
+ // remove "6" from right = {8, 9, 2, 3, 4, 1, 0}
+ // add "6" in right = {8, 9, 2, 3, 4, 1, 0, 6}
+
+ final List<Integer> left = Lists.newArrayList(8, 9, 2, 3, 4, 1, 0, 6);
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+
+ // Merge the move of "1" (assume 1 already removed from right)
+ List<Integer> right = Lists.newArrayList(6, 2, 9, 3, 0, 4, 7);
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(1));
+ // Inserted just before "0"
+ assertSame(Integer.valueOf(4), Integer.valueOf(insertionIndex));
+
+ // Merge the move of "9" (assume 9 already removed from right)
+ right = Lists.newArrayList(6, 2, 3, 1, 0, 4, 7);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(9));
+ // Inserted just before "2"
+ assertSame(Integer.valueOf(1), Integer.valueOf(insertionIndex));
+
+ // Merge the move of "0" (assume 0 already removed from right)
+ right = Lists.newArrayList(6, 9, 2, 3, 1, 4, 7);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ // Inserted just before "4"
+ assertSame(Integer.valueOf(5), Integer.valueOf(insertionIndex));
+
+ // merge the addition of "8"
+ right = Lists.newArrayList(6, 9, 2, 3, 1, 0, 4, 7);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(8));
+ // Inserted just before "9"
+ assertSame(Integer.valueOf(1), Integer.valueOf(insertionIndex));
+
+ // remove "7"... right = {6, 8, 9, 2, 3, 1, 0, 4}
+
+ // merge the move of "4" (assume already removed from right)
+ right = Lists.newArrayList(6, 8, 9, 2, 3, 1, 0);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(4));
+ // Inserted just after "3"
+ assertSame(Integer.valueOf(5), Integer.valueOf(insertionIndex));
+
+ // merge the move of "6" (assume already removed from right)
+ right = Lists.newArrayList(8, 9, 2, 3, 4, 1, 0);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(6));
+ // Inserted just after "0"
+ assertSame(Integer.valueOf(7), Integer.valueOf(insertionIndex));
+ }
+
+ @Test
+ public void insertionIndexTest2() {
+ // Try and insert between two lists with no common element
+ final List<Integer> right = Lists.newArrayList(4, 5, 6);
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+ // We'll add "0" in right and expect it to be added at the end wherever its location in left
+ final Integer expectedIndex = Integer.valueOf(right.size());
+
+ List<Integer> left = Lists.newArrayList(0, 1, 2, 3);
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 0, 2, 3);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 2, 3, 0);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+ }
+
+ @Test
+ public void insertionIndexTest3() {
+ // Try and insert an element before the LCS, LCS being the whole second list
+ final List<Integer> right = Lists.newArrayList(1, 2, 3);
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+ // We'll add "0" in right and expect it to be added at the beginning
+ final Integer expectedIndex = Integer.valueOf(0);
+
+ List<Integer> left = Lists.newArrayList(0, 1, 2, 3);
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(0, 4, 1, 2, 3);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(4, 0, 1, 2, 3);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(4, 0, 5, 1, 2, 3);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(4, 0, 5, 1, 2, 3, 6);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(4, 0, 5, 1, 6, 2, 3);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(4, 0, 5, 1, 6, 2, 7, 8, 3, 9);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+ }
+
+ @Test
+ public void insertionIndexTest4() {
+ // Try and insert an element before the LCS, LCS being part of the second list
+ // We'll add "0" in right and expect it to be added just before the LCS
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+
+ List<Integer> left = Lists.newArrayList(0, 1, 2, 3);
+ List<Integer> right = Lists.newArrayList(4, 1, 2, 3);
+ // Start of LCS is 1
+ Integer expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(1)));
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(0, 6, 1, 5, 2, 4, 3);
+ right = Lists.newArrayList(7, 4, 1, 2, 3, 8);
+ // Start of LCS is 1
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(1)));
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(5, 0, 6, 7, 1, 2, 4, 3);
+ right = Lists.newArrayList(7, 4, 1, 2, 9, 3, 8);
+ // Start of LCS is 7
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(7)));
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+ }
+
+ @Test
+ public void insertionIndexTest5() {
+ // Try and insert an element after the LCS, LCS being the whole second list
+ final List<Integer> right = Lists.newArrayList(1, 2, 3);
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+ // We'll add "0" in right and expect it to be added at the end
+ final Integer expectedIndex = Integer.valueOf(right.size());
+
+ List<Integer> left = Lists.newArrayList(1, 2, 3, 0);
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 2, 3, 4, 0);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 2, 3, 0, 4);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 2, 3, 5, 0, 4);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(6, 1, 2, 3, 5, 0, 4);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 6, 2, 3, 5, 0, 4);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(9, 1, 6, 2, 7, 8, 3, 5, 0, 4);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+ }
+
+ @Test
+ public void insertionIndexTest6() {
+ // Try and insert an element after the LCS, LCS being part of the second list
+ // We'll add "0" in right and expect it to be added just after the LCS
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+
+ List<Integer> left = Lists.newArrayList(1, 2, 3, 0);
+ List<Integer> right = Lists.newArrayList(1, 2, 3, 4);
+ // End of LCS is 3
+ Integer expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(3)) + 1);
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 5, 2, 4, 3, 6, 0);
+ right = Lists.newArrayList(8, 1, 2, 3, 4, 7);
+ // End of LCS is 3
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(3)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 2, 4, 3, 7, 6, 0, 5);
+ right = Lists.newArrayList(8, 1, 2, 9, 3, 4, 7);
+ // End of LCS is 7
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(7)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+ }
+
+ @Test
+ public void insertionIndexTest7() {
+ // Try and insert an element in the middle of the LCS, LCS being the whole second list
+ // We'll add "0" in right and expect it to be added right after the closest LCS element
+ final List<Integer> right = Lists.newArrayList(1, 2, 3);
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+
+ List<Integer> left = Lists.newArrayList(1, 0, 2, 3);
+ // Closest LCS element "before" is 1
+ int expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(1)) + 1);
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 2, 0, 3, 4);
+ // Closest LCS element "before" is 2
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(2)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 0, 4, 2, 3);
+ // Closest LCS element "before" is 1
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(1)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(5, 1, 4, 2, 0, 3);
+ // Closest LCS element "before" is 2
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(2)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(6, 1, 7, 8, 0, 9, 2, 10, 3, 5, 4);
+ // Closest LCS element "before" is 1
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(1)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+ }
+
+ @Test
+ public void insertionIndexTest8() {
+ // Try and insert an element in the middle of the LCS, LCS being part of the second list
+ // We'll add "0" in right and expect it to be added right after the closest LCS element
+ final Comparison emptyComparison = CompareFactory.eINSTANCE.createComparison();
+
+ List<Integer> left = Lists.newArrayList(1, 2, 0, 3);
+ List<Integer> right = Lists.newArrayList(1, 2, 3, 4);
+ // Closest LCS element is 2
+ Integer expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(2)) + 1);
+ int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ left = Lists.newArrayList(1, 5, 2, 4, 0, 3, 6);
+ right = Lists.newArrayList(8, 1, 2, 3, 4, 7);
+ // Closest LCS element is 2
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(2)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+
+ /*
+ * This is documented in {@link DefaultDiffEngine#findInsertionIndex(Comparison, List, List, Object)}.
+ * Ensure the documentation stays in sync.
+ */
+ left = Lists.newArrayList(1, 2, 4, 6, 8, 3, 0, 7, 5);
+ right = Lists.newArrayList(8, 1, 2, 9, 3, 4, 7);
+ // Closest LCS element is 3
+ expectedIndex = Integer.valueOf(right.indexOf(Integer.valueOf(3)) + 1);
+ insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0));
+ assertSame(expectedIndex, Integer.valueOf(insertionIndex));
+ }
+
+ /**
+ * Ensures that the two given lists contain the same elements in the same order. The kind of list does not
+ * matter.
+ *
+ * @param list1
+ * First of the two lists to compare.
+ * @param list2
+ * Second of the two lists to compare.
+ */
+ private static <T> void assertEqualContents(List<T> list1, List<T> list2) {
+ final int size = list1.size();
+ assertSame(Integer.valueOf(size), Integer.valueOf(list2.size()));
+
+ for (int i = 0; i < size; i++) {
+ assertEquals(list1.get(i), list2.get(i));
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java index 81675f989..a7d76a379 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java @@ -16,9 +16,9 @@ import junit.textui.TestRunner; import org.eclipse.emf.compare.ComparePackage;
import org.eclipse.emf.compare.internal.spec.CompareFactorySpec;
-import org.eclipse.emf.compare.tests.conflict.ConflictDetectionTest; -import org.eclipse.emf.compare.tests.diff.DiffEngineTest; -import org.eclipse.emf.compare.tests.equi.EquiComputingTest; +import org.eclipse.emf.compare.tests.conflict.ConflictDetectionTest;
+import org.eclipse.emf.compare.tests.diff.DiffUtilTest;
+import org.eclipse.emf.compare.tests.equi.EquiComputingTest;
import org.eclipse.emf.compare.tests.fullcomparison.IdentifierComparisonTest;
import org.eclipse.emf.compare.tests.model.CompareModelTestSuite;
import org.eclipse.emf.compare.tests.nodes.NodesPackage;
@@ -39,8 +39,8 @@ import org.junit.runners.Suite.SuiteClasses; * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
*/
@RunWith(Suite.class)
-@SuiteClasses({CompareModelTestSuite.class, DefaultComparisonScopeTest.class, IdentifierComparisonTest.class, - ConflictDetectionTest.class, ReqComputingTest.class, EquiComputingTest.class, DiffEngineTest.class }) +@SuiteClasses({CompareModelTestSuite.class, DefaultComparisonScopeTest.class, IdentifierComparisonTest.class,
+ ConflictDetectionTest.class, ReqComputingTest.class, EquiComputingTest.class, DiffUtilTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml index 211dc7b7a..7f7956ba2 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml @@ -1,35 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>emf.compare-parent</artifactId> - <groupId>org.eclipse.emf.compare</groupId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../../org.eclipse.emf.compare-parent</relativePath> - </parent> - <groupId>org.eclipse.emf.compare</groupId> - <artifactId>org.eclipse.emf.compare.uml2.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <includes> - <include>org/eclipse/emf/compare/uml2/diff/test/suite/AllUML2Tests.class</include> - </includes> - <useUIHarness>false</useUIHarness> - <useUIThread>false</useUIThread> - <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine> - <testFailureIgnore>true</testFailureIgnore> - </configuration> - </plugin> - </plugins> - </build> - -</project> +<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>org.eclipse.emf.compare.uml2.tests</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>org/eclipse/emf/compare/uml2/diff/test/suite/AllUML2Tests.class</include>
+ </includes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DefaultDiffEngine.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DefaultDiffEngine.java index 5ea7426ab..e25ad21ba 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DefaultDiffEngine.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DefaultDiffEngine.java @@ -15,7 +15,6 @@ import static com.google.common.base.Predicates.not; import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.Iterator;
@@ -25,6 +24,7 @@ import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.DifferenceSource;
import org.eclipse.emf.compare.Match;
+import org.eclipse.emf.compare.utils.DiffUtil;
import org.eclipse.emf.compare.utils.EqualityHelper;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EObject;
@@ -163,94 +163,6 @@ public class DefaultDiffEngine implements IDiffEngine { }
/**
- * This will compute the longest common subsequence between the two given Lists. We will use
- * {@link EqualityHelper#matchingValues(Comparison, Object, Object)} in order to try and match the values
- * from both lists two-by-two. This can thus be used both for reference values or attribute values. If
- * there are two subsequences of the same "longest" length, the first (according to the second argument)
- * will be returned.
- * <p>
- * For example, it the two given sequence are, in this order, {"a", "b", "c", "d", "e"} and {"c", "z",
- * "d", "a", "b"}, there are two "longest" subsequences : {"a", "b"} and {"c", "d"}. The first of those
- * two subsequences in the second list is {"c", "d"}. On the other hand, the LCS of {"a", "b", "c", "d",
- * "e"} and {"y", "c", "d", "e", "b"} is {"c", "d", "e"}.
- * </p>
- * <p>
- * The following algorithm has been inferred from the wikipedia article on the Longest Common Subsequence,
- * http://en.wikipedia.org/wiki/Longest_common_subsequence_problem at the time of writing. It is
- * decomposed in two : we first compute the LCS matrix, then we backtrack through the input to determine
- * the LCS. Evaluation will be shortcut after the first part if the LCS is one of the two input sequences.
- * </p>
- * <p>
- * Note : we are not using Iterables as input in order to make use of the random access cost of
- * ArrayLists. This might also be converted to directly use arrays. This implementation will not play well
- * with LinkedLists or any List which needs to iterate over the values for each call to
- * {@link List#get(int)}, i.e any list which is not instanceof RandomAccess or does not satisfy its
- * contract.
- * </p>
- *
- * @param comparison
- * This will be used in order to retrieve the Match for EObjects when comparing them.
- * @param sequence1
- * First of the two sequences to consider.
- * @param sequence2
- * Second of the two sequences to consider.
- * @param <E>
- * Type of the sequences content.
- * @return The LCS of the two given sequences. Will never be the same instance as one of the input
- * sequences.
- */
- public <E> List<E> longestCommonSubsequence(Comparison comparison, List<E> sequence1, List<E> sequence2) {
- final int size1 = sequence1.size();
- final int size2 = sequence2.size();
- final int[][] matrix = new int[size1 + 1][size2 + 1];
-
- // Compute the LCS matrix
- for (int i = 1; i <= size1; i++) {
- for (int j = 1; j <= size2; j++) {
- final E first = sequence1.get(i - 1);
- final E second = sequence2.get(j - 1);
- if (helper.matchingValues(comparison, first, second)) {
- matrix[i][j] = 1 + matrix[i - 1][j - 1];
- } else {
- matrix[i][j] = Math.max(matrix[i - 1][j], matrix[i][j - 1]);
- }
- }
- }
-
- // Shortcut evaluation if the lcs is the whole sequence
- final boolean lcsIs1 = matrix[size1][size2] == size1;
- final boolean lcsIs2 = matrix[size1][size2] == size2;
- if (lcsIs1 || lcsIs2) {
- final List<E> shortcut;
- if (lcsIs1) {
- shortcut = ImmutableList.copyOf(sequence1);
- } else {
- shortcut = ImmutableList.copyOf(sequence2);
- }
- return shortcut;
- }
-
- int current1 = size1;
- int current2 = size2;
- final List<E> result = Lists.newArrayList();
-
- while (current1 > 0 && current2 > 0) {
- final E first = sequence1.get(current1 - 1);
- final E second = sequence2.get(current2 - 1);
- if (helper.matchingValues(comparison, first, second)) {
- result.add(first);
- current1--;
- current2--;
- } else if (matrix[current1][current2 - 1] >= matrix[current1 - 1][current2]) {
- current2--;
- } else {
- current1--;
- }
- }
- return Lists.reverse(result);
- }
-
- /**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.diff.IDiffEngine#diff(org.eclipse.emf.compare.Comparison)
@@ -314,8 +226,9 @@ public class DefaultDiffEngine implements IDiffEngine { final List<Object> rightValues = getAsList(match.getRight(), reference);
final List<Object> originValues = getAsList(match.getOrigin(), reference);
- final List<Object> lcsOriginLeft = longestCommonSubsequence(getComparison(), originValues, leftValues);
- final List<Object> lcsOriginRight = longestCommonSubsequence(getComparison(), originValues,
+ final List<Object> lcsOriginLeft = DiffUtil.longestCommonSubsequence(getComparison(), originValues,
+ leftValues);
+ final List<Object> lcsOriginRight = DiffUtil.longestCommonSubsequence(getComparison(), originValues,
rightValues);
// TODO Can we shortcut in any way?
@@ -420,7 +333,7 @@ public class DefaultDiffEngine implements IDiffEngine { final List<Object> leftValues = getAsList(match.getLeft(), reference);
final List<Object> rightValues = getAsList(match.getRight(), reference);
- final List<Object> lcs = longestCommonSubsequence(getComparison(), rightValues, leftValues);
+ final List<Object> lcs = DiffUtil.longestCommonSubsequence(getComparison(), rightValues, leftValues);
// TODO Can we shortcut in any way?
@@ -555,8 +468,9 @@ public class DefaultDiffEngine implements IDiffEngine { final List<Object> rightValues = getAsList(match.getRight(), feature);
final List<Object> originValues = getAsList(match.getOrigin(), feature);
- final List<Object> lcsOriginLeft = longestCommonSubsequence(getComparison(), originValues, leftValues);
- final List<Object> lcsOriginRight = longestCommonSubsequence(getComparison(), originValues,
+ final List<Object> lcsOriginLeft = DiffUtil.longestCommonSubsequence(getComparison(), originValues,
+ leftValues);
+ final List<Object> lcsOriginRight = DiffUtil.longestCommonSubsequence(getComparison(), originValues,
rightValues);
// TODO Can we shortcut in any way?
@@ -639,7 +553,7 @@ public class DefaultDiffEngine implements IDiffEngine { final List<Object> leftValues = getAsList(match.getLeft(), feature);
final List<Object> rightValues = getAsList(match.getRight(), feature);
- final List<Object> lcs = longestCommonSubsequence(getComparison(), rightValues, leftValues);
+ final List<Object> lcs = DiffUtil.longestCommonSubsequence(getComparison(), rightValues, leftValues);
// TODO Can we shortcut in any way?
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/ReferenceChangeSpec.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/ReferenceChangeSpec.java new file mode 100644 index 000000000..476bb9bdd --- /dev/null +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/ReferenceChangeSpec.java @@ -0,0 +1,80 @@ +/*******************************************************************************
+ * Copyright (c) 2012 Obeo.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.internal.spec;
+
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.DifferenceKind;
+import org.eclipse.emf.compare.DifferenceSource;
+import org.eclipse.emf.compare.Match;
+import org.eclipse.emf.compare.impl.ReferenceChangeImpl;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * This specialization of the {@link referenceChangeImpl} class allows us to define the derived features and
+ * operations implementations.
+ *
+ * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ */
+public class ReferenceChangeSpec extends ReferenceChangeImpl {
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.impl.DiffImpl#apply()
+ */
+ @Override
+ public void apply() {
+ // "apply" is merging from right (reference) to left (working copy)
+ if (getSource() == DifferenceSource.LEFT) {
+ // Any diff that is from the left side can simply be left alone : it is already "applied"
+ }
+
+ // Merge all of our dependencies if any
+ for (Diff dependency : getRequires()) {
+ // FIXME handle dependency circles
+ dependency.apply();
+ }
+
+ if (getKind() == DifferenceKind.ADD) {
+ if (!getReference().isContainment()) {
+ applyAddToContainment();
+ } else {
+ applyAdd();
+ }
+ }
+ }
+
+ protected void applyAdd() {
+ // this is an addition which has been done on the right side.
+ // Applying is simply doing the same addition on the left
+ final EObject expectedContainer = getMatch().getLeft();
+ final Match valueMatch = getMatch().getComparison().getMatch(getValue());
+
+ if (expectedContainer == null || valueMatch == null || valueMatch.getLeft() == null) {
+ // FIXME throw exception? log? re-try to match the requires?
+ // one of the "required" diffs should have created our container.
+ // another should have created our left value and added it to its Match
+ } else {
+ final EObject expectedValue = valueMatch.getLeft();
+
+ // We have the container reference and value. We need to know the insertion index
+ }
+ }
+
+ protected void applyAddToContainment() {
+ // this is an addition which has been done on the right side.
+ // Applying is simply doing the same addition on the left
+ final EObject expectedContainer = getMatch().getLeft();
+
+ if (expectedContainer == null) {
+ // This should never happen : one of the "required" diffs should have created our container.
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/resource/NameSimilarityMatchingStrategy.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/resource/NameSimilarityMatchingStrategy.java index 367ab1b19..13812e369 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/resource/NameSimilarityMatchingStrategy.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/resource/NameSimilarityMatchingStrategy.java @@ -21,7 +21,7 @@ import java.util.Set; import org.eclipse.emf.compare.CompareFactory;
import org.eclipse.emf.compare.MatchResource;
-import org.eclipse.emf.compare.utils.SimilarityUtil;
+import org.eclipse.emf.compare.utils.DiffUtil;
import org.eclipse.emf.ecore.resource.Resource;
/**
@@ -194,7 +194,7 @@ public class NameSimilarityMatchingStrategy implements IResourceMatchingStrategy String firstName = first.getURI().lastSegment();
String secondName = second.getURI().lastSegment();
- return SimilarityUtil.diceCoefficient(firstName, secondName);
+ return DiffUtil.diceCoefficient(firstName, secondName);
}
/**
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java new file mode 100644 index 000000000..ba3e13c65 --- /dev/null +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java @@ -0,0 +1,338 @@ +/*******************************************************************************
+ * Copyright (c) 2012 Obeo.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.utils;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.compare.Comparison;
+
+/**
+ * This utility class will be used to provide similarity implementations.
+ *
+ * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ */
+public final class DiffUtil {
+ /** This utility class does not need to be instantiated. */
+ private DiffUtil() {
+ // Hides default constructor
+ }
+
+ /**
+ * Computes the dice coefficient between the two given String's bigrams.
+ * <p>
+ * This implementation is case insensitive.
+ * </p>
+ *
+ * @param first
+ * First of the two Strings to compare.
+ * @param second
+ * Second of the two Strings to compare.
+ * @return The dice coefficient of the two given String's bigrams, ranging from 0 to 1.
+ */
+ public static double diceCoefficient(String first, String second) {
+ final char[] str1 = first.toLowerCase().toCharArray();
+ final char[] str2 = second.toLowerCase().toCharArray();
+
+ final double coefficient;
+
+ if (str1.equals(str2)) {
+ coefficient = 1d;
+ } else if (str1.length <= 2 || str2.length <= 2) {
+ int equalChars = 0;
+
+ for (int i = 0; i < Math.min(str1.length, str2.length); i++) {
+ if (str1[i] == str2[i]) {
+ equalChars++;
+ }
+ }
+
+ int union = str1.length + str2.length;
+ if (str1.length != str2.length) {
+ coefficient = (double)equalChars / union;
+ } else {
+ coefficient = ((double)equalChars * 2) / union;
+ }
+ } else {
+ Set<String> s1Bigrams = Sets.newHashSet();
+ Set<String> s2Bigrams = Sets.newHashSet();
+
+ for (int i = 0; i < str1.length - 1; i++) {
+ char[] chars = new char[] {str1[i], str1[i + 1], };
+ s1Bigrams.add(String.valueOf(chars));
+ }
+ for (int i = 0; i < str2.length - 1; i++) {
+ char[] chars = new char[] {str2[i], str2[i + 1], };
+ s2Bigrams.add(String.valueOf(chars));
+ }
+
+ Set<String> intersection = Sets.intersection(s1Bigrams, s2Bigrams);
+ coefficient = (2 * intersection.size()) / (s1Bigrams.size() + s2Bigrams.size());
+ }
+
+ return coefficient;
+ }
+
+ /**
+ * This will compute the longest common subsequence between the two given Lists. We will use
+ * {@link EqualityHelper#matchingValues(Comparison, Object, Object)} in order to try and match the values
+ * from both lists two-by-two. This can thus be used both for reference values or attribute values. If
+ * there are two subsequences of the same "longest" length, the first (according to the second argument)
+ * will be returned.
+ * <p>
+ * For example, it the two given sequence are, in this order, <code>{"a", "b", "c", "d", "e"}</code> and
+ * <code>{"c", "z",
+ * "d", "a", "b"}</code>, there are two "longest" subsequences : <code>{"a", "b"}</code> and
+ * <code>{"c", "d"}</code>. The first of those two subsequences in the second list is
+ * <code>{"c", "d"}</code>. On the other hand, the LCS of <code>{"a", "b", "c", "d",
+ * "e"}</code> and <code>{"y", "c", "d", "e", "b"}</code> is <code>{"c", "d", "e"}</code>.
+ * </p>
+ * <p>
+ * The following algorithm has been inferred from the wikipedia article on the Longest Common Subsequence,
+ * http://en.wikipedia.org/wiki/Longest_common_subsequence_problem at the time of writing. It is
+ * decomposed in two : we first compute the LCS matrix, then we backtrack through the input to determine
+ * the LCS. Evaluation will be shortcut after the first part if the LCS is one of the two input sequences.
+ * </p>
+ * <p>
+ * Note : we are not using Iterables as input in order to make use of the random access cost of
+ * ArrayLists. This might also be converted to directly use arrays. This implementation will not play well
+ * with LinkedLists or any List which needs to iterate over the values for each call to
+ * {@link List#get(int)}, i.e any list which is not instanceof RandomAccess or does not satisfy its
+ * contract.
+ * </p>
+ *
+ * @param comparison
+ * This will be used in order to retrieve the Match for EObjects when comparing them.
+ * @param sequence1
+ * First of the two sequences to consider.
+ * @param sequence2
+ * Second of the two sequences to consider.
+ * @param <E>
+ * Type of the sequences content.
+ * @return The LCS of the two given sequences. Will never be the same instance as one of the input
+ * sequences.
+ */
+ public static <E> List<E> longestCommonSubsequence(Comparison comparison, List<E> sequence1,
+ List<E> sequence2) {
+ final int size1 = sequence1.size();
+ final int size2 = sequence2.size();
+ final int[][] matrix = new int[size1 + 1][size2 + 1];
+
+ // Compute the LCS matrix
+ for (int i = 1; i <= size1; i++) {
+ for (int j = 1; j <= size2; j++) {
+ final E first = sequence1.get(i - 1);
+ final E second = sequence2.get(j - 1);
+ if (EqualityHelper.matchingValues(comparison, first, second)) {
+ matrix[i][j] = 1 + matrix[i - 1][j - 1];
+ } else {
+ matrix[i][j] = Math.max(matrix[i - 1][j], matrix[i][j - 1]);
+ }
+ }
+ }
+
+ // Shortcut evaluation if the lcs is the whole sequence
+ final boolean lcsIs1 = matrix[size1][size2] == size1;
+ final boolean lcsIs2 = matrix[size1][size2] == size2;
+ if (lcsIs1 || lcsIs2) {
+ final List<E> shortcut;
+ if (lcsIs1) {
+ shortcut = ImmutableList.copyOf(sequence1);
+ } else {
+ shortcut = ImmutableList.copyOf(sequence2);
+ }
+ return shortcut;
+ }
+
+ int current1 = size1;
+ int current2 = size2;
+ final List<E> result = Lists.newArrayList();
+
+ while (current1 > 0 && current2 > 0) {
+ final E first = sequence1.get(current1 - 1);
+ final E second = sequence2.get(current2 - 1);
+ if (EqualityHelper.matchingValues(comparison, first, second)) {
+ result.add(first);
+ current1--;
+ current2--;
+ } else if (matrix[current1][current2 - 1] >= matrix[current1 - 1][current2]) {
+ current2--;
+ } else {
+ current1--;
+ }
+ }
+ return Lists.reverse(result);
+ }
+
+ /**
+ * This will try and determine the index at which a given element from the {@code source} list should be
+ * inserted in the {@code target} list. We expect {@code newElement} to be an element from the
+ * {@code source} or to have a Match that allows us to map it to one of the {@code source} list's
+ * elements.
+ * <p>
+ * The expected insertion index will always be relative to the Longest Common Subsequence (LCS) between
+ * the two given lists. If there are more than one "longest" subsequence between the two lists, the
+ * insertion index will be relative to the first that comes in the {@code target} list.
+ * </p>
+ * <p>
+ * For example, assume {@code source} is <code>{"1", "2", "4", "6", "8", "3", "0", "7", "5"}</code> and
+ * {@code target} is <code>{"8", "1", "2", "9", "3", "4", "7"}</code>; I try to merge the addition of
+ * {@code "0"} in the right list. The returned "insertion index" will be {@code 5} : just after
+ * {@code "3"}. There are two subsequence of the same "longest" length 4 :
+ * <code>{"1", "2", "3", "7"}</code> and <code>{"1", "2", "4", "7"}</code>. However, the first of those
+ * two in {@code target} is <code>{"1", "2", "3", "7"}</code>. The closest element before {@code "0"} in
+ * this LCS in {@code source} is {@code "3"}.
+ * </p>
+ * <p>
+ * Note : we are not using Iterables as input in order to make use of the random access cost of
+ * ArrayLists. This might also be converted to directly use arrays. This implementation will not play well
+ * with LinkedLists or any List which needs to iterate over the values for each call to
+ * {@link List#get(int)}, i.e any list which is not instanceof RandomAccess or does not satisfy its
+ * contract.
+ * </p>
+ *
+ * @param comparison
+ * This will be used in order to retrieve the Match for EObjects when comparing them.
+ * @param source
+ * The List from which one element has to be added to the {@code target} list.
+ * @param target
+ * The List into which one element from {@code source} has to be added.
+ * @param newElement
+ * The element from {@code source} that needs to be added into {@code target}.
+ * @param <E>
+ * Type of the sequences content.
+ * @return The index at which {@code newElement} should be inserted in {@code target}.
+ * @see #longestCommonSubsequence(Comparison, List, List)
+ */
+ public static <E> int findInsertionIndex(Comparison comparison, List<E> source, List<E> target,
+ E newElement) {
+ /*
+ * TODO perf : all "lookups" in source and target could be rewritten by using the lcs elements'
+ * matches. This may or may not help, should be profiled.
+ */
+ // TODO split this into multiple sub-methods
+
+ // We assume that "newElement" is in source but not in the target yet
+ final List<E> lcs = longestCommonSubsequence(comparison, source, target);
+ E firstLCS = null;
+ E lastLCS = null;
+ if (lcs.size() > 0) {
+ firstLCS = lcs.get(0);
+ lastLCS = lcs.listIterator(lcs.size()).previous();
+ }
+
+ // Let's determine the subsequence where we need to be added. This is either one of :
+ // 0 - <index of first element from LCS>
+ // <index of element "above" in the LCS> - <index of element "after" in the LCS>
+ // <last element from LCS> - source.size()
+ final int noLCS = -2;
+ int currentIndex = -1;
+ int firstLCSIndex = -1;
+ int lastLCSIndex = -1;
+ if (firstLCS == null) {
+ // We have no LCS
+ firstLCSIndex = noLCS;
+ lastLCSIndex = noLCS;
+ }
+
+ final Iterator<E> sourceIterator = source.iterator();
+ for (int i = 0; sourceIterator.hasNext() && (currentIndex == -1 || lastLCSIndex == -1); i++) {
+ final E sourceElement = sourceIterator.next();
+ if (currentIndex == -1 && EqualityHelper.matchingValues(comparison, sourceElement, newElement)) {
+ currentIndex = i;
+ }
+ if (firstLCSIndex == -1 && EqualityHelper.matchingValues(comparison, sourceElement, firstLCS)) {
+ firstLCSIndex = i;
+ }
+ if (lastLCSIndex == -1 && EqualityHelper.matchingValues(comparison, sourceElement, lastLCS)) {
+ lastLCSIndex = i;
+ }
+ }
+
+ int insertionIndex = -1;
+ if (firstLCSIndex == noLCS) {
+ // We have no LCS. The two lists have no element in common. Insert at the very end of the target.
+ insertionIndex = target.size();
+ } else if (currentIndex < firstLCSIndex) {
+ // The object we are to insert is before the LCS in source.
+ // The insertion index will be inside the subsequence {0, <LCS start>} in target
+ /*
+ * We'll insert it just before the LCS start : there cannot be any common element between the two
+ * lists "before" the LCS since it would be part of the LCS itself.
+ */
+ for (int i = 0; i < target.size() && insertionIndex == -1; i++) {
+ final E targetElement = target.get(i);
+
+ if (EqualityHelper.matchingValues(comparison, targetElement, firstLCS)) {
+ // We've reached the first element from the LCS in target. Insert here
+ insertionIndex = i;
+ }
+ }
+ } else if (currentIndex > lastLCSIndex) {
+ // The object we are to insert is after the LCS in source.
+ // The insertion index will be inside the subsequence {<LCS end>, <list.size()>} in target.
+ /*
+ * We'll insert it just after the LCS end : there cannot be any common element between the two
+ * lists "after" the LCS since it would be part of the LCS itself.
+ */
+
+ // First, find the LCS end in target
+ for (int i = 0; i < target.size() && insertionIndex == -1; i++) {
+ final E targetElement = target.get(i);
+ if (EqualityHelper.matchingValues(comparison, targetElement, lastLCS)) {
+ insertionIndex = i + 1;
+ }
+ }
+ } else {
+ // Our object is in-between two elements A and B of the LCS in source
+ /*
+ * If any element of the subsequence {<index of A>, <index of B>} from source had been in the same
+ * subsequence in target, it would have been part of the LCS. We thus know none is.
+ */
+ // The insertion index will be just after A in target
+
+ // First, find which element of the LCS is "A"
+ E subsequenceStart = null;
+ for (int i = 0; i < currentIndex; i++) {
+ final E sourceElement = source.get(i);
+
+ boolean isInLCS = false;
+ for (int j = 0; j < lcs.size() && !isInLCS; j++) {
+ final E lcsElement = lcs.get(j);
+
+ if (EqualityHelper.matchingValues(comparison, sourceElement, lcsElement)) {
+ isInLCS = true;
+ }
+ }
+
+ if (isInLCS) {
+ subsequenceStart = sourceElement;
+ }
+ }
+
+ // Then, find the index of "A" in target
+ for (int i = 0; i < target.size() && insertionIndex == -1; i++) {
+ final E targetElement = target.get(i);
+
+ if (EqualityHelper.matchingValues(comparison, targetElement, subsequenceStart)) {
+ insertionIndex = i + 1;
+ }
+ }
+ }
+
+ return insertionIndex;
+ }
+}
|