Merge branch 'main' of https://github.com/Dynamsoft/barcode-reader-java-samples into main

DMGithubPublisher · DMGithubPublisher · commit 737915408076 · 2022-10-21T09:09:36.000+08:00
diff --git a/samples/GeneralSettings/pom.xml b/samples/GeneralSettings/pom.xml
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.dynamsoft</groupId>
 			<artifactId>dbr</artifactId>
-			<version>9.0.0</version>
+			<version>9.4.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/samples/GeneralSettings/src/main/java/GeneralSettings.java b/samples/GeneralSettings/src/main/java/GeneralSettings.java
@@ -50,7 +50,7 @@ public static void main(String[] args) {
 				for (int i = 0; i < results.length; i++) {
 					TextResult result = results[i];
 					
-					String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;
+					String barcodeFormat = result.barcodeFormatString;
 					System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);
 				}
 			} else {
diff --git a/samples/HelloWorld/pom.xml b/samples/HelloWorld/pom.xml
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.dynamsoft</groupId>
 			<artifactId>dbr</artifactId>
-			<version>9.0.0</version>
+			<version>9.4.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/samples/ImageDecoding/pom.xml b/samples/ImageDecoding/pom.xml
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.dynamsoft</groupId>
 			<artifactId>dbr</artifactId>
-			<version>9.0.0</version>
+			<version>9.4.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/samples/ImageDecoding/src/main/java/ImageDecoding.java b/samples/ImageDecoding/src/main/java/ImageDecoding.java
@@ -233,7 +233,7 @@ public static void main(String[] args) {
 					for (int i = 0; i < results.length; i++) {
 						TextResult result = results[i];
 						
-						String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;
+						String barcodeFormat = result.barcodeFormatString;
 						System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);
 					}
 				} else {
diff --git a/samples/Performance/AccuracyFirstSettings/pom.xml b/samples/Performance/AccuracyFirstSettings/pom.xml
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.dynamsoft</groupId>
 			<artifactId>dbr</artifactId>
-			<version>9.0.0</version>
+			<version>9.4.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/samples/Performance/AccuracyFirstSettings/src/main/java/AccuracyFirstSettings.java b/samples/Performance/AccuracyFirstSettings/src/main/java/AccuracyFirstSettings.java
@@ -37,7 +37,7 @@ private static void outputResults(TextResult[] results) {
 			for (int i = 0; i < results.length; i++) {
 				TextResult result = results[i];
 				
-				String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;
+				String barcodeFormat = result.barcodeFormatString;
 				System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);
 			}
 		} else {
diff --git a/samples/Performance/ReadRateFirstSettings/pom.xml b/samples/Performance/ReadRateFirstSettings/pom.xml
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.dynamsoft</groupId>
 			<artifactId>dbr</artifactId>
-			<version>9.0.0</version>
+			<version>9.4.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/samples/Performance/ReadRateFirstSettings/src/main/java/ReadRateFirstSettings.java b/samples/Performance/ReadRateFirstSettings/src/main/java/ReadRateFirstSettings.java
@@ -64,7 +64,7 @@ private static void outputResults(TextResult[] results) {
 			for (int i = 0; i < results.length; i++) {
 				TextResult result = results[i];
 				
-				String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;
+				String barcodeFormat = result.barcodeFormatString;
 				System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);
 			}
 		} else {
diff --git a/samples/Performance/SpeedFirstSettings/pom.xml b/samples/Performance/SpeedFirstSettings/pom.xml
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.dynamsoft</groupId>
 			<artifactId>dbr</artifactId>
-			<version>9.0.0</version>
+			<version>9.4.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/samples/Performance/SpeedFirstSettings/src/main/java/SpeedFirstSettings.java b/samples/Performance/SpeedFirstSettings/src/main/java/SpeedFirstSettings.java
@@ -72,7 +72,7 @@ private static void outputResults(TextResult[] results, long costTime) {
 			for (int i = 0; i < results.length; i++) {
 				TextResult result = results[i];
 				
-				String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;
+				String barcodeFormat = result.barcodeFormatString;
 				System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static void main(String[] args) {`
`50`	`50`	`for (int i = 0; i < results.length; i++) {`
`51`	`51`	`TextResult result = results[i];`
`52`	`52`
`53`		`- String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;`
	`53`	`+ String barcodeFormat = result.barcodeFormatString;`
`54`	`54`	`System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);`
`55`	`55`	`}`
`56`	`56`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public static void main(String[] args) {`
`233`	`233`	`for (int i = 0; i < results.length; i++) {`
`234`	`234`	`TextResult result = results[i];`
`235`	`235`
`236`		`- String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;`
	`236`	`+ String barcodeFormat = result.barcodeFormatString;`
`237`	`237`	`System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);`
`238`	`238`	`}`
`239`	`239`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ private static void outputResults(TextResult[] results) {`
`37`	`37`	`for (int i = 0; i < results.length; i++) {`
`38`	`38`	`TextResult result = results[i];`
`39`	`39`
`40`		`- String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;`
	`40`	`+ String barcodeFormat = result.barcodeFormatString;`
`41`	`41`	`System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);`
`42`	`42`	`}`
`43`	`43`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private static void outputResults(TextResult[] results) {`
`64`	`64`	`for (int i = 0; i < results.length; i++) {`
`65`	`65`	`TextResult result = results[i];`
`66`	`66`
`67`		`- String barcodeFormat = result.barcodeFormat==0?result.barcodeFormatString_2:result.barcodeFormatString;`
	`67`	`+ String barcodeFormat = result.barcodeFormatString;`
`68`	`68`	`System.out.println("Barcode " + i + ":" + barcodeFormat + ","+ result.barcodeText);`
`69`	`69`	`}`
`70`	`70`	`} else {`