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;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -250,15 +249,15 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
|
|
||||||
int type = resource.getType();
|
int type = resource.getType();
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case IResource.PROJECT :
|
case IResource.PROJECT:
|
||||||
return create((IProject)resource);
|
return create((IProject)resource);
|
||||||
case IResource.FILE :
|
case IResource.FILE:
|
||||||
return create((IFile)resource, cproject);
|
return create((IFile)resource, cproject);
|
||||||
case IResource.FOLDER :
|
case IResource.FOLDER:
|
||||||
return create((IFolder)resource, cproject);
|
return create((IFolder)resource, cproject);
|
||||||
case IResource.ROOT :
|
case IResource.ROOT:
|
||||||
return getCModel((IWorkspaceRoot)resource);
|
return getCModel((IWorkspaceRoot)resource);
|
||||||
default :
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -403,7 +402,7 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
final String contentTypeId = CoreModel.getRegistedContentTypeId(project, path.lastSegment());
|
final String contentTypeId = CoreModel.getRegistedContentTypeId(project, path.lastSegment());
|
||||||
|
|
||||||
if (path.isAbsolute()) {
|
if (path.isAbsolute()) {
|
||||||
if (! Util.isNonZeroLengthFile(path)) {
|
if (!Util.isNonZeroLengthFile(path)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -478,16 +477,13 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
@ -670,7 +665,7 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
|
|
||||||
URI fileUri = file.getLocationURI();
|
URI fileUri = file.getLocationURI();
|
||||||
//Avoid name special devices, empty files and the like
|
//Avoid name special devices, empty files and the like
|
||||||
if (! Util.isNonZeroLengthFile(fileUri)) {
|
if (!Util.isNonZeroLengthFile(fileUri)) {
|
||||||
// PR:xxx the EFS does not seem to work for newly created file
|
// PR:xxx the EFS does not seem to work for newly created file
|
||||||
// so before bailing out give another try?
|
// so before bailing out give another try?
|
||||||
//Avoid name special devices, empty files and the like
|
//Avoid name special devices, empty files and the like
|
||||||
|
@ -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,47 +855,46 @@ 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();
|
||||||
switch (event.getType()) {
|
switch (event.getType()) {
|
||||||
case IResourceChangeEvent.PRE_DELETE :
|
case IResourceChangeEvent.PRE_DELETE:
|
||||||
try {
|
try {
|
||||||
if (resource.getType() == IResource.PROJECT &&
|
if (resource.getType() == IResource.PROJECT &&
|
||||||
( ((IProject)resource).hasNature(CProjectNature.C_NATURE_ID) ||
|
( ((IProject)resource).hasNature(CProjectNature.C_NATURE_ID) ||
|
||||||
((IProject)resource).hasNature(CCProjectNature.CC_NATURE_ID) )){
|
((IProject)resource).hasNature(CCProjectNature.CC_NATURE_ID) )){
|
||||||
this.preDeleteProject((IProject) resource);}
|
this.preDeleteProject((IProject) resource);}
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IResourceChangeEvent.PRE_CLOSE :
|
case IResourceChangeEvent.PRE_CLOSE:
|
||||||
try {
|
try {
|
||||||
if (resource.getType() == IResource.PROJECT &&
|
if (resource.getType() == IResource.PROJECT &&
|
||||||
( ((IProject)resource).hasNature(CProjectNature.C_NATURE_ID) ||
|
( ((IProject)resource).hasNature(CProjectNature.C_NATURE_ID) ||
|
||||||
((IProject)resource).hasNature(CCProjectNature.CC_NATURE_ID) )){
|
((IProject)resource).hasNature(CCProjectNature.CC_NATURE_ID) )){
|
||||||
this.preCloseProject((IProject) resource);}
|
this.preCloseProject((IProject) resource);}
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IResourceChangeEvent.POST_CHANGE :
|
case IResourceChangeEvent.POST_CHANGE:
|
||||||
try {
|
try {
|
||||||
if (delta != null) {
|
if (delta != null) {
|
||||||
checkForProjectRename(delta);
|
checkForProjectRename(delta);
|
||||||
ICElementDelta[] translatedDeltas = fDeltaProcessor.processResourceDelta(delta);
|
ICElementDelta[] translatedDeltas = fDeltaProcessor.processResourceDelta(delta);
|
||||||
if (translatedDeltas.length > 0) {
|
if (translatedDeltas.length > 0) {
|
||||||
for (ICElementDelta translatedDelta : translatedDeltas) {
|
for (ICElementDelta translatedDelta : translatedDeltas) {
|
||||||
registerCModelDelta(translatedDelta);
|
registerCModelDelta(translatedDelta);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
fire(ElementChangedEvent.POST_CHANGE);
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
fire(ElementChangedEvent.POST_CHANGE);
|
||||||
CCorePlugin.log(e);
|
|
||||||
}
|
}
|
||||||
break;
|
} catch (Exception e) {
|
||||||
|
CCorePlugin.log(e);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1010,32 +1004,31 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (eventType) {
|
switch (eventType) {
|
||||||
case DEFAULT_CHANGE_EVENT :
|
case DEFAULT_CHANGE_EVENT:
|
||||||
firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
||||||
firePostChangeDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
firePostChangeDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
||||||
fireReconcileDelta(listeners, listenerMask, listenerCount);
|
fireReconcileDelta(listeners, listenerMask, listenerCount);
|
||||||
break;
|
break;
|
||||||
case ElementChangedEvent.PRE_AUTO_BUILD :
|
case ElementChangedEvent.PRE_AUTO_BUILD:
|
||||||
firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
||||||
break;
|
break;
|
||||||
case ElementChangedEvent.POST_CHANGE :
|
case ElementChangedEvent.POST_CHANGE:
|
||||||
firePostChangeDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
firePostChangeDelta(deltaToNotify, listeners, listenerMask, listenerCount);
|
||||||
fireReconcileDelta(listeners, listenerMask, listenerCount);
|
fireReconcileDelta(listeners, listenerMask, listenerCount);
|
||||||
break;
|
break;
|
||||||
case ElementChangedEvent.POST_RECONCILE :
|
case ElementChangedEvent.POST_RECONCILE:
|
||||||
fireReconcileDelta(listeners, listenerMask, listenerCount);
|
fireReconcileDelta(listeners, listenerMask, listenerCount);
|
||||||
break;
|
break;
|
||||||
case ElementChangedEvent.POST_SHIFT:
|
case ElementChangedEvent.POST_SHIFT:
|
||||||
fireShiftEvent(deltaToNotify, listeners, listenerMask, listenerCount);
|
fireShiftEvent(deltaToNotify, listeners, listenerMask, listenerCount);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@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