-Suchfenster verbessert

	- On The Fly nach Name funktioniert nun
	- Tab Meine Images nun Funktionsfähig
-Möglichkeit der Konfiguration der Anwendung ist geschaffen, somit können die beiden GUIs BillOfRights und der Link zu vmware player für immer ausgeblendet werden
-Thrift ist nun fertig implementiert

11 files changed, 20 insertions, 54 deletions

diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index 58c7e63c..5f865381 100644
--- a/Dozentenmodulserver/bin/server/ServerHandler.class
+++ b/Dozentenmodulserver/bin/server/ServerHandler.class
diff --git a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class b/Dozentenmodulserver/bin/server/User$UserStandardScheme.class
index b431453b..b25a2613 100644
--- a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class
+++ b/Dozentenmodulserver/bin/server/User$UserStandardScheme.class
diff --git a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class
index 176c88aa..0e4017f8 100644
--- a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class b/Dozentenmodulserver/bin/server/User$UserTupleScheme.class
index ef7626d2..8b2f8aa7 100644
--- a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class
+++ b/Dozentenmodulserver/bin/server/User$UserTupleScheme.class
diff --git a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class
index 4e4fba66..f88d2c7c 100644
--- a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/User$_Fields.class b/Dozentenmodulserver/bin/server/User$_Fields.class
index 8837c194..b00860c9 100644
--- a/Dozentenmodulserver/bin/server/User$_Fields.class
+++ b/Dozentenmodulserver/bin/server/User$_Fields.class
diff --git a/Dozentenmodulserver/bin/server/User.class b/Dozentenmodulserver/bin/server/User.class
index b19fe5bd..e81a2862 100644
--- a/Dozentenmodulserver/bin/server/User.class
+++ b/Dozentenmodulserver/bin/server/User.class
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index 1c996f36..593b47bf 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 78e81464..9b52aea6 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -92,31 +92,21 @@ public class ServerHandler implements Server.Iface {
 
 	@Override
 	public List<Image> getImageList() throws TException {
-		ResultSet resWith=sql.getImageListWithLectures(con);
-		ResultSet resWithout=sql.getImageListWithoutLectures(con);
-		List<Image> listWith = new ArrayList<Image>();
-		List<Image> listWithout = new ArrayList<Image>();
+		ResultSet res=sql.getImageList(con);
+		
+		List<Image> list = new ArrayList<Image>();
+
 		try {
 			
-			while(resWith.next())
+			while(res.next())
 			{
 				
-				listWith.add(new Image(resWith.getString("image_name"),resWith.getString("cond_hasLicenseRestriction"),resWith.getString("name"),resWith.getString("lecture"),resWith.getString("image_update_time"),resWith.getString("user")));
-				
-			}
-			
-			while(resWithout.next())
-			{
-				listWithout.add(new Image(resWithout.getString("image_name"),resWithout.getString("cond_hasLicenseRestriction"),resWithout.getString("name"),"''",resWithout.getString("image_update_time"),resWithout.getString("user")));
+				list.add(new Image(res.getString("image_name"),res.getString("cond_hasLicenseRestriction"),res.getString("name"),res.getString("lecture"),res.getString("image_update_time"),res.getString("user")));
 				
 			}
 			
-			if(listWithout!=null)
-			{
-			listWith.addAll(listWith.size(), listWithout);
-			}		
 
-			return listWith;
+			return list;
 		} catch (SQLException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
diff --git a/Dozentenmodulserver/src/server/User.java b/Dozentenmodulserver/src/server/User.java
index 5fd2f983..a763e1c7 100644
--- a/Dozentenmodulserver/src/server/User.java
+++ b/Dozentenmodulserver/src/server/User.java
@@ -5,32 +5,20 @@
  *  @generated
  */
 package server;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-
 import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("serial")
 public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
 
@@ -38,7 +26,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
   private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)-2);
   private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)-3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  @SuppressWarnings("rawtypes")
+private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
     schemes.put(StandardScheme.class, new UserStandardSchemeFactory());
     schemes.put(TupleScheme.class, new UserTupleSchemeFactory());
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index b07de35b..9f9ba352 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -191,11 +191,11 @@ public class SQL {
 		

 	}

 	

-	public ResultSet getImageListWithoutLectures(Connection con){

+	public ResultSet getImageList(Connection con){

 		try {

 			Statement stm=con.createStatement();

 			

-			return stm.executeQuery("SELECT distinct vl.image_name, vl.cond_hasLicenseRestriction, os.name, '',vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID;");

+			return stm.executeQuery("SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name, '' as lecture,vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture,  vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");

 			

 			

 		} catch (SQLException e) {

@@ -205,19 +205,6 @@ public class SQL {
 		return null;

 	}

 	

-	public ResultSet getImageListWithLectures(Connection con){

-		try {

-			Statement stm=con.createStatement();

-			

-			return stm.executeQuery("SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture,  vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");

-			

-			

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		return null;

-	}

 	

 	public ResultSet getAllOS(Connection con)

 	{