Merge pull request #28 from NativeScript/trifonov/improve-generation

improve generation

Author: vtrifonov

README.md

@@ -47,3 +47,9 @@ Rename classes.jar if necessary
 ```shell
 java -jar build\libs\dts-generator.jar -input classes.jar dependency-of-classes-jar.jar
 ```
+
+## Support libraries
+In the [lib](lib) folder there are android support libraries jars which are get from the following git repos:
+* [android-support-v4](https://github.com/dandar3/android-support-v4/tree/master/libs)
+* [android-support-v7-appcompat](https://github.com/dandar3/android-support-v7-appcompat/tree/master/libs)
+* [android-support-design](https://github.com/dandar3/android-support-design/tree/master/libs)

dts-generator/src/main/java/com/telerik/dts/DtsApi.java

@@ -36,8 +36,10 @@ public class DtsApi {
     private Map<String, String> aliasedTypes;
     private String[] namespaceParts;
     private int indent = 0;
+    private boolean writeMultipleFiles;
 
-    public DtsApi() {
+    public DtsApi(boolean writeMultipleFiles) {
+        this.writeMultipleFiles = writeMultipleFiles;
         this.indent = 0;
 
         overrideFieldComparator();
@@ -157,10 +159,12 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
             String[] refs = references.toArray(new String[references.size()]);
             Arrays.sort(refs);
 
-            for (String r : refs) {
-                sbHeaders.append("/// <reference path=\"./");
-                sbHeaders.append(r);
-                sbHeaders.appendln(".d.ts\" />");
+            if(this.writeMultipleFiles) {
+                for (String r : refs) {
+                    sbHeaders.append("/// <reference path=\"./");
+                    sbHeaders.append(r);
+                    sbHeaders.appendln(".d.ts\" />");
+                }
             }
         }
 

dts-generator/src/main/java/com/telerik/dts/FileWriter.java

@@ -18,7 +18,6 @@ public class FileWriter {
     private boolean writeMultipleFiles;
     private PrintStream ps;
     private File outDir;
-    private boolean isFirstRun = true;
 
     public FileWriter(File outDir, boolean writeMultipleFiles) {
         this.writeMultipleFiles = writeMultipleFiles;
@@ -37,12 +36,6 @@ public void write(String content, String fileName) {
                 String outFile = this.outDir.getAbsolutePath() + File.separator + this.defaultDtsFileName + ".d.ts";
                 this.ps = new PrintStream(new FileOutputStream(outFile, /*append*/true));
 
-                // add helpers reference to the top of the file
-                if(this.isFirstRun) {
-                    ps.println("/// <reference path=\"./_helpers.d.ts\" />");
-                    this.isFirstRun = false;
-                }
-
                 this.ps.print(content);
                 this.ps.println();
             }
@@ -58,11 +51,12 @@ public void write(String content, String fileName) {
 
     public void writeHelperTypings(String content, boolean append) {
         try {
-                String outFile = this.outDir.getAbsolutePath() + File.separator + "_helpers.d.ts";
-                this.ps = new PrintStream(new FileOutputStream(outFile, append));
+            String outFile = this.outDir.getAbsolutePath() + File.separator +
+                (this.writeMultipleFiles ? "_helpers.d.ts": (this.defaultDtsFileName + ".d.ts"));
+            this.ps = new PrintStream(new FileOutputStream(outFile, append));
 
-                this.ps.print(content);
-                this.ps.println();
+            this.ps.print(content);
+            this.ps.println();
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         }

dts-generator/src/main/java/com/telerik/dts/Generator.java

@@ -21,7 +21,7 @@ public class Generator {
     public void start(InputParameters inputParameters) throws IOException {
         outFolder = inputParameters.getOutputDir();
         this.fw = new FileWriter(inputParameters.getOutputDir(), inputParameters.isGenerateMultipleFiles());
-        this.dtsApi = new DtsApi();
+        this.dtsApi = new DtsApi(inputParameters.isGenerateMultipleFiles());
 
         loadJavaClasses(inputParameters.getInputJars());
         ClassRepo.sortCachedProviders();