Revert "Exclude tests from Sonar analysis and adapt code to DiffMerge…

… version change" This reverts commit dfd0a9b.
eclipse-capella · Jan 19, 2021 · e21cb5c · e21cb5c
1 parent dfd0a9b
commit e21cb5c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 35 deletions.
diff --git a/...olarsys/capella/vp/requirements/importer/transposer/bridge/categories/EClassCategory.java b/...olarsys/capella/vp/requirements/importer/transposer/bridge/categories/EClassCategory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2021 THALES GLOBAL SERVICES.
+ * Copyright (c) 2016, 2020, 2019 THALES GLOBAL SERVICES.
  * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -20,7 +20,6 @@
 import org.eclipse.emf.diffmerge.generic.api.Role;
 import org.eclipse.emf.diffmerge.generic.api.diff.IDifference;
 import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
-import org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory;
 import org.eclipse.emf.diffmerge.ui.viewers.categories.AbstractDifferenceCategory;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -52,13 +51,6 @@ public boolean keepElement(Object element) {
     return false;
   }
 
-  public EClassCategory(EClass iconClazz, String name, String description, Collection<EClass> clazzes) {
-    this.iconClazz = iconClazz;
-    this.name = name;
-    this.description = description;
-    this.clazzes = clazzes;
-  }
-
   public EClassCategory(EClass iconClazz, String name, EClass clazz) {
     this(iconClazz, name, Collections.singletonList(clazz));
   }
@@ -128,10 +120,4 @@ public void run() {
     return image[0];
   }
 
-  @Override
-  public IDifferenceCategory copy() {
-    EClassCategory copied = new EClassCategory(iconClazz, name, description, clazzes);
-    copied.copyState(this);
-    return copied;
-  }
 }
diff --git a/...lla/vp/requirements/importer/transposer/bridge/categories/RelationIdentifierCategory.java b/...lla/vp/requirements/importer/transposer/bridge/categories/RelationIdentifierCategory.java
@@ -16,7 +16,6 @@
 import org.eclipse.emf.diffmerge.diffdata.EMatch;
 import org.eclipse.emf.diffmerge.generic.api.diff.IDifference;
 import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
-import org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory;
 import org.eclipse.emf.diffmerge.ui.viewers.categories.AbstractDifferenceCategory;
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.swt.graphics.Image;
@@ -89,11 +88,4 @@ public String getText(EMFDiffNode node_p) {
     return Messages.Categories_Relation_Identifier;
   }
 
-  @Override
-  public IDifferenceCategory copy() {
-    RelationIdentifierCategory copied = new RelationIdentifierCategory();
-    copied.copyState(this);
-    return copied;
-  }
-
 }
diff --git a/...rsys/capella/vp/requirements/importer/transposer/bridge/categories/ReqIFTextCategory.java b/...rsys/capella/vp/requirements/importer/transposer/bridge/categories/ReqIFTextCategory.java
@@ -16,7 +16,6 @@
 import org.eclipse.emf.diffmerge.diffdata.EMatch;
 import org.eclipse.emf.diffmerge.generic.api.diff.IDifference;
 import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
-import org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory;
 import org.eclipse.emf.diffmerge.ui.viewers.categories.AbstractDifferenceCategory;
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.swt.graphics.Image;
@@ -89,11 +88,4 @@ public String getText(EMFDiffNode node_p) {
     return Messages.Categories_ReqIFText_Identifier;
   }
 
-  @Override
-  public IDifferenceCategory copy() {
-    ReqIFTextCategory copied = new ReqIFTextCategory();
-    copied.copyState(this);
-    return copied;
-  }
-
 }
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/pom.xml b/tests/org.polarsys.capella.vp.requirements.ju/pom.xml
@@ -25,10 +25,6 @@
 	<artifactId>org.polarsys.capella.vp.requirements.ju</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<version>0.12.0-SNAPSHOT</version>
-
-	<properties>
-    	<sonar.skip>true</sonar.skip>
-	</properties>
 
 	<build>
 		<plugins>