Author: jheight
Date: Mon Jul 24 05:40:25 2006
New Revision: 425026
URL: http://svn.apache.org/viewvc?rev=425026&view=rev
Log:
Exception Chaining: Added support for java 1.4 style exception chaining.
Believe that POI is targeted at 1.4 nowdays so this should not cause an issue.
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=425026&r1=425025&r2=425026&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
(original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java Mon Jul
24 05:40:25 2006
@@ -111,7 +111,7 @@
}
activeRecord.dump();
} catch (IOException e) {
- throw new RecordFormatException("Error reading bytes");
+ throw new RecordFormatException("Error reading bytes", e);
}
Record[] retval = new Record[records.size()];
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java?rev=425026&r1=425025&r2=425026&view=diff
==============================================================================
---
jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
(original)
+++
jakarta/poi/trunk/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
Mon Jul 24 05:40:25 2006
@@ -332,9 +332,7 @@
}
catch (Exception introspectionException)
{
- introspectionException.printStackTrace();
- throw new RecordFormatException(
- "Unable to construct record instance, the following exception
occured: " + introspectionException.getMessage());
+ throw new RecordFormatException("Unable to construct record
instance" , introspectionException);
}
if (retval instanceof RKRecord)
{
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java?rev=425026&r1=425025&r2=425026&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
(original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
Mon Jul 24 05:40:25 2006
@@ -102,7 +102,7 @@
field_7_expression_len = in.readShort();
field_8_parsed_expr =
Ptg.createParsedExpressionTokens(field_7_expression_len, in);
} catch (java.lang.UnsupportedOperationException uoe) {
- throw new RecordFormatException(uoe.toString());
+ throw new RecordFormatException(uoe);
}
}
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java?rev=425026&r1=425025&r2=425026&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java
(original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactory.java
Mon Jul 24 05:40:25 2006
@@ -222,9 +222,7 @@
}
catch (Exception introspectionException)
{
- introspectionException.printStackTrace();
- throw new RecordFormatException(
- "Unable to construct record instance, the following exception
occured: " + introspectionException.getMessage());
+ throw new RecordFormatException("Unable to construct record
instance",introspectionException);
}
if (retval instanceof RKRecord)
{
@@ -316,9 +314,8 @@
}
catch (Exception illegalArgumentException)
{
- illegalArgumentException.printStackTrace();
throw new RecordFormatException(
- "Unable to determine record types");
+ "Unable to determine record types",
illegalArgumentException);
}
result.put(new Short(sid), constructor);
}
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java?rev=425026&r1=425025&r2=425026&view=diff
==============================================================================
---
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java
(original)
+++
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFormatException.java
Mon Jul 24 05:40:25 2006
@@ -30,4 +30,12 @@
{
super(exception);
}
+
+ public RecordFormatException(String exception, Throwable thr) {
+ super(exception, thr);
+ }
+
+ public RecordFormatException(Throwable thr) {
+ super(thr);
+ }
}
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java?rev=425026&r1=425025&r2=425026&view=diff
==============================================================================
---
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java
(original)
+++
jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/RecordInputStream.java
Mon Jul 24 05:40:25 2006
@@ -54,7 +54,7 @@
//Dont increment the pos just yet (technically we are at the start of
//the record stream until nextRecord is called).
} catch (IOException ex) {
- throw new RecordFormatException("Error reading bytes");
+ throw new RecordFormatException("Error reading bytes", ex);
}
}
Modified: jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java?rev=425026&r1=425025&r2=425026&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java
(original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java Mon
Jul 24 05:40:25 2006
@@ -327,7 +327,7 @@
default :
//retval = new UnknownPtg();
- throw new java.lang.UnsupportedOperationException(
+ throw new java.lang.UnsupportedOperationException(" Unknown
Ptg in Formula: 0x"+
Integer.toHexString(( int ) id) + " (" + ( int ) id +
")");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/
