You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/09/01 21:42:22 UTC
svn commit: r1164231 - in
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util:
HTMLFileContentFilter.java JSFileNameFilter.java
Author: lu4242
Date: Thu Sep 1 19:42:22 2011
New Revision: 1164231
URL: http://svn.apache.org/viewvc?rev=1164231&view=rev
Log:
fix windows specific bug and rename symbols/src/... .js.html files references too
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/HTMLFileContentFilter.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/JSFileNameFilter.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/HTMLFileContentFilter.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/HTMLFileContentFilter.java?rev=1164231&r1=1164230&r2=1164231&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/HTMLFileContentFilter.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/HTMLFileContentFilter.java Thu Sep 1 19:42:22 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.plugins.jsdoc
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.IOFileFilter;
+import org.apache.commons.lang.StringUtils;
import java.io.File;
import java.io.IOException;
@@ -38,10 +39,12 @@ public class HTMLFileContentFilter imple
{
String substitutionDir;
+ String substitutionName;
public HTMLFileContentFilter(String substitutionDir)
{
this.substitutionDir = substitutionDir;
+ this.substitutionName = substitutionDir.replace('/', '_').replace('\\', '_').replace(':', '_');
}
private boolean fixFile(String fileName) throws IOException
@@ -58,7 +61,10 @@ public class HTMLFileContentFilter imple
{
Object line = it.next();
String sLine = (String) line;
- targetLines.add(sLine.replaceAll(substitutionDir, ""));
+ //targetLines.add(sLine.replaceAll(substitutionDir, ""));
+ String targetLine = StringUtils.replace(sLine, substitutionDir, "");
+ targetLine = StringUtils.replace(targetLine, substitutionName, "");
+ targetLines.add(targetLine);
}
FileUtils.writeLines(new File(fileName), targetLines);
return true;
@@ -72,7 +78,15 @@ public class HTMLFileContentFilter imple
}
try
{
- fixFile(file.getAbsolutePath());
+ if (file.getName().startsWith(substitutionName))
+ {
+ String newName = file.getName().substring(substitutionName.length());
+ file.renameTo(new File(file.getParentFile(), newName));
+ }
+ else
+ {
+ fixFile(file.getAbsolutePath());
+ }
}
catch (IOException e)
{
@@ -89,7 +103,15 @@ public class HTMLFileContentFilter imple
}
try
{
- fixFile(file.getAbsolutePath() + File.separator + s);
+ if (s.startsWith(substitutionName))
+ {
+ String newName = s.substring(substitutionName.length());
+ file.renameTo(new File(file.getParentFile(), newName));
+ }
+ else
+ {
+ fixFile(file.getAbsolutePath() + File.separator + s);
+ }
}
catch (IOException e)
{
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/JSFileNameFilter.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/JSFileNameFilter.java?rev=1164231&r1=1164230&r2=1164231&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/JSFileNameFilter.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jsdoc-plugin/src/main/java/org/apache/myfaces/plugins/jsdoc/util/JSFileNameFilter.java Thu Sep 1 19:42:22 2011
@@ -47,6 +47,10 @@ public class JSFileNameFilter implements
private boolean matchNames(String fileName)
{
Iterator it = _fileMap.getFileNames().iterator();
+ if (fileName != null)
+ {
+ fileName = fileName.replace('\\', '/');
+ }
while (it.hasNext())
{
String matchPattern = (String) it.next();