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/10 11:05:02 UTC
[lucene-solr] 02/02: LUCENE-8738: Remove TODOs about Java 11
(charsets in Luke)
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit ebd235c765aa70d2a7ef5b380f7a8fc35d9803a8
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Wed Apr 10 13:04:41 2019 +0200
LUCENE-8738: Remove TODOs about Java 11 (charsets in Luke)
---
.../components/dialog/menubar/CheckIndexDialogFactory.java | 7 -------
.../components/dialog/menubar/OptimizeIndexDialogFactory.java | 3 ---
.../apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java | 9 +++------
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
index 3928ba6..0c9ad37 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
@@ -36,7 +36,6 @@ import java.awt.Insets;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -277,15 +276,12 @@ public final class CheckIndexDialogFactory implements DialogOpener.DialogFactory
CheckIndex.Status status = toolsModel.checkIndex(ps);
ps.flush();
return status;
- } catch (UnsupportedEncodingException e) {
- // will not reach
} catch (Exception e) {
statusLbl.setText(MessageUtils.getLocalizedMessage("message.error.unknown"));
throw e;
} finally {
setProgress(100);
}
- return null;
}
@Override
@@ -358,15 +354,12 @@ public final class CheckIndexDialogFactory implements DialogOpener.DialogFactory
statusLbl.setText("Done");
ps.flush();
return status;
- } catch (UnsupportedEncodingException e) {
- // will not occur
} catch (Exception e) {
statusLbl.setText(MessageUtils.getLocalizedMessage("message.error.unknown"));
throw e;
} finally {
setProgress(100);
}
- return null;
}
@Override
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java
index e5543d8..947525c 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OptimizeIndexDialogFactory.java
@@ -39,7 +39,6 @@ import java.awt.Insets;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -221,8 +220,6 @@ public final class OptimizeIndexDialogFactory implements DialogOpener.DialogFact
ps = new TextAreaPrintStream(logArea);
toolsModel.optimize(expungeCB.isSelected(), (int) maxSegSpnr.getValue(), ps);
ps.flush();
- } catch (UnsupportedEncodingException e) {
- // will not reach
} catch (Exception e) {
statusLbl.setText(MessageUtils.getLocalizedMessage("message.error.unknown"));
throw e;
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java
index 7c1f7ca..d826b65 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java
@@ -20,7 +20,6 @@ package org.apache.lucene.luke.app.desktop.util;
import javax.swing.JTextArea;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
/** PrintStream for text areas */
@@ -30,8 +29,8 @@ public final class TextAreaPrintStream extends PrintStream {
private final JTextArea textArea;
- public TextAreaPrintStream(JTextArea textArea) throws UnsupportedEncodingException {
- super(new ByteArrayOutputStream(), false, StandardCharsets.UTF_8.name()); // TODO: replace by Charset in Java 11
+ public TextAreaPrintStream(JTextArea textArea) {
+ super(new ByteArrayOutputStream(), false, StandardCharsets.UTF_8);
this.baos = (ByteArrayOutputStream) out;
this.textArea = textArea;
baos.reset();
@@ -40,9 +39,7 @@ public final class TextAreaPrintStream extends PrintStream {
@Override
public void flush() {
try {
- textArea.append(baos.toString(StandardCharsets.UTF_8.name())); // TODO: replace by Charset in Java 11
- } catch (UnsupportedEncodingException e) {
- setError();
+ textArea.append(baos.toString(StandardCharsets.UTF_8));
} finally {
baos.reset();
}