From 9668fe889eb407e5fe05e61d1d4f87af8e96693a Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Tue, 13 Nov 2018 16:20:19 +0100 Subject: [PATCH] Rename and Bug Fixes --- .../java/de/sebse/fuplanner/services/KVV/Modules.java | 2 +- .../fuplanner/services/KVV/ModulesAnnouncements.java | 2 +- .../sebse/fuplanner/services/KVV/ModulesAssignments.java | 2 +- .../de/sebse/fuplanner/services/KVV/ModulesDetails.java | 6 +++--- .../de/sebse/fuplanner/services/KVV/ModulesEvents.java | 2 +- .../sebse/fuplanner/services/KVV/ModulesGradebook.java | 2 +- .../de/sebse/fuplanner/services/KVV/ModulesList.java | 4 ++-- .../sebse/fuplanner/services/KVV/ModulesResources.java | 2 +- .../services/KVV/{ModulesPart.java => PartModules.java} | 9 ++++++--- 9 files changed, 17 insertions(+), 14 deletions(-) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{ModulesPart.java => PartModules.java} (88%) diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java index 50d67ba..eba21a5 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java @@ -22,7 +22,7 @@ public class Modules { @NotNull public ModulesDetails details() { return (ModulesDetails) addAndGet("details", () -> { - ModulesPart[] parts = {announcements(), assignments(), events(), gradebook(), resources()}; + PartModules[] parts = {announcements(), assignments(), events(), gradebook(), resources()}; return new ModulesDetails(mLogin, list(), context, parts); }); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java index 72adc75..b13df13 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java @@ -14,7 +14,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class ModulesAnnouncements extends ModulesPart> { +public class ModulesAnnouncements extends PartModules> { ModulesAnnouncements(Login login, ModulesList list, Context context) { super(login, list, context); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java index 93d3aa2..357be2c 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java @@ -15,7 +15,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class ModulesAssignments extends ModulesPart { +public class ModulesAssignments extends PartModules { ModulesAssignments(Login login, ModulesList list, Context context) { super(login, list, context); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java index 9ae2559..a08fda4 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java @@ -11,9 +11,9 @@ import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; final public class ModulesDetails extends Part> { - private final ModulesPart[] parts; + private final PartModules[] parts; - ModulesDetails(Login login, ModulesList list, Context context, ModulesPart[] parts) { + ModulesDetails(Login login, ModulesList list, Context context, PartModules[] parts) { super(login, list, context); this.parts = parts; } @@ -40,7 +40,7 @@ final public class ModulesDetails extends Part> { errorCallback.onError(lastError.get()); } }; - for (ModulesPart part: parts) { + for (PartModules part: parts) { part.recv(module, successCb, errorCb, forceRefresh, RETRY_COUNT); } } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java index 50617f9..66ba5c1 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java @@ -13,7 +13,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class ModulesEvents extends ModulesPart { +public class ModulesEvents extends PartModules { ModulesEvents(Login login, ModulesList list, Context context) { super(login, list, context); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java index 4784a91..d346289 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java @@ -14,7 +14,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class ModulesGradebook extends ModulesPart> { +public class ModulesGradebook extends PartModules> { ModulesGradebook(Login login, ModulesList list, Context context) { super(login, list, context); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java index ddc1e91..bd98552 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java @@ -21,7 +21,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -import static de.sebse.fuplanner.services.KVV.ModulesPart.RETRY_COUNT; +import static de.sebse.fuplanner.services.KVV.PartModules.RETRY_COUNT; public class ModulesList extends HTTPService { private final Login mLogin; @@ -172,7 +172,7 @@ public class ModulesList extends HTTPService { } String type = site.getJSONObject("props").optString("kvv_coursetype", null); String description = site.optString("description", ""); - description = String.valueOf(ModulesPart.fromHtml(description)); + description = String.valueOf(PartModules.fromHtml(description)); String id = site.getString("id"); modules.addModule(semester, lvNumbers, title, lecturers, type, description, id); } catch (JSONException e) { diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java index 2c0545a..f26869c 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java @@ -18,7 +18,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class ModulesResources extends ModulesPart> { +public class ModulesResources extends PartModules> { ModulesResources(Login login, ModulesList list, Context context) { super(login, list, context); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java similarity index 88% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java index 81f13c6..64cb4b8 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java @@ -10,10 +10,10 @@ import de.sebse.fuplanner.tools.NewAsyncQueue; import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -abstract class ModulesPart extends Part { +abstract class PartModules extends Part { private NewAsyncQueue mQueue = new NewAsyncQueue(); - ModulesPart(Login login, ModulesList list, Context context) { + PartModules(Login login, ModulesList list, Context context) { super(login, list, context); } @@ -36,7 +36,10 @@ abstract class ModulesPart extends Part { mLogin.refreshLogin(success -> { recv(module, callback, errorCallback, forceRefresh, retries-1); mQueue.next(); - }, errorCallback); + }, error2 -> { + errorCallback.onError(error2); + mQueue.next(); + }); return; } errorCallback.onError(error);