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

Conflicts:
	Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
	Dozentenmodul/src/models/Links.java

1 files changed, 7 insertions, 18 deletions

diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 1d7a80eb..9db4be3b 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -68,7 +68,6 @@ public class EditLectureLink_GUI extends JFrame {
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 
-	
 	/**
 	 * Create the dialog.
 	 */
@@ -174,8 +173,9 @@ public class EditLectureLink_GUI extends JFrame {
 		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);
@@ -405,8 +405,7 @@ public class EditLectureLink_GUI extends JFrame {
 									JOptionPane.INFORMATION_MESSAGE);
 
 						}
-						
-					
+
 						MainMenue_GUI m = new MainMenue_GUI();
 						m.setVisible(true);
 						dispose();
@@ -442,19 +441,9 @@ public class EditLectureLink_GUI extends JFrame {
 		mntmFaq.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				
+
 				Links.openFAQ();
-				
-				/*faq = Links.getFAQ();
-
-				try {
-				
-					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
-				} catch (IOException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				*/
+
 			}
 		});
 
@@ -464,7 +453,7 @@ public class EditLectureLink_GUI extends JFrame {
 		mntmOtrs.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				
+
 				Links.openOTRS();
 
 			}