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

cosmetics: generics/enhanced loops

Browse source
This commit is contained in:
Andrew Gvozdev 2010-01-25 21:43:49 +00:00
parent 44392d77e4
commit e6ffb95d44
1 changed files with 22 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryDataSerializer.java
View file

@ -11,11 +11,11 @@
package org.eclipse.cdt.core.settings.model.util; package org.eclipse.cdt.core.settings.model.util;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.core.settings.model.ICStorageElement; import org.eclipse.cdt.core.settings.model.ICStorageElement;
import org.eclipse.cdt.core.settings.model.extension.CLanguageData; import org.eclipse.cdt.core.settings.model.extension.CLanguageData;
@ -36,14 +36,12 @@ public class UserAndDiscoveredEntryDataSerializer extends CDataSerializer {
public void loadEntries(CLanguageData data, ICStorageElement el) { public void loadEntries(CLanguageData data, ICStorageElement el) {
UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data; UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data;
List entries = LanguageSettingEntriesSerializer.loadEntriesList(el); List<ICSettingEntry> entries = LanguageSettingEntriesSerializer.loadEntriesList(el);
EntryStore store = new EntryStore(); EntryStore store = new EntryStore();
store.addEntries((ICLanguageSettingEntry[])entries.toArray(new ICLanguageSettingEntry[entries.size()])); store.addEntries(entries.toArray(new ICLanguageSettingEntry[entries.size()]));
int kinds[] = KindBasedStore.getLanguageEntryKinds(); int kinds[] = KindBasedStore.getLanguageEntryKinds();
int kind;
ICLanguageSettingEntry[] sortedEntries; ICLanguageSettingEntry[] sortedEntries;
for(int i = 0; i < kinds.length; i++){ for (int kind : kinds) {
kind = kinds[i];
if(store.containsEntriesList(kind)){ if(store.containsEntriesList(kind)){
sortedEntries = store.getEntries(kind); sortedEntries = store.getEntries(kind);
lData.setEntriesToStore(kind, sortedEntries); lData.setEntriesToStore(kind, sortedEntries);
@ -51,11 +49,8 @@ public class UserAndDiscoveredEntryDataSerializer extends CDataSerializer {
} }
ICStorageElement[] children = el.getChildren(); ICStorageElement[] children = el.getChildren();
ICStorageElement child; for (ICStorageElement child : children) {
String name; String name = child.getName();
for(int i = 0; i < children.length; i++){
child = children[i];
name = child.getName();
if(DISABLED_DISCOVERED_ENTRIES.equals(name)){ if(DISABLED_DISCOVERED_ENTRIES.equals(name)){
loadDisabledEntriesInfo(lData, child); loadDisabledEntriesInfo(lData, child);
} }
@ -64,21 +59,17 @@ public class UserAndDiscoveredEntryDataSerializer extends CDataSerializer {
protected void loadDisabledEntriesInfo(UserAndDiscoveredEntryLanguageData lData, ICStorageElement el){ protected void loadDisabledEntriesInfo(UserAndDiscoveredEntryLanguageData lData, ICStorageElement el){
ICStorageElement[] children = el.getChildren(); ICStorageElement[] children = el.getChildren();
ICStorageElement child; for (ICStorageElement child : children) {
String name; String name = child.getName();
String tmp;
for(int i = 0; i < children.length; i++){
child = children[i];
name = child.getName();
if(NAME.equals(name)){ if(NAME.equals(name)){
tmp = child.getAttribute(KIND); String tmp = child.getAttribute(KIND);
int kind = LanguageSettingEntriesSerializer.stringToKind(tmp); int kind = LanguageSettingEntriesSerializer.stringToKind(tmp);
if(kind != 0){ if(kind != 0){
tmp = child.getAttribute(VALUE); tmp = child.getAttribute(VALUE);
if(tmp != null){ if(tmp != null){
Set set = lData.getDisabledSet(kind); Set<String> set = lData.getDisabledSet(kind);
if(set == null) if(set == null)
set = new HashSet(); set = new HashSet<String>();
set.add(tmp); set.add(tmp);
lData.setDisabledSet(kind, set); lData.setDisabledSet(kind, set);
} }
@ -91,10 +82,8 @@ public class UserAndDiscoveredEntryDataSerializer extends CDataSerializer {
public void storeEntries(CLanguageData data, ICStorageElement el) { public void storeEntries(CLanguageData data, ICStorageElement el) {
UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data; UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data;
int kinds[] = KindBasedStore.getLanguageEntryKinds(); int kinds[] = KindBasedStore.getLanguageEntryKinds();
int kind;
ICLanguageSettingEntry[] sortedEntries; ICLanguageSettingEntry[] sortedEntries;
for(int i = 0; i < kinds.length; i++){ for (int kind : kinds) {
kind = kinds[i];
sortedEntries = lData.getEntriesFromStore(kind); sortedEntries = lData.getEntriesFromStore(kind);
if(sortedEntries != null && sortedEntries.length != 0){ if(sortedEntries != null && sortedEntries.length != 0){
LanguageSettingEntriesSerializer.serializeEntries(sortedEntries, el); LanguageSettingEntriesSerializer.serializeEntries(sortedEntries, el);
@ -108,21 +97,16 @@ public class UserAndDiscoveredEntryDataSerializer extends CDataSerializer {
protected void storeDisabledEntriesInfo(UserAndDiscoveredEntryLanguageData lData, ICStorageElement el){ protected void storeDisabledEntriesInfo(UserAndDiscoveredEntryLanguageData lData, ICStorageElement el){
int kinds[] = KindBasedStore.getLanguageEntryKinds(); int kinds[] = KindBasedStore.getLanguageEntryKinds();
Set set; for (int kind : kinds) {
int kind; Set<String> set = lData.getDisabledSet(kind);
for(int i = 0; i < kinds.length; i++){
kind = kinds[i];
set = lData.getDisabledSet(kind);
if(set != null && set.size() != 0){ if(set != null && set.size() != 0){
for(Iterator iter = set.iterator();iter.hasNext();){ for (String string : set) {
ICStorageElement child = el.createChild(NAME); ICStorageElement child = el.createChild(NAME);
child.setAttribute(KIND, LanguageSettingEntriesSerializer.kindToString(kind)); child.setAttribute(KIND, LanguageSettingEntriesSerializer.kindToString(kind));
child.setAttribute(VALUE, (String)iter.next()); child.setAttribute(VALUE, string);
} }
} }
} }
} }
} }