diff options
| author | unknown | 2014-04-15 14:31:15 +0200 |
|---|---|---|
| committer | unknown | 2014-04-15 14:31:15 +0200 |
| commit | 20d23bbfdb530cb0c915a712c960785745d8a553 (patch) | |
| tree | 878576e490bf6292b830835aaecbb86effba532b /Dozentenmodul/src/gui/intro/MainMenue_GUI.java | |
| parent | th (diff) | |
| parent | sdfv (diff) | |
| download | tutor-module-20d23bbfdb530cb0c915a712c960785745d8a553.tar.gz tutor-module-20d23bbfdb530cb0c915a712c960785745d8a553.tar.xz tutor-module-20d23bbfdb530cb0c915a712c960785745d8a553.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: grhrdh
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
Diffstat (limited to 'Dozentenmodul/src/gui/intro/MainMenue_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 868f9cd3..5e9c85c5 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -359,8 +359,6 @@ public class MainMenue_GUI extends JFrame { // SearchMethodLecture_GUI sm = new // SearchMethodLecture_GUI(); SearchImage_GUI si = new SearchImage_GUI(); - // SearchEditImage_GUI si = new - // SearchEditImage_GUI(); si.setVisible(true); dispose(); // Lectures @@ -373,13 +371,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(); - // EditLectureSearch_GUI sl = new - // EditLectureSearch_GUI(); sl.setVisible(true); dispose(); } |