Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove (almost) unused method from provisional IApiBaselineManager #1533

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.pde.api.tools.tests
Bundle-Version: 1.3.700.qualifier
Bundle-Version: 1.3.800.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.pde.api.tools;bundle-version="1.0.600",
Expand Down
2 changes: 1 addition & 1 deletion apitools/org.eclipse.pde.api.tools.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.eclipse.pde.api.tools.tests</artifactId>
<version>1.3.700-SNAPSHOT</version>
<version>1.3.800-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.IApiBaselineManager;
import org.eclipse.pde.api.tools.internal.provisional.IApiMarkerConstants;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
import org.eclipse.pde.api.tools.internal.provisional.problems.IApiProblemTypes;
import org.eclipse.pde.api.tools.internal.util.Util;
Expand Down Expand Up @@ -1199,7 +1200,9 @@ protected static void exportProjects(IApiBaselineManager manager, IProject[] pro

private static void exportComponent(IApiBaselineManager manager, IPath baselineLocation, IProject currentProject,
int retry) throws Exception {
IApiComponent component = manager.getWorkspaceComponent(currentProject.getName());
IApiBaseline bl = manager.getWorkspaceBaseline();
assertNotNull("No Workspace baseline set", bl); //$NON-NLS-1$
IApiComponent component = bl.getApiComponent(currentProject.getName());
assertNotNull("The project was not found in the workspace baseline: " + currentProject.getName(), //$NON-NLS-1$
component);
try {
Expand Down
2 changes: 1 addition & 1 deletion apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.api.tools;singleton:=true
Bundle-Version: 1.3.600.qualifier
Bundle-Version: 1.3.700.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -706,12 +706,4 @@ private IApiBaseline createWorkspaceBaseline() throws CoreException {
return baseline;
}

@Override
public IApiComponent getWorkspaceComponent(String symbolicName) {
IApiBaseline baseline = getWorkspaceBaseline();
if (baseline != null) {
return baseline.getApiComponent(symbolicName);
}
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package org.eclipse.pde.api.tools.internal.provisional;

import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;

/**
* Interface describing the {@link IApiBaselineManager}
Expand Down Expand Up @@ -98,12 +97,4 @@ public interface IApiBaselineManager {
*/
public IApiBaseline getWorkspaceBaseline();

/**
* Returns the API component the workspace baseline with the given symbolic
* name or <code>null</code> if none.
*
* @param symbolicName bundle symbolic name
* @return API component from the workspace baseline or <code>null</code>
*/
public IApiComponent getWorkspaceComponent(String symbolicName);
}
Loading