|
Lines 1-5
Link Here
|
| 1 |
/******************************************************************************* |
1 |
/******************************************************************************* |
| 2 |
* Copyright (c) 2000, 2010 IBM Corporation and others. |
2 |
* Copyright (c) 2000, 2011 IBM Corporation and others. |
| 3 |
* All rights reserved. This program and the accompanying materials |
3 |
* All rights reserved. This program and the accompanying materials |
| 4 |
* are made available under the terms of the Eclipse Public License v1.0 |
4 |
* are made available under the terms of the Eclipse Public License v1.0 |
| 5 |
* which accompanies this distribution, and is available at |
5 |
* which accompanies this distribution, and is available at |
|
Lines 477-482
Link Here
|
| 477 |
} |
477 |
} |
| 478 |
|
478 |
|
| 479 |
BundleSpecification[] specs = desc.getRequiredBundles(); |
479 |
BundleSpecification[] specs = desc.getRequiredBundles(); |
|
|
480 |
if (specs.length != required.length) { |
| 481 |
// If the bundle description has stale data in it, don't compare it to the header data, see bug 308741 |
| 482 |
specs = null; |
| 483 |
} |
| 484 |
|
| 480 |
for (int i = 0; i < required.length; i++) { |
485 |
for (int i = 0; i < required.length; i++) { |
| 481 |
checkCanceled(monitor); |
486 |
checkCanceled(monitor); |
| 482 |
|
487 |
|
|
Lines 492-498
Link Here
|
| 492 |
boolean optional = isOptional(required[i]); |
497 |
boolean optional = isOptional(required[i]); |
| 493 |
int severity = getRequireBundleSeverity(required[i], optional); |
498 |
int severity = getRequireBundleSeverity(required[i], optional); |
| 494 |
|
499 |
|
| 495 |
if (specs[i].getSupplier() == null) { |
500 |
// It is possible for the bundle description to not match the headers |
|
|
501 |
if (specs != null && specs[i].getSupplier() == null) { |
| 496 |
if (desc.getContainingState().getBundle(specs[i].getName(), null) == null) { |
502 |
if (desc.getContainingState().getBundle(specs[i].getName(), null) == null) { |
| 497 |
IMarker marker = report(NLS.bind(PDECoreMessages.BundleErrorReporter_NotExistPDE, bundleID), getPackageLine(header, required[i]), severity, PDEMarkerFactory.M_REQ_BUNDLE_NOT_AVAILABLE, PDEMarkerFactory.CAT_FATAL); |
503 |
IMarker marker = report(NLS.bind(PDECoreMessages.BundleErrorReporter_NotExistPDE, bundleID), getPackageLine(header, required[i]), severity, PDEMarkerFactory.M_REQ_BUNDLE_NOT_AVAILABLE, PDEMarkerFactory.CAT_FATAL); |
| 498 |
try { |
504 |
try { |
