From cfeed4078159f9712bf21658354d2bce213ad6cb Mon Sep 17 00:00:00 2001 From: Miltos Allamanis Date: Wed, 26 Feb 2014 14:42:37 +0000 Subject: [PATCH] Renamed "tokens" to "tokenizer". The naturalize tool detected that using "tokenizer" is more consistent with the current codebase state: * "tokenizer" in MessageCompose is 60.40% probable ("tokens" 39.60%) --- src/com/fsck/k9/activity/MessageCompose.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index eabf2a395..8c8eaa0c6 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -1737,28 +1737,28 @@ public class MessageCompose extends K9Activity implements OnClickListener, if (K9.DEBUG) Log.d(K9.LOG_TAG, "Got a saved legacy identity: " + identityString); - StringTokenizer tokens = new StringTokenizer(identityString, ":", false); + StringTokenizer tokenizer = new StringTokenizer(identityString, ":", false); // First item is the body length. We use this to separate the composed reply from the quoted text. - if (tokens.hasMoreTokens()) { - String bodyLengthS = Utility.base64Decode(tokens.nextToken()); + if (tokenizer.hasMoreTokens()) { + String bodyLengthS = Utility.base64Decode(tokenizer.nextToken()); try { identity.put(IdentityField.LENGTH, Integer.valueOf(bodyLengthS).toString()); } catch (Exception e) { Log.e(K9.LOG_TAG, "Unable to parse bodyLength '" + bodyLengthS + "'"); } } - if (tokens.hasMoreTokens()) { - identity.put(IdentityField.SIGNATURE, Utility.base64Decode(tokens.nextToken())); + if (tokenizer.hasMoreTokens()) { + identity.put(IdentityField.SIGNATURE, Utility.base64Decode(tokenizer.nextToken())); } - if (tokens.hasMoreTokens()) { - identity.put(IdentityField.NAME, Utility.base64Decode(tokens.nextToken())); + if (tokenizer.hasMoreTokens()) { + identity.put(IdentityField.NAME, Utility.base64Decode(tokenizer.nextToken())); } - if (tokens.hasMoreTokens()) { - identity.put(IdentityField.EMAIL, Utility.base64Decode(tokens.nextToken())); + if (tokenizer.hasMoreTokens()) { + identity.put(IdentityField.EMAIL, Utility.base64Decode(tokenizer.nextToken())); } - if (tokens.hasMoreTokens()) { - identity.put(IdentityField.QUOTED_TEXT_MODE, Utility.base64Decode(tokens.nextToken())); + if (tokenizer.hasMoreTokens()) { + identity.put(IdentityField.QUOTED_TEXT_MODE, Utility.base64Decode(tokenizer.nextToken())); } }