mavenization v2

7 files changed, 148 insertions, 140 deletions

diff --git a/Dozentenmodul/src/main/java/models/Image.java b/Dozentenmodul/src/main/java/models/Image.java
index a18ae8fe..fc31e583 100644
--- a/Dozentenmodul/src/main/java/models/Image.java
+++ b/Dozentenmodul/src/main/java/models/Image.java
@@ -13,6 +13,8 @@ public class Image {
         private String newName;
 
         private String imagepath;
+        
+        private String OS;
 
         private int shareMode;
 
@@ -27,16 +29,34 @@ public class Image {
         private int cpu;
 
         private long filesize;
+        
+        private String desc;
 
         public static Image image =new Image();
 
         
 
         
-
         
+        
+
+        public String getDesc() {
+			return desc;
+		}
+
+		public void setDesc(String desc) {
+			this.desc = desc;
+		}
+
+		public String getOS() {
+			return OS;
+		}
+
+		public void setOS(String oS) {
+			OS = oS;
+		}
 
-        public int getShareMode() {
+		public int getShareMode() {
 
                 return shareMode;
 
diff --git a/Dozentenmodul/src/main/java/models/ImageRights.java b/Dozentenmodul/src/main/java/models/ImageRights.java
new file mode 100644
index 00000000..1b7e0e55
--- /dev/null
+++ b/Dozentenmodul/src/main/java/models/ImageRights.java
@@ -0,0 +1,45 @@
+package models;
+
+public class ImageRights {
+	
+	private int read;
+	private int write;
+	private int changePermission;
+	private int admin;
+	private int linkAllowed;
+	
+	public static ImageRights rights =new ImageRights();
+	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/LectureRights.java b/Dozentenmodul/src/main/java/models/LectureRights.java
new file mode 100644
index 00000000..c136141f
--- /dev/null
+++ b/Dozentenmodul/src/main/java/models/LectureRights.java
@@ -0,0 +1,37 @@
+package models;
+
+public class LectureRights {
+	private int recRead;
+	private int recWrite;
+	private int recChangePermission;
+	private int recAdmin;
+	
+	public static LectureRights rights =new LectureRights();
+	
+	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/Links.java b/Dozentenmodul/src/main/java/models/Links.java
index 693fbb3e..80e3182e 100644
--- a/Dozentenmodul/src/main/java/models/Links.java
+++ b/Dozentenmodul/src/main/java/models/Links.java
@@ -1,161 +1,31 @@
 package models;
 
-import java.awt.Desktop;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-
 public class Links {
 
 	private static String FAQ = "http://bwlehrpool.hs-offenburg.de/";
-	private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de/otrs/customer.pl";
+	private static String OTRS = "http://bwlehrpool.hs-offenburg.de/";
 	private static String uriWindows = "https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
 	private static String uriLinux = "https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
+	private static String AnleitungVMDK = "http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/3_bwLehrpool_-_Image_einbinden_und_starten.pdf";
 
 	public static String getFAQ() {
 		return FAQ;
 	}
 
+	public static String getAnleitungVMDK(){
+		return AnleitungVMDK;
+	}
+	
 	public static String getOTRS() {
 		return OTRS;
 	}
 
-	public static void openFAQ() {
-
-		String faq = FAQ;
-		Runtime rt = Runtime.getRuntime();
-		String os = System.getProperty("os.name");
-
-		try {
-
-
-			if (os.indexOf( "Win" ) >= 0) {
-				
-		        rt.exec( "rundll32 url.dll,FileProtocolHandler " + faq);
-	 
-		    } else if (os.indexOf( "Mac" ) >= 0) {
-		    	
-		        rt.exec( "open " + faq);
-	 
-            } else if (os.indexOf( "nix") >=0 || os.indexOf( "nux") >=0) {
-
-		        // Do a best guess on unix until we get a platform independent way
-		        // Build a list of browsers to try, in this order.
-		        String[] browsers = {"epiphany", "firefox", "mozilla", "konqueror",
-		       			             "netscape","opera","links","lynx"};
-	 
-		        StringBuffer cmd = new StringBuffer();
-		        for (int i=0; i<browsers.length; i++)
-		            cmd.append( (i==0  ? "" : " || " ) + browsers[i] +" \"" + faq + "\" ");
-	 
-		        rt.exec(new String[] { "sh", "-c", cmd.toString() });
-            }
-
-			if (os.indexOf("Win") >= 0) {
-
-				// this doesn't support showing urls in the form of
-				// "page.html#nameLink"
-				rt.exec("rundll32 url.dll,FileProtocolHandler " + faq);
-
-			} else if (os.indexOf("Mac") >= 0) {
-
-				rt.exec("open " + faq);
-
-			} else if (os.indexOf("nix") >= 0 || os.indexOf("nux") >= 0) {
-
-				// Do a best guess on unix until we get a platform independent
-				// way
-				// Build a list of browsers to try, in this order.
-				String[] browsers = { "epiphany", "firefox", "mozilla",
-						"konqueror", "netscape", "opera", "links", "lynx" };
-
-				// Build a command string which looks like
-				// "browser1 "url" || browser2 "url" ||..."
-				StringBuffer cmd = new StringBuffer();
-				for (int i = 0; i < browsers.length; i++)
-					cmd.append((i == 0 ? "" : " || ") + browsers[i] + " \""
-							+ faq + "\" ");
-
-				rt.exec(new String[] { "sh", "-c", cmd.toString() });
-			}
-
-
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-	public static void openOTRS() {
-
-		String otrs = OTRS;
-		Runtime rt = Runtime.getRuntime();
-		String os = System.getProperty("os.name");
-
-		try {
-
-			 if (os.indexOf( "Win" ) >= 0) {
- 
-		        rt.exec( "rundll32 url.dll,FileProtocolHandler " + otrs);
-	 
-		    } else if (os.indexOf( "Mac" ) >= 0) {
-
-		        rt.exec( "open " + otrs);
-	 
-            } else if (os.indexOf( "nix") >=0 || os.indexOf( "nux") >=0) {
-
-		        String[] browsers = {"epiphany", "firefox", "mozilla", "konqueror",
-		       			             "netscape","opera","links","lynx"};
-	 
-		        StringBuffer cmd = new StringBuffer();
-		        for (int i=0; i<browsers.length; i++)
-		            cmd.append( (i==0  ? "" : " || " ) + browsers[i] +" \"" + otrs + "\" ");
-	 
-		        rt.exec(new String[] { "sh", "-c", cmd.toString() });
-            }
-
-			if (os.indexOf("Win") >= 0) {
-
-				// this doesn't support showing urls in the form of
-				// "page.html#nameLink"
-				rt.exec("rundll32 url.dll,FileProtocolHandler " + otrs);
-
-			} else if (os.indexOf("Mac") >= 0) {
-
-				rt.exec("open " + otrs);
-
-			} else if (os.indexOf("nix") >= 0 || os.indexOf("nux") >= 0) {
-
-				// Do a best guess on unix until we get a platform independent
-				// way
-				// Build a list of browsers to try, in this order.
-				String[] browsers = { "epiphany", "firefox", "mozilla",
-						"konqueror", "netscape", "opera", "links", "lynx" };
-
-				// Build a command string which looks like
-				// "browser1 "url" || browser2 "url" ||..."
-				StringBuffer cmd = new StringBuffer();
-				for (int i = 0; i < browsers.length; i++)
-					cmd.append((i == 0 ? "" : " || ") + browsers[i] + " \""
-							+ otrs + "\" ");
-
-				rt.exec(new String[] { "sh", "-c", cmd.toString() });
-			}
-
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
 	public static String getUriWindows() {
 		return uriWindows;
 	}
 
 	public static String getUriLinux() {
 		return uriLinux;
-	}
+	} 
 
-}
+}// end class
diff --git a/Dozentenmodul/src/main/java/models/SessionData.java b/Dozentenmodul/src/main/java/models/SessionData.java
index 187dc59f..d085bc29 100644
--- a/Dozentenmodul/src/main/java/models/SessionData.java
+++ b/Dozentenmodul/src/main/java/models/SessionData.java
@@ -5,6 +5,7 @@ public class SessionData {
 	private String sessionID;
 	private String authToken;
 	private String serverAdress;
+
 	public static SessionData session =new SessionData();
 	
 	public String getSessionID() {
@@ -25,6 +26,7 @@ public class SessionData {
 	public void setServerAdress(String serverAdress) {
 		this.serverAdress = serverAdress;
 	}
+
 	
 	
 }
diff --git a/Dozentenmodul/src/main/java/models/Version.java b/Dozentenmodul/src/main/java/models/Version.java
new file mode 100644
index 00000000..b44819e4
--- /dev/null
+++ b/Dozentenmodul/src/main/java/models/Version.java
@@ -0,0 +1,24 @@
+package models;
+
+public class Version {
+	
+	private static String Version = "1.06";
+	private static String BuildDate = "04.09.2014";
+	
+	
+	public static String getVersion() {
+		return Version;
+	}
+	public static void setVersion(String version) {
+		Version = version;
+	}
+	public static String getBuildDate() {
+		return BuildDate;
+	}
+	public static void setBuildDate(String buildDate) {
+		BuildDate = buildDate;
+	}
+
+	
+	
+}
diff --git a/Dozentenmodul/src/main/java/models/person.java b/Dozentenmodul/src/main/java/models/person.java
index 6e066730..479c2ecd 100644
--- a/Dozentenmodul/src/main/java/models/person.java
+++ b/Dozentenmodul/src/main/java/models/person.java
@@ -17,11 +17,21 @@ public class person{
 	private String Fakultaet;
 
 	private boolean ischecked;
+	
+	private String role;
 
 	public static person verantwortlicher=new person();
 
 	
 
+	public String getRole() {
+		return role;
+	}
+
+	public void setRole(String role) {
+		this.role = role;
+	}
+
 	public String getUsername() {
 
 		return username;