Merge pull request #49 from owent/dev

v2.19.3
owent · Oct 28, 2024 · 701538b · 701538b
2 parents 2582402 + 100a372
commit 701538b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,10 +2,17 @@
 
 ## Unrelease
 
+### 2.19.3
+
+1. 优化Warning的输出数据源
+2. 更新依赖库
+   + `com.google.protobuf` -> 4.28.3
+
 ## 2.19.2
 
 1. 修复 `--data-source-mapping-file` 指向的地址无效时的 stacktrace 。
 
+
 ## 2.19.1
 
 1. 输出的UE代码的默认值也输出到 USTRUCT 申明中（不包含 `FString` ）。

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.xresloader</groupId>
     <artifactId>xresloader</artifactId>
-    <version>2.19.2</version>
+    <version>2.19.3</version>
     <packaging>jar</packaging>
     <name>xresloader</name>
 
@@ -243,12 +243,12 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>4.28.2</version>
+            <version>4.28.3</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>4.28.0</version>
+            <version>4.28.3</version>
         </dependency>
 
         <dependency>

diff --git a/src/org/xresloader/core/data/dst/DataDstJava.java b/src/org/xresloader/core/data/dst/DataDstJava.java
@@ -1360,9 +1360,13 @@ && dumpPlainField(ret.value, field.getTypeDescriptor(), null, children.get(i), n
 
         if (!missingFields.isEmpty()) {
             String message = String.format(
-                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > Missing fields: %s",
+                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > File: %s, Table: %s, Row: %d, Column: %d(%s)%s  > Missing fields: %s",
                     field.getTypeDescriptor().getFullName(), atLeastFieldSize, fieldSize, inputs.length,
                     ProgramOptions.getEndl(),
+                    rowContext.fileName, rowContext.tableName,
+                    rowContext.row + 1, DataSrcImpl.getOurInstance().getLastColomnNum() + 1,
+                    ExcelEngine.getColumnName(DataSrcImpl.getOurInstance().getLastColomnNum() + 1),
+                    ProgramOptions.getEndl(),
                     String.join(",", missingFields.values().stream().map(DataDstFieldDescriptor::getName)
                             .collect(Collectors.toList())));
             ProgramOptions.getLoger().warn(message);

diff --git a/src/org/xresloader/core/data/dst/DataDstPb.java b/src/org/xresloader/core/data/dst/DataDstPb.java
@@ -3059,9 +3059,13 @@ && dumpPlainField(builder, null, child, null, inputs[usedInputIdx], rowContext,
 
         if (!missingFields.isEmpty()) {
             String message = String.format(
-                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > Missing fields: %s",
+                    "Try to convert %s need at least %d fields, at most %d fields, but only provide %d fields.%s  > File: %s, Table: %s, Row: %d, Column: %d(%s)%s  > Missing fields: %s",
                     field.getTypeDescriptor().getFullName(), atLeastFieldSize, fieldSize, inputs.length,
                     ProgramOptions.getEndl(),
+                    rowContext.fileName, rowContext.tableName,
+                    rowContext.row + 1, DataSrcImpl.getOurInstance().getLastColomnNum() + 1,
+                    ExcelEngine.getColumnName(DataSrcImpl.getOurInstance().getLastColomnNum() + 1),
+                    ProgramOptions.getEndl(),
                     String.join(",", missingFields.values().stream().map(DataDstFieldDescriptor::getName)
                             .collect(Collectors.toList())));
             ProgramOptions.getLoger().warn(message);