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

1 files changed, 46 insertions, 0 deletions

diff --git a/Dozentenmodul/src/models/Search.java b/Dozentenmodul/src/models/Search.java
new file mode 100644
index 00000000..59a28b21
--- /dev/null
+++ b/Dozentenmodul/src/models/Search.java
@@ -0,0 +1,46 @@
+package models;
+
+public class Search {
+	
+	
+	private String Software;
+	private String Hochschule;
+	private String Creator;
+	private boolean ExistingImage;
+	private boolean Rohling;
+	public static Search search =new Search();
+
+	public String getSoftware() {
+		return Software;
+	}
+	public void setSoftware(String software) {
+		Software = software;
+	}
+	public String getHochschule() {
+		return Hochschule;
+	}
+	public void setHochschule(String hochschule) {
+		Hochschule = hochschule;
+	}
+	public String getCreator() {
+		return Creator;
+	}
+	public void setCreator(String creator) {
+		Creator = creator;
+	}
+	public boolean isExistingImage() {
+		return ExistingImage;
+	}
+	public void setExistingImage(boolean existingImage) {
+		ExistingImage = existingImage;
+	}
+	public boolean isRohling() {
+		return Rohling;
+	}
+	public void setRohling(boolean rohling) {
+		Rohling = rohling;
+	}
+	
+	
+
+}