-User und Passwort werden nicht mehr ausgegeben

-Ausgaben insgesamt etwas ausgedünnt

30 files changed, 116 insertions, 112 deletions

diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
index e1dc0068..101eeca5 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index de05d0ec..7f37814b 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
index e2ae84dc..aea7cc9d 100644
--- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
index 225b1b06..e67f41d5 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
index be70d58b..5b2e2f61 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index 38bd1e7f..6e81b472 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
index 24613829..41128bc8 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
index 13e86cff..cb5966d1 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index eec06e78..4a9e9a0f 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index db7cd89e..f2c03ce9 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index 15cb2ba1..78bcd9b7 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
index 4e2296e7..359af1fe 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
index 569827ad..1bbaae71 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
index e827afb1..1f8d4f7e 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
index 31a514d3..acfc42b0 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
index 852d5e14..17a2d992 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
index 34afa967..de6193d4 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
index 045661b3..24e03d07 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
index 8da2716a..302b8c84 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
index d411f9ab..cfa89387 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
index 5b26c8f5..31dd1069 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index 4418d210..f14366f8 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
index c5ce2396..2957775c 100644
--- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
index 15823f5c..e804c5fa 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
index 1d7ed4b2..80671923 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
index c5d4f8cf..959ba420 100644
--- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
+++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
index e4b4f646..e5a83ed6 100644
--- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
index ce77282a..df610f6b 100644
--- a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
@@ -1,6 +1,5 @@
 package gui.image;
 
-
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Dimension;
@@ -26,15 +25,10 @@ import javax.swing.JMenuItem;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
-
-import javax.swing.JRadioButton;
 import javax.swing.ButtonGroup;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
 
 import models.Image;
 import models.Links;
@@ -61,7 +55,7 @@ public class CreateImageFreigabe_GUI extends JFrame {
 			}
 		});
 		setResizable(false);
-		
+
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
@@ -71,10 +65,10 @@ public class CreateImageFreigabe_GUI extends JFrame {
 		}
 		setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
+		int top = (screenSize.height - 722) / 2;
+		int left = (screenSize.width - 603) / 2;
 		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 603, 722);
+		// setBounds(100, 100, 603, 722);
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -88,11 +82,12 @@ public class CreateImageFreigabe_GUI extends JFrame {
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
 			}
-			
+
 			JTextPane txtpnBitteWhlenSie = new JTextPane();
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("W\u00E4hlen Sie bitte hier die von Ihnen gew\u00FCnschte Freigabe f\u00FCr Ihr Image aus.");
+			txtpnBitteWhlenSie
+					.setText("W\u00E4hlen Sie bitte hier die von Ihnen gew\u00FCnschte Freigabe f\u00FCr Ihr Image aus.");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -101,51 +96,54 @@ public class CreateImageFreigabe_GUI extends JFrame {
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel);
 		contentPanel.setLayout(null);
-		
+
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBorder(new TitledBorder(null, "Freigabe",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_1.setBounds(10, 51, 557, 124);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-		
+
 		JLabel lblNewLabel_2 = new JLabel("Freigabemodus:");
 		lblNewLabel_2.setBounds(10, 55, 250, 20);
 		panel_1.add(lblNewLabel_2);
-		
+
 		comboBox = new JComboBox();
-		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "\u00D6ffentlich (Alle Hochschulen)"}));
+		comboBox.setModel(new DefaultComboBoxModel(new String[] {
+				"Lokal (Eigene Hochschule)",
+				"\u00D6ffentlich (Alle Hochschulen)" }));
 		comboBox.setSelectedIndex(0);
 		comboBox.setBounds(270, 55, 250, 20);
 		panel_1.add(comboBox);
-		
+
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				
+
 				CreateImageFreigabe_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
+				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
 			}
 		});
 		lblHauptmen.setForeground(Color.BLUE);
 		lblHauptmen.setBounds(10, 11, 61, 14);
 		contentPanel.add(lblHauptmen);
-		
+
 		JLabel label_1 = new JLabel(">");
 		label_1.setBounds(69, 11, 13, 14);
 		contentPanel.add(label_1);
