From f6df6000d580e0801e653e02cfe8b8119e29e9f2 Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Mon, 17 Jun 2013 12:42:56 +0000 Subject: [PATCH] We can finally use isEmpty(), given Android 2.3.3+ is required git-svn-id: https://zxing.googlecode.com/svn/trunk@2819 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../client/android/DecodeHintManager.java | 4 ++-- .../zxing/client/android/HelpActivity.java | 4 ++-- .../zxing/client/android/LocaleManager.java | 2 +- .../android/book/BrowseBookListener.java | 2 +- .../book/SearchBookContentsActivity.java | 18 +++++++++--------- .../book/SearchBookContentsListItem.java | 6 +++--- .../client/android/encode/ContactEncoder.java | 4 ++-- .../client/android/encode/QRCodeEncoder.java | 16 ++++++++-------- .../client/android/history/HistoryItem.java | 4 ++-- .../result/AddressBookResultHandler.java | 6 +++--- .../client/android/result/ResultHandler.java | 14 +++++++------- .../supplement/BookResultInfoRetriever.java | 2 +- .../supplement/SupplementalInfoRetriever.java | 2 +- .../result/supplement/TitleRetriever.java | 2 +- .../client/android/share/ShareActivity.java | 8 ++++---- .../client/android/wifi/WifiConfigManager.java | 14 +++++++------- .../result/EmailAddressResultParser.java | 2 +- .../zxing/client/result/ParsedResult.java | 2 +- .../zxing/client/result/ResultParser.java | 2 +- .../zxing/client/result/VCardResultParser.java | 2 +- .../zxing/client/result/WifiResultParser.java | 2 +- .../zxing/datamatrix/DataMatrixWriter.java | 2 +- .../zxing/oned/OneDimensionalCodeWriter.java | 2 +- .../rss/expanded/decoders/FieldParser.java | 2 +- .../com/google/zxing/qrcode/QRCodeWriter.java | 2 +- .../client/CalendarEventGenerator.java | 6 +++--- .../generator/client/ContactInfoGenerator.java | 6 +++--- .../web/generator/client/EmailGenerator.java | 2 +- .../generator/client/GeoLocationGenerator.java | 4 ++-- .../generator/client/PhoneNumberGenerator.java | 2 +- .../generator/client/SmsAddressGenerator.java | 4 ++-- .../web/generator/client/TextGenerator.java | 2 +- .../web/generator/client/WifiGenerator.java | 8 ++++---- 33 files changed, 80 insertions(+), 80 deletions(-) diff --git a/android/src/com/google/zxing/client/android/DecodeHintManager.java b/android/src/com/google/zxing/client/android/DecodeHintManager.java index fd9f9ecb0..d8b49ce33 100644 --- a/android/src/com/google/zxing/client/android/DecodeHintManager.java +++ b/android/src/com/google/zxing/client/android/DecodeHintManager.java @@ -116,7 +116,7 @@ final class DecodeHintManager { static Map parseDecodeHints(Uri inputUri) { String query = inputUri.getEncodedQuery(); - if (query == null || query.length() == 0) { + if (query == null || query.isEmpty()) { return null; } @@ -157,7 +157,7 @@ final class DecodeHintManager { if (hintType.getValueType().equals(Boolean.class)) { // A boolean hint: a few values for false, everything else is true. // An empty parameter is simply a flag-style parameter, assuming true - if (parameterText.length() == 0) { + if (parameterText.isEmpty()) { hints.put(hintType, Boolean.TRUE); } else if ("0".equals(parameterText) || "false".equalsIgnoreCase(parameterText) || diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java index cb145cc9d..84b0256be 100644 --- a/android/src/com/google/zxing/client/android/HelpActivity.java +++ b/android/src/com/google/zxing/client/android/HelpActivity.java @@ -76,7 +76,7 @@ public final class HelpActivity extends Activity { webView.restoreState(icicle); } else if (intent != null) { String page = intent.getStringExtra(REQUESTED_PAGE_KEY); - if (page != null && page.length() > 0) { + if (page != null && !page.isEmpty()) { webView.loadUrl(BASE_URL + page); } else { webView.loadUrl(BASE_URL + DEFAULT_PAGE); @@ -94,7 +94,7 @@ public final class HelpActivity extends Activity { @Override protected void onSaveInstanceState(Bundle state) { String url = webView.getUrl(); - if (url != null && url.length() > 0) { + if (url != null && !url.isEmpty()) { webView.saveState(state); state.putBoolean(WEBVIEW_STATE_PRESENT, true); } diff --git a/android/src/com/google/zxing/client/android/LocaleManager.java b/android/src/com/google/zxing/client/android/LocaleManager.java index e766dc8f7..c52ca34aa 100644 --- a/android/src/com/google/zxing/client/android/LocaleManager.java +++ b/android/src/com/google/zxing/client/android/LocaleManager.java @@ -172,7 +172,7 @@ public final class LocaleManager { public static String getCountry(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); String countryOverride = prefs.getString(PreferencesActivity.KEY_SEARCH_COUNTRY, null); - if (countryOverride != null && countryOverride.length() > 0 && !"-".equals(countryOverride)) { + if (countryOverride != null && !countryOverride.isEmpty() && !"-".equals(countryOverride)) { return countryOverride; } return getSystemCountry(); diff --git a/android/src/com/google/zxing/client/android/book/BrowseBookListener.java b/android/src/com/google/zxing/client/android/book/BrowseBookListener.java index b84711281..c00bd6e93 100644 --- a/android/src/com/google/zxing/client/android/book/BrowseBookListener.java +++ b/android/src/com/google/zxing/client/android/book/BrowseBookListener.java @@ -46,7 +46,7 @@ final class BrowseBookListener implements AdapterView.OnItemClickListener { } String pageId = items.get(itemOffset).getPageId(); String query = SearchBookContentsResult.getQuery(); - if (LocaleManager.isBookSearchUrl(activity.getISBN()) && pageId.length() > 0) { + if (LocaleManager.isBookSearchUrl(activity.getISBN()) && !pageId.isEmpty()) { String uri = activity.getISBN(); int equals = uri.indexOf('='); String volumeId = uri.substring(equals + 1); diff --git a/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java b/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java index 04c76d58e..07a05f31a 100644 --- a/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java +++ b/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java @@ -121,7 +121,7 @@ public final class SearchBookContentsActivity extends Activity { queryTextView = (EditText) findViewById(R.id.query_text_view); String initialQuery = intent.getStringExtra(Intents.SearchBookContents.QUERY); - if (initialQuery != null && initialQuery.length() > 0) { + if (initialQuery != null && !initialQuery.isEmpty()) { // Populate the search box but don't trigger the search queryTextView.setText(initialQuery); } @@ -155,7 +155,7 @@ public final class SearchBookContentsActivity extends Activity { private void launchSearch() { String query = queryTextView.getText().toString(); - if (query != null && query.length() > 0) { + if (query != null && !query.isEmpty()) { NetworkTask oldTask = networkTask; if (oldTask != null) { oldTask.cancel(true); @@ -244,25 +244,25 @@ public final class SearchBookContentsActivity extends Activity { try { String pageId = json.getString("page_id"); String pageNumber = json.getString("page_number"); - if (pageNumber.length() > 0) { - pageNumber = getString(R.string.msg_sbc_page) + ' ' + pageNumber; - } else { + if (pageNumber.isEmpty()) { // This can happen for text on the jacket, and possibly other reasons. pageNumber = getString(R.string.msg_sbc_unknown_page); + } else { + pageNumber = getString(R.string.msg_sbc_page) + ' ' + pageNumber; } // Remove all HTML tags and encoded characters. Ideally the server would do this. String snippet = json.optString("snippet_text"); boolean valid = true; - if (snippet.length() > 0) { + if (snippet.isEmpty()) { + snippet = '(' + getString(R.string.msg_sbc_snippet_unavailable) + ')'; + valid = false; + } else { snippet = TAG_PATTERN.matcher(snippet).replaceAll(""); snippet = LT_ENTITY_PATTERN.matcher(snippet).replaceAll("<"); snippet = GT_ENTITY_PATTERN.matcher(snippet).replaceAll(">"); snippet = QUOTE_ENTITY_PATTERN.matcher(snippet).replaceAll("'"); snippet = QUOT_ENTITY_PATTERN.matcher(snippet).replaceAll("\""); - } else { - snippet = '(' + getString(R.string.msg_sbc_snippet_unavailable) + ')'; - valid = false; } return new SearchBookContentsResult(pageId, pageNumber, snippet, valid); } catch (JSONException e) { diff --git a/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java b/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java index 90badc993..964c36bd3 100644 --- a/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java +++ b/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java @@ -56,7 +56,9 @@ public final class SearchBookContentsListItem extends LinearLayout { public void set(SearchBookContentsResult result) { pageNumberView.setText(result.getPageNumber()); String snippet = result.getSnippet(); - if (snippet.length() > 0) { + if (snippet.isEmpty()) { + snippetView.setText(""); + } else { if (result.getValidSnippet()) { String lowerQuery = SearchBookContentsResult.getQuery().toLowerCase(Locale.getDefault()); String lowerSnippet = snippet.toLowerCase(Locale.getDefault()); @@ -77,8 +79,6 @@ public final class SearchBookContentsListItem extends LinearLayout { // This may be an error message, so don't try to bold the query terms within it snippetView.setText(snippet); } - } else { - snippetView.setText(""); } } } diff --git a/android/src/com/google/zxing/client/android/encode/ContactEncoder.java b/android/src/com/google/zxing/client/android/encode/ContactEncoder.java index 76e850f5a..079fdfb82 100644 --- a/android/src/com/google/zxing/client/android/encode/ContactEncoder.java +++ b/android/src/com/google/zxing/client/android/encode/ContactEncoder.java @@ -47,7 +47,7 @@ abstract class ContactEncoder { return null; } String result = s.trim(); - return result.length() == 0 ? null : result; + return result.isEmpty() ? null : result; } static void doAppend(StringBuilder newContents, @@ -78,7 +78,7 @@ abstract class ContactEncoder { Collection uniques = new HashSet(2); for (String value : values) { String trimmed = trim(value); - if (trimmed != null && trimmed.length() > 0 && !uniques.contains(trimmed)) { + if (trimmed != null && !trimmed.isEmpty() && !uniques.contains(trimmed)) { newContents.append(prefix).append(':').append(fieldFormatter.format(trimmed)).append(terminator); String display = formatter == null ? trimmed : formatter.format(trimmed); newDisplayContents.append(display).append('\n'); diff --git a/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java b/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java index 2fe1ce96f..eb30ebabe 100755 --- a/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java +++ b/android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java @@ -112,20 +112,20 @@ final class QRCodeEncoder { } if (format == null || format == BarcodeFormat.QR_CODE) { String type = intent.getStringExtra(Intents.Encode.TYPE); - if (type == null || type.length() == 0) { + if (type == null || type.isEmpty()) { return false; } this.format = BarcodeFormat.QR_CODE; encodeQRCodeContents(intent, type); } else { String data = intent.getStringExtra(Intents.Encode.DATA); - if (data != null && data.length() > 0) { + if (data != null && !data.isEmpty()) { contents = data; displayContents = data; title = activity.getString(R.string.contents_text); } } - return contents != null && contents.length() > 0; + return contents != null && !contents.isEmpty(); } // Handles send intents from multitude of Android applications @@ -158,7 +158,7 @@ final class QRCodeEncoder { } // Trim text to avoid URL breaking. - if (theContents == null || theContents.length() == 0) { + if (theContents == null || theContents.isEmpty()) { throw new WriterException("Empty EXTRA_TEXT"); } contents = theContents; @@ -208,7 +208,7 @@ final class QRCodeEncoder { throw new WriterException("Result was not an address"); } encodeQRCodeContents((AddressBookParsedResult) parsedResult); - if (contents == null || contents.length() == 0) { + if (contents == null || contents.isEmpty()) { throw new WriterException("No content to encode"); } } @@ -216,7 +216,7 @@ final class QRCodeEncoder { private void encodeQRCodeContents(Intent intent, String type) { if (type.equals(Contents.Type.TEXT)) { String data = intent.getStringExtra(Intents.Encode.DATA); - if (data != null && data.length() > 0) { + if (data != null && !data.isEmpty()) { contents = data; displayContents = data; title = activity.getString(R.string.contents_text); @@ -271,7 +271,7 @@ final class QRCodeEncoder { urls, note); // Make sure we've encoded at least one field. - if (encoded[1].length() > 0) { + if (!encoded[1].isEmpty()) { contents = encoded[0]; displayContents = encoded[1]; title = activity.getString(R.string.contents_contact); @@ -304,7 +304,7 @@ final class QRCodeEncoder { toIterable(contact.getURLs()), null); // Make sure we've encoded at least one field. - if (encoded[1].length() > 0) { + if (!encoded[1].isEmpty()) { contents = encoded[0]; displayContents = encoded[1]; title = activity.getString(R.string.contents_contact); diff --git a/android/src/com/google/zxing/client/android/history/HistoryItem.java b/android/src/com/google/zxing/client/android/history/HistoryItem.java index 3dda489fe..45da8bd30 100644 --- a/android/src/com/google/zxing/client/android/history/HistoryItem.java +++ b/android/src/com/google/zxing/client/android/history/HistoryItem.java @@ -36,12 +36,12 @@ public final class HistoryItem { public String getDisplayAndDetails() { StringBuilder displayResult = new StringBuilder(); - if (display == null || display.length() == 0) { + if (display == null || display.isEmpty()) { displayResult.append(result.getText()); } else { displayResult.append(display); } - if (details != null && details.length() > 0) { + if (details != null && !details.isEmpty()) { displayResult.append(" : ").append(details); } return displayResult.toString(); diff --git a/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java b/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java index cb4b8e7a2..3efd5df2d 100644 --- a/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java @@ -82,7 +82,7 @@ public final class AddressBookResultHandler extends ResultHandler { super(activity, result); AddressBookParsedResult addressResult = (AddressBookParsedResult) result; String[] addresses = addressResult.getAddresses(); - boolean hasAddress = addresses != null && addresses.length > 0 && addresses[0] != null && addresses[0].length() > 0; + boolean hasAddress = addresses != null && addresses.length > 0 && addresses[0] != null && !addresses[0].isEmpty(); String[] phoneNumbers = addressResult.getPhoneNumbers(); boolean hasPhoneNumber = phoneNumbers != null && phoneNumbers.length > 0; String[] emails = addressResult.getEmails(); @@ -175,7 +175,7 @@ public final class AddressBookResultHandler extends ResultHandler { int namesLength = contents.length(); String pronunciation = result.getPronunciation(); - if (pronunciation != null && pronunciation.length() > 0) { + if (pronunciation != null && !pronunciation.isEmpty()) { contents.append("\n("); contents.append(pronunciation); contents.append(')'); @@ -196,7 +196,7 @@ public final class AddressBookResultHandler extends ResultHandler { ParsedResult.maybeAppend(result.getURLs(), contents); String birthday = result.getBirthday(); - if (birthday != null && birthday.length() > 0) { + if (birthday != null && !birthday.isEmpty()) { Date date = parseDate(birthday); if (date != null) { ParsedResult.maybeAppend(DateFormat.getDateInstance(DateFormat.MEDIUM).format(date.getTime()), contents); diff --git a/android/src/com/google/zxing/client/android/result/ResultHandler.java b/android/src/com/google/zxing/client/android/result/ResultHandler.java index a6f374895..9453fcce1 100644 --- a/android/src/com/google/zxing/client/android/result/ResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/ResultHandler.java @@ -262,7 +262,7 @@ public abstract class ResultHandler { StringBuilder aggregatedNotes = new StringBuilder(); if (urls != null) { for (String url : urls) { - if (url != null && url.length() > 0) { + if (url != null && !url.isEmpty()) { aggregatedNotes.append('\n').append(url); } } @@ -274,7 +274,7 @@ public abstract class ResultHandler { } if (nicknames != null) { for (String nickname : nicknames) { - if (nickname != null && nickname.length() > 0) { + if (nickname != null && !nickname.isEmpty()) { aggregatedNotes.append('\n').append(nickname); } } @@ -371,7 +371,7 @@ public abstract class ResultHandler { final void sendMMSFromUri(String uri, String subject, String body) { Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse(uri)); // The Messaging app needs to see a valid subject or else it will treat this an an SMS. - if (subject == null || subject.length() == 0) { + if (subject == null || subject.isEmpty()) { putExtra(intent, "subject", activity.getString(R.string.msg_default_mms_subject)); } else { putExtra(intent, "subject", subject); @@ -399,9 +399,9 @@ public abstract class ResultHandler { * @param address The address to find * @param title An optional title, e.g. the name of the business at this address */ - final void searchMap(String address, CharSequence title) { + final void searchMap(String address, String title) { String query = address; - if (title != null && title.length() > 0) { + if (title != null && !title.isEmpty()) { query += " (" + title + ')'; } launchIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("geo:0,0?q=" + Uri.encode(query)))); @@ -510,7 +510,7 @@ public abstract class ResultHandler { } private static void putExtra(Intent intent, String key, String value) { - if (value != null && value.length() > 0) { + if (value != null && !value.isEmpty()) { intent.putExtra(key, value); } } @@ -519,7 +519,7 @@ public abstract class ResultHandler { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity); String customProductSearch = prefs.getString(PreferencesActivity.KEY_CUSTOM_PRODUCT_SEARCH, null); - if (customProductSearch != null && customProductSearch.trim().length() == 0) { + if (customProductSearch != null && customProductSearch.trim().isEmpty()) { return null; } return customProductSearch; diff --git a/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java index 5936a0ae5..0ae0b5cc6 100644 --- a/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java +++ b/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java @@ -94,7 +94,7 @@ final class BookResultInfoRetriever extends SupplementalInfoRetriever { Collection newTexts = new ArrayList(); maybeAddText(title, newTexts); maybeAddTextSeries(authors, newTexts); - maybeAddText(pages == null || pages.length() == 0 ? null : pages + "pp.", newTexts); + maybeAddText(pages == null || pages.isEmpty() ? null : pages + "pp.", newTexts); String baseBookUri = "http://www.google." + LocaleManager.getBookSearchCountryTLD(context) + "/search?tbm=bks&source=zxing&q="; diff --git a/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java index a065044da..0df8d015e 100644 --- a/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java +++ b/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java @@ -156,7 +156,7 @@ public abstract class SupplementalInfoRetriever extends AsyncTask texts) { - if (text != null && text.length() > 0) { + if (text != null && !text.isEmpty()) { texts.add(text); } } diff --git a/android/src/com/google/zxing/client/android/result/supplement/TitleRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/TitleRetriever.java index 8e4948fa4..05bc82c8f 100644 --- a/android/src/com/google/zxing/client/android/result/supplement/TitleRetriever.java +++ b/android/src/com/google/zxing/client/android/result/supplement/TitleRetriever.java @@ -55,7 +55,7 @@ final class TitleRetriever extends SupplementalInfoRetriever { Matcher m = TITLE_PATTERN.matcher(contents); if (m.find()) { String title = m.group(1); - if (title != null && title.length() > 0) { + if (title != null && !title.isEmpty()) { if (title.length() > MAX_TITLE_LEN) { title = title.substring(0, MAX_TITLE_LEN) + "..."; } diff --git a/android/src/com/google/zxing/client/android/share/ShareActivity.java b/android/src/com/google/zxing/client/android/share/ShareActivity.java index b788dad2c..ebaaa6ced 100755 --- a/android/src/com/google/zxing/client/android/share/ShareActivity.java +++ b/android/src/com/google/zxing/client/android/share/ShareActivity.java @@ -208,7 +208,7 @@ public final class ShareActivity extends Activity { // Don't require a name to be present, this contact might be just a phone number. Bundle bundle = new Bundle(); - if (name != null && name.length() > 0) { + if (name != null && !name.isEmpty()) { bundle.putString(ContactsContract.Intents.Insert.NAME, massageContactData(name)); } @@ -224,7 +224,7 @@ public final class ShareActivity extends Activity { int phonesNumberColumn = phonesCursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER); while (phonesCursor.moveToNext() && foundPhone < Contents.PHONE_KEYS.length) { String number = phonesCursor.getString(phonesNumberColumn); - if (number != null && number.length() > 0) { + if (number != null && !number.isEmpty()) { bundle.putString(Contents.PHONE_KEYS[foundPhone], massageContactData(number)); } foundPhone++; @@ -245,7 +245,7 @@ public final class ShareActivity extends Activity { if (methodsCursor.moveToNext()) { String data = methodsCursor.getString( methodsCursor.getColumnIndex(ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS)); - if (data != null && data.length() > 0) { + if (data != null && !data.isEmpty()) { bundle.putString(ContactsContract.Intents.Insert.POSTAL, massageContactData(data)); } } @@ -265,7 +265,7 @@ public final class ShareActivity extends Activity { int emailColumn = emailCursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.DATA); while (emailCursor.moveToNext() && foundEmail < Contents.EMAIL_KEYS.length) { String email = emailCursor.getString(emailColumn); - if (email != null && email.length() > 0) { + if (email != null && !email.isEmpty()) { bundle.putString(Contents.EMAIL_KEYS[foundEmail], massageContactData(email)); } foundEmail++; diff --git a/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java b/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java index 052752c28..d6d4b6812 100644 --- a/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java +++ b/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java @@ -82,7 +82,7 @@ public final class WifiConfigManager extends AsyncTask 0) { + if (value != null && !value.isEmpty()) { // Don't add a newline before the first value if (result.length() > 0) { result.append('\n'); diff --git a/core/src/com/google/zxing/client/result/ResultParser.java b/core/src/com/google/zxing/client/result/ResultParser.java index 21981b76f..66b42bd2c 100644 --- a/core/src/com/google/zxing/client/result/ResultParser.java +++ b/core/src/com/google/zxing/client/result/ResultParser.java @@ -230,7 +230,7 @@ public abstract class ResultParser { if (trim) { element = element.trim(); } - if (element.length() > 0) { + if (!element.isEmpty()) { matches.add(element); } i++; diff --git a/core/src/com/google/zxing/client/result/VCardResultParser.java b/core/src/com/google/zxing/client/result/VCardResultParser.java index 771b2388b..0d0467108 100644 --- a/core/src/com/google/zxing/client/result/VCardResultParser.java +++ b/core/src/com/google/zxing/client/result/VCardResultParser.java @@ -278,7 +278,7 @@ public final class VCardResultParser extends ResultParser { List result = new ArrayList(lists.size()); for (List list : lists) { String value = list.get(0); - if (value != null && value.length() > 0) { + if (value != null && !value.isEmpty()) { result.add(value); } } diff --git a/core/src/com/google/zxing/client/result/WifiResultParser.java b/core/src/com/google/zxing/client/result/WifiResultParser.java index 01ab3b55e..b62151c72 100644 --- a/core/src/com/google/zxing/client/result/WifiResultParser.java +++ b/core/src/com/google/zxing/client/result/WifiResultParser.java @@ -37,7 +37,7 @@ public final class WifiResultParser extends ResultParser { return null; } String ssid = matchSinglePrefixedField("S:", rawText, ';', false); - if (ssid == null || ssid.length() == 0) { + if (ssid == null || ssid.isEmpty()) { return null; } String pass = matchSinglePrefixedField("P:", rawText, ';', false); diff --git a/core/src/com/google/zxing/datamatrix/DataMatrixWriter.java b/core/src/com/google/zxing/datamatrix/DataMatrixWriter.java index 236118e51..1560f68f1 100644 --- a/core/src/com/google/zxing/datamatrix/DataMatrixWriter.java +++ b/core/src/com/google/zxing/datamatrix/DataMatrixWriter.java @@ -46,7 +46,7 @@ public final class DataMatrixWriter implements Writer { @Override public BitMatrix encode(String contents, BarcodeFormat format, int width, int height, Map hints) { - if (contents.length() == 0) { + if (contents.isEmpty()) { throw new IllegalArgumentException("Found empty contents"); } diff --git a/core/src/com/google/zxing/oned/OneDimensionalCodeWriter.java b/core/src/com/google/zxing/oned/OneDimensionalCodeWriter.java index e9a90a8fe..d328155b8 100644 --- a/core/src/com/google/zxing/oned/OneDimensionalCodeWriter.java +++ b/core/src/com/google/zxing/oned/OneDimensionalCodeWriter.java @@ -50,7 +50,7 @@ public abstract class OneDimensionalCodeWriter implements Writer { int width, int height, Map hints) throws WriterException { - if (contents.length() == 0) { + if (contents.isEmpty()) { throw new IllegalArgumentException("Found empty contents"); } diff --git a/core/src/com/google/zxing/oned/rss/expanded/decoders/FieldParser.java b/core/src/com/google/zxing/oned/rss/expanded/decoders/FieldParser.java index 2a16271e6..8de540b3d 100644 --- a/core/src/com/google/zxing/oned/rss/expanded/decoders/FieldParser.java +++ b/core/src/com/google/zxing/oned/rss/expanded/decoders/FieldParser.java @@ -191,7 +191,7 @@ final class FieldParser { } static String parseFieldsInGeneralPurpose(String rawInformation) throws NotFoundException{ - if(rawInformation.length() == 0) { + if (rawInformation.isEmpty()) { return null; } diff --git a/core/src/com/google/zxing/qrcode/QRCodeWriter.java b/core/src/com/google/zxing/qrcode/QRCodeWriter.java index 50b78b168..a4fabf406 100644 --- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java +++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java @@ -51,7 +51,7 @@ public final class QRCodeWriter implements Writer { int height, Map hints) throws WriterException { - if (contents.length() == 0) { + if (contents.isEmpty()) { throw new IllegalArgumentException("Found empty contents"); } diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/CalendarEventGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/CalendarEventGenerator.java index cf26bcc1a..1ea5253ff 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/CalendarEventGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/CalendarEventGenerator.java @@ -198,7 +198,7 @@ public final class CalendarEventGenerator implements GeneratorSource { private String getEventNameField() throws GeneratorException { String inputName = eventName.getText(); - if (inputName.length() < 1) { + if (inputName.isEmpty()) { throw new GeneratorException("Event name must be at least 1 character."); } if (inputName.contains("\n")) { @@ -216,7 +216,7 @@ public final class CalendarEventGenerator implements GeneratorSource { private String getLocationField() throws GeneratorException { String locationString = location.getText(); - if (locationString.length() < 1) { + if (locationString.isEmpty()) { return ""; } if (locationString.contains("\n")) { @@ -228,7 +228,7 @@ public final class CalendarEventGenerator implements GeneratorSource { private String getDescriptionField() throws GeneratorException { String descriptionString = description.getText(); - if (descriptionString.length() < 1) { + if (descriptionString.isEmpty()) { return ""; } if (descriptionString.contains("\n")) { diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java index ea9e1b4d2..1e73d6e4a 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java @@ -170,7 +170,7 @@ public final class ContactInfoGenerator implements GeneratorSource { private String getNameField() throws GeneratorException { String input = name.getText(); - if (input.length() < 1) { + if (input.isEmpty()) { throw new GeneratorException("Name must be at least 1 character."); } return input; @@ -186,7 +186,7 @@ public final class ContactInfoGenerator implements GeneratorSource { private String getTelField() throws GeneratorException { String input = Validators.filterNumber(tel.getText()); - if (input.length() < 1) { + if (input.isEmpty()) { return ""; } Validators.validateNumber(input); @@ -206,7 +206,7 @@ public final class ContactInfoGenerator implements GeneratorSource { private String getEmailField() throws GeneratorException { String input = email.getText(); - if (input.length() < 1) { + if (input.isEmpty()) { return ""; } Validators.validateEmail(input); diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/EmailGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/EmailGenerator.java index 240e36322..cdbe50e80 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/EmailGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/EmailGenerator.java @@ -50,7 +50,7 @@ public final class EmailGenerator implements GeneratorSource { private String getEmailField() throws GeneratorException { String input = email.getText(); - if (input.length() < 1) { + if (input.isEmpty()) { throw new GeneratorException("Email must be present."); } Validators.validateEmail(input); diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/GeoLocationGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/GeoLocationGenerator.java index 50f6639c4..fde3228b5 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/GeoLocationGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/GeoLocationGenerator.java @@ -57,7 +57,7 @@ public final class GeoLocationGenerator implements GeneratorSource { @Override public String getText() throws GeneratorException { String que = getQueryField(); - if (que != null && que.length() > 0) { + if (que != null && !que.isEmpty()) { if (getLatitudeField() == null) { latitude.setText("0"); } @@ -68,7 +68,7 @@ public final class GeoLocationGenerator implements GeneratorSource { String lat = getLatitudeField(); String lon = getLongitudeField(); - if (que != null && que.length() > 0) { + if (que != null && !que.isEmpty()) { return "geo:" + lat + ',' + lon + "?q=" + que; } return "geo:" + lat + ',' + lon; diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/PhoneNumberGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/PhoneNumberGenerator.java index 8c0dd41a5..d7b91f491 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/PhoneNumberGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/PhoneNumberGenerator.java @@ -51,7 +51,7 @@ public final class PhoneNumberGenerator implements GeneratorSource { private String getTelField() throws GeneratorException { String input = number.getText(); - if (input.length() < 1) { + if (input.isEmpty()) { throw new GeneratorException("Phone number must be present."); } input = Validators.filterNumber(input); diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/SmsAddressGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/SmsAddressGenerator.java index aa930552e..f2cf15d73 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/SmsAddressGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/SmsAddressGenerator.java @@ -54,7 +54,7 @@ public final class SmsAddressGenerator implements GeneratorSource { String output = inputNumber; // we add the text only if there actually is something in the field. - if (inputMessage.length() > 0) { + if (!inputMessage.isEmpty()) { output += ':' + inputMessage; } @@ -63,7 +63,7 @@ public final class SmsAddressGenerator implements GeneratorSource { private String getTelField() throws GeneratorException { String input = number.getText(); - if (input.length() < 1) { + if (input.isEmpty()) { throw new GeneratorException("Phone number must be present."); } input = Validators.filterNumber(input); diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/TextGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/TextGenerator.java index 1f3718569..35fdec623 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/TextGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/TextGenerator.java @@ -49,7 +49,7 @@ public final class TextGenerator implements GeneratorSource { String getTextField() throws GeneratorException { String input = text.getText(); - if (input.length() == 0) { + if (input.isEmpty()) { throw new GeneratorException("Text should be at least 1 character."); } return input; diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java index 908c2c621..382819e1e 100644 --- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java +++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java @@ -69,7 +69,7 @@ public final class WifiGenerator implements GeneratorSource { StringBuilder output = new StringBuilder(100); output.append("WIFI:"); output.append("S:").append(ssid).append(';'); - if (type != null && type.length() > 0 && !"nopass".equals(type)) { + if (type != null && !type.isEmpty() && !"nopass".equals(type)) { maybeAppend(output, "T:", type); } maybeAppend(output, "P:", password); @@ -81,14 +81,14 @@ public final class WifiGenerator implements GeneratorSource { } private static void maybeAppend(StringBuilder output, String prefix, String value) { - if (value != null && value.length() > 0) { + if (value != null && !value.isEmpty()) { output.append(prefix).append(value).append(';'); } } private static String parseTextField(String name, HasText textBox) throws GeneratorException { String input = textBox.getText(); - if (input.length() < 1) { + if (input.isEmpty()) { return ""; } if (input.contains("\n")) { @@ -99,7 +99,7 @@ public final class WifiGenerator implements GeneratorSource { private String getSsidField() throws GeneratorException { String input = ssid.getText(); - if (input.length() < 1) { + if (input.isEmpty()) { throw new GeneratorException("SSID must be at least 1 character."); } String parsed = parseTextField("SSID", ssid);