Merge remote-tracking branch 'git.woa.com/dev' into dev

.github/workflows/build.yml

@@ -1,50 +1,50 @@
-# setup @see https://help.github.com/en/articles/workflow-syntax-for-github-actions
-# environment @see https://help.github.com/en/articles/software-in-virtual-environments-for-github-actions
-#                  https://help.github.com/en/articles/virtual-environments-for-github-actions
-# example     @see https://github.com/actions/toolkit/blob/master/.github/workflows/workflow.yml
-name: Main Building
-# This workflow is triggered on pushes to the repository.
-on: # @see https://help.github.com/en/articles/events-that-trigger-workflows#webhook-events
-  push:
-    branches: # Array of patterns that match refs/heads
-      - master # Push events on master branch
-      - main
-  pull_request:
-    branches:
-      - main
-  # schedule:
-  #  - cron:  0 * * * *
-
-jobs:
-  build: # job id, can be any string
-    # Job name is Build And Publish
-    name: Build
-    # This job runs on Linux
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3 # https://github.com/actions/checkout
-        with:
-          lfs: true
-          submodules: true
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3 # https://github.com/actions/setup-java
-        with:
-          distribution: temurin
-          java-version: "11"
-          java-package: jdk
-          architecture: x64
-      - name: Build with Maven
-        # uses: .github/action/build-with-maven
-        run: |
-          cd tools
-          python3 -m pip install --user -r requirements.txt
-          python3 gen_header_v2.py
-          python3 gen_header_v3.py
-          cd ..
-          mvn package --file pom.xml
-          cd sample
-          bash gen_sample_output.sh
+# setup @see https://help.github.com/en/articles/workflow-syntax-for-github-actions
+# environment @see https://help.github.com/en/articles/software-in-virtual-environments-for-github-actions
+#                  https://help.github.com/en/articles/virtual-environments-for-github-actions
+# example     @see https://github.com/actions/toolkit/blob/master/.github/workflows/workflow.yml
+name: Main Building
+# This workflow is triggered on pushes to the repository.
+on: # @see https://help.github.com/en/articles/events-that-trigger-workflows#webhook-events
+  push:
+    branches: # Array of patterns that match refs/heads
+      - master # Push events on master branch
+      - main
+  pull_request:
+    branches:
+      - main
+  # schedule:
+  #  - cron:  0 * * * *
+
+jobs:
+  build: # job id, can be any string
+    # Job name is Build And Publish
+    name: Build
+    # This job runs on Linux
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3 # https://github.com/actions/checkout
+        with:
+          lfs: true
+          submodules: true
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3 # https://github.com/actions/setup-java
+        with:
+          distribution: temurin
+          java-version: "11"
+          java-package: jdk
+          architecture: x64
+      - name: Build with Maven
+        # uses: .github/action/build-with-maven
+        run: |
+          cd tools
+          python3 -m pip install --user -r requirements.txt
+          python3 gen_header_v2.py
+          python3 gen_header_v3.py
+          cd ..
+          mvn package --file pom.xml
+          cd sample
+          bash gen_sample_output.sh

.github/workflows/release.yml

