From 4ba8d45ce456b08fbe308de4c6a506f3e7d526b4 Mon Sep 17 00:00:00 2001 From: zhaojunxia Date: Tue, 17 May 2022 15:36:21 +0800 Subject: [PATCH] modify codecheck Signed-off-by: zhaojunxia --- src/gen/analyze.js | 4 ++++ src/generator/src/com/sk/dialog/GenResultDialog.java | 1 + src/generator/src/com/sk/dialog/GenerateDialog.java | 11 ++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/gen/analyze.js b/src/gen/analyze.js index 1df7a8be..d1439ce3 100644 --- a/src/gen/analyze.js +++ b/src/gen/analyze.js @@ -47,6 +47,10 @@ function analyzeFile(fn) { if (null != licenseData) { result.declareLicense.push(licenseData) } + return analyze(data, result) +} + +function analyze(data, result) { while (true) { let oldData = data data = removeEmptyLine(data) diff --git a/src/generator/src/com/sk/dialog/GenResultDialog.java b/src/generator/src/com/sk/dialog/GenResultDialog.java index 3f2be9aa..488e7b90 100644 --- a/src/generator/src/com/sk/dialog/GenResultDialog.java +++ b/src/generator/src/com/sk/dialog/GenResultDialog.java @@ -32,6 +32,7 @@ import java.util.List; */ public class GenResultDialog extends JDialog { private static final Logger LOG = Logger.getInstance(GenResultDialog.class); + private JPanel contentPane; private JButton buttonOK; private JList resultList; diff --git a/src/generator/src/com/sk/dialog/GenerateDialog.java b/src/generator/src/com/sk/dialog/GenerateDialog.java index 71266d90..be26127b 100644 --- a/src/generator/src/com/sk/dialog/GenerateDialog.java +++ b/src/generator/src/com/sk/dialog/GenerateDialog.java @@ -189,6 +189,14 @@ public class GenerateDialog extends JDialog { } catch (InterruptedException exception) { LOG.warn("exec command Interrupted" + exception); Thread.currentThread().interrupt(); + } finally { + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException ioException) { + LOG.error("exec command close inputStream error" + ioException); + } + } } } @@ -298,7 +306,8 @@ public class GenerateDialog extends JDialog { private void genResultLog(Process process) { BufferedReader stdInput = new BufferedReader(new InputStreamReader(process.getInputStream())); BufferedReader stdError = new BufferedReader(new InputStreamReader(process.getErrorStream())); - String sErr, sOut; + String sErr; + String sOut; sErr = getErrorResult(stdError); if (TextUtils.isEmpty(sErr)) { sOut = genInputLog(stdInput); -- Gitee