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

Conflicts:
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/src/gui/image/DeleteImage_GUI.java

1 files changed, 11 insertions, 9 deletions

diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index d364ba53..3649d79d 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -343,7 +343,7 @@ public class MainMenue_GUI extends JFrame {
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
-						//Images
+						// Images
 						if (rdbtnImageNew.isSelected() == true) {
 							CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI();
 							sr.setVisible(true);
@@ -357,12 +357,14 @@ public class MainMenue_GUI extends JFrame {
 							di.setVisible(true);
 							dispose();
 						} else if (rdbtnImageSearchDownload.isSelected() == true) {
-							//SearchMethodLecture_GUI sm = new SearchMethodLecture_GUI();
-							//SearchImage_GUI si = new SearchImage_GUI();
-							SearchEditImage_GUI si = new SearchEditImage_GUI();
+							// SearchMethodLecture_GUI sm = new
+							// SearchMethodLecture_GUI();
+							SearchImage_GUI si = new SearchImage_GUI();
+							// SearchEditImage_GUI si = new
+							// SearchEditImage_GUI();
 							si.setVisible(true);
 							dispose();
-						//Lectures
+							// Lectures
 						} else if (rdbtnLectureNew.isSelected() == true) {
 							CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI();
 							av.setVisible(true);
@@ -372,11 +374,11 @@ public class MainMenue_GUI extends JFrame {
 							el.setVisible(true);
 							dispose();
 						} else if (rdbtnLectureDelete.isSelected() == true) {
-							//DeleteLecture_GUI dl = new DeleteLecture_GUI();
-							//dl.setVisible(true);
-							//dispose();
+							// DeleteLecture_GUI dl = new DeleteLecture_GUI();
+							// dl.setVisible(true);
+							// dispose();
 						} else if (rdbtnLectureSearch.isSelected() == true) {
-							//SearchLecture_GUI sl = new SearchLecture_GUI();
+							// SearchLecture_GUI sl = new SearchLecture_GUI();
 							EditLectureSearch_GUI sl = new EditLectureSearch_GUI();
 							sl.setVisible(true);
 							dispose();