From 5485d0faf1a9541e7d52076fed427e20711ec880 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Wed, 1 Dec 2010 03:04:07 +0000 Subject: [PATCH] switch over some for loops to enhanced for loop syntax per intellij --- .../fsck/k9/activity/FolderListFilter.java | 4 +-- src/com/fsck/k9/helper/DomainNameChecker.java | 25 +++++++------------ src/com/fsck/k9/mail/filter/Base64.java | 6 ++--- .../web/AccessibleEmailContentActivity.java | 8 +++--- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/com/fsck/k9/activity/FolderListFilter.java b/src/com/fsck/k9/activity/FolderListFilter.java index ea6b20e7f..1610dda18 100644 --- a/src/com/fsck/k9/activity/FolderListFilter.java +++ b/src/com/fsck/k9/activity/FolderListFilter.java @@ -81,9 +81,7 @@ public class FolderListFilter extends Filter final ArrayList newValues = new ArrayList(); - for (int i = 0; i < count; i++) - { - final T value = values.get(i); + for (final T value : values) { final String valueText = value.toString().toLowerCase(); for (int k = 0; k < wordCount; k++) diff --git a/src/com/fsck/k9/helper/DomainNameChecker.java b/src/com/fsck/k9/helper/DomainNameChecker.java index e3beb10cd..d8214909f 100644 --- a/src/com/fsck/k9/helper/DomainNameChecker.java +++ b/src/com/fsck/k9/helper/DomainNameChecker.java @@ -140,22 +140,15 @@ public class DomainNameChecker Collection subjectAltNames = certificate.getSubjectAlternativeNames(); if (subjectAltNames != null) { - Iterator i = subjectAltNames.iterator(); - while (i.hasNext()) - { - List altNameEntry = (List)(i.next()); - if ((altNameEntry != null) && (2 <= altNameEntry.size())) - { - Integer altNameType = (Integer)(altNameEntry.get(0)); - if (altNameType != null) - { - if (altNameType.intValue() == ALT_IPA_NAME) - { - String altName = (String)(altNameEntry.get(1)); - if (altName != null) - { - if (K9.DEBUG) - { + for (Object subjectAltName : subjectAltNames) { + List altNameEntry = (List) (subjectAltName); + if ((altNameEntry != null) && (2 <= altNameEntry.size())) { + Integer altNameType = (Integer) (altNameEntry.get(0)); + if (altNameType != null) { + if (altNameType == ALT_IPA_NAME) { + String altName = (String) (altNameEntry.get(1)); + if (altName != null) { + if (K9.DEBUG) { Log.v(K9.LOG_TAG, "alternative IP: " + altName); } if (thisDomain.equalsIgnoreCase(altName)) diff --git a/src/com/fsck/k9/mail/filter/Base64.java b/src/com/fsck/k9/mail/filter/Base64.java index 4ac505de4..2b5a33733 100644 --- a/src/com/fsck/k9/mail/filter/Base64.java +++ b/src/com/fsck/k9/mail/filter/Base64.java @@ -538,10 +538,8 @@ public class Base64 implements BinaryEncoder, BinaryDecoder */ public static boolean isArrayByteBase64(byte[] arrayOctet) { - for (int i = 0; i < arrayOctet.length; i++) - { - if (!isBase64(arrayOctet[i]) && !isWhiteSpace(arrayOctet[i])) - { + for (byte anArrayOctet : arrayOctet) { + if (!isBase64(anArrayOctet) && !isWhiteSpace(anArrayOctet)) { return false; } } diff --git a/src/com/fsck/k9/web/AccessibleEmailContentActivity.java b/src/com/fsck/k9/web/AccessibleEmailContentActivity.java index 115efb708..75a2cfdc3 100644 --- a/src/com/fsck/k9/web/AccessibleEmailContentActivity.java +++ b/src/com/fsck/k9/web/AccessibleEmailContentActivity.java @@ -43,11 +43,9 @@ public class AccessibleEmailContentActivity extends ListActivity String[] rawListItems = parsedHtml.toString().split("\n"); ArrayList cleanedList = new ArrayList(); - for (int i = 0; i < rawListItems.length; i++) - { - if (rawListItems[i].trim().length() > 0) - { - addToCleanedList(cleanedList, rawListItems[i]); + for (String rawListItem : rawListItems) { + if (rawListItem.trim().length() > 0) { + addToCleanedList(cleanedList, rawListItem); } }