From c75649436079b010634473a34e387b37d1c69d88 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 15 Sep 2014 15:55:42 +0200
Subject: [client] News class for getting news from the satellite

---
 .../src/main/java/gui/intro/MainMenue_GUI.java          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 1c41ed1f..529dfe9f 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -19,8 +19,13 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashMap;
 
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
@@ -41,12 +46,22 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.xml.sax.SAXException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 import models.ImageRights;
 import models.Links;
 import models.SessionData;
 import models.person;
 import util.GuiOrganizer;
+import util.News;
 import util.ResourceLoader;
 import util.OpenLinks;
 
@@ -253,7 +268,7 @@ public class MainMenue_GUI extends JFrame {
 		txtNews.setBackground(SystemColor.menu);
 		txtNews.setWrapStyleWord(true);
 		txtNews.setLineWrap(true);
-		txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten und sind HS-spezifisch.");
+		txtNews.setText(News.getContent());
 		scrollPaneNews.add(txtNews);
 		panelNews.add(scrollPaneNews);
 
-- 
cgit v1.2.3-55-g7522


From 689b594498dc48972cab218ae8bd6b0c330a53d2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 15 Sep 2014 17:11:20 +0200
Subject: [client] only set news if not null

---
 dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 529dfe9f..87a656f6 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -268,7 +268,7 @@ public class MainMenue_GUI extends JFrame {
 		txtNews.setBackground(SystemColor.menu);
 		txtNews.setWrapStyleWord(true);
 		txtNews.setLineWrap(true);
-		txtNews.setText(News.getContent());
+		if (News.getContent() != null) txtNews.setText(News.getContent());
 		scrollPaneNews.add(txtNews);
 		panelNews.add(scrollPaneNews);
 
-- 
cgit v1.2.3-55-g7522