Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts: Dozentenmodul/bin/gui/intro/Login_GUI.class Dozentenmodulserver/bin/server/ServerHandler.class Dozentenmodulserver/bin/server/startServer.class Dozentenmodulserver/src/server/startServer.java
author: Nino Breuer 2014-05-22 15:41:51 +0200
committer: Nino Breuer 2014-05-22 15:41:51 +0200
commit: 8ee0ed5c5a947ecff257f799dfa60b9b000aab75 (patch)
tree: e5790134d1cada9aee15611f8818fa7da71cd982 /Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
parent: Vorbereitung Multithreading (diff)
parent: Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
download: tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.tar.gz
tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.tar.xz
tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.zip
1 files changed, 64 insertions, 15 deletions
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 4160f855..f995d70d 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -2,6 +2,7 @@ package gui.lecture;
 
 import gui.intro.MainMenue_GUI;
 import java.awt.Color;
+import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
@@ -15,6 +16,7 @@ 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.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -43,6 +45,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
 import models.Lecture;
+import models.Links;
 import models.person;
 import org.apache.thrift.TException;
 import server.Server.Client;
@@ -64,8 +67,8 @@ public class EditLectureLink_GUI extends JFrame {
 	private JTextField textFieldName;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
-	ThriftConnection thrift = new ThriftConnection();
-	Client client = thrift.getThriftConnection();
+	ThriftConnection con = new ThriftConnection();
+	Client client = models.Client.clientcon.getClient();
 
 	/**
 	 * Launch the application.
@@ -87,6 +90,7 @@ public class EditLectureLink_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				con.closeThriftConnection();
 				System.exit(0);
 			}
 		});
@@ -116,8 +120,7 @@ public class EditLectureLink_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel(
-						"Image verlinken");
+				JLabel lblNewLabel = new JLabel("Image verlinken");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -181,17 +184,17 @@ public class EditLectureLink_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(317, 106, 203, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		comboBox = new JComboBox<String>();
@@ -355,7 +358,7 @@ public class EditLectureLink_GUI extends JFrame {
 			}
 			{
 				JButton cancelButton = new JButton(
-						"Veranstaltung ändern und abschlie\u00DFen");
+						"Veranstaltung \u00e4ndern und abschlie\u00DFen");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
@@ -372,9 +375,11 @@ public class EditLectureLink_GUI extends JFrame {
 									.toString();
 
 							try {
-								
-								DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-								client.updateLecturedata(Lecture.lecture.getName(),
+
+								DateFormat formatter = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+								client.updateLecturedata(
+										Lecture.lecture.getName(),
 										Lecture.lecture.getNewName(),
 										Lecture.lecture.getShortDesc(),
 										Lecture.lecture.getDesc(),
@@ -391,9 +396,16 @@ public class EditLectureLink_GUI extends JFrame {
 										person.verantwortlicher.getHochschule(),
 										person.verantwortlicher.getEMail(),
 										person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultät(),
+										person.verantwortlicher.getFakultaet(),
 										Lecture.lecture.getid());
-								
+
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.",
+												"Veranstaltung angelegt",
+												JOptionPane.INFORMATION_MESSAGE);
+
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
@@ -402,11 +414,13 @@ public class EditLectureLink_GUI extends JFrame {
 						} else {
 							// nothing selected
 							JOptionPane.showMessageDialog(null,
-									"Bitte wählen Sie ein Image aus.",
+									"Bitte w\u00e4hlen Sie ein Image aus.",
 									"Image Auswahl",
 									JOptionPane.INFORMATION_MESSAGE);
 
 						}
+						
+					
 						MainMenue_GUI m = new MainMenue_GUI();
 						m.setVisible(true);
 						dispose();
@@ -439,9 +453,44 @@ public class EditLectureLink_GUI extends JFrame {
 		menuBar.add(mnNewMenu_1);
 
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mntmFaq.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				
+				String faq;
+				
+				faq = Links.getFAQ();
+
+				try {
+				
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		});
+
 		mnNewMenu_1.add(mntmFaq);
 
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mntmOtrs.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				String otrs;
+				
+				otrs = Links.getOTRS();
+				
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs );
+				} catch (IOException f) {
+					// TODO Auto-generated catch block
+					f.printStackTrace();
+				}
+
+			}
+		});
+
 		mnNewMenu_1.add(mntmOtrs);
 
 	}
author	Nino Breuer	2014-05-22 15:41:51 +0200
committer	Nino Breuer	2014-05-22 15:41:51 +0200
commit	8ee0ed5c5a947ecff257f799dfa60b9b000aab75 (patch)
tree	e5790134d1cada9aee15611f8818fa7da71cd982 /Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
parent	Vorbereitung Multithreading (diff)
parent	Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
download	tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.tar.gz tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.tar.xz tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.zip