TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-19 09:54:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed not needed singleton

Browse Source
This commit is contained in:
hneemann 2018-01-02 14:39:15 +01:00
parent f903835877
commit 375dd750b0
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/gui/Main.java
View File

@ -1573,7 +1573,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
}
main.setVisible(true);
CheckForNewRelease.getInstance().showReleaseDialog(main);
CheckForNewRelease.showReleaseDialog(main);
});
}

34
src/main/java/de/neemann/digital/gui/release/CheckForNewRelease.java
View File

@ -13,33 +13,21 @@ import java.util.prefs.Preferences;
*/
public final class CheckForNewRelease {
private static class InstanceHolder {
private static final CheckForNewRelease INSTANCE = new CheckForNewRelease();
}
/**
* @return the instance
*/
public static CheckForNewRelease getInstance() {
return InstanceHolder.INSTANCE;
}
private static final long ADAY = 24L * 60 * 60 * 1000;
private static final String PREF_LAST = "last";
private static final String PREF_ASKED = "asked";
private static final Preferences PREFS = Preferences.userRoot().node("dig").node("rev");
private String latestRev;
private CheckForNewRelease() {
}
/**
* Returns true if there is a new release.
* Connects the server only once a day and returns true only once for every new release.
* Connects the server only once a day and calls the interface method only
* once for every new release.
*
* @param runnable started if there is a new release!
* @param anInterface started if there is a new release!
*/
private void startIfNewRelease(Runnable runnable) {
static private void startIfNewRelease(Interface anInterface) {
long lastAsked = PREFS.getLong(PREF_LAST, -1);
long time = System.currentTimeMillis();
if (time - lastAsked < ADAY) return;
@ -51,7 +39,7 @@ public final class CheckForNewRelease {
try {
ReleaseInfo info = new ReleaseInfo();
latestRev = info.getVersion();
String latestRev = info.getVersion();
if (latestRev != null) {
String asked = PREFS.get(PREF_ASKED, "none");
@ -64,7 +52,7 @@ public final class CheckForNewRelease {
if (runningRev.equals(latestRev))
return;
SwingUtilities.invokeLater(runnable);
SwingUtilities.invokeLater(() -> anInterface.showMessage(latestRev));
}
} catch (IOException e) {
e.printStackTrace();
@ -75,15 +63,19 @@ public final class CheckForNewRelease {
}
/**
* Shows a new release pop up
* Shows a new release pop up in necessary
*
* @param parent the parent window
*/
public void showReleaseDialog(Component parent) {
startIfNewRelease(() -> {
static public void showReleaseDialog(Component parent) {
startIfNewRelease((latestRev) -> {
String msg = Lang.get("msg_newRelease_N", latestRev);
InfoDialog.showInfo(parent, msg, "");
});
}
private interface Interface {
void showMessage(String latest);
}
}

2
src/main/resources/lang/lang_de.xml
View File

@ -1288,7 +1288,7 @@ eine &lt;a href=&quot;https://github.com/hneemann/Digital/issues/new?labels=enha
<string name="msg_newRelease_N"><![CDATA[
<html>
<h1>Neue Version {0} Verfügbar</h1>
<h1>Neue Version {0} verfügbar</h1>
<p>Es ist eine neue Version des Simulators verfügbar.</p>
<p>In den <a href="https://github.com/hneemann/Digital/releases/latest">Release Notes</a>
können Sie nachlesen, was sich in der Version {0} verändert hat.</p>