@@ -1,55 +1,55 @@
-# setup @see https://help.github.com/en/articles/workflow-syntax-for-github-actions
-# environment @see https://help.github.com/en/articles/software-in-virtual-environments-for-github-actions
-#                  https://help.github.com/en/articles/virtual-environments-for-github-actions
-# example     @see https://github.com/actions/toolkit/blob/master/.github/workflows/workflow.yml
-name: Release
-# This workflow is triggered on pushes to the repository.
-on: # @see https://help.github.com/en/articles/events-that-trigger-workflows#webhook-events
-  push:
-    tags:
-      - "*"
-
-jobs:
-  build: # job id, can be any string
-    # Job name is Build And Publish
-    name: Build And Publish
-    # This job runs on Linux
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3 # https://github.com/actions/checkout
-        with:
-          lfs: true
-          submodules: true
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3 # https://github.com/actions/setup-java
-        with:
-          distribution: temurin
-          java-version: "11"
-          java-package: jdk
-          architecture: x64
-      - name: Build with Maven
-        run: |
-          cd tools
-          python3 -m pip install --user -r requirements.txt
-          python3 gen_header_v2.py
-          python3 gen_header_v3.py
-          cd ..
-          mvn package --file pom.xml
-          if [[ -e "target/protocols.zip" ]]; then rm -f "target/protocols.zip"; fi
-          if [[ -e "target/tools.zip" ]]; then rm -f "target/tools.zip"; fi
-          mkdir target/protocols
-          cp -rf third_party/xresloader-protocol/core/*.proto third_party/xresloader-protocol/core/extensions header/*.pb target/protocols/
-          echo $(cd target/protocols && zip -r "../protocols.zip" *)
-          echo $(cd tools && zip -r "../target/tools.zip" requirements.txt extensions.pb *.py)
-      - uses: xresloader/upload-to-github-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          file: "target/protocols.zip;target/tools.zip;target/*.jar"
-          tags: true
-          draft: true
-          overwrite: true
+# setup @see https://help.github.com/en/articles/workflow-syntax-for-github-actions
+# environment @see https://help.github.com/en/articles/software-in-virtual-environments-for-github-actions
+#                  https://help.github.com/en/articles/virtual-environments-for-github-actions
+# example     @see https://github.com/actions/toolkit/blob/master/.github/workflows/workflow.yml
+name: Release
+# This workflow is triggered on pushes to the repository.
+on: # @see https://help.github.com/en/articles/events-that-trigger-workflows#webhook-events
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build: # job id, can be any string
+    # Job name is Build And Publish
+    name: Build And Publish
+    # This job runs on Linux
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3 # https://github.com/actions/checkout
+        with:
+          lfs: true
+          submodules: true
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3 # https://github.com/actions/setup-java
+        with:
+          distribution: temurin
+          java-version: "11"
+          java-package: jdk
+          architecture: x64
+      - name: Build with Maven
+        run: |
+          cd tools
+          python3 -m pip install --user -r requirements.txt
+          python3 gen_header_v2.py
+          python3 gen_header_v3.py
+          cd ..
+          mvn package --file pom.xml
+          if [[ -e "target/protocols.zip" ]]; then rm -f "target/protocols.zip"; fi
+          if [[ -e "target/tools.zip" ]]; then rm -f "target/tools.zip"; fi
+          mkdir target/protocols
+          cp -rf third_party/xresloader-protocol/core/*.proto third_party/xresloader-protocol/core/extensions header/*.pb target/protocols/
+          echo $(cd target/protocols && zip -r "../protocols.zip" *)
+          echo $(cd tools && zip -r "../target/tools.zip" requirements.txt extensions.pb *.py)
+      - uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          file: "target/protocols.zip;target/tools.zip;target/*.jar"
+          tags: true
+          draft: true
+          overwrite: true

src/org/xresloader/core/data/dst/DataDstLua.java

@@ -131,15 +131,13 @@ private String quote(String input) {
             return w.toString();
         }
 
-        char b;
         char c = 0;
         String hhhh;
         int i;
         int len = input.length();
 
         w.write('"');
         for (i = 0; i < len; i += 1) {
-            b = c;
             c = input.charAt(i);
             switch (c) {
                 case '\\':

src/org/xresloader/core/engine/ExcelHSSFStreamSheetHandle.java

@@ -27,7 +27,6 @@
 import org.apache.poi.hssf.record.RKRecord;
 import org.apache.poi.hssf.record.SSTRecord;
 import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 
 /**

src/org/xresloader/core/engine/IdentifyEngine.java

@@ -17,8 +17,6 @@ public class IdentifyEngine {
      * @return
      */
     static public IdentifyDescriptor n2i(String _name, int index) {
-        String[] segs = null;
-
         IdentifyDescriptor ret = new IdentifyDescriptor();
         ret.index = index;
         int verify_index = _name.lastIndexOf('@');

src/org/xresloader/core/scheme/SchemeDataSourceExcel.java

@@ -84,9 +84,6 @@ public boolean load_scheme(String sheet_name) throws InitializeException {
         // 数据项必须在这之后
         for (++data_row; data_row < row_num; ++data_row) {
             ExcelEngine.DataRowWrapper rowWrapper = new ExcelEngine.DataRowWrapper(table.getRow(data_row));
-            if (null == rowWrapper) {
-                continue;
-            }
 
             String key = cell2str(rowWrapper, key_col);
             ArrayList<String> datas = new ArrayList<String>();