Fixed bug#71811 "AJDoc: should be able to set encoding like javadoc"

diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/Main.java b/ajdoc/src/org/aspectj/tools/ajdoc/Main.java
index 2cff8de2c844041ad1183a91f2c75b2785405812..6611d2165e42bc77417decfc1aea9b34775af0d1 100644 (file)
--- a/ajdoc/src/org/aspectj/tools/ajdoc/Main.java
+++ b/ajdoc/src/org/aspectj/tools/ajdoc/Main.java
@@ -495,6 +495,21 @@ public class Main implements Config {
                 options.addElement( arg );
                 ajcOptions.addElement( arg );
             }
+            else if ( arg.equals( "-encoding" ) ) {
+                addNextAsOption = true;
+                addNextToAJCOptions = false;
+                options.addElement( arg );
+            }
+            else if ( arg.equals( "-docencoding" ) ) {
+                addNextAsOption = true;
+                addNextToAJCOptions = false;
+                options.addElement( arg );
+            }
+            else if ( arg.equals( "-charset" ) ) {
+                addNextAsOption = true;
+                addNextToAJCOptions = false;
+                options.addElement( arg );
+            }
             else if ( arg.equals( "-sourcepath" ) ) {
                 addNextAsSourcePath = true;
                 //options.addElement( arg );

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
index a7dd019745d61ecb198f8f211bfdf6234bb6ec49..25182eaf7dd0ba022add11065a5bd50114a85e65 100644 (file)
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@ -36,6 +36,24 @@ public class CoverageTestCase extends TestCase {
         
        File outdir = new File("testdata/coverage/doc");
        
+       public void testOptions() {
+               outdir.delete();
+               String[] args = { 
+                       "-private",
+                       "-encoding",
+                       "EUCJIS",
+                       "-docencoding",
+                       "EUCJIS",
+                       "-charset",
+                       "UTF-8",
+                       "-d", 
+                       outdir.getAbsolutePath(),
+                       file0.getAbsolutePath(), 
+               };
+               org.aspectj.tools.ajdoc.Main.main(args);
+           assertTrue(true);
+       }
+       
        public void testCoverage() {
                outdir.delete();
                String[] args = { 
@@ -59,7 +77,7 @@ public class CoverageTestCase extends TestCase {
                };
                org.aspectj.tools.ajdoc.Main.main(args);
        }
-
+       
        public void testCoveragePublicMode() {
                outdir.delete();
                String[] args = {