Refactor

Author: nguyenq

src/main/java/net/sourceforge/tess4j/Tesseract.java

@@ -359,6 +359,32 @@ protected void init() {
  if (psm > -1) {
  api.TessBaseAPISetPageSegMode(handle, psm);
  }
+ 
+ validateDatapathAndLanguagePacks();
+ }
+ 
+ /**
+ * Validates specified datapath and language data existence.
+ */
+ void validateDatapathAndLanguagePacks() {
+ String dataPath = api.TessBaseAPIGetDatapath(handle);
+ if (!new File(dataPath).exists()) {
+ throw new IllegalArgumentException("Specified datapath " + dataPath + " does not exist.");
+ }
+
+ Pointer ptr = api.TessBaseAPIGetLoadedLanguagesAsVector(handle).getPointer();
+ String[] loadedLangs = ptr.getStringArray(0);
+ PointerByReference pref = new PointerByReference();
+ pref.setPointer(ptr);
+ api.TessDeleteTextArray(pref);
+ ptr = api.TessBaseAPIGetAvailableLanguagesAsVector(handle).getPointer();
+ String[] availLangs = ptr.getStringArray(0);
+ pref.setPointer(ptr);
+ api.TessDeleteTextArray(pref);
+
+ if (!Arrays.asList(availLangs).containsAll(Arrays.asList(loadedLangs))) {
+ throw new IllegalArgumentException("Specified language data does not exist.");
+ }
  }
 
  /**
@@ -437,26 +463,6 @@ protected void setROI(Rectangle rect) {
  * @return the recognized text
  */
  protected String getOCRText(String filename, int pageNum) {
- // check for valid datapath and language data existence
- String dataPath = api.TessBaseAPIGetDatapath(handle);
- if (!new File(dataPath).exists()) {
- throw new IllegalArgumentException("Specified datapath " + dataPath + " does not exist.");
- }
-
- Pointer ptr = api.TessBaseAPIGetLoadedLanguagesAsVector(handle).getPointer();
- String[] loadedLangs = ptr.getStringArray(0);
- PointerByReference pref = new PointerByReference();
- pref.setPointer(ptr);
- api.TessDeleteTextArray(pref);
- ptr = api.TessBaseAPIGetAvailableLanguagesAsVector(handle).getPointer();
- String[] availLangs = ptr.getStringArray(0);
- pref.setPointer(ptr);
- api.TessDeleteTextArray(pref);
-
- if (!Arrays.asList(availLangs).containsAll(Arrays.asList(loadedLangs))) {
- throw new IllegalArgumentException("Specified language data does not exist.");
- }
-
  if (filename != null && !filename.isEmpty()) {
  api.TessBaseAPISetInputName(handle, filename);
  }

src/main/java/net/sourceforge/tess4j/Tesseract1.java

@@ -341,6 +341,32 @@ protected void init() {
  if (psm > -1) {
  TessBaseAPISetPageSegMode(handle, psm);
  }
+
+ validateDatapathAndLanguagePacks();
+ }
+
+ /**
+ * Validates specified datapath and language data existence.
+ */
+ void validateDatapathAndLanguagePacks() {
+ String dataPath = TessBaseAPIGetDatapath(handle);
+ if (!new File(dataPath).exists()) {
+ throw new IllegalArgumentException("Specified datapath " + dataPath + " does not exist.");
+ }
+
+ Pointer ptr = TessBaseAPIGetLoadedLanguagesAsVector(handle).getPointer();
+ String[] loadedLangs = ptr.getStringArray(0);
+ PointerByReference pref = new PointerByReference();
+ pref.setPointer(ptr);
+ TessDeleteTextArray(pref);
+ ptr = TessBaseAPIGetAvailableLanguagesAsVector(handle).getPointer();
+ String[] availLangs = ptr.getStringArray(0);
+ pref.setPointer(ptr);
+ TessDeleteTextArray(pref);
+
+ if (!Arrays.asList(availLangs).containsAll(Arrays.asList(loadedLangs))) {
+ throw new IllegalArgumentException("Specified language data does not exist.");
+ }
  }
 
  /**
@@ -419,26 +445,6 @@ protected void setROI(Rectangle rect) {
  * @return the recognized text
  */
  protected String getOCRText(String filename, int pageNum) {
- // check for valid datapath and language data existence
- String dataPath = TessBaseAPIGetDatapath(handle);
- if (!new File(dataPath).exists()) {
- throw new IllegalArgumentException("Specified datapath " + dataPath + " does not exist.");
- }
-
- Pointer ptr = TessBaseAPIGetLoadedLanguagesAsVector(handle).getPointer();
- String[] loadedLangs = ptr.getStringArray(0);
- PointerByReference pref = new PointerByReference();
- pref.setPointer(ptr);
- TessDeleteTextArray(pref);
- ptr = TessBaseAPIGetAvailableLanguagesAsVector(handle).getPointer();
- String[] availLangs = ptr.getStringArray(0);
- pref.setPointer(ptr);
- TessDeleteTextArray(pref);
-
- if (!Arrays.asList(availLangs).containsAll(Arrays.asList(loadedLangs))) {
- throw new IllegalArgumentException("Specified language data does not exist.");
- }
-
  if (filename != null && !filename.isEmpty()) {
  TessBaseAPISetInputName(handle, filename);
  }