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/DeleteLecture_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, 59 insertions, 22 deletions
diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
index 57d36515..ae228c1e 100644
--- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
@@ -15,6 +15,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.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
@@ -43,6 +44,8 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
+
+import models.Links;
 import models.person;
 import org.apache.thrift.TException;
 import server.Server.Client;
@@ -63,10 +66,10 @@ public class DeleteLecture_GUI extends JFrame {
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
 	String[] titles = { "Veranstaltungsname", "Beschreibung",
-			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
+			"G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung",
 			"Verantwortlicher", "Image", "Schlagwort", "ID" };
 	ThriftConnection con = new ThriftConnection();
-	Client client = con.getThriftConnection();
+	Client client = models.Client.clientcon.getClient();
 	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
 	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
@@ -100,7 +103,7 @@ public class DeleteLecture_GUI extends JFrame {
 				System.exit(0);
 			}
 		});
-		// Verhindert das Vergrößern Des Fensters
+		// Verhindert das Vergroessern Des Fensters
 		setResizable(false);
 
 		try {
@@ -187,27 +190,27 @@ public class DeleteLecture_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) {
-				// Öffnet das Fenster Extended GUI
-				con.closeThriftConnection();
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				// oeffnet das Fenster Extended GUI
+				
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(336, 106, 184, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				// Öffnet das Hauptmenü
-				con.closeThriftConnection();
+				// oeffnet das Hauptmenue
+				
 				DeleteLecture_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
@@ -336,18 +339,18 @@ public class DeleteLecture_GUI extends JFrame {
 					//a row is selected
 					//ask for confirmation
 					eingabe = JOptionPane.showConfirmDialog(null,
-							"Wollen Sie diese Daten löschen?", "Löschen?",
+							"Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?",
 							JOptionPane.YES_NO_OPTION);
 					
 					if (eingabe == JOptionPane.YES_OPTION) {
 						//user has confirmed deletion, now get the ID of the selected lecture
 						lectureID = modelMyLectures.getValueAt(tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()), 8).toString();
-						System.out.println("Lösche Lecture "+lectureID);
+						System.out.println("L\u00f6sche Lecture "+lectureID);
 						try {
-							if(client.deleteLecture(lectureID)){
-								System.out.println("Löschen erfolgreich");
+							if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){
+								System.out.println("L\u00f6schen erfolgreich");
 								//delete successful
-								con.closeThriftConnection();
+								
 								DeleteLecture_GUI dl = new DeleteLecture_GUI();
 								dl.setVisible(true);
 								dispose();
@@ -356,7 +359,7 @@ public class DeleteLecture_GUI extends JFrame {
 								JOptionPane
 								.showMessageDialog(
 										null,
-										"Löschen aus Datenbank fehlgeschlagen.",
+										"L\u00f6schen aus Datenbank fehlgeschlagen.",
 										"Fehler",
 										JOptionPane.INFORMATION_MESSAGE);
 							}
@@ -382,8 +385,8 @@ public class DeleteLecture_GUI extends JFrame {
 				JButton btnBack = new JButton("Zur\u00FCck");
 				btnBack.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						// Öffnet das Hauptmenü
-						con.closeThriftConnection();
+						// oeffnet das Hauptmenue
+						
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
 						dispose();
@@ -410,14 +413,48 @@ public class DeleteLecture_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);
 
 	}
 
-	// Initiale Beffülung eines Table models
+	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
 		List<server.Lecture> lectures;
 		try {
@@ -428,7 +465,7 @@ public class DeleteLecture_GUI extends JFrame {
 			int x = 0;
 
 			while (i.hasNext()) {
-				// erzeuge Objekte für die Tabelle
+				// erzeuge Objekte fuer die Tabelle
 				Object[] obj = {
 						lectures.get(x).lecturename,
 						lectures.get(x).desc,
@@ -437,7 +474,7 @@ public class DeleteLecture_GUI extends JFrame {
 						lectures.get(x).isActive, lectures.get(x).lastused,
 						lectures.get(x).username, " ",
 						lectures.get(x).imagename, lectures.get(x).id };
-				// Füge diese Objekte der Tabelle hinzu
+				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
 				i.next();
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/DeleteLecture_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