Revision: 2592
http://daisymfc.svn.sourceforge.net/daisymfc/?rev=2592&view=rev
Author: joeha480
Date: 2011-04-19 07:42:23 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
Updated brailleUtils libraries to current release (1.1.0)
Improved error messages for PEF2Text
Modified Paths:
--------------
trunk/dmfc/.classpath
trunk/dmfc/META-INF/MANIFEST.MF
trunk/dmfc/build.properties
trunk/dmfc/transformers/org_pef_text/pef2text/PEF2Text.java
Added Paths:
-----------
trunk/dmfc/lib/brailleUtils-catalog-1.1.0.jar
trunk/dmfc/lib/brailleUtils-core-1.1.0.jar
Removed Paths:
-------------
trunk/dmfc/lib/brailleUtils-catalog-1.1.0rc1.jar
trunk/dmfc/lib/brailleUtils-core-1.1.0rc1.jar
Modified: trunk/dmfc/.classpath
===================================================================
--- trunk/dmfc/.classpath 2011-04-08 09:46:06 UTC (rev 2591)
+++ trunk/dmfc/.classpath 2011-04-19 07:42:23 UTC (rev 2592)
@@ -36,7 +36,7 @@
<classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
<classpathentry kind="lib" path="transformers/int_vspiewak_odt2daisy/lib/odt2daisy.jar"/>
- <classpathentry kind="lib" path="lib/brailleUtils-catalog-1.1.0rc1.jar"/>
- <classpathentry kind="lib" path="lib/brailleUtils-core-1.1.0rc1.jar"/>
+ <classpathentry kind="lib" path="lib/brailleUtils-catalog-1.1.0.jar"/>
+ <classpathentry kind="lib" path="lib/brailleUtils-core-1.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/dmfc/META-INF/MANIFEST.MF
===================================================================
--- trunk/dmfc/META-INF/MANIFEST.MF 2011-04-08 09:46:06 UTC (rev 2591)
+++ trunk/dmfc/META-INF/MANIFEST.MF 2011-04-19 07:42:23 UTC (rev 2592)
@@ -10,8 +10,8 @@
daisy-util.jar,
lib/batik-css.jar,
lib/batik-util.jar,
- lib/brailleUtils-core-1.1.0rc1.jar,
- lib/brailleUtils-catalog-1.1.0rc1.jar,
+ lib/brailleUtils-core-1.1.0.jar,
+ lib/brailleUtils-catalog-1.1.0.jar,
lib/chardet.jar,
lib/commons-cli-1.1.jar,
lib/commons-pool-1.4.jar,
Modified: trunk/dmfc/build.properties
===================================================================
--- trunk/dmfc/build.properties 2011-04-08 09:46:06 UTC (rev 2591)
+++ trunk/dmfc/build.properties 2011-04-19 07:42:23 UTC (rev 2592)
@@ -35,8 +35,8 @@
src/pipeline.user.properties,\
launchers/pipeline-plugin.sh,\
launchers/pipeline-plugin.bat,\
- lib/brailleUtils-catalog-1.1.0rc1.jar,\
- lib/brailleUtils-core-1.1.0rc1.jar,\
+ lib/brailleUtils-catalog-1.1.0.jar,\
+ lib/brailleUtils-core-1.1.0.jar,\
lib/louisFat.jar
bin.excludes = doc/.cvsignore,\
doc/dev_old/,\
Added: trunk/dmfc/lib/brailleUtils-catalog-1.1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/dmfc/lib/brailleUtils-catalog-1.1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/dmfc/lib/brailleUtils-catalog-1.1.0rc1.jar
===================================================================
(Binary files differ)
Added: trunk/dmfc/lib/brailleUtils-core-1.1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/dmfc/lib/brailleUtils-core-1.1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/dmfc/lib/brailleUtils-core-1.1.0rc1.jar
===================================================================
(Binary files differ)
Modified: trunk/dmfc/transformers/org_pef_text/pef2text/PEF2Text.java
===================================================================
--- trunk/dmfc/transformers/org_pef_text/pef2text/PEF2Text.java 2011-04-08 09:46:06 UTC (rev 2591)
+++ trunk/dmfc/transformers/org_pef_text/pef2text/PEF2Text.java 2011-04-19 07:42:23 UTC (rev 2592)
@@ -123,9 +123,13 @@
}
} catch (TransformerRunException e2) {
throw new TransformerRunException(e2.getMessage(), e2);
+ } catch (UnsupportedWidthException e2) {
+ throw new TransformerRunException(e2.getMessage(), e2);
} finally {
os.close();
}
+ } catch (UnsupportedWidthException e) {
+ throw new TransformerRunException(e.getMessage(), e);
}
} else {
output = new File(outFileName);
@@ -152,6 +156,8 @@
throw new TransformerRunException(e.getMessage(), e);
} catch (PrintException e) {
throw new TransformerRunException(e.getMessage(), e);
+ } catch (UnsupportedWidthException e) {
+ throw new TransformerRunException(e.getMessage(), e);
} finally {
if ("".equals(outFileName) && output!=null) {
output.delete();
@@ -171,7 +177,7 @@
}
}
- private void convert(File input, File output, Embosser em, Range rangeObj, String paperWidthFallback, boolean align, int offset) throws TransformerRunException {
+ private void convert(File input, File output, Embosser em, Range rangeObj, String paperWidthFallback, boolean align, int offset) throws TransformerRunException, UnsupportedWidthException {
try {
EmbosserWriter embosserObj = em.newEmbosserWriter(new FileOutputStream(output));
convert(input, embosserObj, rangeObj, paperWidthFallback, align, offset);
@@ -180,7 +186,7 @@
}
}
- private void convert(File input, EmbosserWriter embosserObj, Range rangeObj, String paperWidthFallback, boolean align, int offset) throws TransformerRunException {
+ private void convert(File input, EmbosserWriter embosserObj, Range rangeObj, String paperWidthFallback, boolean align, int offset) throws TransformerRunException, UnsupportedWidthException {
try {
PEFHandler ph = new PEFHandler.Builder(embosserObj)
.range(rangeObj)
@@ -194,7 +200,7 @@
} catch (SAXException e) {
throw new TransformerRunException(e.getMessage(), e);
} catch (UnsupportedWidthException e) {
- throw new TransformerRunException(e.getMessage(), e);
+ throw e;
} catch (IOException e) {
throw new TransformerRunException(e.getMessage(), e);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|