1 files changed, 70 insertions, 64 deletions

diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
index 860cae35..07db94a5 100644
--- a/Dozentenmodul/src/models/Links.java
+++ b/Dozentenmodul/src/models/Links.java
@@ -6,52 +6,55 @@ 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 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 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";
+
 	public static String getFAQ() {
 		return FAQ;
 	}
-	
+
 	public static String getOTRS() {
 		return OTRS;
 	}
-	
-<<<<<<< HEAD
+
 	public static void openFAQ() {
-		
+
 		String faq = FAQ;
 		Runtime rt = Runtime.getRuntime();
 		String os = System.getProperty("os.name");
 
 		try {
-			
-			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() });
-            }
+
+			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
@@ -59,53 +62,56 @@ public class Links {
 		}
 
 	}
-	
-public static void openOTRS() {
-		
+
+	public static void openOTRS() {
+
 		String otrs = OTRS;
 		Runtime rt = Runtime.getRuntime();
 		String os = System.getProperty("os.name");
 
 		try {
-			
-			 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() });
-            }
+
+			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;
 	}
-	
->>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd
+
 }