You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/07 12:31:01 UTC
[lucene-solr] 21/34: Make auxiliary classes static inner classes
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch jira/lucene-2562-luke-swing-3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit d1b40dcab4c663c8cdcaa5ebe9ede9f6fbaba12f
Author: Tomoko Uchida <to...@gmail.com>
AuthorDate: Sat Apr 6 09:19:17 2019 +0900
Make auxiliary classes static inner classes
---
.../desktop/components/AnalysisPanelProvider.java | 97 ++---
.../desktop/components/CommitsPanelProvider.java | 190 ++++-----
.../desktop/components/DocumentsPanelProvider.java | 437 +++++++++++----------
.../desktop/components/OverviewPanelProvider.java | 179 +++++----
.../desktop/components/SearchPanelProvider.java | 111 +++---
.../dialog/analysis/EditParamsDialogFactory.java | 107 ++---
.../luke/app/desktop/util/TextAreaAppender.java | 1 -
.../org/apache/lucene/luke/util/LoggerFactory.java | 2 +-
8 files changed, 562 insertions(+), 562 deletions(-)
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.java
index c38272a..70c2291 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.java
@@ -375,66 +375,67 @@ public final class AnalysisPanelProvider implements AnalysisTabOperator {
}
-}
-
-final class TokensTableModel extends TableModelBase<TokensTableModel.Column> {
+ static final class TokensTableModel extends TableModelBase<TokensTableModel.Column> {
+
+ enum Column implements TableColumnInfo {
+ TERM("Term", 0, String.class, 150),
+ ATTR("Attributes", 1, String.class, 1000);
+
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
+
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- enum Column implements TableColumnInfo {
- TERM("Term", 0, String.class, 150),
- ATTR("Attributes", 1, String.class, 1000);
+ @Override
+ public String getColName() {
+ return colName;
+ }
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ @Override
+ public int getIndex() {
+ return index;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
- @Override
- public String getColName() {
- return colName;
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getIndex() {
- return index;
+ TokensTableModel() {
+ super();
}
- @Override
- public Class<?> getType() {
- return type;
+ TokensTableModel(List<Analysis.Token> tokens) {
+ super(tokens.size());
+ for (int i = 0; i < tokens.size(); i++) {
+ Analysis.Token token = tokens.get(i);
+ data[i][Column.TERM.getIndex()] = token.getTerm();
+ List<String> attValues = token.getAttributes().stream()
+ .flatMap(att -> att.getAttValues().entrySet().stream()
+ .map(e -> e.getKey() + "=" + e.getValue()))
+ .collect(Collectors.toList());
+ data[i][Column.ATTR.getIndex()] = String.join(",", attValues);
+ }
}
@Override
- public int getColumnWidth() {
- return width;
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
- TokensTableModel() {
- super();
- }
-
- TokensTableModel(List<Analysis.Token> tokens) {
- super(tokens.size());
- for (int i = 0; i < tokens.size(); i++) {
- Analysis.Token token = tokens.get(i);
- data[i][Column.TERM.getIndex()] = token.getTerm();
- List<String> attValues = token.getAttributes().stream()
- .flatMap(att -> att.getAttValues().entrySet().stream()
- .map(e -> e.getKey() + "=" + e.getValue()))
- .collect(Collectors.toList());
- data[i][Column.ATTR.getIndex()] = String.join(",", attValues);
- }
- }
+}
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
-}
\ No newline at end of file
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/CommitsPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/CommitsPanelProvider.java
index e7a2333..d06abcc 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/CommitsPanelProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/CommitsPanelProvider.java
@@ -444,132 +444,132 @@ public final class CommitsPanelProvider {
DIAGNOSTICS, ATTRIBUTES, CODEC;
}
-}
+ static final class FilesTableModel extends TableModelBase<FilesTableModel.Column> {
-final class FilesTableModel extends TableModelBase<FilesTableModel.Column> {
+ enum Column implements TableColumnInfo {
- enum Column implements TableColumnInfo {
+ FILENAME("Filename", 0, String.class, 200),
+ SIZE("Size", 1, String.class, Integer.MAX_VALUE);
- FILENAME("Filename", 0, String.class, 200),
- SIZE("Size", 1, String.class, Integer.MAX_VALUE);
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public String getColName() {
+ return colName;
+ }
- @Override
- public String getColName() {
- return colName;
+ @Override
+ public int getIndex() {
+ return index;
+ }
+
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
+
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getIndex() {
- return index;
+ FilesTableModel() {
+ super();
}
- @Override
- public Class<?> getType() {
- return type;
+ FilesTableModel(List<File> files) {
+ super(files.size());
+ for (int i = 0; i < files.size(); i++) {
+ File file = files.get(i);
+ data[i][Column.FILENAME.getIndex()] = file.getFileName();
+ data[i][Column.SIZE.getIndex()] = file.getDisplaySize();
+ }
}
@Override
- public int getColumnWidth() {
- return width;
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
- FilesTableModel() {
- super();
- }
+ static final class SegmentsTableModel extends TableModelBase<SegmentsTableModel.Column> {
- FilesTableModel(List<File> files) {
- super(files.size());
- for (int i = 0; i < files.size(); i++) {
- File file = files.get(i);
- data[i][Column.FILENAME.getIndex()] = file.getFileName();
- data[i][Column.SIZE.getIndex()] = file.getDisplaySize();
- }
- }
+ enum Column implements TableColumnInfo {
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
-}
+ NAME("Name", 0, String.class, 60),
+ MAXDOCS("Max docs", 1, Integer.class, 60),
+ DELS("Dels", 2, Integer.class, 60),
+ DELGEN("Del gen", 3, Long.class, 60),
+ VERSION("Lucene ver.", 4, String.class, 60),
+ CODEC("Codec", 5, String.class, 100),
+ SIZE("Size", 6, String.class, 150);
-final class SegmentsTableModel extends TableModelBase<SegmentsTableModel.Column> {
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
- enum Column implements TableColumnInfo {
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- NAME("Name", 0, String.class, 60),
- MAXDOCS("Max docs", 1, Integer.class, 60),
- DELS("Dels", 2, Integer.class, 60),
- DELGEN("Del gen", 3, Long.class, 60),
- VERSION("Lucene ver.", 4, String.class, 60),
- CODEC("Codec", 5, String.class, 100),
- SIZE("Size", 6, String.class, 150);
+ @Override
+ public String getColName() {
+ return colName;
+ }
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ @Override
+ public int getIndex() {
+ return index;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
- @Override
- public String getColName() {
- return colName;
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getIndex() {
- return index;
+ SegmentsTableModel() {
+ super();
}
- @Override
- public Class<?> getType() {
- return type;
+ SegmentsTableModel(List<Segment> segments) {
+ super(segments.size());
+ for (int i = 0; i < segments.size(); i++) {
+ Segment segment = segments.get(i);
+ data[i][Column.NAME.getIndex()] = segment.getName();
+ data[i][Column.MAXDOCS.getIndex()] = segment.getMaxDoc();
+ data[i][Column.DELS.getIndex()] = segment.getDelCount();
+ data[i][Column.DELGEN.getIndex()] = segment.getDelGen();
+ data[i][Column.VERSION.getIndex()] = segment.getLuceneVer();
+ data[i][Column.CODEC.getIndex()] = segment.getCodecName();
+ data[i][Column.SIZE.getIndex()] = segment.getDisplaySize();
+ }
}
@Override
- public int getColumnWidth() {
- return width;
- }
- }
-
- SegmentsTableModel() {
- super();
- }
-
- SegmentsTableModel(List<Segment> segments) {
- super(segments.size());
- for (int i = 0; i < segments.size(); i++) {
- Segment segment = segments.get(i);
- data[i][Column.NAME.getIndex()] = segment.getName();
- data[i][Column.MAXDOCS.getIndex()] = segment.getMaxDoc();
- data[i][Column.DELS.getIndex()] = segment.getDelCount();
- data[i][Column.DELGEN.getIndex()] = segment.getDelGen();
- data[i][Column.VERSION.getIndex()] = segment.getLuceneVer();
- data[i][Column.CODEC.getIndex()] = segment.getCodecName();
- data[i][Column.SIZE.getIndex()] = segment.getDisplaySize();
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
+}
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
-}
\ No newline at end of file
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java
index 299c3f5..144941b 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java
@@ -851,264 +851,265 @@ public final class DocumentsPanelProvider implements DocumentsTabOperator {
}
}
-}
+ static final class PosTableModel extends TableModelBase<PosTableModel.Column> {
-final class PosTableModel extends TableModelBase<PosTableModel.Column> {
+ enum Column implements TableColumnInfo {
- enum Column implements TableColumnInfo {
+ POSITION("Position", 0, Integer.class, 80),
+ OFFSETS("Offsets", 1, String.class, 120),
+ PAYLOAD("Payload", 2, String.class, 300);
- POSITION("Position", 0, Integer.class, 80),
- OFFSETS("Offsets", 1, String.class, 120),
- PAYLOAD("Payload", 2, String.class, 300);
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public String getColName() {
+ return colName;
+ }
- @Override
- public String getColName() {
- return colName;
- }
+ @Override
+ public int getIndex() {
+ return index;
+ }
- @Override
- public int getIndex() {
- return index;
- }
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
- @Override
- public Class<?> getType() {
- return type;
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getColumnWidth() {
- return width;
+ PosTableModel() {
+ super();
}
- }
- PosTableModel() {
- super();
- }
+ PosTableModel(List<TermPosting> postings) {
+ super(postings.size());
- PosTableModel(List<TermPosting> postings) {
- super(postings.size());
+ for (int i = 0; i < postings.size(); i++) {
+ TermPosting p = postings.get(i);
- for (int i = 0; i < postings.size(); i++) {
- TermPosting p = postings.get(i);
+ int position = postings.get(i).getPosition();
+ String offset = null;
+ if (p.getStartOffset() >= 0 && p.getEndOffset() >= 0) {
+ offset = p.getStartOffset() + "-" + p.getEndOffset();
+ }
+ String payload = null;
+ if (p.getPayload() != null) {
+ payload = BytesRefUtils.decode(p.getPayload());
+ }
- int position = postings.get(i).getPosition();
- String offset = null;
- if (p.getStartOffset() >= 0 && p.getEndOffset() >= 0) {
- offset = p.getStartOffset() + "-" + p.getEndOffset();
- }
- String payload = null;
- if (p.getPayload() != null) {
- payload = BytesRefUtils.decode(p.getPayload());
+ data[i] = new Object[]{position, offset, payload};
}
+ }
- data[i] = new Object[]{position, offset, payload};
+ @Override
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
-}
+ static final class DocumentsTableModel extends TableModelBase<DocumentsTableModel.Column> {
-final class DocumentsTableModel extends TableModelBase<DocumentsTableModel.Column> {
+ enum Column implements TableColumnInfo {
+ FIELD("Field", 0, String.class, 150),
+ FLAGS("Flags", 1, String.class, 200),
+ NORM("Norm", 2, Long.class, 80),
+ VALUE("Value", 3, String.class, 500);
- enum Column implements TableColumnInfo {
- FIELD("Field", 0, String.class, 150),
- FLAGS("Flags", 1, String.class, 200),
- NORM("Norm", 2, Long.class, 80),
- VALUE("Value", 3, String.class, 500);
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public String getColName() {
+ return colName;
+ }
- @Override
- public String getColName() {
- return colName;
- }
+ @Override
+ public int getIndex() {
+ return index;
+ }
- @Override
- public int getIndex() {
- return index;
- }
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
- @Override
- public Class<?> getType() {
- return type;
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getColumnWidth() {
- return width;
+ DocumentsTableModel() {
+ super();
}
- }
-
- DocumentsTableModel() {
- super();
- }
- DocumentsTableModel(List<DocumentField> doc) {
- super(doc.size());
-
- for (int i = 0; i < doc.size(); i++) {
- DocumentField docField = doc.get(i);
- String field = docField.getName();
- String flags = flags(docField);
- long norm = docField.getNorm();
- String value = null;
- if (docField.getStringValue() != null) {
- value = docField.getStringValue();
- } else if (docField.getNumericValue() != null) {
- value = String.valueOf(docField.getNumericValue());
- } else if (docField.getBinaryValue() != null) {
- value = String.valueOf(docField.getBinaryValue());
+ DocumentsTableModel(List<DocumentField> doc) {
+ super(doc.size());
+
+ for (int i = 0; i < doc.size(); i++) {
+ DocumentField docField = doc.get(i);
+ String field = docField.getName();
+ String flags = flags(docField);
+ long norm = docField.getNorm();
+ String value = null;
+ if (docField.getStringValue() != null) {
+ value = docField.getStringValue();
+ } else if (docField.getNumericValue() != null) {
+ value = String.valueOf(docField.getNumericValue());
+ } else if (docField.getBinaryValue() != null) {
+ value = String.valueOf(docField.getBinaryValue());
+ }
+ data[i] = new Object[]{field, flags, norm, value};
}
- data[i] = new Object[]{field, flags, norm, value};
}
- }
- private static String flags(org.apache.lucene.luke.models.documents.DocumentField f) {
- StringBuilder sb = new StringBuilder();
- // index options
- if (f.getIdxOptions() == null || f.getIdxOptions() == IndexOptions.NONE) {
- sb.append("-----");
- } else {
- sb.append("I");
- switch (f.getIdxOptions()) {
- case DOCS:
- sb.append("d---");
- break;
- case DOCS_AND_FREQS:
- sb.append("df--");
- break;
- case DOCS_AND_FREQS_AND_POSITIONS:
- sb.append("dfp-");
- break;
- case DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS:
- sb.append("dfpo");
- break;
- default:
- sb.append("----");
+ private static String flags(org.apache.lucene.luke.models.documents.DocumentField f) {
+ StringBuilder sb = new StringBuilder();
+ // index options
+ if (f.getIdxOptions() == null || f.getIdxOptions() == IndexOptions.NONE) {
+ sb.append("-----");
+ } else {
+ sb.append("I");
+ switch (f.getIdxOptions()) {
+ case DOCS:
+ sb.append("d---");
+ break;
+ case DOCS_AND_FREQS:
+ sb.append("df--");
+ break;
+ case DOCS_AND_FREQS_AND_POSITIONS:
+ sb.append("dfp-");
+ break;
+ case DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS:
+ sb.append("dfpo");
+ break;
+ default:
+ sb.append("----");
+ }
}
- }
- // has norm?
- if (f.hasNorms()) {
- sb.append("N");
- } else {
- sb.append("-");
- }
- // has payloads?
- if (f.hasPayloads()) {
- sb.append("P");
- } else {
- sb.append("-");
- }
- // stored?
- if (f.isStored()) {
- sb.append("S");
- } else {
- sb.append("-");
- }
- // binary?
- if (f.getBinaryValue() != null) {
- sb.append("B");
- } else {
- sb.append("-");
- }
- // numeric?
- if (f.getNumericValue() == null) {
- sb.append("----");
- } else {
- sb.append("#");
- // try faking it
- Number numeric = f.getNumericValue();
- if (numeric instanceof Integer) {
- sb.append("i32");
- } else if (numeric instanceof Long) {
- sb.append("i64");
- } else if (numeric instanceof Float) {
- sb.append("f32");
- } else if (numeric instanceof Double) {
- sb.append("f64");
- } else if (numeric instanceof Short) {
- sb.append("i16");
- } else if (numeric instanceof Byte) {
- sb.append("i08");
- } else if (numeric instanceof BigDecimal) {
- sb.append("b^d");
- } else if (numeric instanceof BigInteger) {
- sb.append("b^i");
+ // has norm?
+ if (f.hasNorms()) {
+ sb.append("N");
} else {
- sb.append("???");
+ sb.append("-");
}
- }
- // has term vector?
- if (f.hasTermVectors()) {
- sb.append("V");
- } else {
- sb.append("-");
- }
- // doc values
- if (f.getDvType() == null || f.getDvType() == DocValuesType.NONE) {
- sb.append("-------");
- } else {
- sb.append("D");
- switch (f.getDvType()) {
- case NUMERIC:
- sb.append("number");
- break;
- case BINARY:
- sb.append("binary");
- break;
- case SORTED:
- sb.append("sorted");
- break;
- case SORTED_NUMERIC:
- sb.append("srtnum");
- break;
- case SORTED_SET:
- sb.append("srtset");
- break;
- default:
- sb.append("??????");
+ // has payloads?
+ if (f.hasPayloads()) {
+ sb.append("P");
+ } else {
+ sb.append("-");
}
+ // stored?
+ if (f.isStored()) {
+ sb.append("S");
+ } else {
+ sb.append("-");
+ }
+ // binary?
+ if (f.getBinaryValue() != null) {
+ sb.append("B");
+ } else {
+ sb.append("-");
+ }
+ // numeric?
+ if (f.getNumericValue() == null) {
+ sb.append("----");
+ } else {
+ sb.append("#");
+ // try faking it
+ Number numeric = f.getNumericValue();
+ if (numeric instanceof Integer) {
+ sb.append("i32");
+ } else if (numeric instanceof Long) {
+ sb.append("i64");
+ } else if (numeric instanceof Float) {
+ sb.append("f32");
+ } else if (numeric instanceof Double) {
+ sb.append("f64");
+ } else if (numeric instanceof Short) {
+ sb.append("i16");
+ } else if (numeric instanceof Byte) {
+ sb.append("i08");
+ } else if (numeric instanceof BigDecimal) {
+ sb.append("b^d");
+ } else if (numeric instanceof BigInteger) {
+ sb.append("b^i");
+ } else {
+ sb.append("???");
+ }
+ }
+ // has term vector?
+ if (f.hasTermVectors()) {
+ sb.append("V");
+ } else {
+ sb.append("-");
+ }
+ // doc values
+ if (f.getDvType() == null || f.getDvType() == DocValuesType.NONE) {
+ sb.append("-------");
+ } else {
+ sb.append("D");
+ switch (f.getDvType()) {
+ case NUMERIC:
+ sb.append("number");
+ break;
+ case BINARY:
+ sb.append("binary");
+ break;
+ case SORTED:
+ sb.append("sorted");
+ break;
+ case SORTED_NUMERIC:
+ sb.append("srtnum");
+ break;
+ case SORTED_SET:
+ sb.append("srtset");
+ break;
+ default:
+ sb.append("??????");
+ }
+ }
+ // point values
+ if (f.getPointDimensionCount() == 0) {
+ sb.append("----");
+ } else {
+ sb.append("T");
+ sb.append(f.getPointNumBytes());
+ sb.append("/");
+ sb.append(f.getPointDimensionCount());
+ }
+ return sb.toString();
}
- // point values
- if (f.getPointDimensionCount() == 0) {
- sb.append("----");
- } else {
- sb.append("T");
- sb.append(f.getPointNumBytes());
- sb.append("/");
- sb.append(f.getPointDimensionCount());
+
+ @Override
+ protected Column[] columnInfos() {
+ return Column.values();
}
- return sb.toString();
}
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
}
+
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/OverviewPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/OverviewPanelProvider.java
index 2dd91ea..c85e93b 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/OverviewPanelProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/OverviewPanelProvider.java
@@ -521,125 +521,124 @@ public final class OverviewPanelProvider {
}
-}
+ static final class TermCountsTableModel extends TableModelBase<TermCountsTableModel.Column> {
-final class TermCountsTableModel extends TableModelBase<TermCountsTableModel.Column> {
+ enum Column implements TableColumnInfo {
- enum Column implements TableColumnInfo {
+ NAME("Name", 0, String.class, 150),
+ TERM_COUNT("Term count", 1, Long.class, 100),
+ RATIO("%", 2, String.class, Integer.MAX_VALUE);
- NAME("Name", 0, String.class, 150),
- TERM_COUNT("Term count", 1, Long.class, 100),
- RATIO("%", 2, String.class, Integer.MAX_VALUE);
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public String getColName() {
+ return colName;
+ }
- @Override
- public String getColName() {
- return colName;
+ @Override
+ public int getIndex() {
+ return index;
+ }
+
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
+
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getIndex() {
- return index;
+ TermCountsTableModel() {
+ super();
}
- @Override
- public Class<?> getType() {
- return type;
+ TermCountsTableModel(double numTerms, Map<String, Long> termCounts) {
+ super(termCounts.size());
+ int i = 0;
+ for (Map.Entry<String, Long> e : termCounts.entrySet()) {
+ String term = e.getKey();
+ Long count = e.getValue();
+ data[i++] = new Object[]{term, count, String.format(Locale.ENGLISH, "%.2f %%", count / numTerms * 100)};
+ }
}
@Override
- public int getColumnWidth() {
- return width;
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
- TermCountsTableModel() {
- super();
- }
+ static final class TopTermsTableModel extends TableModelBase<TopTermsTableModel.Column> {
- TermCountsTableModel(double numTerms, Map<String, Long> termCounts) {
- super(termCounts.size());
- int i = 0;
- for (Map.Entry<String, Long> e : termCounts.entrySet()) {
- String term = e.getKey();
- Long count = e.getValue();
- data[i++] = new Object[]{term, count, String.format(Locale.ENGLISH, "%.2f %%", count / numTerms * 100)};
- }
- }
+ enum Column implements TableColumnInfo {
+ RANK("Rank", 0, Integer.class, 50),
+ FREQ("Freq", 1, Integer.class, 80),
+ TEXT("Text", 2, String.class, Integer.MAX_VALUE);
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
-}
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
-final class TopTermsTableModel extends TableModelBase<TopTermsTableModel.Column> {
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- enum Column implements TableColumnInfo {
- RANK("Rank", 0, Integer.class, 50),
- FREQ("Freq", 1, Integer.class, 80),
- TEXT("Text", 2, String.class, Integer.MAX_VALUE);
+ @Override
+ public String getColName() {
+ return colName;
+ }
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ @Override
+ public int getIndex() {
+ return index;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
- @Override
- public String getColName() {
- return colName;
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getIndex() {
- return index;
+ TopTermsTableModel() {
+ super();
}
- @Override
- public Class<?> getType() {
- return type;
+ TopTermsTableModel(List<TermStats> termStats, int numTerms) {
+ super(Math.min(numTerms, termStats.size()));
+ for (int i = 0; i < data.length; i++) {
+ int rank = i + 1;
+ int freq = termStats.get(i).getDocFreq();
+ String termText = termStats.get(i).getDecodedTermText();
+ data[i] = new Object[]{rank, freq, termText};
+ }
}
@Override
- public int getColumnWidth() {
- return width;
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
-
- TopTermsTableModel() {
- super();
- }
-
- TopTermsTableModel(List<TermStats> termStats, int numTerms) {
- super(Math.min(numTerms, termStats.size()));
- for (int i = 0; i < data.length; i++) {
- int rank = i + 1;
- int freq = termStats.get(i).getDocFreq();
- String termText = termStats.get(i).getDecodedTermText();
- data[i] = new Object[]{rank, freq, termText};
- }
- }
-
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
-}
\ No newline at end of file
+}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
index 3e402f7..f94517a 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/SearchPanelProvider.java
@@ -764,72 +764,71 @@ public final class SearchPanelProvider implements SearchTabOperator {
}
}
-}
-
-final class SearchResultsTableModel extends TableModelBase<SearchResultsTableModel.Column> {
+ static final class SearchResultsTableModel extends TableModelBase<SearchResultsTableModel.Column> {
+
+ enum Column implements TableColumnInfo {
+ DOCID("Doc ID", 0, Integer.class, 50),
+ SCORE("Score", 1, Float.class, 100),
+ VALUE("Field Values", 2, String.class, 800);
+
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
+
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
- enum Column implements TableColumnInfo {
- DOCID("Doc ID", 0, Integer.class, 50),
- SCORE("Score", 1, Float.class, 100),
- VALUE("Field Values", 2, String.class, 800);
+ @Override
+ public String getColName() {
+ return colName;
+ }
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ @Override
+ public int getIndex() {
+ return index;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
- @Override
- public String getColName() {
- return colName;
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
}
- @Override
- public int getIndex() {
- return index;
+ SearchResultsTableModel() {
+ super();
}
- @Override
- public Class<?> getType() {
- return type;
+ SearchResultsTableModel(SearchResults results) {
+ super(results.size());
+ for (int i = 0; i < results.size(); i++) {
+ SearchResults.Doc doc = results.getHits().get(i);
+ data[i][Column.DOCID.getIndex()] = doc.getDocId();
+ if (!Float.isNaN(doc.getScore())) {
+ data[i][Column.SCORE.getIndex()] = doc.getScore();
+ } else {
+ data[i][Column.SCORE.getIndex()] = 1.0f;
+ }
+ List<String> concatValues = doc.getFieldValues().entrySet().stream().map(e -> {
+ String v = String.join(",", Arrays.asList(e.getValue()));
+ return e.getKey() + "=" + v + ";";
+ }).collect(Collectors.toList());
+ data[i][Column.VALUE.getIndex()] = String.join(" ", concatValues);
+ }
}
@Override
- public int getColumnWidth() {
- return width;
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
-
- SearchResultsTableModel() {
- super();
- }
-
- SearchResultsTableModel(SearchResults results) {
- super(results.size());
- for (int i = 0; i < results.size(); i++) {
- SearchResults.Doc doc = results.getHits().get(i);
- data[i][Column.DOCID.getIndex()] = doc.getDocId();
- if (!Float.isNaN(doc.getScore())) {
- data[i][Column.SCORE.getIndex()] = doc.getScore();
- } else {
- data[i][Column.SCORE.getIndex()] = 1.0f;
- }
- List<String> concatValues = doc.getFieldValues().entrySet().stream().map(e -> {
- String v = String.join(",", Arrays.asList(e.getValue()));
- return e.getKey() + "=" + v + ";";
- }).collect(Collectors.toList());
- data[i][Column.VALUE.getIndex()] = String.join(" ", concatValues);
- }
- }
-
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
-}
\ No newline at end of file
+}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/EditParamsDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/EditParamsDialogFactory.java
index 67d0a6d..f9a30da 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/EditParamsDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/EditParamsDialogFactory.java
@@ -179,75 +179,76 @@ public final class EditParamsDialogFactory implements DialogOpener.DialogFactory
});
}
-}
+ static final class ParamsTableModel extends TableModelBase<ParamsTableModel.Column> {
+
+ enum Column implements TableColumnInfo {
+ DELETE("Delete", 0, Boolean.class, 50),
+ NAME("Name", 1, String.class, 150),
+ VALUE("Value", 2, String.class, Integer.MAX_VALUE);
+
+ private final String colName;
+ private final int index;
+ private final Class<?> type;
+ private final int width;
+
+ Column(String colName, int index, Class<?> type, int width) {
+ this.colName = colName;
+ this.index = index;
+ this.type = type;
+ this.width = width;
+ }
-final class ParamsTableModel extends TableModelBase<ParamsTableModel.Column> {
+ @Override
+ public String getColName() {
+ return colName;
+ }
- enum Column implements TableColumnInfo {
- DELETE("Delete", 0, Boolean.class, 50),
- NAME("Name", 1, String.class, 150),
- VALUE("Value", 2, String.class, Integer.MAX_VALUE);
+ @Override
+ public int getIndex() {
+ return index;
+ }
- private final String colName;
- private final int index;
- private final Class<?> type;
- private final int width;
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
- Column(String colName, int index, Class<?> type, int width) {
- this.colName = colName;
- this.index = index;
- this.type = type;
- this.width = width;
- }
+ @Override
+ public int getColumnWidth() {
+ return width;
+ }
- @Override
- public String getColName() {
- return colName;
}
- @Override
- public int getIndex() {
- return index;
+ private static final int PARAM_SIZE = 20;
+
+ ParamsTableModel(Map<String, String> params) {
+ super(PARAM_SIZE);
+ List<String> keys = new ArrayList<>(params.keySet());
+ for (int i = 0; i < keys.size(); i++) {
+ data[i][Column.NAME.getIndex()] = keys.get(i);
+ data[i][Column.VALUE.getIndex()] = params.get(keys.get(i));
+ }
+ for (int i = 0; i < data.length; i++) {
+ data[i][Column.DELETE.getIndex()] = false;
+ }
}
@Override
- public Class<?> getType() {
- return type;
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return true;
}
@Override
- public int getColumnWidth() {
- return width;
+ public void setValueAt(Object value, int rowIndex, int columnIndex) {
+ data[rowIndex][columnIndex] = value;
}
- }
-
- private static final int PARAM_SIZE = 20;
-
- ParamsTableModel(Map<String, String> params) {
- super(PARAM_SIZE);
- List<String> keys = new ArrayList<>(params.keySet());
- for (int i = 0; i < keys.size(); i++) {
- data[i][Column.NAME.getIndex()] = keys.get(i);
- data[i][Column.VALUE.getIndex()] = params.get(keys.get(i));
- }
- for (int i = 0; i < data.length; i++) {
- data[i][Column.DELETE.getIndex()] = false;
+ @Override
+ protected Column[] columnInfos() {
+ return Column.values();
}
}
- @Override
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- return true;
- }
-
- @Override
- public void setValueAt(Object value, int rowIndex, int columnIndex) {
- data[rowIndex][columnIndex] = value;
- }
-
- @Override
- protected Column[] columnInfos() {
- return Column.values();
- }
}
+
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaAppender.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaAppender.java
index 41cab03..b7b1d42 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaAppender.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaAppender.java
@@ -19,7 +19,6 @@ package org.apache.lucene.luke.app.desktop.util;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
-
import java.io.Serializable;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.java
index c98d552..4735d64 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.java
@@ -20,8 +20,8 @@ package org.apache.lucene.luke.util;
import java.nio.charset.StandardCharsets;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.FileAppender;