aboutsummaryrefslogtreecommitdiffstats
path: root/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java
diff options
context:
space:
mode:
authorJiri Vanek <[email protected]>2014-01-06 10:51:06 +0100
committerJiri Vanek <[email protected]>2014-01-06 10:51:06 +0100
commitf9288c313418e0684e955b152ed14b2a92e3fc95 (patch)
tree919c0e7af267d8162ff7e94b7996745c341ef7a3 /netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java
parent3261e3454f94f66082d97c2ba8a10cbe603dcc01 (diff)
Copy all button in console controls sorts by date by default.
Diffstat (limited to 'netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java')
-rw-r--r--netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java16
1 files changed, 10 insertions, 6 deletions
diff --git a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java
index 79b132b..912d220 100644
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java
@@ -125,8 +125,12 @@ public class ConsoleOutputPaneModel {
String importList(int start) {
return importList(highLight, start);
}
-
+
String importList(boolean mark, int start) {
+ return importList(mark, start, sortBy);
+ }
+
+ String importList(boolean mark, int start, int sortByLocal) {
int added = start;
StringBuilder sb = new StringBuilder();
if (mark) {
@@ -139,9 +143,9 @@ public class ConsoleOutputPaneModel {
List<MessageWithHeader> sortedList;
if (start == 0) {
- sortedList = preSort(dataProvider.getData());
+ sortedList = preSort(dataProvider.getData(), sortByLocal);
} else {
- sortedList = preSort(Collections.synchronizedList(dataProvider.getData().subList(start, dataProvider.getData().size())));
+ sortedList = preSort(Collections.synchronizedList(dataProvider.getData().subList(start, dataProvider.getData().size())), sortByLocal);
}
lastUpdateIndex = dataProvider.getData().size();
@@ -226,9 +230,9 @@ public class ConsoleOutputPaneModel {
return sb.toString();
}
- List<MessageWithHeader> preSort(List<MessageWithHeader> data) {
+ List<MessageWithHeader> preSort(List<MessageWithHeader> data, int sortByLocal) {
List<MessageWithHeader> sortedData;
- if (sortBy == 0) {
+ if (sortByLocal == 0) {
if (revertSort) {
sortedData = Collections.synchronizedList(new ArrayList<MessageWithHeader>(data));
Collections.reverse(sortedData);
@@ -237,7 +241,7 @@ public class ConsoleOutputPaneModel {
}
} else {
sortedData = Collections.synchronizedList(new ArrayList<MessageWithHeader>(data));
- switch (sortBy) {
+ switch (sortByLocal) {
case 1:
Collections.sort(sortedData, new CatchedMessageWithHeaderComparator() {
@Override