|
Lines 252-260
Link Here
|
| 252 |
validateManifestFile(manifestFile, new SubProgressMonitor(monitor, 1)); |
252 |
validateManifestFile(manifestFile, new SubProgressMonitor(monitor, 1)); |
| 253 |
} |
253 |
} |
| 254 |
} |
254 |
} |
| 255 |
if ((type & BUILD) != 0) { |
255 |
validateBuildProperties(new SubProgressMonitor(monitor, 1), (type & BUILD) != 0); |
| 256 |
validateBuildProperties(new SubProgressMonitor(monitor, 1)); |
|
|
| 257 |
} |
| 258 |
} |
256 |
} |
| 259 |
|
257 |
|
| 260 |
private int getWorkAmount(int type) { |
258 |
private int getWorkAmount(int type) { |
|
Lines 330-341
Link Here
|
| 330 |
monitor.done(); |
328 |
monitor.done(); |
| 331 |
} |
329 |
} |
| 332 |
|
330 |
|
| 333 |
private void validateBuildProperties(IProgressMonitor monitor) { |
331 |
private void validateBuildProperties(IProgressMonitor monitor, boolean force) { |
| 334 |
if (monitor.isCanceled()) |
332 |
if (monitor.isCanceled()) |
| 335 |
return; |
333 |
return; |
| 336 |
IProject project = getProject(); |
334 |
IProject project = getProject(); |
| 337 |
IFile file = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR); |
335 |
IFile file = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR); |
| 338 |
if (file.exists()) { |
336 |
if (file.exists()) { |
|
|
337 |
// If we aren't strictly required to check the build.properties, |
| 338 |
// check them anyway if there are currently PDE markers |
| 339 |
// |
| 340 |
if (!force) { |
| 341 |
try { |
| 342 |
if (file.findMarkers(PDEMarkerFactory.MARKER_ID, false, 0).length == 0) |
| 343 |
return; |
| 344 |
} catch (CoreException e) { |
| 345 |
} |
| 346 |
} |
| 339 |
monitor.subTask(PDECoreMessages.ManifestConsistencyChecker_buildPropertiesSubtask); |
347 |
monitor.subTask(PDECoreMessages.ManifestConsistencyChecker_buildPropertiesSubtask); |
| 340 |
BuildErrorReporter ber = new BuildErrorReporter(file); |
348 |
BuildErrorReporter ber = new BuildErrorReporter(file); |
| 341 |
ber.validateContent(monitor); |
349 |
ber.validateContent(monitor); |
