summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src
diff options
context:
space:
mode:
authorMichael Wilson2014-10-08 16:29:06 +0200
committerMichael Wilson2014-10-08 16:29:06 +0200
commit153b9b10cdceabf110f3ff81b517e290f2dc42ff (patch)
tree98dba61c9407a86ee2f7f33f50c5a95d7e26e6de /dozentenmodul/src
parent-Rechteveraltung funktioniert endlich beim anlegen eines neuen Image -> muss ... (diff)
parent[client] EditImageTech: code cleanup (diff)
downloadtutor-module-153b9b10cdceabf110f3ff81b517e290f2dc42ff.tar.gz
tutor-module-153b9b10cdceabf110f3ff81b517e290f2dc42ff.tar.xz
tutor-module-153b9b10cdceabf110f3ff81b517e290f2dc42ff.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src')
-rw-r--r--dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java129
1 files changed, 18 insertions, 111 deletions
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<String> comboBox;
ThriftConnection con = new ThriftConnection();
Client client = models.Client.clientcon.getClient();
private static final String HELP_MESSAGE = "<html><div align = \"center\">" +
@@ -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<String>();
+ List<String> os = null;
try {
- List<String> os=client.getAllOS();
- for(int i=0;i<os.size();i++)
- {
+ os=client.getAllOS();
+ for(int i=0;i<os.size();i++) {
comboBox.addItem(os.get(i).toString());
-
}
} catch (TException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
LOGGER.info("OS of this image: " + Image.image.getOS());
- for(int i =0;i<comboBox.getItemCount();i++)
- {
- if(comboBox.getItemAt(i).equals(Image.image.getOS()+" bit")){
-
- comboBox.setSelectedIndex(i);
-
- }
- }
- LOGGER.debug(comboBox.getSelectedItem().toString());
+ // since the name of the OS is mapped to an internal value
+ // ex: 'Ubuntu x.x 64 Bit' to 'ubuntu-64' it needs a bit
+ // more work to set this box correctly...
+ // TODO: use getOS(key) from the client to get the string from the key
+ //comboBox.setSelectedItem(Client.getOs(Image.image.getOS()));
comboBox.setBounds(270, 26, 277, 20);
panel_1.add(comboBox);
-
-
- if(Image.image.isInternet() == true ){
- chckbxIsInternetBlocked.setSelected(true);
- } else {
- chckbxIsInternetBlocked.setSelected(false);
- }
-
- if (Image.image.isLicensed() == true) {
- //rdbtnlicenseJa.setSelected(true);
- chckbxIsLicensed.setSelected(true);
- chckbxIsLicensed.isSelected();
- } else {
- //rdbtnlicenseNein.setSelected(true);
- chckbxIsLicensed.setSelected(false);
- }
+ chckbxIsInternetBlocked.setSelected(Image.image.isInternet());
+ chckbxIsLicensed.setSelected(Image.image.isLicensed());
JLabel lblHauptmen = new JLabel("Hauptmenü");
lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -368,19 +309,8 @@ public class EditImageTechnisch_GUI extends JFrame {
spinnerCPU.getValue().toString()).intValue());
Image.image.setRam(Integer.valueOf(
spinnerRam.getValue().toString()).intValue());
- if (chckbxIsInternetBlocked.isSelected() == true) {
- Image.image.setInternet(true);
- } else {
- Image.image.setInternet(false);
- }
-
- if (chckbxIsLicensed.isSelected() == true) {
- Image.image.setLicensed(true);
- } else {
- Image.image.setLicensed(false);
- }
-
-
+ Image.image.setInternet(chckbxIsInternetBlocked.isSelected());
+ Image.image.setLicensed(chckbxIsLicensed.isSelected());
Image.image.setOS(comboBox.getSelectedItem().toString());
// oeffnet das vorherige Fenster
EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI();
@@ -400,19 +330,8 @@ public class EditImageTechnisch_GUI extends JFrame {
spinnerCPU.getValue().toString()).intValue());
Image.image.setRam(Integer.valueOf(
spinnerRam.getValue().toString()).intValue());
- if (chckbxIsInternetBlocked.isSelected() == true) {
- Image.image.setInternet(true);
- } else {
- Image.image.setInternet(false);
- }
-
- if (chckbxIsLicensed.isSelected() == true) {
- Image.image.setLicensed(true);
- } else {
- Image.image.setLicensed(false);
- }
-
-
+ Image.image.setInternet(chckbxIsInternetBlocked.isSelected());
+ Image.image.setLicensed(chckbxIsLicensed.isSelected());
Image.image.setOS(comboBox.getSelectedItem().toString());
LOGGER.info("OS: " + Image.image.getOS() +
", Vorlage: " + Image.image.isVorlage() +
@@ -450,15 +369,10 @@ public class EditImageTechnisch_GUI extends JFrame {
mntmFaq.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent arg0) {
-
- OpenLinks open = new OpenLinks();
-
URI windows;
try {
windows = new URI(Links.getFAQ());
-
- open.openWebpage(windows);
-
+ OpenLinks.openWebpage(windows);
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -467,25 +381,18 @@ public class EditImageTechnisch_GUI extends JFrame {
});
mnNewMenu_1.add(mntmFaq);
-
JMenuItem mntmOtrs = new JMenuItem("OTRS");
mntmOtrs.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent arg0) {
-
- OpenLinks open = new OpenLinks();
-
URI windows;
try {
windows = new URI(Links.getOTRS());
-
- open.openWebpage(windows);
-
+ OpenLinks.openWebpage(windows);
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
}
});
mnNewMenu_1.add(mntmOtrs);
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 21:32:09 +0100