Skip to content

Commit 3ba2159

Browse files
author
Open Lowcode SAS
committed
Close #121
1 parent c6748dc commit 3ba2159

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

src/org/openlowcode/client/graphic/widget/CGrid.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -902,12 +902,12 @@ public void handle(ActionEvent event) {
902902

903903
@Override
904904
public void handle(ContextMenuEvent event) {
905-
logger.severe("Context menu requested on editabletreetable");
905+
logger.fine("Context menu requested on editabletreetable");
906906
if (contextmenu.isShowing()) {
907-
logger.severe("After showing, hide");
907+
logger.fine("After showing, hide");
908908
contextmenu.hide();
909909
} else {
910-
logger.severe("After hiding, show");
910+
logger.fine("After hiding, show");
911911
contextmenu.show(treetablenode, event.getScreenX(), event.getScreenY());
912912

913913
}
@@ -918,9 +918,9 @@ public void handle(ContextMenuEvent event) {
918918

919919
@Override
920920
public void changed(ObservableValue<? extends Boolean> arg0, Boolean oldvalue, Boolean newvalue) {
921-
logger.severe(" changed value on context menu");
921+
logger.fine(" changed value on context menu");
922922
if (!newvalue) {
923-
logger.severe(" context menu hide");
923+
logger.fine(" context menu hide");
924924
contextmenu.hide();
925925

926926
}

src/org/openlowcode/client/graphic/widget/table/EditableTreeTable.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import java.lang.reflect.Method;
1414
import java.math.BigDecimal;
1515
import java.util.ArrayList;
16+
import java.util.Collections;
17+
import java.util.Comparator;
1618
import java.util.HashMap;
1719
import java.util.Iterator;
1820
import java.util.List;
@@ -953,6 +955,23 @@ public void preProcess(List<E> alldata) {
953955
keymap.put(key, titlepayload);
954956
}
955957
}
958+
// if comparable, orders the columns
959+
boolean comparable=false;
960+
if (alltitles.size()>0) {
961+
comparable=true;
962+
for (int i=0;i<alltitles.size();i++) if (! (alltitles.get(i) instanceof Comparable<?>)) comparable=false;
963+
}
964+
if (comparable) {
965+
Collections.sort(alltitles,new Comparator<F>() {
966+
967+
@Override
968+
public int compare(F o1, F o2) {
969+
@SuppressWarnings("unchecked")
970+
Comparable<F> o1comp = (Comparable<F>) o1;
971+
return o1comp.compareTo(o2);
972+
973+
}});
974+
}
956975
}
957976

958977
}

0 commit comments

Comments
 (0)