-		
+
 		JLabel lblVlimage = new JLabel("VL-Image");
 		lblVlimage.setForeground(Color.BLUE);
 		lblVlimage.setBounds(81, 11, 45, 14);
 		contentPanel.add(lblVlimage);
-		
+
 		JLabel label_2 = new JLabel(">");
 		label_2.setBounds(133, 11, 13, 14);
 		contentPanel.add(label_2);
-		
+
 		JLabel lblNewLabel_1 = new JLabel("Neu");
 		lblNewLabel_1.setBounds(146, 11, 46, 14);
 		contentPanel.add(lblNewLabel_1);
@@ -159,26 +157,26 @@ public class CreateImageFreigabe_GUI extends JFrame {
 				JButton cancelButton = new JButton("Zur\u00FCck");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
+
 						Image.image.setShareMode(comboBox.getSelectedIndex());
-						CreateImageTechnisch_GUI sr=new CreateImageTechnisch_GUI();
+						CreateImageTechnisch_GUI sr = new CreateImageTechnisch_GUI();
 						sr.setVisible(true);
 						dispose();
 					}
 				});
 				cancelButton.setActionCommand("OK");
 				buttonPane.add(cancelButton);
-				//getRootPane().setDefaultButton(cancelButton);
+				// getRootPane().setDefaultButton(cancelButton);
 			}
 			{
 				JButton continueButton = new JButton("Weiter");
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						Image.image.setShareMode(comboBox.getSelectedIndex());
-						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
+						FTPCreateUploader_GUI ea = new FTPCreateUploader_GUI();
 						ea.setVisible(true);
 						dispose();
-						
+
 					}
 				});
 				continueButton.setActionCommand("Cancel");
@@ -186,38 +184,39 @@ public class CreateImageFreigabe_GUI extends JFrame {
 				getRootPane().setDefaultButton(continueButton);
 			}
 		}
-		
+
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 78, 597, 2);
 		getContentPane().add(separator);
-		
+
 		JSeparator separator_1 = new JSeparator();
 		separator_1.setBounds(0, 627, 597, 2);
 		getContentPane().add(separator_1);
-		
+
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
-		
+
 		JMenu mnNewMenu = new JMenu("Suchen");
 		menuBar.add(mnNewMenu);
-		
+
 		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
 		mnNewMenu.add(mntmVlSuche);
-		
+
 		JMenu mnNewMenu_1 = new JMenu("Hilfe");
 		menuBar.add(mnNewMenu_1);
-		
+
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
 		mntmFaq.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				
+
 				String faq;
-				
+
 				faq = Links.getFAQ();
 
 				try {
-					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
+					Runtime.getRuntime().exec(
+							"rundll32 url.dll,FileProtocolHandler " + faq);
 				} catch (IOException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -226,17 +225,18 @@ public class CreateImageFreigabe_GUI extends JFrame {
 		});
 
 		mnNewMenu_1.add(mntmFaq);
-		
+
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mntmOtrs.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 				String otrs;
-				
+
 				otrs = Links.getOTRS();
-				
+
 				try {
-					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs );
+					Runtime.getRuntime().exec(
+							"rundll32 url.dll,FileProtocolHandler " + otrs);
 				} catch (IOException f) {
 					// TODO Auto-generated catch block
 					f.printStackTrace();
@@ -246,6 +246,6 @@ public class CreateImageFreigabe_GUI extends JFrame {
 		});
 
 		mnNewMenu_1.add(mntmOtrs);
-		
+
 	}
 }
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 3c93b46f..1d7a80eb 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -445,9 +445,7 @@ public class EditLectureLink_GUI extends JFrame {
 				
 				Links.openFAQ();
 				
-<<<<<<< HEAD
-=======
-				faq = Links.getFAQ();
+				/*faq = Links.getFAQ();
 
 				try {
 				
@@ -456,7 +454,7 @@ public class EditLectureLink_GUI extends JFrame {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
->>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd
+				*/
 			}
 		});
 
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
+
 }