From 51e0f37a1448a1f445c52a24f0cf8aab32d946ec Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 28 Oct 2024 20:10:33 +0800 Subject: [PATCH] update constant name --- .../screens/home/settings/CSubmenuDownloaders.java | 4 ++-- .../src/main/java/forge/view/FTitleBarBase.java | 4 ++-- .../src/forge/assets/AssetsDownloader.java | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java index 62edd9c1b0f..1814e18bc49 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java @@ -20,7 +20,7 @@ import forge.util.RSSReader; import java.util.concurrent.CompletableFuture; -import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_URL_ATOM; +import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM; /** * Controls the utilities submenu in the home UI. @@ -33,7 +33,7 @@ public enum CSubmenuDownloaders implements ICDoc { SINGLETON_INSTANCE; private final UiCommand cmdLicensing = VSubmenuDownloaders.SINGLETON_INSTANCE::showLicensing; - private final UiCommand cmdCheckForUpdates = () -> new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_URL_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp()))); + private final UiCommand cmdCheckForUpdates = () -> new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp()))); private final UiCommand cmdPicDownload = () -> new GuiDownloader(new GuiDownloadPicturesLQ()).show(); private final UiCommand cmdPicDownloadHQ = () -> new GuiDownloader(new GuiDownloadPicturesHQ()).show(); diff --git a/forge-gui-desktop/src/main/java/forge/view/FTitleBarBase.java b/forge-gui-desktop/src/main/java/forge/view/FTitleBarBase.java index 60ed4bc7c47..109a569531d 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FTitleBarBase.java +++ b/forge-gui-desktop/src/main/java/forge/view/FTitleBarBase.java @@ -28,7 +28,7 @@ import forge.toolbox.FSkin.SkinnedMenuBar; import forge.util.Localizer; import forge.util.RSSReader; -import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_URL_ATOM; +import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM; @SuppressWarnings("serial") public abstract class FTitleBarBase extends SkinnedMenuBar { @@ -438,7 +438,7 @@ public abstract class FTitleBarBase extends SkinnedMenuBar { protected void onClick() { if (!displayText.isEmpty()) { try { - new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_URL_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp()))); + new AutoUpdater(false).attemptToUpdate(CompletableFuture.supplyAsync(() -> RSSReader.getCommitLog(GITHUB_COMMITS_ATOM, FControl.instance.getBuildTimeStamp(), FControl.instance.getSnapsTimestamp()))); } catch (Exception e) { e.printStackTrace(); } diff --git a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java index 3c63a46f87e..40bdd32fd33 100644 --- a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java +++ b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java @@ -24,9 +24,9 @@ import static forge.localinstance.properties.ForgeConstants.ADV_TEXTURE_BG_FILE; import static forge.localinstance.properties.ForgeConstants.ASSETS_DIR; import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; import static forge.localinstance.properties.ForgeConstants.DEFAULT_SKINS_DIR; -import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_URL_ATOM; +import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM; import static forge.localinstance.properties.ForgeConstants.GITHUB_FORGE_URL; -import static forge.localinstance.properties.ForgeConstants.GITHUB_RELEASES_URL_ATOM; +import static forge.localinstance.properties.ForgeConstants.GITHUB_RELEASES_ATOM; import static forge.localinstance.properties.ForgeConstants.RELEASE_URL; import static forge.localinstance.properties.ForgeConstants.RES_DIR; @@ -68,7 +68,7 @@ public class AssetsDownloader { boolean connectedToInternet = Forge.getDeviceAdapter().isConnectedToInternet(); if (connectedToInternet) { //currently for desktop/mobile-dev release on github - final String releaseTag = Forge.getDeviceAdapter().getReleaseTag(GITHUB_RELEASES_URL_ATOM); + final String releaseTag = Forge.getDeviceAdapter().getReleaseTag(GITHUB_RELEASES_ATOM); try { URL versionUrl = new URL(versionText); String version = ""; @@ -117,7 +117,7 @@ public class AssetsDownloader { message += " If so, you may want to connect to wifi first. The download is around " + (GuiBase.isAndroid() ? apkSize : packageSize) + "."; } if (!GuiBase.isAndroid()) { - message += Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_URL_ATOM, null, null); + message += Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_ATOM, null, null); } //failed to grab latest github tag if (!isSnapshots && releaseTag.isEmpty()) { @@ -210,7 +210,7 @@ public class AssetsDownloader { } mandatory = true; build += "\nInstalled resources date:\n" + target + "\n"; - log = Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_URL_ATOM, buildDate, snapsTimestamp); + log = Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_ATOM, buildDate, snapsTimestamp); } catch (Exception e) { e.printStackTrace(); }