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

Compiler warnings.

Browse source
This commit is contained in:
Sergey Prigogin 2008-07-28 16:51:12 +00:00
parent 8517a2d791
commit b0780772c9
2 changed files with 69 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CExternalSetting.java
View file

@ -40,15 +40,14 @@ public final class CExternalSetting implements ICExternalSetting {
initEntryStore(entries); initEntryStore(entries);
} }
public CExternalSetting(String[] languageIDs, public CExternalSetting(String[] languageIDs, String[] contentTypeIds, String[] extensions,
String[] contentTypeIds, String[] extensions,
ICSettingEntry[] entries) { ICSettingEntry[] entries) {
if (languageIDs != null) if (languageIDs != null)
fLanguageIds = (String[])languageIDs.clone(); fLanguageIds = languageIDs.clone();
if (contentTypeIds != null) if (contentTypeIds != null)
fContentTypeIds = (String[])contentTypeIds.clone(); fContentTypeIds = contentTypeIds.clone();
if (extensions != null) if (extensions != null)
fExtensions = (String[])extensions.clone(); fExtensions = extensions.clone();
initEntryStore(entries); initEntryStore(entries);
} }
@ -68,15 +67,15 @@ public final class CExternalSetting implements ICExternalSetting {
getEntriesSet(entry.getKind(), true).addEntry(entry); getEntriesSet(entry.getKind(), true).addEntry(entry);
} }
/* private void trimToSize(){ // private void trimToSize() {
int kinds[] = KindBasedStore.getSupportedKinds(); // int kinds[] = KindBasedStore.getSupportedKinds();
for(int i = 0; i < kinds.length; i++){ // for (int i = 0; i < kinds.length; i++) {
CEntriesSet set = getEntriesSet(kinds[i], false); // CEntriesSet set = getEntriesSet(kinds[i], false);
if(set != null) // if (set != null)
set.trimToSize(); // set.trimToSize();
} // }
} // }
*/
private CEntriesSet getEntriesSet(int kind, boolean create) { private CEntriesSet getEntriesSet(int kind, boolean create) {
CEntriesSet set = (CEntriesSet)fStore.get(kind); CEntriesSet set = (CEntriesSet)fStore.get(kind);
if (set == null && create) { if (set == null && create) {
@ -88,19 +87,19 @@ public final class CExternalSetting implements ICExternalSetting {
public String[] getCompatibleContentTypeIds() { public String[] getCompatibleContentTypeIds() {
if (fContentTypeIds != null) if (fContentTypeIds != null)
return (String[])fContentTypeIds.clone(); return fContentTypeIds.clone();
return null; return null;
} }
public String[] getCompatibleExtensions() { public String[] getCompatibleExtensions() {
if (fExtensions != null) if (fExtensions != null)
return (String[])fExtensions.clone(); return fExtensions.clone();
return null; return null;
} }
public String[] getCompatibleLanguageIds() { public String[] getCompatibleLanguageIds() {
if (fLanguageIds != null) if (fLanguageIds != null)
return (String[])fLanguageIds.clone(); return fLanguageIds.clone();
return null; return null;
} }
@ -116,7 +115,7 @@ public final class CExternalSetting implements ICExternalSetting {
// } // }
public ICSettingEntry[] getEntries() { public ICSettingEntry[] getEntries() {
List result = new ArrayList(); List<ICSettingEntry> result = new ArrayList<ICSettingEntry>();
int kinds[] = KindBasedStore.getAllEntryKinds(); int kinds[] = KindBasedStore.getAllEntryKinds();
for (int i = 0; i < kinds.length; i++) { for (int i = 0; i < kinds.length; i++) {
CEntriesSet list = getEntriesSet(kinds[i], false); CEntriesSet list = getEntriesSet(kinds[i], false);
@ -124,6 +123,6 @@ public final class CExternalSetting implements ICExternalSetting {
result.addAll(Arrays.asList(list.toArray())); result.addAll(Arrays.asList(list.toArray()));
} }
return (ICSettingEntry[])result.toArray(new ICSettingEntry[result.size()]); return result.toArray(new ICSettingEntry[result.size()]);
} }
} }

7
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionEvent.java
View file

@ -103,15 +103,15 @@ public final class CProjectDescriptionEvent {
} }
} else if (newCfg == null) { } else if (newCfg == null) {
delta = new CProjectDescriptionDelta(null, oldCfg); delta = new CProjectDescriptionDelta(null, oldCfg);
} else { } else if (newCfg.getId().equals(oldCfg.getId())) {
if(newCfg.getId().equals(oldCfg.getId())){
delta = findCfgDelta(fProjDelta, newCfg.getId()); delta = findCfgDelta(fProjDelta, newCfg.getId());
} else { } else {
delta = CProjectDescriptionManager.getInstance().createDelta(newCfg, oldCfg); delta = CProjectDescriptionManager.getInstance().createDelta(newCfg, oldCfg);
} }
} }
} }
} break;
case COPY_CREATED: case COPY_CREATED:
break; break;
} }
@ -145,5 +145,4 @@ public final class CProjectDescriptionEvent {
public ICProjectDescription getAppliedCProjectDescription() { public ICProjectDescription getAppliedCProjectDescription() {
return fAppliedDescription; return fAppliedDescription;
} }
} }