From 15205a1abf58aaa9fd71f173c47533c9fec6decf Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Mon, 24 Nov 2014 16:41:43 +0100 Subject: Remove redundant cache parameter A logging manager is already conceptually tied to a particular cache. There is no need to repeat the same parameter when calling postLog(). --- main/src/cgeo/geocaching/LogCacheActivity.java | 2 +- main/src/cgeo/geocaching/connector/ILoggingManager.java | 13 +++++-------- main/src/cgeo/geocaching/connector/NoLoggingManager.java | 2 +- main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java | 2 +- main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java | 2 +- .../cgeo/geocaching/connector/oc/OkapiLoggingManager.java | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java index 4c25679..3ad6101 100644 --- a/main/src/cgeo/geocaching/LogCacheActivity.java +++ b/main/src/cgeo/geocaching/LogCacheActivity.java @@ -420,7 +420,7 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia final String log = logTexts[0]; final String logPwd = logTexts.length > 1 ? logTexts[1] : null; try { - final LogResult logResult = loggingManager.postLog(cache, typeSelected, date, log, logPwd, trackables); + final LogResult logResult = loggingManager.postLog(typeSelected, date, log, logPwd, trackables); if (logResult.getPostLogResult() == StatusCode.NO_ERROR) { // update geocache in DB diff --git a/main/src/cgeo/geocaching/connector/ILoggingManager.java b/main/src/cgeo/geocaching/connector/ILoggingManager.java index c5586b3..a8caf69 100644 --- a/main/src/cgeo/geocaching/connector/ILoggingManager.java +++ b/main/src/cgeo/geocaching/connector/ILoggingManager.java @@ -1,6 +1,5 @@ package cgeo.geocaching.connector; -import cgeo.geocaching.Geocache; import cgeo.geocaching.TrackableLog; import cgeo.geocaching.enumerations.LogType; @@ -14,7 +13,6 @@ public interface ILoggingManager { /** * Post a log for a cache online * - * @param cache * @param logType * @param date * @param log @@ -23,12 +21,11 @@ public interface ILoggingManager { * @param trackableLogs * @return */ - LogResult postLog(Geocache cache, - LogType logType, - Calendar date, - String log, - String logPassword, - List trackableLogs); + LogResult postLog(LogType logType, + Calendar date, + String log, + String logPassword, + List trackableLogs); ImageResult postLogImage(String logId, String imageCaption, diff --git a/main/src/cgeo/geocaching/connector/NoLoggingManager.java b/main/src/cgeo/geocaching/connector/NoLoggingManager.java index afec2e9..54d5a10 100644 --- a/main/src/cgeo/geocaching/connector/NoLoggingManager.java +++ b/main/src/cgeo/geocaching/connector/NoLoggingManager.java @@ -19,7 +19,7 @@ class NoLoggingManager extends AbstractLoggingManager { } @Override - public LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { + public LogResult postLog(final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { return new LogResult(StatusCode.LOG_POST_ERROR, ""); } diff --git a/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java b/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java index cbeaf67..f380a6b 100644 --- a/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java +++ b/main/src/cgeo/geocaching/connector/ec/ECLoggingManager.java @@ -31,7 +31,7 @@ class ECLoggingManager extends AbstractLoggingManager { } @Override - public final LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { + public final LogResult postLog(final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { return ECApi.postLog(cache, logType, date, log); } diff --git a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java index ffb4325..057d97b 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java +++ b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java @@ -92,7 +92,7 @@ class GCLoggingManager extends AbstractLoggingManager implements LoaderManager.L } @Override - public LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { + public LogResult postLog(final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { try { final ImmutablePair postResult = GCParser.postLog(cache.getGeocode(), cache.getCacheId(), viewstates, logType, diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java index 51c8a7e..75bc987 100644 --- a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java +++ b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java @@ -37,7 +37,7 @@ public class OkapiLoggingManager extends AbstractLoggingManager { } @Override - public final LogResult postLog(final Geocache cache, final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { + public final LogResult postLog(final LogType logType, final Calendar date, final String log, final String logPassword, final List trackableLogs) { final LogResult result = OkapiClient.postLog(cache, logType, date, log, logPassword, connector); connector.login(null, null); return result; -- cgit v1.1