diff options
author | Jonathan Bauer | 2018-11-29 10:33:59 +0100 |
---|---|---|
committer | Jonathan Bauer | 2018-11-29 10:33:59 +0100 |
commit | ca4bddecf74d1c9b387fadc6b4d7a6301ba40ff8 (patch) | |
tree | 33295d998b7404059b41b0f9652d32a0772b37c0 | |
parent | [client] remove unused import (diff) | |
download | tutor-module-ca4bddecf74d1c9b387fadc6b4d7a6301ba40ff8.tar.gz tutor-module-ca4bddecf74d1c9b387fadc6b4d7a6301ba40ff8.tar.xz tutor-module-ca4bddecf74d1c9b387fadc6b4d7a6301ba40ff8.zip |
[client] formatting
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java index 56649bfe..ab90d868 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java @@ -55,8 +55,8 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { // mount points / win drive letters - ideally, we would check whether the image is linux or windows based // and either show a drive selection list like this one, or a textfield for a user-defined mount point... - private Character[] mountPoints = { EMPTY_MARKER, 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', - 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' }; + private Character[] mountPoints = { EMPTY_MARKER, 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' }; public NetshareConfigurator() { super(); @@ -76,7 +76,8 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { // first set the fields to let any listener trigger tfSharePath.setText(item.path); if (item.displayname != null) - tfShareName.setText(String.valueOf(EMPTY_MARKER).equals(item.displayname) ? "" : item.displayname); + tfShareName.setText( + String.valueOf(EMPTY_MARKER).equals(item.displayname) ? "" : item.displayname); tfUsername.setText(item.username); tfPassword.setText(item.password); cboNetshareAuth.setSelectedItem(item.auth); @@ -100,7 +101,6 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { } }); - cboNetshareMountPoint.setModel(new DefaultComboBoxModel<Character>(mountPoints)); cboNetshareMountPoint.setSelectedItem(null); @@ -207,7 +207,7 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { Wrapper<NetShare> newEntry = new Wrapper<NetShare>(input, false); Wrapper<NetShare> oldEntry = tblNetshare.getSelectedItem(); List<Wrapper<NetShare>> oldList = new ArrayList<>(tblNetshare.getData()); - + // now decide whether to create a new entry or update existing one if (oldEntry != null && oldList.contains(oldEntry)) { // editing existing one, delete it from the internal data @@ -287,6 +287,7 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { chkShowPass.setSelected(false); btnAdd.setText("Hinzufügen"); } + public List<NetShare> getState() { List<Wrapper<NetShare>> list = tblNetshare.getData(); List<NetShare> ret = new ArrayList<>(); @@ -302,7 +303,7 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { if (data == null) return false; List<NetShare> shareList = new ArrayList<>(data); - List<NetShare> predef = MetaDataCache.getPredefinedNetshares(); + List<NetShare> predef = MetaDataCache.getPredefinedNetshares(); Set<NetShare> checked = new HashSet<>(); for (NetShare item : data) { if (item.shareId == 0) @@ -329,7 +330,7 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { tblNetshare.setData(shareList, checked, false); return true; } - + public void addTableModelListener(TableModelListener listener) { tblNetshare.getModel().addTableModelListener(listener); } @@ -358,22 +359,25 @@ class NetshareConfiguratorLayout extends JPanel { protected final JButton btnAdd, btnDel; protected final JCheckBox chkIsPrinter; protected final JCheckBox chkShowPass; - protected final ComboBox<NetShareAuth> cboNetshareAuth = new ComboBox<>(new ComboBoxRenderer<NetShareAuth>() { - @Override - public String renderItem(NetShareAuth item) { - if (item == null) - return null; - return FormatHelper.netShareAuthName(item); - } - }); - protected final ComboBox<Character> cboNetshareMountPoint = new ComboBox<>(new ComboBoxRenderer<Character>() { - @Override - public String renderItem(Character letter) { - if (letter == null) - return null; - return letter.equals(NetshareConfigurator.EMPTY_MARKER) ? letter.toString() : letter.toString() + ":"; - } - }); + protected final ComboBox<NetShareAuth> cboNetshareAuth = new ComboBox<>( + new ComboBoxRenderer<NetShareAuth>() { + @Override + public String renderItem(NetShareAuth item) { + if (item == null) + return null; + return FormatHelper.netShareAuthName(item); + } + }); + protected final ComboBox<Character> cboNetshareMountPoint = new ComboBox<>( + new ComboBoxRenderer<Character>() { + @Override + public String renderItem(Character letter) { + if (letter == null) + return null; + return letter.equals(NetshareConfigurator.EMPTY_MARKER) ? letter.toString() + : letter.toString() + ":"; + } + }); public NetshareConfiguratorLayout() { GridManager grid = new GridManager(this, 3, true, new Insets(3, 3, 3, 3)); |