ICU-5605 fixed some unix issues
X-SVN-Rev: 21436
This commit is contained in:
parent
b22dae289b
commit
99d3fb3e5d
@ -166,14 +166,12 @@ class PathModel extends AbstractListModel {
|
|||||||
char sign;
|
char sign;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
System.out.println("try 3");
|
|
||||||
System.out.println(pathListFilename);
|
|
||||||
System.out.println(pathListFile);
|
|
||||||
reader = new BufferedReader(new InputStreamReader(
|
reader = new BufferedReader(new InputStreamReader(
|
||||||
new FileInputStream(pathListFile), "UTF-8"), 4 * 1024);
|
new FileInputStream(pathListFile), "UTF-8"), 4 * 1024);
|
||||||
reader = new BufferedReader(new FileReader(pathListFile));
|
|
||||||
while ((line = reader.readLine()) != null) {
|
while ((line = reader.readLine()) != null) {
|
||||||
line = line.replace('\ufeff', ' ').trim();
|
if (line.length() >= 1 && line.charAt(0) == '\ufeff')
|
||||||
|
line = line.substring(1);
|
||||||
|
line = line.trim();
|
||||||
|
|
||||||
if (line.length() >= 1) {
|
if (line.length() >= 1) {
|
||||||
sign = line.charAt(0);
|
sign = line.charAt(0);
|
||||||
@ -332,11 +330,9 @@ class PathModel extends AbstractListModel {
|
|||||||
* The message to put in the exception.
|
* The message to put in the exception.
|
||||||
* @param lineNumber
|
* @param lineNumber
|
||||||
* The line number to put in the exception.
|
* The line number to put in the exception.
|
||||||
* @throws IllegalArgumentException
|
|
||||||
*/
|
*/
|
||||||
private void pathListError(String message, int lineNumber)
|
private void pathListError(String message, int lineNumber) {
|
||||||
throws IllegalArgumentException {
|
logger.errorln("Error in " + pathListFilename + " (line " + lineNumber
|
||||||
throw new IllegalArgumentException("Error in " + pathListFilename
|
+ "): " + message);
|
||||||
+ " (line " + lineNumber + "): " + message);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -229,7 +229,9 @@ class ResultModel extends AbstractTableModel {
|
|||||||
reader = new BufferedReader(new InputStreamReader(
|
reader = new BufferedReader(new InputStreamReader(
|
||||||
new FileInputStream(resultListFile), "UTF-8"), 4 * 1024);
|
new FileInputStream(resultListFile), "UTF-8"), 4 * 1024);
|
||||||
while ((line = reader.readLine()) != null) {
|
while ((line = reader.readLine()) != null) {
|
||||||
line = line.replace('\ufeff', ' ').trim();
|
if (line.length() >= 1 && line.charAt(0) == '\ufeff')
|
||||||
|
line = line.substring(1);
|
||||||
|
line = line.trim();
|
||||||
logger.printlnToScreen(line);
|
logger.printlnToScreen(line);
|
||||||
|
|
||||||
if (line.length() >= 1 && (tab = line.lastIndexOf('\t')) >= 0) {
|
if (line.length() >= 1 && (tab = line.lastIndexOf('\t')) >= 0) {
|
||||||
@ -427,11 +429,9 @@ class ResultModel extends AbstractTableModel {
|
|||||||
* The message.
|
* The message.
|
||||||
* @param lineNumber
|
* @param lineNumber
|
||||||
* The line number.
|
* The line number.
|
||||||
* @throws IllegalArgumentException
|
|
||||||
*/
|
*/
|
||||||
private void resultListError(String message, int lineNumber)
|
private void resultListError(String message, int lineNumber) {
|
||||||
throws IllegalArgumentException {
|
logger.errorln("Error in " + resultListFilename + " (line "
|
||||||
throw new IllegalArgumentException("Error in " + resultListFilename
|
+ lineNumber + "): " + message);
|
||||||
+ " (line " + lineNumber + "): " + message);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user