You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2018/03/10 05:40:10 UTC
[03/14] logging-chainsaw git commit: Use List::sort
Use List::sort
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/1c866d29
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/1c866d29
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/1c866d29
Branch: refs/heads/master
Commit: 1c866d29d41664cbbdea7e0ccd963749399235d1
Parents: a088cd6
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 23:02:31 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 23:02:31 2018 -0600
----------------------------------------------------------------------
.../ChainsawCyclicBufferTableModel.java | 8 +++----
.../log4j/chainsaw/LogPanelLoggerTreeModel.java | 2 +-
.../apache/log4j/chainsaw/ThresholdSlider.java | 22 +++++++++-----------
.../receivers/PluginPropertyEditorPanel.java | 14 ++++++-------
4 files changed, 21 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1c866d29/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index ba5512d..86ecce7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -336,11 +336,9 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
updateEventMillisDelta(e, lastEvent);
lastEvent = e;
}
- Collections.sort(
- filteredList,
- new ColumnComparator(
- getColumnName(currentSortColumn), currentSortColumn,
- currentSortAscending));
+ filteredList.sort(new ColumnComparator(
+ getColumnName(currentSortColumn), currentSortColumn,
+ currentSortAscending));
}
}
if (sort) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1c866d29/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
index 5b10f5f..eb1a495 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
@@ -197,7 +197,7 @@ outerFor:
super.insert(newChild, childIndex);
// logger.debug("Children after insert: " + this.children);
- Collections.sort(this.children, nodeComparator);
+ this.children.sort(nodeComparator);
// logger.debug("Children after sort: " + this.children);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1c866d29/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java b/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
index 237654e..a56bd5e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
@@ -51,22 +51,20 @@ final class ThresholdSlider extends JSlider {
priorityList = Arrays.asList(levels);
- Collections.sort(
- priorityList,
- new Comparator() {
+ priorityList.sort(new Comparator() {
public int compare(Object o1, Object o2) {
- Level p1 = (Level) o1;
- Level p2 = (Level) o2;
+ Level p1 = (Level) o1;
+ Level p2 = (Level) o2;
- if (p1.toInt() == p2.toInt()) {
- return 0;
- } else if (p1.toInt() < p2.toInt()) {
- return -1;
- }
+ if (p1.toInt() == p2.toInt()) {
+ return 0;
+ } else if (p1.toInt() < p2.toInt()) {
+ return -1;
+ }
- return 1;
+ return 1;
}
- });
+ });
setModel(
new DefaultBoundedRangeModel(
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1c866d29/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
index b4f5385..b219f4e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
@@ -253,17 +253,17 @@ public class PluginPropertyEditorPanel extends JPanel {
List list = new ArrayList(Arrays.asList(
beanInfo.getPropertyDescriptors()));
- Collections.sort(list, new Comparator() {
+ list.sort(new Comparator() {
- public int compare(Object o1, Object o2) {
+ public int compare(Object o1, Object o2) {
- PropertyDescriptor d1 = (PropertyDescriptor) o1;
- PropertyDescriptor d2 = (PropertyDescriptor) o2;
+ PropertyDescriptor d1 = (PropertyDescriptor) o1;
+ PropertyDescriptor d2 = (PropertyDescriptor) o2;
- return d1.getDisplayName().compareToIgnoreCase(
+ return d1.getDisplayName().compareToIgnoreCase(
d2.getDisplayName());
- }
- });
+ }
+ });
this.plugin = p;
this.descriptors = (PropertyDescriptor[]) list.toArray(
new PropertyDescriptor[0]);