Changeset 17452 for lang/java

Timestamp:

08/11/08 22:13:39 (3 months ago)

Author:

shogo4405

Message:

JSDocタスクをプレリリース

Location:

lang/java/utiljs/trunk

Files:

• build/build.xml (modified) (1 diff)
• src/org/coderepos/utiljs/taskdefs/JSDoc.java (modified) (7 diffs)
• test/testcase.xml (modified) (1 diff)

lang/java/utiljs/trunk/build/build.xml

@@ -2 +2 @@
 <project name="utiljs" default="default" basedir="../">
 
-        <property name="version" value="0.0.3" />
+        <property name="version" value="0.0.4" />
 
         <property name="dir.bin" value="bin" />

lang/java/utiljs/trunk/src/org/coderepos/utiljs/taskdefs/JSDoc.java

@@ -16 +16 @@
 final public class JSDoc extends Task
 {
+        final private File NULLFILE = new File("");
+
         final public String MAINJAR = "jsrun.jar";
         final public String MAINDOC = "app/run.js";
@@ -31 +33 @@
         private boolean nocode = false;
         /** 出力結果の保存 **/
-        private File log = null;
+        private File out = null;
         /** private関数も出力するか？ **/
         private boolean privateOpt = false;
@@ -90 +92 @@
                         };
                 };
-                args.addIf(0 < recurse, "--recurse=" + new Integer(recurse).toString());
                 args.addIf(help, "--help");
                 args.addIf(allfunctions, "--allfunctions");
@@ -96 +97 @@
                 args.addIf(nocode, "--nocode");
                 args.addIf(supress, "--supress");
-                args.addIf(ext != null, ext);
                 args.addIf(verbose, "--verbose");
-                args.addIf(destDir != null, "--directory=" + getDestDir());
+                args.addIf(hasExt(), "--ext=" + getExt());
+                args.addIf(hasEncoding(), "--encoding=" + getEncoding());
+                args.addIf(hasOut(), "--out=" + getOut().getAbsolutePath());
+                args.addIf(hasRecurse(), "--recurse=" + new Integer(recurse).toString());
+                args.addIf(hasDestDir(), "--directory=" + getDestDir().getAbsolutePath());
                 args.add("--template=" + getTemplate());
 
@@ -120 +124 @@
         };
 
+        public boolean hasDestDir(){
+                return (!NULLFILE.equals(getDestDir()));
+        };
+
+        public boolean hasOut(){
+                return (!NULLFILE.equals(getOut()));
+        };
+
+        public boolean hasEncoding(){
+                return (!"".equals(getEncoding()));
+        };
+
+        public boolean hasExt(){
+                return (!"".equals(getExt()));
+        };
+
+        public boolean hasRecurse(){
+                return (-1 < recurse);
+        };
+
         /** setter for encoding **/
         public void setEncoding(String s){ encoding = s; };
         /** getter for encoding **/
-        public String getEncoding(){ return encoding; };
+        public String getEncoding(){
+                return (encoding == null) ? "" : encoding;
+        };
 
         /** setter for destDir **/
@@ -143 +169 @@
         public void setExt(String s){ ext = s; };
         /** getter for ext **/
-        public String getExt(){ return ext; };
+        public String getExt(){
+                return (ext == null) ? "" : ext;
+        };
 
         /** setter for template **/
@@ -161 +189 @@
 
         /** setter for log **/
-        public void setLog(File f){ log = f; };
+        public void setOut(File f){ out = f; };
         /** getter for log **/
-        public File getLog(){ return log; };
+        public File getOut(){
+                return (out == null) ? NULLFILE : out;
+        };
 
         /** setter for setPrivateOpt **/

lang/java/utiljs/trunk/test/testcase.xml

@@ -14 +14 @@
 
                 <!-- Jsdoc Case#03 -->
-                <jsdoc path="c:/jsdoc" verbose="yes">
-                        <src dir="c:/jsdoc/app" includes="test.js" />
+                <jsdoc path="c:/jsdoc" verbose="yes" encoding="Windows-31J" destDir="result/jsdoc">
+                        <src dir="c:/jsdoc/app" includes="*.js" />
                 </jsdoc>