From: Niki Roo Date: Sat, 25 Apr 2020 15:17:21 +0000 (+0200) Subject: Merge commit 'ee020e75a5de0c1e54557db79f77edc50e05ea04' X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=f19b48e27a56ebab18687debd9ef52581a03f06d;p=fanfix-swing.git Merge commit 'ee020e75a5de0c1e54557db79f77edc50e05ea04' --- f19b48e27a56ebab18687debd9ef52581a03f06d diff --cc src/be/nikiroo/utils/android/ImageUtilsAndroid.class index 00000000,844712ac..844712ac mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/utils/android/test/TestAndroid.class index 00000000,216aa205..216aa205 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/utils/compat/DefaultListModel6.java index 00000000,114ac42e..114ac42e mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/DefaultListModel6.java +++ b/src/be/nikiroo/utils/compat/DefaultListModel6.java diff --cc src/be/nikiroo/utils/compat/JList6.java index 00000000,ca441650..ca441650 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/JList6.java +++ b/src/be/nikiroo/utils/compat/JList6.java diff --cc src/be/nikiroo/utils/compat/ListCellRenderer6.java index 00000000,d0048498..d0048498 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/ListCellRenderer6.java +++ b/src/be/nikiroo/utils/compat/ListCellRenderer6.java diff --cc src/be/nikiroo/utils/compat/ListModel6.java index 00000000,a1f8c607..a1f8c607 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/ListModel6.java +++ b/src/be/nikiroo/utils/compat/ListModel6.java diff --cc src/be/nikiroo/utils/ui/BreadCrumbsBar.java index 00000000,8b993e64..8b993e64 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/BreadCrumbsBar.java +++ b/src/be/nikiroo/utils/ui/BreadCrumbsBar.java diff --cc src/be/nikiroo/utils/ui/DataNode.java index 00000000,2d3ac267..2d3ac267 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/DataNode.java +++ b/src/be/nikiroo/utils/ui/DataNode.java diff --cc src/be/nikiroo/utils/ui/DataTree.java index 00000000,e941a71d..e941a71d mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/DataTree.java +++ b/src/be/nikiroo/utils/ui/DataTree.java diff --cc src/be/nikiroo/utils/ui/DelayWorker.java index 00000000,3618b89e..3618b89e mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/DelayWorker.java +++ b/src/be/nikiroo/utils/ui/DelayWorker.java diff --cc src/be/nikiroo/utils/ui/ListModel.java index 00000000,06e7914c..06e7914c mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/ListModel.java +++ b/src/be/nikiroo/utils/ui/ListModel.java diff --cc src/be/nikiroo/utils/ui/ListenerPanel.java index 00000000,144cdd24..144cdd24 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/ListenerPanel.java +++ b/src/be/nikiroo/utils/ui/ListenerPanel.java diff --cc src/be/nikiroo/utils/ui/TreeCellSpanner.java index 00000000,703bfa1c..703bfa1c mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/TreeCellSpanner.java +++ b/src/be/nikiroo/utils/ui/TreeCellSpanner.java diff --cc src/be/nikiroo/utils/ui/TreeModelTransformer.java index 00000000,9568f175..9568f175 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/TreeModelTransformer.java +++ b/src/be/nikiroo/utils/ui/TreeModelTransformer.java diff --cc src/be/nikiroo/utils/ui/TreeSnapshot.java index 00000000,ef9a6fb6..ef9a6fb6 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/TreeSnapshot.java +++ b/src/be/nikiroo/utils/ui/TreeSnapshot.java