Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-18 01:31:01 +02:00
Code Issues Projects Releases Wiki Activity

[Debt] Removed MiscUtils.getPlanVersion() method.

Browse Source 
This method was dependent on PlanPlugin.getInstance() which is being
removed.
Also removed use of Settings in MiscUtils.close methods.

Affected issues: none
This commit is contained in:
Rsl1122 2018-09-18 15:39:50 +03:00
parent 54e3528a59
commit bff365de20
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/src/main/java/com/djrapitops/plan/system/webserver/response/errors/ErrorResponse.java
View File

@ -5,7 +5,6 @@
package com.djrapitops.plan.system.webserver.response.errors; package com.djrapitops.plan.system.webserver.response.errors;
import com.djrapitops.plan.system.webserver.response.Response; import com.djrapitops.plan.system.webserver.response.Response;
import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plan.utilities.file.FileUtil;
import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler; import com.djrapitops.plugin.logging.error.ErrorHandler;
@ -26,6 +25,7 @@ public class ErrorResponse extends Response {
private String paragraph; private String paragraph;
// TODO // TODO
private String version;
private ErrorHandler errorHandler; private ErrorHandler errorHandler;
public ErrorResponse() { public ErrorResponse() {
@ -42,7 +42,7 @@ public class ErrorResponse extends Response {
String[] split = title.split(">", 3); String[] split = title.split(">", 3);
placeHolders.put("titleText", split.length == 3 ? split[2] : title); placeHolders.put("titleText", split.length == 3 ? split[2] : title);
placeHolders.put("paragraph", paragraph); placeHolders.put("paragraph", paragraph);
placeHolders.put("version", MiscUtils.getPlanVersion()); placeHolders.put("version", version);
setContent(StringSubstitutor.replace(getContent(), placeHolders)); setContent(StringSubstitutor.replace(getContent(), placeHolders));
} }

21
Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java
View File

@ -1,10 +1,8 @@
package com.djrapitops.plan.utilities; package com.djrapitops.plan.utilities;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.system.settings.Permissions; import com.djrapitops.plan.system.settings.Permissions;
import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.command.CommandUtils; import com.djrapitops.plugin.command.CommandUtils;
import com.djrapitops.plugin.command.ISender; import com.djrapitops.plugin.command.ISender;
@ -78,11 +76,8 @@ public class MiscUtils {
if (c != null) { if (c != null) {
try { try {
c.close(); c.close();
} catch (IOException e) { } catch (IOException ignored) {
if (Settings.DEV_MODE.isTrue()) { // Closing exceptions are ignored.
Log.warn("THIS ERROR IS ONLY LOGGED IN DEV MODE:");
Log.toLog(MiscUtils.class, e);
}
} }
} }
} }
@ -93,18 +88,10 @@ public class MiscUtils {
if (c != null) { if (c != null) {
try { try {
c.close(); c.close();
} catch (Exception e) { } catch (Exception ignore) {
if (Settings.DEV_MODE.isTrue()) { // Closing exceptions are ignored.
Log.warn("THIS ERROR IS ONLY LOGGED IN DEV MODE:");
Log.toLog(MiscUtils.class, e);
} }
} }
} }
} }
} }
@Deprecated
public static String getPlanVersion() {
return PlanPlugin.getInstance().getVersion();
}
}

6
Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java
View File

@ -46,6 +46,8 @@ public class InspectPage implements Page {
private final PlayerContainer player; private final PlayerContainer player;
private final Map<UUID, String> serverNames; private final Map<UUID, String> serverNames;
private final String version;
private final PlanConfig config; private final PlanConfig config;
private final Theme theme; private final Theme theme;
private final Graphs graphs; private final Graphs graphs;
@ -60,6 +62,7 @@ public class InspectPage implements Page {
InspectPage( InspectPage(
PlayerContainer player, Map<UUID, String> serverNames, PlayerContainer player, Map<UUID, String> serverNames,
String version,
PlanConfig config, PlanConfig config,
Theme theme, Theme theme,
Graphs graphs, Graphs graphs,
@ -70,6 +73,7 @@ public class InspectPage implements Page {
) { ) {
this.player = player; this.player = player;
this.serverNames = serverNames; this.serverNames = serverNames;
this.version = version;
this.config = config; this.config = config;
this.theme = theme; this.theme = theme;
this.graphs = graphs; this.graphs = graphs;
@ -107,7 +111,7 @@ public class InspectPage implements Page {
PlaceholderReplacer replacer = new PlaceholderReplacer(); PlaceholderReplacer replacer = new PlaceholderReplacer();
replacer.put("refresh", clockLongFormatter.apply(now)); replacer.put("refresh", clockLongFormatter.apply(now));
replacer.put("version", MiscUtils.getPlanVersion()); replacer.put("version", version);
replacer.put("timeZone", MiscUtils.getTimeZoneOffsetHours()); replacer.put("timeZone", MiscUtils.getTimeZoneOffsetHours());
boolean online = false; boolean online = false;

4
Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java
View File

@ -94,7 +94,9 @@ public class PageFactory {
Map<UUID, String> serverNames = database.get().fetch().getServerNames(); Map<UUID, String> serverNames = database.get().fetch().getServerNames();
return new InspectPage( return new InspectPage(
player, serverNames, player, serverNames,
config.get(), theme.get(), graphs.get(), tables.get(), formatters.get(), serverInfo.get(), timings.get() version,
config.get(), theme.get(), graphs.get(), tables.get(), formatters.get(),
serverInfo.get(), timings.get()
); );
} }