louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged mainly with eclipse merge tool

Browse Source
This commit is contained in:
Jochen Staerk
2017-05-25 10:34:23 +02:00
parent 94c9585578 58d930b2e6
commit 4d7a00df34
3 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
mustang/src/main/java/org/mustangproject/ZUGFeRD/PDFAConformanceLevel.java → src/main/java/org/mustangproject/ZUGFeRD/PDFAConformanceLevel.java
View File

0
mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java → src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
View File

54
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
View File

@@ -225,7 +225,7 @@ public class ZUGFeRDExporter implements Closeable {
// // MAIN CLASS // // MAIN CLASS
private PDFAConformanceLevel conformanceLevel = PDFAConformanceLevel.UNICODE; private PDFAConformanceLevel conformanceLevel = PDFAConformanceLevel.UNICODE;
private String versionStr = "1.4.0"; private String versionStr = "1.4.1";
// BASIC, COMFORT etc - may be set from outside. // BASIC, COMFORT etc - may be set from outside.
private ZUGFeRDConformanceLevel zUGFeRDConformanceLevel = ZUGFeRDConformanceLevel.EXTENDED; private ZUGFeRDConformanceLevel zUGFeRDConformanceLevel = ZUGFeRDConformanceLevel.EXTENDED;
@@ -355,7 +355,7 @@ public class ZUGFeRDExporter implements Closeable {
ignoreA1Errors = true; ignoreA1Errors = true;
} }
private boolean getA1ParserValidationResult(PreflightParser parser) { private boolean getA1ParserValidationResult(PreflightParser parser) throws IOException {
ValidationResult result = null; ValidationResult result = null;
try { try {
@@ -387,10 +387,7 @@ public class ZUGFeRDExporter implements Closeable {
* instance of ValidationResult * instance of ValidationResult
*/ */
return false; return false;
} catch (IOException e) {
return false;
} }
// display validation result // display validation result
return result.isValid(); return result.isValid();
@@ -402,43 +399,16 @@ public class ZUGFeRDExporter implements Closeable {
* @param file * @param file
* @return boolean * @return boolean
*/ */
public boolean isValidA1(InputStream file) { public boolean isValidA1(InputStream file) throws IOException {
return getA1ParserValidationResult(new PreflightParser(new ByteArrayDataSource(file)));
ByteArrayDataSource fd;
try {
fd = new ByteArrayDataSource(file);
PreflightParser parser = new PreflightParser(fd);
return getA1ParserValidationResult(parser);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
return false;
}
}
public void loadPDFA3(String filename) {
try {
doc = PDDocument.load(new File(filename));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
} }
public void loadPDFA3(InputStream file) { public void loadPDFA3(String filename) throws IOException {
doc = PDDocument.load(new File(filename));
}
try { public void loadPDFA3(InputStream file) throws IOException {
doc = PDDocument.load(file); doc = PDDocument.load(file);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
} }
/** /**
@@ -1437,12 +1407,8 @@ public class ZUGFeRDExporter implements Closeable {
"text/xml", zugferdData); "text/xml", zugferdData);
} }
public void export(String ZUGFeRDfilename) { public void export(String ZUGFeRDfilename) throws IOException {
try { doc.save(ZUGFeRDfilename);
doc.save(ZUGFeRDfilename);
} catch (IOException ex) {
ex.printStackTrace();
}
} }
/** /**