mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

Cosmetics for binary runner

Browse source
This commit is contained in:
Anton Leherbauer 2008-03-18 15:05:02 +00:00
parent 868da804e7
commit 616baf0dd6
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2007 QNX Software Systems and others. * Copyright (c) 2000, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -9,6 +9,7 @@
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Warren Paul (Nokia) * Warren Paul (Nokia)
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Anton Leherbauer (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.model; package org.eclipse.cdt.internal.core.model;
@ -107,7 +108,11 @@ public class BinaryRunner {
vlib.removeChildren(); vlib.removeChildren();
vbin.removeChildren(); vbin.removeChildren();
cproject.getProject().accept(new Visitor(monitor), IContainer.INCLUDE_PHANTOMS); // traverse project, but only if at least one binary parser is configured
BinaryParserConfig[] parsers = CModelManager.getDefault().getBinaryParser(cproject.getProject());
if (parsers.length > 0) {
cproject.getProject().accept(new Visitor(monitor), IContainer.INCLUDE_PHANTOMS);
}
if (!monitor.isCanceled()) { if (!monitor.isCanceled()) {
CModelOperation op = new BinaryRunnerOperation(cproject); CModelOperation op = new BinaryRunnerOperation(cproject);
@ -179,10 +184,6 @@ public class BinaryRunner {
return false; return false;
} }
vMonitor.worked(1); vMonitor.worked(1);
// give a hint to the user of what we are doing
String name = proxy.getName();
vMonitor.subTask(name);
// Attempt to speed things up by rejecting up front // Attempt to speed things up by rejecting up front
// Things we know should not be Binary files. // Things we know should not be Binary files.
@ -193,7 +194,7 @@ public class BinaryRunner {
} }
// check against known content types // check against known content types
String name = proxy.getName();
IContentType contentType = CCorePlugin.getContentType(project, name); IContentType contentType = CCorePlugin.getContentType(project, name);
if (contentType != null && textContentType != null) { if (contentType != null && textContentType != null) {
if (contentType != null && contentType.isKindOf(textContentType)) { if (contentType != null && contentType.isKindOf(textContentType)) {
@ -203,6 +204,9 @@ public class BinaryRunner {
} }
} }
// give a hint to the user of what we are doing
vMonitor.subTask(name);
// we have a candidate // we have a candidate
IPath path = proxy.requestFullPath(); IPath path = proxy.requestFullPath();
if (path != null) { if (path != null) {
@ -214,8 +218,8 @@ public class BinaryRunner {
if (bin != null) { if (bin != null) {
// Create the file will add it to the {Archive,Binary}Containery. // Create the file will add it to the {Archive,Binary}Containery.
factory.create(file, bin, cproject); factory.create(file, bin, cproject);
return true;
} }
return true;
} }
} }
} }

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
View file

@ -599,7 +599,7 @@ public class CModelManager implements IResourceChangeListener, ICDescriptorListe
try { try {
parser = parsers[i].getBinaryParser(); parser = parsers[i].getBinaryParser();
if (parser.getHintBufferSize() > hints) { if (parser.getHintBufferSize() > hints) {
hints = parser.getHintBufferSize(); hints = Math.max(hints, parser.getHintBufferSize());
} }
} catch (CoreException e) { } catch (CoreException e) {
} }