#36 Some example plugins require migration

- Make also APA2Capella compatible with Git projects Change-Id: I6fcee0696907aec1c65fcebd201f2931a83ae6d4 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
eclipse-diffmerge · May 24, 2022 · 461ede2 · 461ede2
1 parent 593380d
commit 461ede2
Show file tree

Hide file tree

Showing 20 changed files with 183 additions and 52 deletions.
diff --git a/...ntegration/src/org/eclipse/emf/diffmerge/bridge/capella/integration/CapellaBridgeJob.java b/...ntegration/src/org/eclipse/emf/diffmerge/bridge/capella/integration/CapellaBridgeJob.java
@@ -19,10 +19,10 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.diffmerge.api.IDiffPolicy;
-import org.eclipse.emf.diffmerge.api.IMatchPolicy;
-import org.eclipse.emf.diffmerge.api.IMergePolicy;
-import org.eclipse.emf.diffmerge.api.IMergeSelector;
+import org.eclipse.emf.diffmerge.generic.api.IDiffPolicy;
+import org.eclipse.emf.diffmerge.generic.api.IMatchPolicy;
+import org.eclipse.emf.diffmerge.generic.api.IMergePolicy;
+import org.eclipse.emf.diffmerge.generic.api.IMergeSelector;
 import org.eclipse.emf.diffmerge.api.scopes.IEditableModelScope;
 import org.eclipse.emf.diffmerge.bridge.api.IBridge;
 import org.eclipse.emf.diffmerge.bridge.api.IBridgeTrace;
