X-Git-Url: http://git.phpeclipse.com

diff --git a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java
index 1463a25..29a3bb8 100644
--- a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java
+++ b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/WikiExporter.java
@@ -12,6 +12,7 @@ import java.util.TreeSet;
 
 import net.sourceforge.phpeclipse.wiki.builder.CreatePageAction;
 import net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin;
+import net.sourceforge.phpeclipse.wiki.preferences.Util;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -20,10 +21,10 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
-import de.java2html.converter.JavaSource2HTMLConverter;
-import de.java2html.javasource.JavaSource;
-import de.java2html.javasource.JavaSourceParser;
-import de.java2html.options.Java2HtmlConversionOptions;
+//import de.java2html.converter.JavaSource2HTMLConverter;
+//import de.java2html.javasource.JavaSource;
+//import de.java2html.javasource.JavaSourceParser;
+//import de.java2html.options.Java2HtmlConversionOptions;
 
 public final class WikiExporter {
 
@@ -45,11 +46,12 @@ public final class WikiExporter {
       InstantiationException, IllegalAccessException, ClassNotFoundException {
     //    exportDirectory = new File(exportDirectoryName);
     IResource[] resources = folder.members(IResource.FILE);
+    String templateFileName = Util.getExportTemplate(folder);
 //    monitor.beginTask(WikiEditorPlugin.getResourceString("Export.wikiPages"), resources.length + 1);
     for (int i = 0; i < resources.length; i++) {
       if (resources[i] instanceof IFile) {
         monitor.subTask(WikiEditorPlugin.getResourceString("Export.exportFile")+resources[i].getLocation());
-        CreatePageAction.createPage((IFile) resources[i], exportDirectoryName, srcBasePath);
+        CreatePageAction.createPage(templateFileName, (IFile) resources[i], exportDirectoryName, srcBasePath);
         monitor.worked(1);
       } else if (resources[i] instanceof IFolder) {
         monitor.subTask(WikiEditorPlugin.getResourceString("Export.exportFolder")+resources[i].getLocation());
@@ -126,19 +128,19 @@ public final class WikiExporter {
     return "java".equals(resource.getFileExtension());
   }
 
-  private void javaToHtml(File source, File destination) throws IOException {
-    JavaSource java = new JavaSourceParser().parse(new FileReader(source));
-    JavaSource2HTMLConverter converter = new JavaSource2HTMLConverter(java);
-    Java2HtmlConversionOptions options = Java2HtmlConversionOptions.getDefault();
-    options.setShowLineNumbers(true);
-    options.setShowFileName(true);
-    options.setShowJava2HtmlLink(true);
-    converter.setConversionOptions(options);
-    FileWriter writer = new FileWriter(destination);
-    converter.convert(writer);
-    writer.flush();
-    writer.close();
-  }
+//  private void javaToHtml(File source, File destination) throws IOException {
+//    JavaSource java = new JavaSourceParser().parse(new FileReader(source));
+//    JavaSource2HTMLConverter converter = new JavaSource2HTMLConverter(java);
+//    Java2HtmlConversionOptions options = Java2HtmlConversionOptions.getDefault();
+//    options.setShowLineNumbers(true);
+//    options.setShowFileName(true);
+//    options.setShowJava2HtmlLink(true);
+//    converter.setConversionOptions(options);
+//    FileWriter writer = new FileWriter(destination);
+//    converter.convert(writer);
+//    writer.flush();
+//    writer.close();
+//  }
 
   private void copy(File source, File dest) throws IOException {
     FileChannel in = null;