diff options
| author | Simon Rettberg | 2014-07-23 12:03:55 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-23 12:03:55 +0200 |
| commit | e6d735edc68c77a543597116bf0a2ec5de6862f8 (patch) | |
| tree | 6a937ba3000cee256499e2780ecff8d1583b8981 /Dozentenmodul/src/main/java/gui/lecture | |
| parent | Removed old files (diff) | |
| parent | Erster Entwurf der Berechtigungsoberfläche (diff) | |
| download | tutor-module-e6d735edc68c77a543597116bf0a2ec5de6862f8.tar.gz tutor-module-e6d735edc68c77a543597116bf0a2ec5de6862f8.tar.xz tutor-module-e6d735edc68c77a543597116bf0a2ec5de6862f8.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module into maven
Conflicts:
Dozentenmodul/.classpath
Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Dozentenmodul/bin/gui/intro/Login_GUI.class
Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java
Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java
Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class
Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class
Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class
Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class
Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class
Dozentenmodulserver/bin/server/Server$startFileCopy_args.class
Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class
Dozentenmodulserver/bin/server/Server$updateImageData_args.class
Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class
Dozentenmodulserver/bin/server/Server$updateImageData_result.class
Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class
Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class
Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class
Dozentenmodulserver/bin/server/Server$writeVLdata_args.class
Dozentenmodulserver/bin/sql/SQL.class
Diffstat (limited to 'Dozentenmodul/src/main/java/gui/lecture')
| -rw-r--r-- | Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java | 2 | ||||
| -rw-r--r-- | Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForLectures_GUI.java (renamed from Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index 0a00e781..0f30aa15 100644 --- a/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -184,7 +184,7 @@ public class CreateLectureLink_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + ExtendedSearchForLectures_GUI es = new ExtendedSearchForLectures_GUI(); es.setVisible(true); } }); diff --git a/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForLectures_GUI.java index 579ea3bd..9afb1790 100644 --- a/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForLectures_GUI.java @@ -37,7 +37,7 @@ import util.GuiOrganizer; import util.OpenLinks; @SuppressWarnings("serial") -public class ExtendedSearchForImages_GUI extends JFrame { +public class ExtendedSearchForLectures_GUI extends JFrame { private final JPanel contentPanel = new JPanel(); String[] result; @@ -48,7 +48,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { /** * Create the dialog. */ - public ExtendedSearchForImages_GUI() { + public ExtendedSearchForLectures_GUI() { setResizable(false); |