@@ -117,8 +117,8 @@ public IEditableModelScope createIntermediateDataSet(SD sourceDataSet_p, IEditab
 			@Override
 			protected EComparison compare(IEditableModelScope created_p, IEditableModelScope existing_p, IBridgeTrace createdTrace_p, IBridgeTrace existingTrace_p,	IProgressMonitor monitor_p) {
 				EComparison comparison = new EComparisonImpl(existing_p, created_p);
-				IMatchPolicy delegate = createMatchPolicyDelegate();
-				IMatchPolicy matchPolicy = createDelegatingMatchPolicy(created_p, createdTrace_p, existingTrace_p, delegate);
+				IMatchPolicy<EObject> delegate = createMatchPolicyDelegate();
+				IMatchPolicy<EObject> matchPolicy = createDelegatingMatchPolicy(created_p, createdTrace_p, existingTrace_p, delegate);
 				comparison.compute(matchPolicy, getDiffPolicy(), getMergePolicy(), monitor_p);
 				return comparison;
 			}
@@ -149,21 +149,21 @@ protected Editable configureTrace(Editable trace_p) {
 	/**
 	 * @return the default merge policy
 	 */
-	protected IMergePolicy createMergePolicy() {
+	protected IMergePolicy<EObject> createMergePolicy() {
 		return null;
 	}
 
 	/**
 	 * @return the default merge selector
 	 */
-	protected IMergeSelector createMergeSelector() {
+	protected IMergeSelector<EObject> createMergeSelector() {
 		return null;
 	}
 
 	/**
 	 * @return the default configurable diff policy
 	 */
-	protected IDiffPolicy createDiffPolicy() {
+	protected IDiffPolicy<EObject> createDiffPolicy() {
 		return new ConfigurableDiffPolicy();
 	}
 
@@ -182,7 +182,7 @@ protected IBridge<SD, IEditableModelScope> createMappingBridge() {
 	 * 
 	 * @return the match policy to delegate to.
 	 */
-	protected IMatchPolicy createMatchPolicyDelegate() {
+	protected IMatchPolicy<EObject> createMatchPolicyDelegate() {
 	  CapellaMatchPolicy delegate = new CapellaMatchPolicy();
 	  delegate.setUseCriterion(STRUCTURE, true);
     delegate.setUseCriterion(SEMANTICS, true);
@@ -203,8 +203,10 @@ protected IMatchPolicy createMatchPolicyDelegate() {
    * @param delegate_p the non-null match policy to delegate to
    * @return the delegating match policy.
    */
-  protected IMatchPolicy createDelegatingMatchPolicy(IEditableModelScope createdScope_p, IBridgeTrace createdTrace_p, IBridgeTrace existingTrace_p, IMatchPolicy delegate_p) {
-    IMatchPolicy matchPolicy = new DelegatingTraceBasedMatchPolicy(createdScope_p, createdTrace_p, existingTrace_p, delegate_p);
+  protected IMatchPolicy<EObject> createDelegatingMatchPolicy(IEditableModelScope createdScope_p,
+      IBridgeTrace createdTrace_p, IBridgeTrace existingTrace_p, IMatchPolicy<EObject> delegate_p) {
+    IMatchPolicy<EObject> matchPolicy = new DelegatingTraceBasedMatchPolicy(
+        createdScope_p, createdTrace_p, existingTrace_p, delegate_p);
     return matchPolicy;
   }
 

diff --git a/...se/emf/diffmerge/bridge/capella/integration/policies/DelegatingTraceBasedMatchPolicy.java b/...se/emf/diffmerge/bridge/capella/integration/policies/DelegatingTraceBasedMatchPolicy.java
@@ -11,10 +11,10 @@
  **********************************************************************/
 package org.eclipse.emf.diffmerge.bridge.capella.integration.policies;
 
-import org.eclipse.emf.diffmerge.api.IMatchPolicy;
-import org.eclipse.emf.diffmerge.api.scopes.IModelScope;
 import org.eclipse.emf.diffmerge.bridge.api.IBridgeTrace;
 import org.eclipse.emf.diffmerge.bridge.incremental.BridgeTraceBasedMatchPolicy;
+import org.eclipse.emf.diffmerge.generic.api.IMatchPolicy;
+import org.eclipse.emf.diffmerge.generic.api.scopes.ITreeDataScope;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -23,12 +23,12 @@
  * 
  */
 public class DelegatingTraceBasedMatchPolicy extends
-    BridgeTraceBasedMatchPolicy {
+    BridgeTraceBasedMatchPolicy<EObject> {
 
   /**
    * The second match policy to delegate to
    */
-  private final IMatchPolicy delegate;
+  private final IMatchPolicy<EObject> delegate;
 
   /**
    * Default constructor
@@ -42,19 +42,18 @@ public class DelegatingTraceBasedMatchPolicy extends
    * @param delegate_p
    *          the non-null match policy to delegate to
    */
-  public DelegatingTraceBasedMatchPolicy(IModelScope createdScope_p,
+  public DelegatingTraceBasedMatchPolicy(ITreeDataScope<EObject> createdScope_p,
       IBridgeTrace createdTrace_p, IBridgeTrace existingTrace_p,
-      IMatchPolicy delegate_p) {
+      IMatchPolicy<EObject> delegate_p) {
     super(createdScope_p, createdTrace_p, existingTrace_p);
     this.delegate = delegate_p;
   }
 
   /**
-   * @see org.eclipse.emf.diffmerge.bridge.incremental.BridgeTraceBasedMatchPolicy#getMatchID(org.eclipse.emf.ecore.EObject,
-   *      org.eclipse.emf.diffmerge.api.scopes.IModelScope)
+   * @see org.eclipse.emf.diffmerge.bridge.incremental.BridgeTraceBasedMatchPolicy#getMatchID(java.lang.Object, org.eclipse.emf.diffmerge.generic.api.scopes.ITreeDataScope)
    */
   @Override
-  public Object getMatchID(EObject element_p, IModelScope scope_p) {
+  public Object getMatchID(EObject element_p, ITreeDataScope<EObject> scope_p) {
     IBridgeTrace trace = scope_p == _createdScope ? _createdTrace
         : _existingTrace;
     Object result = trace.getCause(element_p);
@@ -68,7 +67,7 @@ public Object getMatchID(EObject element_p, IModelScope scope_p) {
    * 
    * @return the match policy delegate.
    */
-  protected IMatchPolicy getDelegate() {
+  protected IMatchPolicy<EObject> getDelegate() {
     return delegate;
   }
 }
diff --git a/...g.eclipse.emf.diffmerge.bridge.examples.apa.gen.edit/.settings/org.eclipse.jdt.core.prefs b/...g.eclipse.emf.diffmerge.bridge.examples.apa.gen.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,23 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
@@ -18,58 +30,87 @@ org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled