[client] rebasing the whole app...

12 files changed, 0 insertions, 782 deletions

diff --git a/dozentenmodul/src/main/java/models/Client.java b/dozentenmodul/src/main/java/models/Client.java
deleted file mode 100644
index 1faa8620..00000000
--- a/dozentenmodul/src/main/java/models/Client.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package models;
-
-import org.openslx.sat.thrift.iface.Server;
-
-public class Client {
-
-	private Server.Client client;
-	public static Client clientcon=new Client();
-
-	public Server.Client getClient() {
-		return client;
-	}
-
-	public void setClient(Server.Client client) {
-		this.client = client;
-	}
-	
-	
-	
-}
diff --git a/dozentenmodul/src/main/java/models/GUIRights.java b/dozentenmodul/src/main/java/models/GUIRights.java
deleted file mode 100644
index a1937b78..00000000
--- a/dozentenmodul/src/main/java/models/GUIRights.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package models;
-
-public class GUIRights {
-
-	private int read;
-	private int write;
-	private int changePermission;
-	private int admin;
-	private int linkAllowed;
-	private String userID;
-
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-
-	public static GUIRights rights = new GUIRights();
-
-	public int getRead() {
-		return read;
-	}
-
-	public void setRead(int read) {
-		this.read = read;
-	}
-
-	public int getWrite() {
-		return write;
-	}
-
-	public void setWrite(int write) {
-		this.write = write;
-	}
-
-	public int getChangePermission() {
-		return changePermission;
-	}
-
-	public void setChangePermission(int changePermission) {
-		this.changePermission = changePermission;
-	}
-
-	public int getAdmin() {
-		return admin;
-	}
-
-	public void setAdmin(int admin) {
-		this.admin = admin;
-	}
-
-	public int getLinkAllowed() {
-		return linkAllowed;
-	}
-
-	public void setLinkAllowed(int linkAllowed) {
-		this.linkAllowed = linkAllowed;
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/models/Image.java b/dozentenmodul/src/main/java/models/Image.java
deleted file mode 100644
index 4bb1338d..00000000
--- a/dozentenmodul/src/main/java/models/Image.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package models;
-
-public class Image {
-	public static String ImageId;
-	public static String Version;
-	public static String Imagename;
-	public static String Imagepath;
-	public static String OS;
-	public static int ShareMode;
-	public static boolean Licensed;
-	public static boolean Internet;
-	public static boolean Vorlage;
-	public static int Ram;
-	public static int Cpu;
-	public static long Filesize;
-	public static String Desc;
-
-	private Image() {
-		// Prevent instantiation
-	}
-
-	public static void reset() {
-		ImageId = null;
-		Version = null;
-		Imagename = null;
-		Imagepath = null;
-		OS = null;
-		ShareMode = 0;
-		Licensed = false;
-		Internet = false;
-		Vorlage = false;
-		Ram = 0;
-		Cpu = 0;
-		Filesize = 0;
-		Desc = null;
-	}
-}
diff --git a/dozentenmodul/src/main/java/models/ImageRights.java b/dozentenmodul/src/main/java/models/ImageRights.java
deleted file mode 100644
index 71148359..00000000
--- a/dozentenmodul/src/main/java/models/ImageRights.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package models;
-
-public class ImageRights {
-	
-	
-	private String userID;
-	private boolean read;
-	private boolean write;
-	private boolean changePermission;
-	private boolean admin;
-	private boolean linkAllowed;
-	
-	
-	public String getUserID() {
-		return userID;
-	}
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-	public static ImageRights rights =new ImageRights();
-	public boolean getRead() {
-		return read;
-	}
-	public void setRead(boolean read) {
-		this.read = read;
-	}
-	public boolean getWrite() {
-		return write;
-	}
-	public void setWrite(boolean write) {
-		this.write = write;
-	}
-	public boolean getChangePermission() {
-		return changePermission;
-	}
-	public void setChangePermission(boolean changePermission) {
-		this.changePermission = changePermission;
-	}
-	public boolean getAdmin() {
-		return admin;
-	}
-	public void setAdmin(boolean admin) {
-		this.admin = admin;
-	}
-	public boolean getLinkAllowed() {
-		return linkAllowed;
-	}
-	public void setLinkAllowed(boolean linkAllowed) {
-		this.linkAllowed = linkAllowed;
-	}
-	
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/ItemOwner.java b/dozentenmodul/src/main/java/models/ItemOwner.java
deleted file mode 100644
index 3afb20d2..00000000
--- a/dozentenmodul/src/main/java/models/ItemOwner.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package models;
-
-public class ItemOwner {
-
-	private String userID;
-	private String username;
-	private String nachname;
-	private String vorname;
-	private String hochschule;
-	private String email;
-
-
-	public static ItemOwner itemOwner = new ItemOwner();
-
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getNachname() {
-		return nachname;
-	}
-
-	public void setNachname(String nachname) {
-		this.nachname = nachname;
-	}
-
-	public String getVorname() {
-		return vorname;
-	}
-
-	public void setVorname(String vorname) {
-		this.vorname = vorname;
-	}
-
-	public String getHochschule() {
-		return hochschule;
-	}
-
-	public void setHochschule(String hochschule) {
-		this.hochschule = hochschule;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	
-	public void reset(){
-		userID=null;
-		username=null;
-		nachname=null;
-		vorname=null;
-		hochschule=null;
-		email=null;
-	}
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/Lecture.java b/dozentenmodul/src/main/java/models/Lecture.java
deleted file mode 100644
index 0b55172b..00000000
--- a/dozentenmodul/src/main/java/models/Lecture.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package models;
-
-import java.util.Date;
-
-public class Lecture {
-
-	private String name;
-
-	private String newName;
-
-	private String shortDesc;
-
-	private String desc;
-
-	private Date startdate;
-
-	private Date enddate;
-
-	private boolean active;
-
-	private String id;
-
-	private String linkedImagename;
-
-	public static Lecture lecture =new Lecture();
-
-	
-
-	public String getNewName() {
-
-		return newName;
-
-	}
-
-	public void setNewName(String newName) {
-
-		this.newName = newName;
-
-	}
-
-	public String getLinkedImagename() {
-
-		return linkedImagename;
-
-	}
-
-	public void setLinkedImagename(String linkedImagename) {
-
-		this.linkedImagename = linkedImagename;
-
-	}
-
-	public String getid() {
-
-		return id;
-
-	}
-
-	public void setid(String id) {
-
-		this.id = id;
-
-	}
-
-	public String getName() {
-
-		return name;
-
-	}
-
-	public void setName(String name) {
-
-		this.name = name;
-
-	}
-
-	public String getShortDesc() {
-
-		return shortDesc;
-
-	}
-
-	public void setShortDesc(String shortDesc) {
-
-		this.shortDesc = shortDesc;
-
-	}
-
-	public String getDesc() {
-
-		return desc;
-
-	}
-
-	public void setDesc(String desc) {
-
-		this.desc = desc;
-
-	}
-
-	public Date getStartdate() {
-
-		return startdate;
-
-	}
-
-	public void setStartdate(Date startdate) {
-
-		this.startdate = startdate;
-
-	}
-
-	public Date getEnddate() {
-
-		return enddate;
-
-	}
-
-	public void setEnddate(Date enddate) {
-
-		this.enddate = enddate;
-
-	}
-
-	public boolean isActive() {
-
-		return active;
-
-	}
-
-	public void setActive(boolean active) {
-
-		this.active = active;
-
-	}
-	
-	public void reset()
-	{
-		  name = null;
-
-		  newName = null;
-
-		  shortDesc = null;
-
-		  desc = null;
-
-		  startdate = null;
-
-		  enddate = null;
-
-		  active = false;
-
-		  id = null;
-
-		  linkedImagename = null;
-	}
-
-	
-
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/LectureRights.java b/dozentenmodul/src/main/java/models/LectureRights.java
deleted file mode 100644
index d5b3b163..00000000
--- a/dozentenmodul/src/main/java/models/LectureRights.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package models;
-
-public class LectureRights {
-	
-	private String userID;
-	private int recRead;
-	private int recWrite;
-	private int recChangePermission;
-	private int recAdmin;
-	
-	
-	public static LectureRights rights =new LectureRights();
-	
-	public String getUserID() {
-		return userID;
-	}
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-		
-	public int getRecRead() {
-		return recRead;
-	}
-	public void setRecRead(int recRead) {
-		this.recRead = recRead;
-	}
-	public int getRecWrite() {
-		return recWrite;
-	}
-	public void setRecWrite(int recWrite) {
-		this.recWrite = recWrite;
-	}
-	public int getRecChangePermission() {
-		return recChangePermission;
-	}
-	public void setRecChangePermission(int recChangePermission) {
-		this.recChangePermission = recChangePermission;
-	}
-	public int getRecAdmin() {
-		return recAdmin;
-	}
-	public void setRecAdmin(int recAdmin) {
-		this.recAdmin = recAdmin;
-	}
-	
-	
-}
diff --git a/dozentenmodul/src/main/java/models/RightsManagement.java b/dozentenmodul/src/main/java/models/RightsManagement.java
deleted file mode 100644
index d93ade10..00000000
--- a/dozentenmodul/src/main/java/models/RightsManagement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package models;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RightsManagement {
-	
-	
-	public RightsManagement(){
-		//
-	}
-	
-	//list which holds all selected users and permissions for this session and type (either for image or lecture, depending on mode)
-	private List<person> permittedUserList = new ArrayList<person>(); 
-
-	public static RightsManagement rightsManagement = new RightsManagement();
-
-	public List<person> getPermittedUserList() {
-		return permittedUserList;
-	}
-
-	public void setPermittedUserList(List<person> list) {
-		this.permittedUserList = list;
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/models/Search.java b/dozentenmodul/src/main/java/models/Search.java
deleted file mode 100644
index 59a28b21..00000000
--- a/dozentenmodul/src/main/java/models/Search.java
+++ /dev/null
@@ -1,46 +0,0 @@
-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;
-	}
-	
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/SessionData.java b/dozentenmodul/src/main/java/models/SessionData.java
deleted file mode 100644
index 4d3fc153..00000000
--- a/dozentenmodul/src/main/java/models/SessionData.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package models;
-
-public class SessionData {
-
-	private SessionData() {
-		// Prevent instantiation
-	}
-	
-	public static String sessionID;
-	public static String authToken;
-	public static String serverAdress;
-
-}
diff --git a/dozentenmodul/src/main/java/models/Version.java b/dozentenmodul/src/main/java/models/Version.java
deleted file mode 100644
index b63e5e6e..00000000
--- a/dozentenmodul/src/main/java/models/Version.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package models;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-public class Version {
-
-	private static String version = null;
-
-	public static String getVersion() {
-		// Maven writes a version number derived from the current timestamp
-		// to MANIFEST.MF - read it
-		if (version == null) {
-			JarFile jf = null;
-			try {
-		        String classPath = Version.class.getName().replace('.', '/') + ".class";
-		        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-		        URL classPathUrl = classLoader.getResource(classPath);
-		        String jarPath = classPathUrl.getPath().replaceAll("![^!]*$", "").replaceAll("^(file:|jar:)*", "");
-		        jf = new JarFile(jarPath);
-		        JarEntry je = jf.getJarEntry("META-INF/MANIFEST.MF");
-		        InputStream is = jf.getInputStream(je);
-				Properties p = new Properties();
-				p.load(is);
-				version = p.getProperty("Version-Timestamp");
-			} catch (Exception e) {
-				e.printStackTrace();
-				version = "unknown";
-			} finally {
-				if (jf != null)
-					try {
-						jf.close();
-					} catch (IOException e) {
-
-					}
-			}
-		}
-		return version;
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java
deleted file mode 100644
index ea6a38c4..00000000
--- a/dozentenmodul/src/main/java/models/person.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package models;
-
-public class person {
-
-	private String username;
-	private String userID;
-	private String Name;
-	private String Vorname;
-	private String Hochschule;
-	private String EMail;
-	private String Tel;
-	private String Fakultaet;
-	private String role;
-	private boolean ischecked;
-	private boolean image_read;
-	private boolean image_write;
-	private boolean image_admin;
-	private boolean image_linkAllowed;
-	private boolean lecture_read;
-	private boolean lecture_write;
-	private boolean lecture_admin;
-
-		
-	public static person verantwortlicher = new person();
-	
-	
-	public boolean isLecture_read() {
-		return lecture_read;
-	}
-
-	public void setLecture_read(boolean lecture_read) {
-		this.lecture_read = lecture_read;
-	}
-
-	public boolean isLecture_write() {
-		return lecture_write;
-	}
-
-	public void setLecture_write(boolean lecture_write) {
-		this.lecture_write = lecture_write;
-	}
-
-	public boolean isLecture_admin() {
-		return lecture_admin;
-	}
-
-	public void setLecture_admin(boolean lecture_admin) {
-		this.lecture_admin = lecture_admin;
-	}
-	
-	public boolean isImageRead() {
-		return image_read;
-	}
-
-	public void setImageRead(boolean image_read) {
-		this.image_read = image_read;
-	}
-
-	public boolean isImageWrite() {
-		return image_write;
-	}
-
-	public void setImageWrite(boolean image_write) {
-		this.image_write = image_write;
-	}
-
-	public boolean isImageAdmin() {
-		return image_admin;
-	}
-
-	public void setImageAdmin(boolean image_admin) {
-		this.image_admin = image_admin;
-	}
-
-	public boolean isImageLinkAllowed() {
-		return image_linkAllowed;
-	}
-
-	public void setImageLinkAllowed(boolean image_linkAllowed) {
-		this.image_linkAllowed = image_linkAllowed;
-	}
-
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public String getUsername() {
-
-		return username;
-
-	}
-
-	public void setUsername(String username) {
-
-		this.username = username;
-
-	}
-
-	public String getName() {
-
-		return Name;
-
-	}
-
-	public void setName(String name) {
-
-		Name = name;
-
-	}
-
-	public String getVorname() {
-
-		return Vorname;
-
-	}
-
-	public void setVorname(String vorname) {
-
-		Vorname = vorname;
-
-	}
-
-	public String getHochschule() {
-
-		return Hochschule;
-
-	}
-
-	public void setHochschule(String hochschule) {
-
-		Hochschule = hochschule;
-
-	}
-
-	public String getEMail() {
-
-		return EMail;
-
-	}
-
-	public void setEMail(String eMail) {
-
-		EMail = eMail;
-
-	}
-
-	public String getTel() {
-
-		return Tel;
-
-	}
-
-	public void setTel(String tel) {
-
-		Tel = tel;
-
-	}
-
-	public String getFakultaet() {
-
-		return Fakultaet;
-
-	}
-
-	public void setFakultaet(String fakultaet) {
-
-		Fakultaet = fakultaet;
-
-	}
-
-	public boolean isIschecked() {
-
-		return ischecked;
-
-	}
-
-	public void setIschecked(boolean ischecked) {
-
-		this.ischecked = ischecked;
-
-	}
-
-
-}