[xdoclet-scm] [CVS maven2-plugin] * now using a comma separated string for includes/excludes

[gjoseph]

Commit in maven2-plugin/src/main/java/org/codehaus/xdoclet on MAIN
Config.java	+9	-9	1.3 -> 1.4
Maven2SourceProvider.java	+11	-11	1.2 -> 1.3
	+20	-20

2 modified files

* now  using a comma separated string for includes/excludes
* defaults to **/*.java for includes instead of **/*

---

maven2-plugin/src/main/java/org/codehaus/xdoclet

Config.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- Config.java	15 Jan 2006 18:50:25 -0000	1.3
+++ Config.java	17 Jan 2006 22:09:51 -0000	1.4
@@ -2,17 +2,17 @@

 
 import java.util.Collections;
 import java.util.Map;

-import java.util.Set;

 
 /**
  * @author Espen Amble Kolstad

- *
- * @version $Revision: 1.3 $

+ * @author gjoseph
+ * 
+ * @version $Revision: 1.4 $

  */
 public class Config {
     private String plugin;

-    private Set includes = Collections.singleton("**/*");
-    private Set excludes = Collections.EMPTY_SET;

+    private String includes = "**/*.java";
+    private String excludes = "";

     private String encoding = System.getProperty("file.encoding");
     private Map params = Collections.EMPTY_MAP;
     private boolean addToSources = true;

@@ -25,19 +25,19 @@

         this.plugin = plugin;
     }
 

-    public Set getIncludes() {

+    public String getIncludes() {

         return includes;
     }
 

-    public void setIncludes(Set includes) {

+    public void setIncludes(String includes) {

         this.includes = includes;
     }
 

-    public Set getExcludes() {

+    public String getExcludes() {

         return excludes;
     }
 

-    public void setExcludes(Set excludes) {

+    public void setExcludes(String excludes) {

         this.excludes = excludes;
     }
 

---

maven2-plugin/src/main/java/org/codehaus/xdoclet

Maven2SourceProvider.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- Maven2SourceProvider.java	15 Jan 2006 18:50:25 -0000	1.2
+++ Maven2SourceProvider.java	17 Jan 2006 22:09:51 -0000	1.3
@@ -9,26 +9,26 @@

 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;

-import java.util.Set;

 
 /**
  * @author Espen Amble Kolstad

+ * @author gjoseph

  *

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

  */
 public class Maven2SourceProvider implements JavaSourceProvider {
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
     private final String encoding;
     private final List compileSourceRoots;

-    private final Set includes;
-    private final Set excludes;

+    private final String[] includes;
+    private final String[] excludes;

 
     public Maven2SourceProvider(Config config, List compileSourceRoots) {
         this.encoding = config.getEncoding();
         this.compileSourceRoots = compileSourceRoots;

-        this.includes = config.getIncludes();
-        this.excludes = config.getExcludes();

+        this.includes = toStringArray(config.getIncludes());
+        this.excludes = toStringArray(config.getExcludes());

     }
 
     public Collection getURLs() throws IOException {

@@ -39,8 +39,8 @@

             final DirectoryScanner scanner = new DirectoryScanner();
             scanner.setBasedir(baseDir);
             scanner.setFollowSymlinks(true);

-            scanner.setExcludes(toStringArray(excludes));
-            scanner.setIncludes(toStringArray(includes));

+            scanner.setExcludes(excludes);
+            scanner.setIncludes(includes);

             scanner.addDefaultExcludes();
             scanner.scan();
             final String[] files = scanner.getIncludedFiles();

@@ -52,11 +52,11 @@

         return urls;
     }
 

-    private String[] toStringArray(Set strings) {
-        if (strings == null || strings.isEmpty()) {

+    private String[] toStringArray(String commaSeparated) {
+        if (commaSeparated == null || commaSeparated.length() == 0) {

             return EMPTY_STRING_ARRAY;
         }

-        return (String[]) strings.toArray(new String[strings.size()]);

+        return commaSeparated.split(",", 0);

     }
 
     public String getEncoding() {

CVSspam 0.2.8