mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Cosmetics.
This commit is contained in:
parent
bb4d695756
commit
cff63a5fbe
1 changed files with 63 additions and 78 deletions
|
@ -89,7 +89,6 @@ import org.eclipse.core.runtime.content.IContentTypeManager.ContentTypeChangeEve
|
||||||
import org.eclipse.core.runtime.content.IContentTypeManager.IContentTypeChangeListener;
|
import org.eclipse.core.runtime.content.IContentTypeManager.IContentTypeChangeListener;
|
||||||
|
|
||||||
public class CModelManager implements IResourceChangeListener, IContentTypeChangeListener, ICProjectDescriptionListener {
|
public class CModelManager implements IResourceChangeListener, IContentTypeChangeListener, ICProjectDescriptionListener {
|
||||||
|
|
||||||
public static boolean VERBOSE = false;
|
public static boolean VERBOSE = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -478,7 +477,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
}
|
}
|
||||||
|
|
||||||
final String contentTypeId = CoreModel.getRegistedContentTypeId(project, fileStore.getName());
|
final String contentTypeId = CoreModel.getRegistedContentTypeId(project, fileStore.getName());
|
||||||
|
|
||||||
if (!Util.isNonZeroLengthFile(locationURI)) {
|
if (!Util.isNonZeroLengthFile(locationURI)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -486,8 +484,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
try {
|
try {
|
||||||
IIncludeReference[] includeReferences = cproject.getIncludeReferences();
|
IIncludeReference[] includeReferences = cproject.getIncludeReferences();
|
||||||
for (IIncludeReference includeReference : includeReferences) {
|
for (IIncludeReference includeReference : includeReferences) {
|
||||||
|
|
||||||
|
|
||||||
// crecoskie
|
// crecoskie
|
||||||
// TODO FIXME: include entries don't handle URIs yet
|
// TODO FIXME: include entries don't handle URIs yet
|
||||||
IPath path = URIUtil.toPath(locationURI);
|
IPath path = URIUtil.toPath(locationURI);
|
||||||
|
@ -515,7 +511,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
}
|
}
|
||||||
|
|
||||||
public void releaseCElement(ICElement celement) {
|
public void releaseCElement(ICElement celement) {
|
||||||
|
|
||||||
// Guard.
|
// Guard.
|
||||||
if (celement == null)
|
if (celement == null)
|
||||||
return;
|
return;
|
||||||
|
@ -683,7 +678,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
//return null;
|
//return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int hints = 0;
|
int hints = 0;
|
||||||
|
|
||||||
for (BinaryParserConfig parser2 : parsers) {
|
for (BinaryParserConfig parser2 : parsers) {
|
||||||
|
@ -817,6 +811,7 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
}
|
}
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* addElementChangedListener method comment.
|
* addElementChangedListener method comment.
|
||||||
*/
|
*/
|
||||||
|
@ -860,7 +855,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
* @see IResource
|
* @see IResource
|
||||||
*/
|
*/
|
||||||
public void resourceChanged(IResourceChangeEvent event) {
|
public void resourceChanged(IResourceChangeEvent event) {
|
||||||
|
|
||||||
if (event.getSource() instanceof IWorkspace) {
|
if (event.getSource() instanceof IWorkspace) {
|
||||||
IResourceDelta delta = event.getDelta();
|
IResourceDelta delta = event.getDelta();
|
||||||
IResource resource = event.getResource();
|
IResource resource = event.getResource();
|
||||||
|
@ -1035,7 +1029,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
private void firePreAutoBuildDelta(ICElementDelta deltaToNotify,
|
private void firePreAutoBuildDelta(ICElementDelta deltaToNotify,
|
||||||
IElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
|
IElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
|
||||||
|
|
||||||
if (Util.VERBOSE_DELTA) {
|
if (Util.VERBOSE_DELTA) {
|
||||||
System.out.println("FIRING PRE_AUTO_BUILD Delta [" + Thread.currentThread() + "]:"); //$NON-NLS-1$//$NON-NLS-2$
|
System.out.println("FIRING PRE_AUTO_BUILD Delta [" + Thread.currentThread() + "]:"); //$NON-NLS-1$//$NON-NLS-2$
|
||||||
System.out.println(deltaToNotify == null ? "<NONE>" : deltaToNotify.toString()); //$NON-NLS-1$
|
System.out.println(deltaToNotify == null ? "<NONE>" : deltaToNotify.toString()); //$NON-NLS-1$
|
||||||
|
@ -1045,8 +1038,8 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void firePostChangeDelta(ICElementDelta deltaToNotify, IElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
|
private void firePostChangeDelta(ICElementDelta deltaToNotify, IElementChangedListener[] listeners,
|
||||||
|
int[] listenerMask, int listenerCount) {
|
||||||
// post change deltas
|
// post change deltas
|
||||||
if (Util.VERBOSE_DELTA) {
|
if (Util.VERBOSE_DELTA) {
|
||||||
System.out.println("FIRING POST_CHANGE Delta [" + Thread.currentThread() + "]:"); //$NON-NLS-1$//$NON-NLS-2$
|
System.out.println("FIRING POST_CHANGE Delta [" + Thread.currentThread() + "]:"); //$NON-NLS-1$//$NON-NLS-2$
|
||||||
|
@ -1072,8 +1065,8 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void fireShiftEvent(ICElementDelta deltaToNotify, IElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
|
private void fireShiftEvent(ICElementDelta deltaToNotify, IElementChangedListener[] listeners,
|
||||||
|
int[] listenerMask, int listenerCount) {
|
||||||
// post change deltas
|
// post change deltas
|
||||||
if (Util.VERBOSE_DELTA) {
|
if (Util.VERBOSE_DELTA) {
|
||||||
System.out.println("FIRING POST_SHIFT event [" + Thread.currentThread() + "]:"); //$NON-NLS-1$//$NON-NLS-2$
|
System.out.println("FIRING POST_SHIFT event [" + Thread.currentThread() + "]:"); //$NON-NLS-1$//$NON-NLS-2$
|
||||||
|
@ -1123,7 +1116,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
}
|
}
|
||||||
|
|
||||||
private ICElementDelta mergeDeltas(Collection<ICElementDelta> deltas) {
|
private ICElementDelta mergeDeltas(Collection<ICElementDelta> deltas) {
|
||||||
|
|
||||||
synchronized (deltas) {
|
synchronized (deltas) {
|
||||||
if (deltas.size() == 0)
|
if (deltas.size() == 0)
|
||||||
return null;
|
return null;
|
||||||
|
@ -1277,16 +1269,10 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
this.temporaryCache.set(null);
|
this.temporaryCache.set(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public void startup() {
|
public void startup() {
|
||||||
// Initialization is performed on the first getDefault()...
|
// Initialization is performed on the first getDefault()...
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public void shutdown() {
|
public void shutdown() {
|
||||||
// Remove ourself from the DescriptorManager.
|
// Remove ourself from the DescriptorManager.
|
||||||
CProjectDescriptionManager.getInstance().removeCProjectDescriptionListener(this);
|
CProjectDescriptionManager.getInstance().removeCProjectDescriptionListener(this);
|
||||||
|
@ -1364,7 +1350,6 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
|
|
||||||
public IWorkingCopy getSharedWorkingCopy(IBufferFactory factory, ITranslationUnit tu, IProblemRequestor requestor,
|
public IWorkingCopy getSharedWorkingCopy(IBufferFactory factory, ITranslationUnit tu, IProblemRequestor requestor,
|
||||||
IProgressMonitor monitor) throws CModelException {
|
IProgressMonitor monitor) throws CModelException {
|
||||||
|
|
||||||
// if factory is null, default factory must be used
|
// if factory is null, default factory must be used
|
||||||
if (factory == null)
|
if (factory == null)
|
||||||
factory = BufferManager.getDefaultBufferManager();
|
factory = BufferManager.getDefaultBufferManager();
|
||||||
|
|
Loading…
Add table
Reference in a new issue