diff options
author | Jonathan Bauer | 2018-11-26 14:15:34 +0100 |
---|---|---|
committer | Jonathan Bauer | 2018-11-26 14:15:34 +0100 |
commit | cbeb881425e3bd24246a1f1ca198eb65f2a32485 (patch) | |
tree | 1a94951e08ca344a37c3876843fc5ab3c7b961e0 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java | |
parent | [client] Overhaul netrules editor (diff) | |
download | tutor-module-cbeb881425e3bd24246a1f1ca198eb65f2a32485.tar.gz tutor-module-cbeb881425e3bd24246a1f1ca198eb65f2a32485.tar.xz tutor-module-cbeb881425e3bd24246a1f1ca198eb65f2a32485.zip |
[client] netshare new features
* added "is printer" checkbox (internally saves mount point as '-')
* allow empty share names (internally mapped to '-')
* allow empty share mount points (displayed as '-')
* spaced out some form components
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java index adeae987..7284f3ed 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/NetshareTable.java @@ -2,6 +2,7 @@ package org.openslx.dozmod.gui.control.table; import org.openslx.bwlp.thrift.iface.NetShare; import org.openslx.bwlp.thrift.iface.NetShareAuth; +import org.openslx.dozmod.gui.configurator.NetshareConfigurator; import org.openslx.dozmod.thrift.Sorters; import org.openslx.dozmod.util.FormatHelper; @@ -11,7 +12,8 @@ public class NetshareTable extends ListTable<NetShare> { public static final ListTableColumn COL_NAME = new ListTableColumn("Name"); public static final ListTableColumn COL_MOUNT = new ListTableColumn("Ziel"); public static final ListTableColumn COL_PATH = new ListTableColumn("Pfad"); - public static final ListTableColumn COL_AUTH = new ListTableColumn("Authentifizierung", Sorters.netShareAuth); + public static final ListTableColumn COL_AUTH = new ListTableColumn("Authentifizierung", + Sorters.netShareAuth); public static final ListTableColumn COL_USER = new ListTableColumn("Username"); public static final ListTableColumn COL_PASSWORD = new ListTableColumn("Passwort"); @@ -35,13 +37,18 @@ public class NetshareTable extends ListTable<NetShare> { return item.password; throw new IndexOutOfBoundsException(); } - + @Override public Object modelValueToDisplayFormat(Object object, ListTableColumn column) { if (column == COL_NAME) return (String) object; - if (column == COL_MOUNT) - return (String) object + ":"; + if (column == COL_MOUNT) { + String input = (String) object; + if (!input.equals(String.valueOf(NetshareConfigurator.EMPTY_MARKER)) + && !input.equals(NetshareConfigurator.PRINTER_MARKER)) + input += ":"; + return input; + } if (column == COL_PATH) return (String) object; if (column == COL_AUTH) { |