package pl.aetas.bakspad.presentation;

import java.text.Collator;
import java.util.Comparator;
import java.util.Locale;

public class LocaleAwareStringComparator implements Comparator<String> {

    private final Collator localeCollator;

    public LocaleAwareStringComparator(Locale locale) {
        localeCollator = Collator.getInstance(locale);
    }

    @Override
    public int compare(String o1, String o2) {
        return localeCollator.compare(o1, o2);
    }
}

@@ -408,24 +408,145 @@
 tring o2) %7B%0A
+        if (o1.isEmpty()) %7B%0A            return 1;%0A        %7D%0A        if (o2.isEmpty()) %7B%0A            return -1;%0A        %7D%0A
         retu

Change for table columns comparator to put empty string at the end