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

Conflicts:
	ffffDozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
	Dozentenmodul/bin/gui/image/SearchImage_GUI.class
	Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
	Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
	Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
	Dozentenmodul/src/models/Links.java

1 files changed, 2 insertions, 26 deletions

diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
index eb28246f..a8dcf498 100644
--- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
@@ -3,7 +3,6 @@ package gui.lecture;
 
 import gui.image.CreateImageAllgemein_GUI;
 import gui.image.FTPCreateUploader_GUI;
-
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
@@ -11,13 +10,9 @@ import java.awt.SystemColor;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -31,9 +26,7 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import models.Links;
-
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
@@ -45,30 +38,13 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 	String[] result;
 	private JTextField textField;
 	private JTextField textField_1;
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			ExtendedSearchForImages_GUI dialog = new ExtendedSearchForImages_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
 	 */
 	public ExtendedSearchForImages_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
+	
 		setResizable(false);
 		
 		try {