diff options
| author | Simon Rettberg | 2018-12-04 15:31:22 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-12-04 15:31:22 +0100 |
| commit | b5e5928a6147e4b7899b4b9ab741279436a2cbdd (patch) | |
| tree | 320e4ba13713df6e0fd6de4f589e3d81df386cdd | |
| parent | [server] Fix comment (diff) | |
| download | tutor-module-b5e5928a6147e4b7899b4b9ab741279436a2cbdd.tar.gz tutor-module-b5e5928a6147e4b7899b4b9ab741279436a2cbdd.tar.xz tutor-module-b5e5928a6147e4b7899b4b9ab741279436a2cbdd.zip | |
[client] NullPointer checks in ListTable etc.
3 files changed, 8 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java index c2a8d2bd..c6c02304 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java @@ -105,7 +105,7 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout { oldList.remove(oldEntry); } oldList.add(newEntry); - tblFilters.setData(oldList, true); + tblFilters.setData(oldList, false); clearInputFields(); } }); @@ -127,7 +127,7 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout { return; } // refresh table data - tblFilters.setData(oldList, true); + tblFilters.setData(oldList, false); } catch (Exception ex) { LOGGER.debug("Failed to remove " + selection.toString() + " from the table data.", ex); return; @@ -146,6 +146,8 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout { public List<LdapFilter> getState() { List<Wrapper<LdapFilter>> current = tblFilters.getData(); + if (current == null) + return new ArrayList<>(0);; ArrayList<LdapFilter> ret = new ArrayList<>(current.size()); for (Wrapper<LdapFilter> item : current) { if (item.isChecked() || item.item.filterId == 0) { 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 ab90d868..f2b47ffe 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 @@ -290,6 +290,8 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout { public List<NetShare> getState() { List<Wrapper<NetShare>> list = tblNetshare.getData(); + if (list == null) + return new ArrayList<>(0); List<NetShare> ret = new ArrayList<>(); for (Wrapper<NetShare> item : list) { if (item.isChecked() || item.item.shareId == 0) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java index f0ba9e93..47062258 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java @@ -110,6 +110,8 @@ public abstract class ListTable<T> extends JTable { } public List<T> getData() { + if (model.data == null) + return null; return Collections.unmodifiableList(model.data); } |