mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

update

Browse source
This commit is contained in:
David Inglis 2004-04-22 02:54:08 +00:00
parent a24bf0e276
commit 22c63f4e56
1 changed files with 71 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListElement.java
View file

@ -113,28 +113,35 @@ public class CPListElement {
} }
private IPathEntry newPathEntry() { private IPathEntry newPathEntry() {
IPath[] exclusionPattern; IPath[] exclusionPattern = (IPath[]) getAttribute(EXCLUSION);
IPath base = (IPath) getAttribute(BASE);
IPath baseRef = (IPath) getAttribute(BASE_REF);
switch (fEntryKind) { switch (fEntryKind) {
case IPathEntry.CDT_OUTPUT: case IPathEntry.CDT_OUTPUT:
exclusionPattern = (IPath[]) getAttribute(EXCLUSION);
return CoreModel.newOutputEntry(fPath, exclusionPattern); return CoreModel.newOutputEntry(fPath, exclusionPattern);
case IPathEntry.CDT_SOURCE: case IPathEntry.CDT_SOURCE:
exclusionPattern = (IPath[]) getAttribute(EXCLUSION);
return CoreModel.newSourceEntry(fPath, exclusionPattern); return CoreModel.newSourceEntry(fPath, exclusionPattern);
case IPathEntry.CDT_LIBRARY: case IPathEntry.CDT_LIBRARY:
IPath attach = (IPath) getAttribute(SOURCEATTACHMENT); IPath attach = (IPath) getAttribute(SOURCEATTACHMENT);
return CoreModel.newLibraryEntry(fPath, null, attach, null, null, isExported()); return CoreModel.newLibraryEntry(fPath, base, attach, null, null, isExported());
case IPathEntry.CDT_PROJECT: case IPathEntry.CDT_PROJECT:
return CoreModel.newProjectEntry(fPath, isExported()); return CoreModel.newProjectEntry(fPath, isExported());
case IPathEntry.CDT_CONTAINER: case IPathEntry.CDT_CONTAINER:
return CoreModel.newContainerEntry(fPath, isExported()); return CoreModel.newContainerEntry(fPath, isExported());
case IPathEntry.CDT_INCLUDE: case IPathEntry.CDT_INCLUDE:
exclusionPattern = (IPath[]) getAttribute(EXCLUSION); if (base != null) {
return CoreModel.newIncludeEntry(fPath, (IPath) getAttribute(INCLUDE), (IPath) getAttribute(BASE_REF), return CoreModel.newIncludeEntry(fPath, (IPath) getAttribute(INCLUDE), base,
((Boolean) getAttribute(SYSTEM_INCLUDE)).booleanValue(), exclusionPattern); ((Boolean) getAttribute(SYSTEM_INCLUDE)).booleanValue(), exclusionPattern);
} else {
}
case IPathEntry.CDT_MACRO: case IPathEntry.CDT_MACRO:
exclusionPattern = (IPath[]) getAttribute(EXCLUSION); if (base != null) {
return CoreModel.newMacroEntry(fPath, (String) getAttribute(MACRO_NAME), (String) getAttribute(MACRO_VALUE), exclusionPattern); return CoreModel.newMacroEntry(fPath, base, (String) getAttribute(MACRO_NAME),
(String) getAttribute(MACRO_VALUE), exclusionPattern);
} else {
}
default: default:
return null; return null;
} }
@ -147,7 +154,7 @@ public class CPListElement {
} else { } else {
buf.append('[').append(']'); buf.append('[').append(']');
} }
return buf; return buf.append(';');
} }
/** /**
@ -165,16 +172,36 @@ public class CPListElement {
IPath[] exclusion = (IPath[]) getAttribute(EXCLUSION); IPath[] exclusion = (IPath[]) getAttribute(EXCLUSION);
buf.append('[').append(exclusion.length).append(']'); buf.append('[').append(exclusion.length).append(']');
for (int i = 0; i < exclusion.length; i++) { for (int i = 0; i < exclusion.length; i++) {
appendEncodePath(exclusion[i], buf).append(';'); appendEncodePath(exclusion[i], buf);
}
switch (fEntryKind) {
case IPathEntry.CDT_INCLUDE:
IPath baseRef = (IPath) getAttribute(BASE_REF);
appendEncodePath(baseRef, buf);
IPath base = (IPath) getAttribute(BASE);
appendEncodePath(base, buf);
IPath include = (IPath) getAttribute(INCLUDE);
appendEncodePath(include, buf);
break;
case IPathEntry.CDT_MACRO:
baseRef = (IPath) getAttribute(BASE_REF);
appendEncodePath(baseRef, buf);
base = (IPath) getAttribute(BASE);
appendEncodePath(base, buf);
String symbol = (String) getAttribute(MACRO_NAME);
buf.append(symbol).append(';');
default:
} }
break; break;
case IPathEntry.CDT_LIBRARY: case IPathEntry.CDT_LIBRARY:
IPath base = (IPath) getAttribute(BASE);
appendEncodePath(base, buf);
IPath sourceAttach = (IPath) getAttribute(SOURCEATTACHMENT); IPath sourceAttach = (IPath) getAttribute(SOURCEATTACHMENT);
appendEncodePath(sourceAttach, buf).append(';'); appendEncodePath(sourceAttach, buf);
break; break;
default: default:
} }
buf.setLength(buf.length()-1);
return buf; return buf;
} }
@ -264,18 +291,20 @@ public class CPListElement {
public boolean equals(Object other) { public boolean equals(Object other) {
if (other != null && other.getClass().equals(getClass())) { if (other != null && other.getClass().equals(getClass())) {
CPListElement elem = (CPListElement) other; CPListElement elem = (CPListElement) other;
if ( elem.fEntryKind != fEntryKind || !elem.fPath.equals(fPath)) { if (elem.fEntryKind != fEntryKind || !elem.fPath.equals(fPath)) {
return false; return false;
} }
switch (fEntryKind) { switch (fEntryKind) {
case IPathEntry.CDT_LIBRARY:
return getAttribute(BASE).equals(elem.getAttribute(BASE));
case IPathEntry.CDT_INCLUDE: case IPathEntry.CDT_INCLUDE:
return (getAttribute(INCLUDE).equals(elem.getAttribute(INCLUDE)) && return (getAttribute(INCLUDE).equals(elem.getAttribute(INCLUDE))
getAttribute(BASE_REF).equals(elem.getAttribute(BASE_REF)) && && getAttribute(BASE_REF).equals(elem.getAttribute(BASE_REF)) && getAttribute(BASE).equals(
getAttribute(BASE).equals(elem.getAttribute(BASE))); elem.getAttribute(BASE)));
case IPathEntry.CDT_MACRO: case IPathEntry.CDT_MACRO:
return (getAttribute(MACRO_NAME).equals(elem.getAttribute(MACRO_NAME)) && return (getAttribute(MACRO_NAME).equals(elem.getAttribute(MACRO_NAME))
getAttribute(BASE_REF).equals(elem.getAttribute(BASE_REF)) && && getAttribute(BASE_REF).equals(elem.getAttribute(BASE_REF)) && getAttribute(BASE).equals(
getAttribute(BASE).equals(elem.getAttribute(BASE))); elem.getAttribute(BASE)));
} }
return true; return true;
} }
@ -286,6 +315,15 @@ public class CPListElement {
* @see Object#hashCode() * @see Object#hashCode()
*/ */
public int hashCode() { public int hashCode() {
int hashCode = 0;
switch (fEntryKind) {
case IPathEntry.CDT_LIBRARY:
hashCode = getAttribute(BASE).hashCode();
case IPathEntry.CDT_INCLUDE:
hashCode = getAttribute(INCLUDE).hashCode() + getAttribute(BASE_REF).hashCode() + getAttribute(BASE).hashCode();
case IPathEntry.CDT_MACRO:
hashCode = getAttribute(MACRO_NAME).hashCode() + getAttribute(BASE_REF).hashCode() + getAttribute(BASE).hashCode();
}
return fPath.hashCode() + fEntryKind; return fPath.hashCode() + fEntryKind;
} }
@ -371,12 +409,11 @@ public class CPListElement {
case IPathEntry.CDT_LIBRARY: case IPathEntry.CDT_LIBRARY:
res = root.findMember(path); res = root.findMember(path);
if (res == null) { if (res == null) {
// if (!ArchiveFileFilter.isArchivePath(path)) { // if (!ArchiveFileFilter.isArchivePath(path)) {
// if (root.getWorkspace().validatePath(path.toString(), IResource.FOLDER).isOK() if (root.getWorkspace().validatePath(path.toString(), IResource.FOLDER).isOK()
// && root.getProject(path.segment(0)).exists()) { && root.getProject(path.segment(0)).exists()) {
// res = root.getFolder(path); res = root.getFolder(path);
// } }
// }
isMissing = !path.toFile().isFile(); // look for external isMissing = !path.toFile().isFile(); // look for external
} }
sourceAttachment = ((ILibraryEntry) curr).getSourceAttachmentPath(); sourceAttachment = ((ILibraryEntry) curr).getSourceAttachmentPath();
@ -410,13 +447,15 @@ public class CPListElement {
if (root.getWorkspace().validatePath(path.toString(), IResource.FOLDER).isOK()) { if (root.getWorkspace().validatePath(path.toString(), IResource.FOLDER).isOK()) {
res = root.getFolder(path); res = root.getFolder(path);
} }
isMissing = !path.toFile().isFile(); // look for external }
if (res.getType() != IResource.PROJECT) {
isMissing = !project.isOnSourceRoot(res);
} }
exclusion = ((IIncludeEntry) curr).getExclusionPatterns(); exclusion = ((IIncludeEntry) curr).getExclusionPatterns();
sysInclude = ((IIncludeEntry) curr).isSystemInclude(); sysInclude = ((IIncludeEntry) curr).isSystemInclude();
baseRef = ((IIncludeEntry) curr).getBasePath(); baseRef = ((IIncludeEntry) curr).getBasePath();
base = new Path(""); base = new Path("");
// base = ((IIncludeEntry) curr).getBasePath(); // base = ((IIncludeEntry) curr).getBasePath();
include = ((IIncludeEntry) curr).getIncludePath(); include = ((IIncludeEntry) curr).getIncludePath();
break; break;
case IPathEntry.CDT_MACRO: case IPathEntry.CDT_MACRO:
@ -426,14 +465,16 @@ public class CPListElement {
if (root.getWorkspace().validatePath(path.toString(), IResource.FOLDER).isOK()) { if (root.getWorkspace().validatePath(path.toString(), IResource.FOLDER).isOK()) {
res = root.getFolder(path); res = root.getFolder(path);
} }
isMissing = !path.toFile().isFile(); // look for external }
if (res.getType() != IResource.PROJECT) {
isMissing = !project.isOnSourceRoot(res);
} }
exclusion = ((IMacroEntry) curr).getExclusionPatterns(); exclusion = ((IMacroEntry) curr).getExclusionPatterns();
macroName = ((IMacroEntry) curr).getMacroName(); macroName = ((IMacroEntry) curr).getMacroName();
macroValue = ((IMacroEntry) curr).getMacroValue(); macroValue = ((IMacroEntry) curr).getMacroValue();
baseRef = ((IMacroEntry) curr).getBasePath(); baseRef = ((IMacroEntry) curr).getBasePath();
base = new Path(""); base = new Path("");
// base = ((IIncludeEntry) curr).getBasePath(); // base = ((IIncludeEntry) curr).getBasePath();
break; break;
case IPathEntry.CDT_PROJECT: case IPathEntry.CDT_PROJECT:
res = root.findMember(path); res = root.findMember(path);