|
Lines 21-26
Link Here
|
| 21 |
import org.eclipse.core.runtime.IProgressMonitor; |
21 |
import org.eclipse.core.runtime.IProgressMonitor; |
| 22 |
import org.eclipse.core.runtime.IStatus; |
22 |
import org.eclipse.core.runtime.IStatus; |
| 23 |
import org.eclipse.core.runtime.Status; |
23 |
import org.eclipse.core.runtime.Status; |
|
|
24 |
import org.eclipse.pde.api.tools.internal.ApiBaselineManager; |
| 24 |
import org.eclipse.pde.api.tools.internal.builder.Reference; |
25 |
import org.eclipse.pde.api.tools.internal.builder.Reference; |
| 25 |
import org.eclipse.pde.api.tools.internal.builder.ReferenceExtractor; |
26 |
import org.eclipse.pde.api.tools.internal.builder.ReferenceExtractor; |
| 26 |
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin; |
27 |
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin; |
|
Lines 292-297
Link Here
|
| 292 |
} |
293 |
} |
| 293 |
String packageName = Signatures.getPackageName(qName); |
294 |
String packageName = Signatures.getPackageName(qName); |
| 294 |
IApiComponent[] components = getApiComponent().getBaseline().resolvePackage(getApiComponent(), packageName); |
295 |
IApiComponent[] components = getApiComponent().getBaseline().resolvePackage(getApiComponent(), packageName); |
|
|
296 |
|
| 297 |
|
| 298 |
if (components.length == 0) { |
| 299 |
IApiComponent[] apiComponentsWrk = ApiBaselineManager.getManager().getWorkspaceBaseline().getApiComponents(); |
| 300 |
for (IApiComponent iApiComponent : apiComponentsWrk) { |
| 301 |
if (iApiComponent.isSourceComponent()) { |
| 302 |
continue; |
| 303 |
} |
| 304 |
components = getApiComponent().getBaseline().resolvePackage(iApiComponent, packageName); |
| 305 |
if (components.length > 0) { |
| 306 |
break; |
| 307 |
} |
| 308 |
} |
| 309 |
} |
| 310 |
|
| 295 |
// If system package, then reorganize library component to consider the |
311 |
// If system package, then reorganize library component to consider the |
| 296 |
// java EE of the component as the preferred library |
312 |
// java EE of the component as the preferred library |
| 297 |
if (qName.startsWith("java.") && components.length > 1) { //$NON-NLS-1$ |
313 |
if (qName.startsWith("java.") && components.length > 1) { //$NON-NLS-1$ |
