Skip to content
Snippets Groups Projects
Commit b7a9f892 authored by Andrey Ruzhanskiy's avatar Andrey Ruzhanskiy
Browse files

Added Nullchecks and better Exception Messages.

parent 3cbb0660
No related branches found
No related tags found
1 merge request!14Feat/braille print back end 4
...@@ -19,7 +19,6 @@ public class PrintDirector { ...@@ -19,7 +19,6 @@ public class PrintDirector {
private PrintService mService; private PrintService mService;
private String mPrinterName; private String mPrinterName;
private DocFlavor mDocflavor; private DocFlavor mDocflavor;
private AbstractBrailleTableParser mParser;
/** /**
...@@ -34,8 +33,12 @@ public class PrintDirector { ...@@ -34,8 +33,12 @@ public class PrintDirector {
switch (mPrinter) { switch (mPrinter) {
case NORMALPRINTER: mBuilder = new NormalBuilder(); break; case NORMALPRINTER: mBuilder = new NormalBuilder(); break;
case INDEX_EVEREST_D_V4_GRAPHIC_PRINTER: mBuilder = new GraphicPrintBuilder(); break; case INDEX_EVEREST_D_V4_GRAPHIC_PRINTER:
case INDEX_EVEREST_D_V4_FLOATINGDOT_PRINTER: mBuilder = new FloatingDotAreaBuilder(); break; mBuilder = new GraphicPrintBuilder();
break;
case INDEX_EVEREST_D_V4_FLOATINGDOT_PRINTER:
mBuilder = new FloatingDotAreaBuilder();
break;
default: throw new IllegalArgumentException(); default: throw new IllegalArgumentException();
} }
} }
...@@ -72,7 +75,7 @@ public class PrintDirector { ...@@ -72,7 +75,7 @@ public class PrintDirector {
} }
} }
} else { } else {
throw new IllegalArgumentException(); throw new IllegalArgumentException("The given Printer " + printerName + " was not found in the System.");
} }
} }
...@@ -86,14 +89,17 @@ public class PrintDirector { ...@@ -86,14 +89,17 @@ public class PrintDirector {
if (printerName == null || data == null) { if (printerName == null || data == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
setUpDoc(); String printerNameFromConfig = data.getPrinterConfig().getProperty("name").toString();
setPrinter(printerName); if (printerName.equals(printerNameFromConfig)) {
setUpDoc();
byte[] result = mBuilder.assemble(data); setPrinter(printerName);
byte[] result = mBuilder.assemble(data);
// Printing the Document print(result);
} else {
throw new IllegalArgumentException("The given Printername does not correspond with the Printername "
+ "in the printerConfig. Printerconfig: " + printerNameFromConfig + " Printer " + printerName);
}
print(result);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment