diff options
| author | Murilo Araujo | 2014-06-17 11:20:55 +0200 |
|---|---|---|
| committer | Murilo Araujo | 2014-06-17 11:20:55 +0200 |
| commit | e7d0d94df89b3f84bace0ad7b56f84622d2c2975 (patch) | |
| tree | 4977e4092116d9bffa61841a696449c26d313d25 | |
| parent | Bug Fix (diff) | |
| download | tutor-module-e7d0d94df89b3f84bace0ad7b56f84622d2c2975.tar.gz tutor-module-e7d0d94df89b3f84bace0ad7b56f84622d2c2975.tar.xz tutor-module-e7d0d94df89b3f84bace0ad7b56f84622d2c2975.zip | |
links fqa und otrs
59 files changed, 688 insertions, 146 deletions
diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class Binary files differindex eff180c5..9e28bfa1 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class Binary files differindex 524ef307..d03e7bba 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 Binary files differindex acab1faf..810a0bde 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 Binary files differindex d314d8e9..bb3de645 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class Binary files differindex 4505ccb5..45e33268 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex c9cf19e6..f37a90df 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 Binary files differindex 9eeb6cec..2cc03f7b 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 Binary files differindex 7d9686ba..5f5bd3c0 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 Binary files differindex 45fb3ab5..c74231f4 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 Binary files differindex 5fff5ecb..76bf7853 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class Binary files differindex 7e083945..2b4bf693 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class Binary files differindex 707b38a1..72c79ffe 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class Binary files differindex 97ba1b77..32770f91 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class Binary files differindex 7f0a2110..7118cb01 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class Binary files differindex a6abdea4..8f2c2337 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 Binary files differindex 97246b3f..55965fd2 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 Binary files differindex 021f7c75..d88ea420 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 Binary files differindex 0a8b212d..bb811f7a 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 Binary files differindex 0181a09e..1cf17778 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 Binary files differindex 9b87348c..e4c4e858 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 Binary files differindex 4c8a2787..715c30d8 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 Binary files differindex 7cabbfc7..10cac7e7 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 Binary files differindex cf347646..c742cf3c 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 Binary files differindex 70c7e041..193a25de 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 Binary files differindex b2f0ae63..1f61a168 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$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class Binary files differindex e1f554c7..091931f8 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class Binary files differindex 4511c064..27406089 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 Binary files differindex 0d3d29cc..45526d36 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 Binary files differindex b35ccd3d..1ff0d787 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$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class Binary files differindex 6d2d2df7..962df75f 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class Binary files differindex 51e86415..07e7e8cf 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class Binary files differindex 959ba420..173ab342 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 Binary files differindex ff9cf61a..ed5b0b25 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 956dea25..6231c6f2 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.JButton; import javax.swing.JFrame; @@ -36,6 +38,7 @@ import models.Image; import models.Links; import models.person; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class CreateImageAllgemein_GUI extends JFrame { @@ -300,19 +303,40 @@ public class CreateImageAllgemein_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { + + OpenLinks open = new OpenLinks(); - Links.openOTRS(); + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java index 38991942..ec50440f 100644 --- a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; @@ -35,6 +37,7 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Links; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class CreateImageFreigabe_GUI extends JFrame { @@ -209,44 +212,45 @@ public class CreateImageFreigabe_GUI extends JFrame { mntmFaq.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - String faq; - - faq = Links.getFAQ(); - + + OpenLinks open = new OpenLinks(); + + URI windows; try { - Runtime.getRuntime().exec( - "rundll32 url.dll,FileProtocolHandler " + faq); - } catch (IOException e) { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - String otrs; - - otrs = Links.getOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; try { - Runtime.getRuntime().exec( - "rundll32 url.dll,FileProtocolHandler " + otrs); - } catch (IOException f) { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { // TODO Auto-generated catch block - f.printStackTrace(); + e.printStackTrace(); } - + } }); - - mnNewMenu_1.add(mntmOtrs); - + mnNewMenu_1.add(mntmOtrs); JMenuItem menuItem = new JMenuItem("About"); menuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index ebcbcaec..34594f3d 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -37,6 +39,7 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Links; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class CreateImageTechnisch_GUI extends JFrame { @@ -350,23 +353,43 @@ public class CreateImageTechnisch_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem menuItem = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 2c748679..67084a75 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -16,6 +16,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Iterator; import java.util.List; @@ -55,6 +57,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class DeleteImage_GUI extends JFrame { @@ -536,8 +539,19 @@ public class DeleteImage_GUI extends JFrame { mntmFaq.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openFAQ(); + + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); mnNewMenu_1.add(mntmFaq); @@ -548,7 +562,18 @@ public class DeleteImage_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index d9b29d91..47837c22 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -13,6 +13,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Map; import javax.swing.JButton; @@ -41,6 +43,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class EditImageAllgemein_GUI extends JFrame { @@ -322,22 +325,43 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); - + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem menuItem = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java index 94ec06a6..e28b774b 100644 --- a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; @@ -36,6 +38,7 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Links; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class EditImageFreigabe_GUI extends JFrame { @@ -207,39 +210,43 @@ public class EditImageFreigabe_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - String faq; + OpenLinks open = new OpenLinks(); - faq = Links.getFAQ(); - + URI windows; try { - Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); - } catch (IOException e) { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - String otrs; - - otrs = Links.getOTRS(); + + OpenLinks open = new OpenLinks(); + URI windows; try { - Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); - } catch (IOException f) { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { // TODO Auto-generated catch block - f.printStackTrace(); + e.printStackTrace(); } - + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 4e0140c2..825292c2 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.ButtonGroup; @@ -36,6 +38,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import util.GuiOrganizer; +import util.OpenLinks; import models.Image; import models.Links; @@ -348,19 +351,41 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); - + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); mnNewMenu_1.add(mntmOtrs); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 91e5decb..b850ccb2 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -45,6 +47,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; import ftp.UploadTask; import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; @@ -358,7 +361,18 @@ public class FTPCreateUploader_GUI extends JFrame implements @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); @@ -370,7 +384,18 @@ public class FTPCreateUploader_GUI extends JFrame implements @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 87a59a6b..d21da67e 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -42,6 +44,7 @@ import server.Server.Client; import server.User; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; import ftp.DownloadTask; import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; @@ -301,7 +304,18 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); @@ -313,8 +327,19 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); - + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 298ea6ea..a2123712 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -45,6 +47,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; import ftp.UploadTask; import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; @@ -350,7 +353,19 @@ public class FTPEditUploader_GUI extends JFrame implements @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); @@ -362,7 +377,19 @@ public class FTPEditUploader_GUI extends JFrame implements @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 11dacd09..58fba9e7 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Iterator; import java.util.List; @@ -55,6 +57,7 @@ import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; //import models.person; +import util.OpenLinks; @SuppressWarnings("serial") public class SearchEditImage_GUI extends JFrame { @@ -502,23 +505,43 @@ public class SearchEditImage_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); - + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 9c197421..ef8b75bb 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Iterator; import java.util.List; @@ -54,6 +56,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class SearchImage_GUI extends JFrame { @@ -435,23 +438,43 @@ public class SearchImage_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index daef9bae..4eda36f0 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -13,6 +13,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -33,6 +35,7 @@ import javax.swing.border.TitledBorder; import models.Links; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class SearchMethodLecture_GUI extends JFrame { @@ -235,23 +238,43 @@ public class SearchMethodLecture_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 2cd45f08..21d15d40 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -12,6 +12,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -39,6 +41,7 @@ import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; import util.GuiOrganizer; +import util.OpenLinks; @@ -195,26 +198,44 @@ public class BillOfRights_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { + + OpenLinks open = new OpenLinks(); - Links.openOTRS(); + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - - mnNewMenu_1.add(mntmOtrs); - - + mnNewMenu_1.add(mntmOtrs); } } diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index abce5001..2954ca3b 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -19,6 +19,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.ButtonGroup; import javax.swing.ImageIcon; @@ -43,6 +45,7 @@ import javax.swing.border.TitledBorder; import models.Links; import models.SessionData; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -407,23 +410,43 @@ public class MainMenue_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index cfe046ad..87c6b2a2 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -39,6 +39,7 @@ import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") @@ -161,8 +162,13 @@ public class VmWareLink_GUI extends JFrame { btnWindows.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { try { - URI windows= new URI(Links.getUriWindows()); - openWebpage(windows); + + OpenLinks open = new OpenLinks(); + + URI windows= new URI(Links.getUriWindows()); + + open.openWebpage(windows); + } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -172,13 +178,17 @@ public class VmWareLink_GUI extends JFrame { }); btnWindows.setBounds(10, 119, 186, 23); contentPanel.add(btnWindows); - + JButton btnLinux = new JButton("VMware Player herunterladen"); btnLinux.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { - URI windows= new URI(Links.getUriLinux()); - openWebpage(windows); + OpenLinks open = new OpenLinks(); + + URI linux= new URI(Links.getUriLinux()); + + open.openWebpage(linux); + } catch (URISyntaxException f) { // TODO Auto-generated catch block f.printStackTrace(); @@ -228,8 +238,19 @@ public class VmWareLink_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); @@ -241,7 +262,18 @@ public class VmWareLink_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); @@ -255,15 +287,6 @@ public class VmWareLink_GUI extends JFrame { }//end constructor - public static void openWebpage(URI uri) { - Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; - if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) { - try { - desktop.browse(uri); - } catch (Exception e) { - e.printStackTrace(); - } - } - }// end openWebpage + }// end class diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index bf0a99be..44e8bd50 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Calendar; import java.util.Date; @@ -40,6 +42,7 @@ import models.Lecture; import models.Links; import models.person; import util.GuiOrganizer; +import util.OpenLinks; import com.toedter.calendar.JDateChooser; @@ -483,23 +486,43 @@ public class CreateLectureAllgemein_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mnmtAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 54c467c5..0a00e781 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -52,6 +54,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class CreateLectureLink_GUI extends JFrame { @@ -452,23 +455,43 @@ public class CreateLectureLink_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { + + OpenLinks open = new OpenLinks(); - Links.openOTRS(); + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 06c6b6ac..c638e440 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Iterator; import java.util.List; @@ -52,6 +54,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class DeleteLecture_GUI extends JFrame { @@ -405,23 +408,43 @@ public class DeleteLecture_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 1c92026b..b72efce9 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -39,6 +41,7 @@ import models.Lecture; import models.Links; import models.person; import util.GuiOrganizer; +import util.OpenLinks; import com.toedter.calendar.JDateChooser; @@ -397,23 +400,43 @@ public class EditLectureAllgemein_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 439c5b41..f7b38b06 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -52,6 +54,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class EditLectureLink_GUI extends JFrame { @@ -444,24 +447,44 @@ public class EditLectureLink_GUI extends JFrame { mntmFaq.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openFAQ(); - + + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); - + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index a6436ebf..58329ae2 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -56,6 +58,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class EditLectureSearch_GUI extends JFrame { @@ -472,23 +475,43 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { + + OpenLinks open = new OpenLinks(); - Links.openOTRS(); + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index d0a18bb7..579ea3bd 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -12,6 +12,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.net.URI; +import java.net.URISyntaxException; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -32,6 +34,7 @@ import javax.swing.border.TitledBorder; import models.Links; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class ExtendedSearchForImages_GUI extends JFrame { @@ -214,23 +217,43 @@ public class ExtendedSearchForImages_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - Links.openOTRS(); - + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 841d17df..6035ebf5 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Iterator; import java.util.List; @@ -51,6 +53,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; +import util.OpenLinks; @SuppressWarnings("serial") public class SearchLecture_GUI extends JFrame { @@ -362,23 +365,43 @@ public class SearchLecture_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { - Links.openFAQ(); + OpenLinks open = new OpenLinks(); + URI windows; + try { + windows = new URI(Links.getFAQ()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } }); - mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - Links.openOTRS(); + OpenLinks open = new OpenLinks(); + + URI windows; + try { + windows = new URI(Links.getOTRS()); + + open.openWebpage(windows); + + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } }); - mnNewMenu_1.add(mntmOtrs); JMenuItem mntmAbout = new JMenuItem("About"); diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java index 3e3dfb0e..693fbb3e 100644 --- a/Dozentenmodul/src/models/Links.java +++ b/Dozentenmodul/src/models/Links.java @@ -8,7 +8,7 @@ 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 = "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"; diff --git a/Dozentenmodul/src/util/OpenLinks.java b/Dozentenmodul/src/util/OpenLinks.java index d0e2d288..a3968825 100644 --- a/Dozentenmodul/src/util/OpenLinks.java +++ b/Dozentenmodul/src/util/OpenLinks.java @@ -1,7 +1,20 @@ package util; +import java.awt.Desktop; +import java.net.URI; + public class OpenLinks { - //hier Code einfuegen zum oeffnen von externen Links. Den Content der Links findet man in models.Links + + public static void openWebpage(URI uri) { + Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; + if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) { + try { + desktop.browse(uri); + } catch (Exception e) { + e.printStackTrace(); + } + } + }// end openWebpage } |