github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 11:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Some minor code clear up.

Browse source
This commit is contained in:
LevelX2 2020-01-10 15:52:47 +01:00
parent eded48648f
commit fe2e9389f2
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.java
View file

@ -23,17 +23,17 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.net.*; import java.net.*;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Scanner; import java.util.Scanner;
import java.util.concurrent.TimeUnit;
/** /**
* @author JayDi85 * @author JayDi85
*/ */
public class WhatsNewDialog extends MageDialog { public class WhatsNewDialog extends MageDialog {
private static final Logger logger = Logger.getLogger(WhatsNewDialog.class); private static final Logger LOGGER = Logger.getLogger(WhatsNewDialog.class);
private static final MageVersion clientVersion = new MageVersion(WhatsNewDialog.class); private static final MageVersion CLIENT_VERSION = new MageVersion(WhatsNewDialog.class);
// cookies tester: http://www.html-kit.com/tools/cookietester/ // cookies tester: http://www.html-kit.com/tools/cookietester/
private static final String WHATS_NEW_PAGE = "https://jaydi85.github.io/xmage-web-news/news.html"; private static final String WHATS_NEW_PAGE = "https://jaydi85.github.io/xmage-web-news/news.html";
@ -52,15 +52,15 @@ public class WhatsNewDialog extends MageDialog {
int maxWait = WHATS_NEW_LOAD_TIMEOUT_SECS; int maxWait = WHATS_NEW_LOAD_TIMEOUT_SECS;
int currentWait = 0; int currentWait = 0;
while (!isPageReady) { while (!isPageReady) {
Thread.sleep(1000); TimeUnit.SECONDS.sleep(1);
currentWait++; currentWait++;
if (currentWait > maxWait) { if (currentWait > maxWait) {
logger.error("Can't load news page: " + WHATS_NEW_PAGE); LOGGER.error("Can't load news page: " + WHATS_NEW_PAGE);
break; break;
} }
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
logger.error("Checking news was interrupted", e); LOGGER.error("Checking news was interrupted", e);
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
return null; return null;
@ -68,12 +68,9 @@ public class WhatsNewDialog extends MageDialog {
@Override @Override
public void done() { public void done() {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(() -> {
@Override if (isPageReady) {
public void run() { showDialog();
if (isPageReady) {
showDialog();
}
} }
}); });
} }
@ -98,9 +95,9 @@ public class WhatsNewDialog extends MageDialog {
newVersion = result.substring("version=".length()); newVersion = result.substring("version=".length());
} }
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
logger.error("Checking updates got wrong url " + WHATS_NEW_VERSION_PAGE, e); LOGGER.error("Checking updates got wrong url " + WHATS_NEW_VERSION_PAGE, e);
} catch (IOException e) { } catch (IOException e) {
logger.error("Checking updates got error", e); LOGGER.error("Checking updates got error", e);
} }
return null; return null;
} }
@ -179,7 +176,7 @@ public class WhatsNewDialog extends MageDialog {
* Store cookies in preferences * Store cookies in preferences
*/ */
private class PersistentCookieStore implements CookieStore, Runnable { private class PersistentCookieStore implements CookieStore, Runnable {
private CookieStore store; private final CookieStore store;
public PersistentCookieStore() { public PersistentCookieStore() {
store = new CookieManager().getCookieStore(); store = new CookieManager().getCookieStore();
@ -195,7 +192,7 @@ public class WhatsNewDialog extends MageDialog {
String sourceValue = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEWS_PAGE_COOKIES, ""); String sourceValue = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEWS_PAGE_COOKIES, "");
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
List<HttpCookie> httpCookies = new ArrayList<>(); List<HttpCookie> httpCookies;
Type type = new TypeToken<List<HttpCookie>>() { Type type = new TypeToken<List<HttpCookie>>() {
}.getType(); }.getType();
try { try {
@ -206,7 +203,7 @@ public class WhatsNewDialog extends MageDialog {
} }
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("Wrong news page cookies", e); LOGGER.error("Wrong news page cookies", e);
} }
} }
@ -264,7 +261,7 @@ public class WhatsNewDialog extends MageDialog {
webView = new WebView(); webView = new WebView();
engine = webView.getEngine(); engine = webView.getEngine();
engine.setUserAgent(engine.getUserAgent() + " XMage/" + clientVersion.toString(false)); engine.setUserAgent(engine.getUserAgent() + " XMage/" + CLIENT_VERSION.toString(false));
webView.contextMenuEnabledProperty().setValue(false); webView.contextMenuEnabledProperty().setValue(false);
CookieManager cookieManager = new CookieManager(new PersistentCookieStore(), CookiePolicy.ACCEPT_ALL); CookieManager cookieManager = new CookieManager(new PersistentCookieStore(), CookiePolicy.ACCEPT_ALL);
@ -272,12 +269,13 @@ public class WhatsNewDialog extends MageDialog {
// on error // on error
engine.getLoadWorker().exceptionProperty().addListener(new ChangeListener<Throwable>() { engine.getLoadWorker().exceptionProperty().addListener(new ChangeListener<Throwable>() {
@Override
public void changed(ObservableValue<? extends Throwable> o, Throwable old, final Throwable value) { public void changed(ObservableValue<? extends Throwable> o, Throwable old, final Throwable value) {
if (engine.getLoadWorker().getState() == Worker.State.FAILED) { if (engine.getLoadWorker().getState() == Worker.State.FAILED) {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
logger.error("Can't load news page: " + (value != null ? value.getMessage() : "null"), value); LOGGER.error("Can't load news page: " + (value != null ? value.getMessage() : "null"), value);
} }
}); });
} }
@ -286,12 +284,14 @@ public class WhatsNewDialog extends MageDialog {
// on completed // on completed
engine.getLoadWorker().stateProperty().addListener(new ChangeListener<Worker.State>() { engine.getLoadWorker().stateProperty().addListener(new ChangeListener<Worker.State>() {
@Override
public void changed(ObservableValue ov, Worker.State oldState, Worker.State newState) { public void changed(ObservableValue ov, Worker.State oldState, Worker.State newState) {
if (newState == Worker.State.SUCCEEDED) { if (newState == Worker.State.SUCCEEDED) {
// 1. replace urls with custom click processing // 1. replace urls with custom click processing
// all classes from org.w3c.dom // all classes from org.w3c.dom
org.w3c.dom.events.EventListener listener = new EventListener() { org.w3c.dom.events.EventListener listener = new EventListener() {
@Override
public void handleEvent(org.w3c.dom.events.Event ev) { public void handleEvent(org.w3c.dom.events.Event ev) {
String href = ((org.w3c.dom.Element) ev.getTarget()).getAttribute("href"); String href = ((org.w3c.dom.Element) ev.getTarget()).getAttribute("href");
ev.preventDefault(); ev.preventDefault();