Mercurial > dive4elements > river
changeset 889:2c9c3448e499
Fixed some minor problems and strings in projectlist.
(Issue285)
flys-client/trunk@2729 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Wed, 14 Sep 2011 09:10:58 +0000 |
| parents | d6b88f8f88dd |
| children | c87500c42c5d |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java |
| diffstat | 2 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Wed Sep 14 08:00:56 2011 +0000 +++ b/flys-client/ChangeLog Wed Sep 14 09:10:58 2011 +0000 @@ -1,3 +1,10 @@ +2011-09-13 Raimund Renkert <raimund.renkert@intevation.de> + + * src/main/java/de/intevation/flys/client/client/ui/ProjectList.java: + Fixed NPE problem on empty list. + Changed filter to caseinsensitiv. (Issue285) + Changed the copy-prefix for duplicated projects. + 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> Fix flys/issue311 (i18n of crosssection).
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java Wed Sep 14 08:00:56 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java Wed Sep 14 09:10:58 2011 +0000 @@ -572,6 +572,10 @@ */ protected void updateGridDataSource (Collection[] c) { collections.clear(); + if(c == null) { + clearGrid(); + return; + } for (Collection coll : c) { this.collections.add(coll); } @@ -619,9 +623,10 @@ name = collections.get(i).getName(); } + name = name.toLowerCase(); // Add a collection to the filtered list if the search string // matches. - if (name.contains(search)) { + if (name.contains(search.toLowerCase())) { filteredCollections.add(collections.get(i)); j++; } @@ -823,7 +828,7 @@ name = cloneCollection.identifier(); } - newColl.setName("(" + messages.copy_of() + ")" + name); + newColl.setName(messages.copy_of() + ": " + name); updateCollectionName(newColl); if(cloneCollection.getTTL() == 0) {