From a54246db8403898f306eba74ef2ad1ba3f4025af Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 8 Oct 2014 15:16:48 +0200 Subject: [client] EditImageTech: code cleanup TODO: get the image's OS from the DB (through client) and set the combobox to that string --- .../java/gui/image/EditImageTechnisch_GUI.java | 129 +++------------------ 1 file changed, 18 insertions(+), 111 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index 1fec8cdb..cf9cb9d2 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -1,7 +1,6 @@ package gui.image; import gui.intro.About_GUI; -import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -18,7 +17,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -27,7 +25,6 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JRadioButton; import javax.swing.JSeparator; import javax.swing.JSpinner; import javax.swing.JTextArea; @@ -66,10 +63,7 @@ public class EditImageTechnisch_GUI extends JFrame { JSpinner spinnerRam; private JCheckBox chckbxIsLicensed; private JCheckBox chckbxIsInternetBlocked; - private final ButtonGroup buttonGrouplicense = new ButtonGroup(); - private final ButtonGroup buttonGroupInternet = new ButtonGroup(); - private final ButtonGroup buttonGroupVorlage = new ButtonGroup(); - JComboBox comboBox; + JComboBox comboBox; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); private static final String HELP_MESSAGE = "
" + @@ -157,34 +151,11 @@ public class EditImageTechnisch_GUI extends JFrame { chckbxIsInternetBlocked.setBounds(266, 85, 97, 23); panel_1.add(chckbxIsInternetBlocked); - //rdbtnlicenseJa = new JRadioButton("Ja"); - //rdbtnlicenseJa.setSelected(true); - //buttonGrouplicense.add(rdbtnlicenseJa); - //rdbtnlicenseJa.setBounds(266, 76, 109, 23); - //panel_1.add(rdbtnlicenseJa); - - //rdbtnlicenseNein = new JRadioButton("Nein"); - //buttonGrouplicense.add(rdbtnlicenseNein); - //rdbtnlicenseNein.setBounds(377, 76, 53, 23); - //panel_1.add(rdbtnlicenseNein); - - JLabel lblInternetIstInnerhalb = new JLabel( "Internet ist innerhalb des Images gesperrt:"); lblInternetIstInnerhalb.setBounds(10, 86, 250, 20); panel_1.add(lblInternetIstInnerhalb); - /*rdbtnInternetJa = new JRadioButton("Ja"); - buttonGroupInternet.add(rdbtnInternetJa); - rdbtnInternetJa.setBounds(266, 104, 109, 23); - panel_1.add(rdbtnInternetJa); - - rdbtnInternetNein = new JRadioButton("Nein"); - rdbtnInternetNein.setSelected(true); - buttonGroupInternet.add(rdbtnInternetNein); - rdbtnInternetNein.setBounds(377, 104, 53, 23); - panel_1.add(rdbtnInternetNein); - */ JLabel label = new JLabel("Lizenzserver eintragen:"); label.setBounds(10, 115, 250, 20); panel_1.add(label); @@ -194,62 +165,32 @@ public class EditImageTechnisch_GUI extends JFrame { button.setBounds(266, 114, 157, 23); panel_1.add(button); - //radioButtonVorlageJa = new JRadioButton("Ja"); - //buttonGroupVorlage.add(radioButtonVorlageJa); - //radioButtonVorlageJa.setBounds(266, 50, 41, 23); - //panel_1.add(radioButtonVorlageJa); - - //radioButtonVorlageNein = new JRadioButton("Nein"); - //radioButtonVorlageNein.setSelected(true); - //buttonGroupVorlage.add(radioButtonVorlageNein); - //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(); + comboBox = new JComboBox(); + List os = null; try { - List os=client.getAllOS(); - for(int i=0;i