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, 14 deletions

diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index 64023706..4e53b2d5 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -8,7 +8,6 @@ import java.awt.FlowLayout;
 import java.awt.Toolkit;
 import javax.swing.JFrame;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -53,18 +52,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 	JRadioButton rdbtnInternetNein;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			CreateImageTechnisch_GUI dialog = new CreateImageTechnisch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
@@ -327,7 +315,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 						}
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
+						CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI();
 						ea.setVisible(true);
 						dispose();