diff options
author | Bananeweizen <bananeweizen@gmx.de> | 2015-04-28 18:43:52 +0200 |
---|---|---|
committer | Bananeweizen <bananeweizen@gmx.de> | 2015-04-28 18:43:52 +0200 |
commit | 7d9e257ea008836b2c3f1506300de2dffdbe8396 (patch) | |
tree | d1cd16741f9fd4f40f25b6e4e627b9b451b23694 | |
parent | b2e3848ae19490bf58caf6db3987601901f22489 (diff) | |
download | cgeo-7d9e257ea008836b2c3f1506300de2dffdbe8396.zip cgeo-7d9e257ea008836b2c3f1506300de2dffdbe8396.tar.gz cgeo-7d9e257ea008836b2c3f1506300de2dffdbe8396.tar.bz2 |
refactoring: use primitive types
4 files changed, 10 insertions, 9 deletions
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java index d728af6..ef4153d 100644 --- a/main/src/cgeo/geocaching/Geocache.java +++ b/main/src/cgeo/geocaching/Geocache.java @@ -1006,8 +1006,8 @@ public class Geocache implements IWaypoint { final Iterator<Trackable> iterator = inventory.iterator(); while (iterator.hasNext()) { final Trackable trackable = iterator.next(); - Boolean removeTrackable = true; - Boolean hasBrand = false; + boolean removeTrackable = true; + boolean hasBrand = false; for (final Trackable newTrackable : newTrackables) { if (trackable.getBrand() == newTrackable.getBrand()) { hasBrand = true; @@ -1039,7 +1039,7 @@ public class Geocache implements IWaypoint { if (inventory == null) { inventory = new ArrayList<>(); } - Boolean foundTrackable = false; + boolean foundTrackable = false; for (final Trackable trackable: inventory) { if (trackable.getUniqueID().equals(newTrackable.getUniqueID())) { // Trackable already present, merge data diff --git a/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java b/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java index 9765f5d..ba984d8 100644 --- a/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java +++ b/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java @@ -43,7 +43,7 @@ public class GeokretyParser { private static final SynchronizedDateFormat DATE_FORMAT = new SynchronizedDateFormat("yyyy-MM-dd kk:mm:ss", TimeZone.getTimeZone("UTC"), Locale.US); private final List<Trackable> trackables = new ArrayList<>(); private Trackable trackable; - private Boolean isMessage = false; + private boolean isMessage = false; private String content; @NonNull diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index ca386db..edc30cd 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -1028,18 +1028,19 @@ public class Settings { } /** - * @return true if plain textlog wanted + * @return true if plain text log wanted */ public static boolean getPlainLogs() { return getBoolean(R.string.pref_plainLogs, false); } /** - * Force set the plain textlog preference + * Force set the plain text log preference * - * @param plainLogs wanted or not + * @param plainLogs + * wanted or not */ - public static void setPlainLogs(final Boolean plainLogs) { + public static void setPlainLogs(final boolean plainLogs) { putBoolean(R.string.pref_plainLogs, plainLogs); } diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java index 51a3ed8..9ab21f4 100644 --- a/main/src/cgeo/geocaching/settings/SettingsActivity.java +++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java @@ -460,7 +460,7 @@ public class SettingsActivity extends PreferenceActivity { getPreference(R.string.pref_lowpowermode).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(final Preference preference, final Object newValue) { - final Boolean useLowPower = (Boolean) newValue; + final boolean useLowPower = ((Boolean) newValue).booleanValue(); sensors.setupGeoDataObservables(Settings.useGooglePlayServices(), useLowPower); sensors.setupDirectionObservable(useLowPower); return true; |