diff options
| author | Jonathan Bauer | 2015-08-18 15:53:20 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-08-18 15:53:20 +0200 |
| commit | c4489f622da82861a83c7a0a1b640fad3d575d8d (patch) | |
| tree | df3ee34be8e479606b1194f6524419cb8d1ba472 /dozentenmodul/src/main/java | |
| parent | [client] major bugfix (diff) | |
| download | tutor-module-c4489f622da82861a83c7a0a1b640fad3d575d8d.tar.gz tutor-module-c4489f622da82861a83c7a0a1b640fad3d575d8d.tar.xz tutor-module-c4489f622da82861a83c7a0a1b640fad3d575d8d.zip | |
[client] fix wrong OS preselected in imageDetailsWindow and imageList Filtering
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java | 5 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java index abc0365c..2badce86 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ComboBox.java @@ -46,14 +46,17 @@ public class ComboBox<T> extends JComboBox<T> { public void setSelectedItem(Object anObject) { if (anObject != null && equalityComparator != null) { ComboBoxModel<T> model = getModel(); + Object localObject = null; try { for (int i = 0; i < model.getSize(); ++i) { T element = model.getElementAt(i); if (equalityComparator.compare((T) anObject, element) == 0) { - anObject = element; + localObject = element; break; } } + super.setSelectedItem(localObject); + return; } catch (ClassCastException e) { // Bummer, fall through } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java index 98586c4c..254e2723 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java @@ -289,7 +289,7 @@ public class ImageListWindow extends ImageListWindowLayout { break; case 1: // filter for owner - String userFilter = FormatHelper.userName(UserCache.find(Session.getUserId())); + String userFilter = Session.getUserId(); filters.add(RowFilter.regexFilter("(?i)" + userFilter, 2)); break; case 2: |