From 941c2a4ef20625a4dd6674e05186cb97097942d5 Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 24 Jul 2014 12:08:41 +0200 Subject: Betriebssystem auswahl ist nun implementiert --- .../src/gui/image/EditImageTechnisch_GUI.java | 91 +++++++++++++++------- 1 file changed, 65 insertions(+), 26 deletions(-) (limited to 'Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java') diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 6573b802..59ba1304 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.net.URI; import java.net.URISyntaxException; +import java.util.List; import javax.swing.ButtonGroup; @@ -37,10 +38,15 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import server.Server.Client; +import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; import models.Image; import models.Links; +import javax.swing.JComboBox; + +import org.apache.thrift.TException; @SuppressWarnings("serial") public class EditImageTechnisch_GUI extends JFrame { @@ -58,7 +64,9 @@ public class EditImageTechnisch_GUI extends JFrame { private final ButtonGroup buttonGrouplicense = new ButtonGroup(); private final ButtonGroup buttonGroupInternet = new ButtonGroup(); private final ButtonGroup buttonGroupVorlage = new ButtonGroup(); - + JComboBox comboBox; + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Create the dialog. */ @@ -111,7 +119,7 @@ public class EditImageTechnisch_GUI extends JFrame { txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } - contentPanel.setBounds(10, 85, 577, 493); + contentPanel.setBounds(10, 85, 577, 532); contentPanel.setBackground(SystemColor.menu); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); @@ -121,24 +129,24 @@ public class EditImageTechnisch_GUI extends JFrame { panel_1.setBackground(SystemColor.menu); panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 25, 557, 136); + panel_1.setBounds(10, 25, 557, 167); contentPanel.add(panel_1); panel_1.setLayout(null); JLabel lblNewLabel_2 = new JLabel( "Image enth\u00E4lt lizenzpflichtige Software:"); - lblNewLabel_2.setBounds(10, 46, 250, 20); + lblNewLabel_2.setBounds(10, 77, 250, 20); panel_1.add(lblNewLabel_2); rdbtnlicenseJa = new JRadioButton("Ja"); rdbtnlicenseJa.setSelected(true); buttonGrouplicense.add(rdbtnlicenseJa); - rdbtnlicenseJa.setBounds(266, 45, 109, 23); + rdbtnlicenseJa.setBounds(266, 76, 109, 23); panel_1.add(rdbtnlicenseJa); rdbtnlicenseNein = new JRadioButton("Nein"); buttonGrouplicense.add(rdbtnlicenseNein); - rdbtnlicenseNein.setBounds(377, 45, 109, 23); + rdbtnlicenseNein.setBounds(377, 76, 109, 23); panel_1.add(rdbtnlicenseNein); if (Image.image.isLicensed() == true) { rdbtnlicenseJa.setSelected(true); @@ -148,43 +156,72 @@ public class EditImageTechnisch_GUI extends JFrame { JLabel lblInternetIstInnerhalb = new JLabel( "Internet ist innerhalb des Image gesperrt:"); - lblInternetIstInnerhalb.setBounds(10, 74, 250, 20); + lblInternetIstInnerhalb.setBounds(10, 105, 250, 20); panel_1.add(lblInternetIstInnerhalb); rdbtnInternetJa = new JRadioButton("Ja"); buttonGroupInternet.add(rdbtnInternetJa); - rdbtnInternetJa.setBounds(266, 73, 109, 23); + rdbtnInternetJa.setBounds(266, 104, 109, 23); panel_1.add(rdbtnInternetJa); rdbtnInternetNein = new JRadioButton("Nein"); rdbtnInternetNein.setSelected(true); buttonGroupInternet.add(rdbtnInternetNein); - rdbtnInternetNein.setBounds(377, 73, 109, 23); + rdbtnInternetNein.setBounds(377, 104, 109, 23); panel_1.add(rdbtnInternetNein); JLabel label = new JLabel("Lizenzserver eintragen:"); - label.setBounds(10, 103, 250, 20); + label.setBounds(10, 134, 250, 20); panel_1.add(label); JButton button = new JButton("Server-Adresse..."); button.setEnabled(false); - button.setBounds(266, 102, 157, 23); + button.setBounds(266, 133, 157, 23); panel_1.add(button); JLabel label_4 = new JLabel("Image ist eine Vorlage:"); - label_4.setBounds(10, 20, 250, 20); + label_4.setBounds(10, 51, 250, 20); panel_1.add(label_4); radioButtonVorlageJa = new JRadioButton("Ja"); buttonGroupVorlage.add(radioButtonVorlageJa); radioButtonVorlageJa.setSelected(true); - radioButtonVorlageJa.setBounds(266, 19, 41, 23); + radioButtonVorlageJa.setBounds(266, 50, 41, 23); panel_1.add(radioButtonVorlageJa); radioButtonVorlageNein = new JRadioButton("Nein"); buttonGroupVorlage.add(radioButtonVorlageNein); - radioButtonVorlageNein.setBounds(377, 19, 46, 23); + radioButtonVorlageNein.setBounds(377, 50, 46, 23); panel_1.add(radioButtonVorlageNein); + + JLabel lblBetriebssystem = new JLabel("Betriebssystem:"); + lblBetriebssystem.setBounds(10, 26, 250, 20); + panel_1.add(lblBetriebssystem); + + comboBox = new JComboBox(); + try { + List os=client.getAllOS(); + for(int i=0;i