diff --git a/src/gen/analyze.js b/src/gen/analyze.js index 1df7a8be72b4989efd8cfa59079d90265fa4e5d2..d1439ce3c63b91f1929b67459759df35cced949d 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 3f2be9aafeb614416a5edca9965a055022e6a0e2..488e7b90c86c8facb3d5719063129396e58df005 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 71266d90188d36f7ed1072b26ef0641fee0a1c3c..be26127bafc95240c9db4a74478af1613019bc5a 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);