From 0e77187eba224e9aeea612cd2492d3c80ff3b923 Mon Sep 17 00:00:00 2001 From: marc Date: Fri, 20 Jun 2014 07:06:54 +0200 Subject: [PATCH] v1.84, push messages --- src/gui/GW2EventerGui.form | 5 ++-- src/gui/GW2EventerGui.java | 48 ++++++++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/gui/GW2EventerGui.form b/src/gui/GW2EventerGui.form index e820413..ef994e7 100644 --- a/src/gui/GW2EventerGui.form +++ b/src/gui/GW2EventerGui.form @@ -332,13 +332,12 @@ - + - - + diff --git a/src/gui/GW2EventerGui.java b/src/gui/GW2EventerGui.java index 1a3cfbf..19112fe 100644 --- a/src/gui/GW2EventerGui.java +++ b/src/gui/GW2EventerGui.java @@ -227,7 +227,7 @@ public class GW2EventerGui extends javax.swing.JFrame { public static final int EVENT_COUNT = 23; - public static final String VERSION = "1.83"; + public static final String VERSION = "1.84"; private JButton workingButton; private JCheckBox refreshSelector; @@ -443,7 +443,7 @@ public void mousePressed(java.awt.event.MouseEvent evt) { this.preventSleepMode(); this.runUpdateService(); - //this.runPushService(); + this.runPushService(); this.runTips(); //this.runTest(); } @@ -613,7 +613,7 @@ private void initComponents() { jLabelNewVersion = new javax.swing.JLabel(); jLabelWorking = new javax.swing.JLabel(); jLabelServer = new javax.swing.JLabel(); - labelMapDate = new javax.swing.JLabel(); + labelPushMessage = new javax.swing.JLabel(); labelEvent1 = new javax.swing.JLabel(); labelEvent2 = new javax.swing.JLabel(); labelEvent3 = new javax.swing.JLabel(); @@ -851,10 +851,9 @@ public void mousePressed(java.awt.event.MouseEvent evt) { jLabelServer.setEnabled(false); jPanel4.add(jLabelServer, new org.netbeans.lib.awtextra.AbsoluteConstraints(1090, 690, 170, -1)); - labelMapDate.setForeground(new java.awt.Color(204, 204, 204)); - labelMapDate.setText("Event Patch
17.06.2014"); - labelMapDate.setToolTipText("Event data from 17.06.2014"); - jPanel4.add(labelMapDate, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 680, -1, -1)); + labelPushMessage.setForeground(new java.awt.Color(204, 204, 204)); + labelPushMessage.setToolTipText(""); + jPanel4.add(labelPushMessage, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 680, -1, -1)); labelEvent1.setFont(new java.awt.Font("Tahoma", 1, 24)); // NOI18N labelEvent1.setForeground(new java.awt.Color(255, 51, 0)); @@ -1561,7 +1560,7 @@ private void runPushService() { RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(10 * 1000).build(); HttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build(); - HttpGet request = new HttpGet("http://gw2eventer.sourceforge.net/gw2/push"); + HttpGet request = new HttpGet("http://gw2eventer.sourceforge.net/push/"); HttpResponse response; @@ -1578,12 +1577,6 @@ private void runPushService() { try { - try { - Thread.sleep(60000 * 33); - } catch (InterruptedException ex) { - Logger.getLogger(GW2EventerGui.class.getName()).log(Level.SEVERE, null, ex); - } - response = client.execute(request); if (response.getStatusLine().toString().contains("200")) { @@ -1620,7 +1613,7 @@ private void runPushService() { } if (!date.equals("") && enabled.equals("true")) { - + try { Date dateData = new Date(Long.parseLong(date)); @@ -1629,11 +1622,14 @@ private void runPushService() { if (!dateData.equals(getLastPushDate())) { setLastPushDate(dateData); - showPushGui(title, message, 100); + //showPushGui(title, message, 100); + setPushMessage(title, message); } } catch (java.lang.NumberFormatException ex) { // } + } else { + clearPushMessage(); } } catch (ParseException ex) { @@ -1643,6 +1639,12 @@ private void runPushService() { request.releaseConnection(); //this.interrupt(); + + try { + Thread.sleep(60000 * 5); + } catch (InterruptedException ex) { + Logger.getLogger(GW2EventerGui.class.getName()).log(Level.SEVERE, null, ex); + } } else { try { request.releaseConnection(); @@ -1827,6 +1829,18 @@ private void showPushGui(String title, String content, int height) { this.pushGui.setVisible(true); } + private void setPushMessage(String title, String message) { + + this.labelPushMessage.setText("" + title + "
" + message + ""); + this.labelPushMessage.setToolTipText(message); + } + + private void clearPushMessage() { + + this.labelPushMessage.setText(""); + this.labelPushMessage.setToolTipText(""); + } + private void showFeedbackGui() { this.feedbackGui.setLocationRelativeTo(this); @@ -1963,7 +1977,7 @@ public void run() { private javax.swing.JLabel labelEvent7; private javax.swing.JLabel labelEvent8; private javax.swing.JLabel labelEvent9; - private javax.swing.JLabel labelMapDate; + private javax.swing.JLabel labelPushMessage; private javax.swing.JLabel labelTimer1; private javax.swing.JLabel labelTimer10; private javax.swing.JLabel labelTimer11;