Revert "Bug 502561 - API tools reports error to specify @Since again when overriding/implementing a method interface."
This reverts commit 67d30210417cf7296b301fcc4c39649e961f735b.
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/MissingSinceTagTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/MissingSinceTagTests.java
index cbc2c4e..aee470e 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/MissingSinceTagTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/MissingSinceTagTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2016 IBM Corporation and others.
+ * Copyright (c) 2008, 2009 IBM Corporation 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
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.pde.api.tools.builder.tests.compatibility;
+import junit.framework.Test;
+
import org.eclipse.core.runtime.IPath;
import org.eclipse.pde.api.tools.internal.problems.ApiProblemFactory;
import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;
import org.eclipse.pde.api.tools.internal.provisional.problems.IApiProblem;
-import junit.framework.Test;
-
/**
* Tests that the builder correctly finds and reports missing since tags
*
@@ -159,8 +159,7 @@
*/
private void xAddNewInterfaceMethod(boolean incremental) throws Exception {
IPath filePath = WORKSPACE_CLASSES_PACKAGE_A.append("AddNewInterfaceMethod.java"); //$NON-NLS-1$
- // configureExpectedProblems(IDelta.METHOD_ELEMENT_TYPE, "methodA()");
- // //$NON-NLS-1$
+ configureExpectedProblems(IDelta.METHOD_ELEMENT_TYPE, "methodA()"); //$NON-NLS-1$
performCompatibilityTest(filePath, incremental);
}
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java
index 5cef7ef..2c508db 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/ClassFileComparator.java
@@ -2108,23 +2108,6 @@
}
}
}
- // check method of interfaces.
- HashSet<IApiType> interfaces = new HashSet<>();
- collectAllInterfaces(this.type2, interfaces);
- if (!interfaces.isEmpty()) {
- for (IApiType inter : interfaces) {
- IApiMethod methodInterface = inter.getMethod(name, descriptor);
- if (methodInterface == null) {
- continue;
- } else {
- int access3 = methodInterface.getModifiers();
- if (Flags.isPublic(access3) || Flags.isProtected(access3)) {
- found = true;
- break;
- }
- }
- }
- }
}
}
if (!found) {