Some warnings/improvements suggested by IntelliJ

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1753188 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-07-18 09:34:59 +00:00
parent 0bf845e0cc
commit 35173d9e30
3 changed files with 8 additions and 10 deletions

View File

@ -90,12 +90,12 @@ public final class RecordFactory {
throw new RuntimeException(e); throw new RuntimeException(e);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
Throwable t = e.getTargetException(); Throwable t = e.getTargetException();
if (t instanceof RecordFormatException) { if (t instanceof org.apache.poi.util.RecordFormatException) {
throw (RecordFormatException)t; throw (org.apache.poi.util.RecordFormatException)t;
} else if (t instanceof EncryptedDocumentException) { } else if (t instanceof EncryptedDocumentException) {
throw (EncryptedDocumentException)t; throw (EncryptedDocumentException)t;
} else { } else {
throw new RecordFormatException("Unable to construct record instance" , t); throw new org.apache.poi.util.RecordFormatException("Unable to construct record instance" , t);
} }
} }
} }
@ -123,7 +123,7 @@ public final class RecordFactory {
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
throw new RecordFormatException("Unable to construct record instance" , e.getTargetException()); throw new org.apache.poi.util.RecordFormatException("Unable to construct record instance" , e.getTargetException());
} }
} }
@Override @Override
@ -443,7 +443,7 @@ public final class RecordFactory {
try { try {
sid = recClass.getField("sid").getShort(null); sid = recClass.getField("sid").getShort(null);
} catch (Exception illegalArgumentException) { } catch (Exception illegalArgumentException) {
throw new RecordFormatException( throw new org.apache.poi.util.RecordFormatException(
"Unable to determine record types"); "Unable to determine record types");
} }
Integer key = Integer.valueOf(sid); Integer key = Integer.valueOf(sid);
@ -482,9 +482,9 @@ public final class RecordFactory {
* *
* @return an array of Records created from the InputStream * @return an array of Records created from the InputStream
* *
* @exception RecordFormatException on error processing the InputStream * @exception org.apache.poi.util.RecordFormatException on error processing the InputStream
*/ */
public static List<Record> createRecords(InputStream in) throws RecordFormatException { public static List<Record> createRecords(InputStream in) throws org.apache.poi.util.RecordFormatException {
List<Record> records = new ArrayList<Record>(NUM_RECORDS); List<Record> records = new ArrayList<Record>(NUM_RECORDS);

View File

@ -51,8 +51,7 @@ public final class ConditionalFormattingTable extends RecordAggregate {
} }
public void visitContainedRecords(RecordVisitor rv) { public void visitContainedRecords(RecordVisitor rv) {
for (int i = 0; i < _cfHeaders.size(); i++) { for (CFRecordsAggregate subAgg : _cfHeaders) {
CFRecordsAggregate subAgg = _cfHeaders.get(i);
subAgg.visitContainedRecords(rv); subAgg.visitContainedRecords(rv);
} }
} }

View File

@ -17,7 +17,6 @@
package org.apache.poi.ss.format; package org.apache.poi.ss.format;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.ss.format.CellFormatCondition;
public class TestCellFormatCondition extends TestCase { public class TestCellFormatCondition extends TestCase {
public void testSVConditions() { public void testSVConditions() {