plog4u-devel Mailing List for Eclipse Wikipedia Editor (Page 8)
Status: Beta
Brought to you by:
axelcl
Menu
▾
▴
plog4u-devel
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
|
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
|
Feb
(86) |
Mar
(5) |
Apr
(1) |
May
|
Jun
(50) |
Jul
(2) |
Aug
(23) |
Sep
(15) |
Oct
(1) |
Nov
|
Dec
|
|
From: Axel C. K. <ax...@us...> - 2006-02-11 18:32:54
|
Update of /cvsroot/plog4u/org.plog4u.jlibrary/src/org/plog4u/jlibrary/jlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16547/src/org/plog4u/jlibrary/jlib Log Message: Directory /cvsroot/plog4u/org.plog4u.jlibrary/src/org/plog4u/jlibrary/jlib added to the repository |
|
From: Axel C. K. <ax...@us...> - 2006-02-11 18:32:54
|
Update of /cvsroot/plog4u/org.plog4u.jlibrary/icons/full/glyphs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16547/icons/full/glyphs Log Message: Directory /cvsroot/plog4u/org.plog4u.jlibrary/icons/full/glyphs added to the repository |
|
From: Axel C. K. <ax...@us...> - 2006-02-11 18:32:54
|
Update of /cvsroot/plog4u/org.plog4u.jlibrary/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16547/icons Log Message: Directory /cvsroot/plog4u/org.plog4u.jlibrary/icons added to the repository |
|
From: Axel C. K. <ax...@us...> - 2006-02-11 18:31:10
|
Update of /cvsroot/plog4u/org.plog4u.jlibrary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15975/org.plog4u.jlibrary Log Message: Directory /cvsroot/plog4u/org.plog4u.jlibrary added to the repository |
|
From: Axel C. K. <ax...@us...> - 2006-02-04 13:29:22
|
Update of /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/macro/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12236/src/org/jzonic/yawiki/wikipedia/macro/api Modified Files: MacroRepository.java LocalePreserved.java Log Message: Eliminated dependencies for commons-logging Index: LocalePreserved.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/macro/api/LocalePreserved.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LocalePreserved.java 20 Aug 2005 15:13:58 -0000 1.1 --- LocalePreserved.java 4 Feb 2006 13:28:49 -0000 1.2 *************** *** 4,9 **** import org.jzonic.yawiki.wikipedia.api.engine.context.RenderContext; import org.jzonic.yawiki.wikipedia.util.i18n.ResourceManager; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.util.Locale; --- 4,9 ---- import org.jzonic.yawiki.wikipedia.api.engine.context.RenderContext; import org.jzonic.yawiki.wikipedia.util.i18n.ResourceManager; ! //import org.apache.commons.logging.Log; ! //import org.apache.commons.logging.LogFactory; import java.util.Locale; *************** *** 36,40 **** public abstract class LocalePreserved extends Preserved implements LocaleMacro { ! private static Log log = LogFactory.getLog(LocalePreserved.class); private String name; --- 36,40 ---- public abstract class LocalePreserved extends Preserved implements LocaleMacro { ! // private static Log log = LogFactory.getLog(LocalePreserved.class); private String name; *************** *** 49,53 **** .getString(getLocaleKey() + ".description"); } catch (Exception e) { ! log.warn("missing macro description for " + getLocaleKey()); return super.getDescription(); } --- 49,53 ---- .getString(getLocaleKey() + ".description"); } catch (Exception e) { ! // log.warn("missing macro description for " + getLocaleKey()); return super.getDescription(); } *************** *** 78,82 **** description = messages.getString(getLocaleKey() + ".description"); } catch (Exception e) { ! log.warn("Cannot read description from properties " + inputName + " for " + getLocaleKey()); } } --- 78,82 ---- description = messages.getString(getLocaleKey() + ".description"); } catch (Exception e) { ! // log.warn("Cannot read description from properties " + inputName + " for " + getLocaleKey()); } } Index: MacroRepository.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/macro/api/MacroRepository.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MacroRepository.java 26 Sep 2005 21:20:17 -0000 1.3 --- MacroRepository.java 4 Feb 2006 13:28:49 -0000 1.4 *************** *** 30,35 **** import java.util.Map; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jzonic.yawiki.wikipedia.api.engine.context.InitialRenderContext; import org.jzonic.yawiki.wikipedia.macro.ABAPMacro; --- 30,35 ---- import java.util.Map; ! //import org.apache.commons.logging.Log; ! //import org.apache.commons.logging.LogFactory; import org.jzonic.yawiki.wikipedia.api.engine.context.InitialRenderContext; import org.jzonic.yawiki.wikipedia.macro.ABAPMacro; *************** *** 47,51 **** */ public class MacroRepository extends PluginRepository { ! private static Log log = LogFactory.getLog(MacroRepository.class); private InitialRenderContext context; --- 47,51 ---- */ public class MacroRepository extends PluginRepository { ! // private static Log log = LogFactory.getLog(MacroRepository.class); private InitialRenderContext context; |
|
From: Axel C. K. <ax...@us...> - 2006-02-04 13:29:22
|
Update of /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12236/src/org/jzonic/yawiki/wikipedia/engine Modified Files: BaseRenderEngine.java Log Message: Eliminated dependencies for commons-logging Index: BaseRenderEngine.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/engine/BaseRenderEngine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BaseRenderEngine.java 6 Sep 2005 17:09:43 -0000 1.2 --- BaseRenderEngine.java 4 Feb 2006 13:28:49 -0000 1.3 *************** *** 31,36 **** import java.io.Writer; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jzonic.yawiki.wikipedia.api.engine.RenderEngine; import org.jzonic.yawiki.wikipedia.api.engine.context.InitialRenderContext; --- 31,36 ---- import java.io.Writer; ! //import org.apache.commons.logging.Log; ! //import org.apache.commons.logging.LogFactory; import org.jzonic.yawiki.wikipedia.api.engine.RenderEngine; import org.jzonic.yawiki.wikipedia.api.engine.context.InitialRenderContext; *************** *** 52,56 **** public static final String NAME = "radeox"; ! private static Log log = LogFactory.getLog(BaseRenderEngine.class); private WikipediaFilter filter = null; protected InitialRenderContext initialContext; --- 52,56 ---- public static final String NAME = "radeox"; ! // private static Log log = LogFactory.getLog(BaseRenderEngine.class); private WikipediaFilter filter = null; protected InitialRenderContext initialContext; |
|
From: Axel C. K. <ax...@us...> - 2006-02-04 13:29:22
|
Update of /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/util/i18n In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12236/src/org/jzonic/yawiki/wikipedia/util/i18n Modified Files: ResourceManager.java Log Message: Eliminated dependencies for commons-logging Index: ResourceManager.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/util/i18n/ResourceManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceManager.java 20 Aug 2005 15:14:06 -0000 1.1 --- ResourceManager.java 4 Feb 2006 13:28:49 -0000 1.2 *************** *** 26,31 **** package org.jzonic.yawiki.wikipedia.util.i18n; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.util.Enumeration; --- 26,31 ---- package org.jzonic.yawiki.wikipedia.util.i18n; ! //import org.apache.commons.logging.Log; ! //import org.apache.commons.logging.LogFactory; import java.util.Enumeration; *************** *** 44,48 **** */ public class ResourceManager { ! private static Log log = LogFactory.getLog(ResourceManager.class); private static ThreadLocal instance = new ThreadLocal() { --- 44,48 ---- */ public class ResourceManager { ! // private static Log log = LogFactory.getLog(ResourceManager.class); private static ThreadLocal instance = new ThreadLocal() { *************** *** 102,106 **** return bundle.getString(key); } catch (Exception e) { ! log.warn("missing resource for bundle '"+baseName+"', key '"+key+"'"); return "???"+key+"???"; } --- 102,106 ---- return bundle.getString(key); } catch (Exception e) { ! // log.warn("missing resource for bundle '"+baseName+"', key '"+key+"'"); return "???"+key+"???"; } *************** *** 151,155 **** resourceBundle = ResourceBundle.getBundle(baseName, locale, cl); } catch (Exception e) { ! log.fatal("unable to load a default bundle: "+baseName+"_"+locale); } // check that the requested main locale matches the resource bundle's, --- 151,155 ---- resourceBundle = ResourceBundle.getBundle(baseName, locale, cl); } catch (Exception e) { ! // log.fatal("unable to load a default bundle: "+baseName+"_"+locale); } // check that the requested main locale matches the resource bundle's, *************** *** 165,169 **** while(fallback.hasMoreElements()) { Locale testLocale = (Locale) fallback.nextElement(); ! log.debug("looking up locale "+testLocale); ResourceBundle testBundle = ResourceBundle.getBundle(baseName, testLocale, cl); String language = testBundle.getLocale().getLanguage(); --- 165,169 ---- while(fallback.hasMoreElements()) { Locale testLocale = (Locale) fallback.nextElement(); ! // log.debug("looking up locale "+testLocale); ResourceBundle testBundle = ResourceBundle.getBundle(baseName, testLocale, cl); String language = testBundle.getLocale().getLanguage(); *************** *** 172,176 **** if (testBundle.getLocale().equals(testLocale)) { resourceBundle = testBundle; ! log.debug("found bundle for locale " +baseName+"_"+ testBundle.getLocale()); break; } else if (testLocale.getLanguage().equals(language)) { --- 172,176 ---- if (testBundle.getLocale().equals(testLocale)) { resourceBundle = testBundle; ! // log.debug("found bundle for locale " +baseName+"_"+ testBundle.getLocale()); break; } else if (testLocale.getLanguage().equals(language)) { *************** *** 178,182 **** // language and country match which is good, keep looking for variant too resourceBundle = testBundle; ! log.debug("potential bundle: " + baseName + "_" + testBundle.getLocale()); continue; } else { --- 178,182 ---- // language and country match which is good, keep looking for variant too resourceBundle = testBundle; ! // log.debug("potential bundle: " + baseName + "_" + testBundle.getLocale()); continue; } else { *************** *** 184,188 **** if (null == resourceBundle) { resourceBundle = testBundle; ! log.debug("potential bundle: " + baseName+"_"+testBundle.getLocale()); } continue; --- 184,188 ---- if (null == resourceBundle) { resourceBundle = testBundle; ! // log.debug("potential bundle: " + baseName+"_"+testBundle.getLocale()); } continue; *************** *** 196,200 **** resourceBundle = ResourceBundle.getBundle(baseName); if (null != resourceBundle) { ! log.debug("system locale bundle taken: " + baseName + "_" + resourceBundle.getLocale()); } } --- 196,200 ---- resourceBundle = ResourceBundle.getBundle(baseName); if (null != resourceBundle) { ! // log.debug("system locale bundle taken: " + baseName + "_" + resourceBundle.getLocale()); } } |
|
From: Axel C. K. <ax...@us...> - 2006-02-04 13:29:22
|
Update of /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12236/src/org/jzonic/yawiki/wikipedia/filter Modified Files: WikipediaParser.java Log Message: Eliminated dependencies for commons-logging Index: WikipediaParser.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/WikipediaParser.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** WikipediaParser.java 20 Dec 2005 20:52:37 -0000 1.11 --- WikipediaParser.java 4 Feb 2006 13:28:49 -0000 1.12 *************** *** 893,896 **** --- 893,897 ---- if (fSource[fCurrentPosition] != '{') { if (readUntilString("}}")) { + fCurrentPosition++; // insert template handling Object[] objs = createParameterMap(fSource, *************** *** 901,921 **** String templateName = (String) objs[1]; // System.out.println(templateName); ! String plainContent = ((IWikipediaRenderEngine) fWikiEngine) ! .getPlainContent("Template:" ! + templateName); ! if (plainContent != null) { ! WikipediaScanner scanner = new WikipediaScanner( ! plainContent.toCharArray()); ! StringBuffer plainBuffer = scanner ! .replaceTemplateParameters( ! plainContent, map); ! // instantiate inner Parser class ! WikipediaParser parser = new WikipediaParser( ! fMacros, plainBuffer.toString(), ! fResultBuffer, fContext, ! fCategories, fRecursionLevel); ! parser.parse(); ! continue; } } --- 902,926 ---- String templateName = (String) objs[1]; // System.out.println(templateName); ! if (fWikiEngine != null ! && fWikiEngine instanceof IWikipediaRenderEngine) { ! String plainContent = ((IWikipediaRenderEngine) fWikiEngine) ! .getPlainContent("Template:" ! + templateName); ! if (plainContent != null) { ! WikipediaScanner scanner = new WikipediaScanner( ! plainContent.toCharArray()); ! StringBuffer plainBuffer = scanner ! .replaceTemplateParameters( ! plainContent, map); ! // instantiate inner Parser class ! WikipediaParser parser = new WikipediaParser( ! fMacros, ! plainBuffer.toString(), ! fResultBuffer, fContext, ! fCategories, fRecursionLevel); ! parser.parse(); ! continue; ! } } } |
|
From: Axel C. K. <ax...@us...> - 2005-12-23 15:52:34
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1341/src/net/sourceforge/phpeclipse/wiki/parser Removed Files: ParserTest.java Log Message: Using iText's HTMLWorker with StyleSheet --- ParserTest.java DELETED --- |
|
From: Axel C. K. <ax...@us...> - 2005-12-23 15:52:34
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1341/src/net/sourceforge/phpeclipse/wiki/export/pdf Modified Files: WikiPDFExporter.java Log Message: Using iText's HTMLWorker with StyleSheet Index: WikiPDFExporter.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf/WikiPDFExporter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WikiPDFExporter.java 20 Dec 2005 20:58:09 -0000 1.10 --- WikiPDFExporter.java 23 Dec 2005 15:52:22 -0000 1.11 *************** *** 31,38 **** --- 31,41 ---- import com.lowagie.text.Chapter; import com.lowagie.text.Document; + import com.lowagie.text.Element; import com.lowagie.text.Font; import com.lowagie.text.FontFactory; import com.lowagie.text.PageSize; import com.lowagie.text.Paragraph; + import com.lowagie.text.html.simpleparser.HTMLWorker; + import com.lowagie.text.html.simpleparser.StyleSheet; import com.lowagie.text.pdf.PdfWriter; *************** *** 236,243 **** StringBuffer htmlBuffer = new StringBuffer(); ! htmlBuffer.append("<html><head></head><body>"); ! boolean noContent = CreatePageAction .createFragmentPage(file, htmlBuffer, context); htmlBuffer.append("</body></html>"); --- 239,248 ---- StringBuffer htmlBuffer = new StringBuffer(); ! htmlBuffer.append("<html><head></head>"); ! htmlBuffer.append("<body encoding=\"utf-8\">"); ! htmlBuffer.append("<table border=\"0\"><tr><td>"); boolean noContent = CreatePageAction .createFragmentPage(file, htmlBuffer, context); + htmlBuffer.append("</td></tr></table>"); htmlBuffer.append("</body></html>"); *************** *** 298,308 **** * @param monitor */ private void appendArticle(Document document, StringBuffer htmlBuffer, String filename, ProblemConsole console) { StringReader stream = null; try { ! WPHtmlParser parser = new WPHtmlParser(); stream = new StringReader(htmlBuffer.toString()); ! parser.go(document, stream); } catch (Exception e) { addError("PDF export exception in file: " + filename, e, console); --- 303,337 ---- * @param monitor */ + // private void appendArticle(Document document, StringBuffer htmlBuffer, + // String filename, ProblemConsole console) { + // StringReader stream = null; + // try { + // WPHtmlParser parser = new WPHtmlParser(); + // stream = new StringReader(htmlBuffer.toString()); + // parser.go(document, stream); + // } catch (Exception e) { + // addError("PDF export exception in file: " + filename, e, console); + // } finally { + // if (stream != null) { + // stream.close(); + // } + // } + // } + /** + * @param document + * @param htmlBuffer + * @param monitor + */ private void appendArticle(Document document, StringBuffer htmlBuffer, String filename, ProblemConsole console) { StringReader stream = null; try { ! StyleSheet st = new StyleSheet(); ! // st.loadTagStyle("body", "face", "arial unicode ms"); stream = new StringReader(htmlBuffer.toString()); ! ArrayList p = HTMLWorker.parseToList(stream, st); ! for (int k = 0; k < p.size(); ++k) { ! document.add((Element) p.get(k)); ! } } catch (Exception e) { addError("PDF export exception in file: " + filename, e, console); *************** *** 381,404 **** // } // - // /** - // * @param document - // * @param htmlBuffer - // * @param monitor - // */ - // private void appendArticle(Document document, StringBuffer htmlBuffer) { - // StringReader stream = null; - // try { - // // WPHtmlParser parser = new WPHtmlParser(); - // stream = new StringReader(htmlBuffer.toString()); - // // parser.go(document, stream); - // new HTMLWorker(document).parse(stream); - // } catch (Exception e) { - // addError("PDF export exception", e); - // } finally { - // if (stream != null) { - // stream.close(); - // } - // } - // } /** --- 410,413 ---- |
|
From: Axel C. K. <ax...@us...> - 2005-12-20 20:58:21
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1573/src/net/sourceforge/phpeclipse/wiki/export/pdf Modified Files: WPHtmlParser.java WikiPDFExporter.java Log Message: New iText version; more console messages Index: WPHtmlParser.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf/WPHtmlParser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WPHtmlParser.java 24 Feb 2005 05:14:34 -0000 1.1 --- WPHtmlParser.java 20 Dec 2005 20:58:09 -0000 1.2 *************** *** 58,61 **** --- 58,62 ---- import com.lowagie.text.DocListener; + import com.lowagie.text.DocumentException; import com.lowagie.text.ExceptionConverter; import com.lowagie.text.html.SAXmyHtmlHandler; *************** *** 68,92 **** public class WPHtmlParser extends XmlParser { ! /** ! * Parses a given file. ! * ! * @param document ! * the document the parser will write to ! * @param is ! * the Reader with the content ! */ ! ! public void go(DocListener document, Reader is) { ! try { ! SAXmyHtmlHandler handler = new SAXmyHtmlHandler(document); ! handler.setControlOpenClose(false); ! parser.parse(new InputSource(is), handler); ! } catch (SAXException se) { ! throw new ExceptionConverter(se); ! } catch (IOException ioe) { ! throw new ExceptionConverter(ioe); ! } ! } ! } \ No newline at end of file --- 69,94 ---- public class WPHtmlParser extends XmlParser { ! /** ! * Parses a given file. ! * ! * @param document ! * the document the parser will write to ! * @param is ! * the Reader with the content ! */ + public void go(DocListener document, Reader is) { + try { + SAXmyHtmlHandler handler = new SAXmyHtmlHandler(document); + handler.setControlOpenClose(false); + parser.parse(new InputSource(is), handler); + } catch (DocumentException e) { + throw new ExceptionConverter(e); + } catch (SAXException se) { + throw new ExceptionConverter(se); + } catch (IOException ioe) { + throw new ExceptionConverter(ioe); + } + } + } \ No newline at end of file Index: WikiPDFExporter.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf/WikiPDFExporter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** WikiPDFExporter.java 21 Oct 2005 19:46:16 -0000 1.9 --- WikiPDFExporter.java 20 Dec 2005 20:58:09 -0000 1.10 *************** *** 10,13 **** --- 10,14 ---- import java.util.List; + import net.sourceforge.phpeclipse.wiki.actions.ProblemConsole; import net.sourceforge.phpeclipse.wiki.builder.CreatePageAction; import net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin; *************** *** 36,54 **** import com.lowagie.text.pdf.PdfWriter; - //import de.java2html.converter.JavaSource2HTMLConverter; - //import de.java2html.javasource.JavaSource; - //import de.java2html.javasource.JavaSourceParser; - //import de.java2html.options.Java2HtmlConversionOptions; - public final class WikiPDFExporter implements IRunnableWithProgress { ! //The constants for the overwrite 3 state ! private static final int OVERWRITE_NOT_SET = 0; ! private static final int OVERWRITE_NONE = 1; ! private static final int OVERWRITE_ALL = 2; - private int overwriteState = OVERWRITE_NOT_SET; - private List errorTable = new ArrayList(1); --- 37,52 ---- import com.lowagie.text.pdf.PdfWriter; public final class WikiPDFExporter implements IRunnableWithProgress { ! private static final boolean DEBUG = false; ! // The constants for the overwrite 3 state ! private static final int OVERWRITE_NOT_SET = 0; ! private static final int OVERWRITE_NONE = 1; ! ! private static final int OVERWRITE_ALL = 2; ! ! private int overwriteState = OVERWRITE_NOT_SET; private List errorTable = new ArrayList(1); *************** *** 200,204 **** public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { ! WikiFilesVisitor visitor = new WikiFilesVisitor(); for (int i = 0; i < fResourcesToExport.size(); i++) { --- 198,202 ---- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { ! ProblemConsole console = new ProblemConsole(); WikiFilesVisitor visitor = new WikiFilesVisitor(); for (int i = 0; i < fResourcesToExport.size(); i++) { *************** *** 245,250 **** if (!noContent) { ! System.out.println(file.getLocation().toString()); ! System.out.println(htmlBuffer.toString()); String fileName = file.getName(); fileName = fileName.replaceAll("_", " "); --- 243,248 ---- if (!noContent) { ! console.println("PDF exporting text: " ! + file.getLocation().toString()); String fileName = file.getName(); fileName = fileName.replaceAll("_", " "); *************** *** 259,263 **** chapterNumber++); document.add(chapter); ! appendArticle(document, htmlBuffer); } monitor.worked(1); --- 257,262 ---- chapterNumber++); document.add(chapter); ! appendArticle(document, htmlBuffer, fileName, ! console); } monitor.worked(1); *************** *** 269,278 **** + e.getMessage(); } ! addError(error, e); } } } catch (Throwable e) { String error = "PDF export exception: " + e.getMessage(); ! addError(error, e); } finally { if (document != null) { --- 268,277 ---- + e.getMessage(); } ! addError(error, e, console); } } } catch (Throwable e) { String error = "PDF export exception: " + e.getMessage(); ! addError(error, e, console); } finally { if (document != null) { *************** *** 299,303 **** * @param monitor */ ! private void appendArticle(Document document, StringBuffer htmlBuffer) { StringReader stream = null; try { --- 298,303 ---- * @param monitor */ ! private void appendArticle(Document document, StringBuffer htmlBuffer, ! String filename, ProblemConsole console) { StringReader stream = null; try { *************** *** 306,310 **** parser.go(document, stream); } catch (Exception e) { ! addError("PDF export exception", e); } finally { if (stream != null) { --- 306,310 ---- parser.go(document, stream); } catch (Exception e) { ! addError("PDF export exception in file: " + filename, e, console); } finally { if (stream != null) { *************** *** 404,410 **** /** * Add a new entry to the error table with the passed information */ ! protected void addError(String message, Throwable e) { ! e.printStackTrace(); errorTable.add(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, message, e)); --- 404,417 ---- /** * Add a new entry to the error table with the passed information + * + * @param console + * TODO */ ! protected void addError(String message, Throwable e, ProblemConsole console) { ! console.errorln(">>> " + message); ! console.errorln(">>> " + e.getMessage()); ! if (DEBUG) { ! e.printStackTrace(); ! } errorTable.add(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, message, e)); *************** *** 426,440 **** null); } ! /** ! * Set this boolean indicating whether exported resources should automatically overwrite existing files when a conflict occurs. If ! * not query the user. ! * ! * @param value ! * boolean ! */ ! public void setOverwriteFiles(boolean value) { ! if (value) ! overwriteState = OVERWRITE_ALL; ! } // test // public static void main(String[] args) { --- 433,449 ---- null); } ! ! /** ! * Set this boolean indicating whether exported resources should ! * automatically overwrite existing files when a conflict occurs. If not ! * query the user. ! * ! * @param value ! * boolean ! */ ! public void setOverwriteFiles(boolean value) { ! if (value) ! overwriteState = OVERWRITE_ALL; ! } // test // public static void main(String[] args) { *************** *** 454,508 **** // } ! // private static void createPDF(final String title, final String htmlContent, ! // final String xslFileName) throws Exception { ! // TransformerFactory m_transformerFactory = TransformerFactory ! // .newInstance(); ! // ! // InputStream in = new ByteArrayInputStream(("<title>" + title ! // + "</title>" + htmlContent).getBytes("utf-8")); ! // ! // Tidy tidy = new Tidy(); ! // tidy.setXmlOut(true); ! // org.w3c.dom.Document xmlDocument = tidy.parseDOM(in, null); ! // ! // Driver driver = new Driver(); ! // driver.setRenderer(Driver.RENDER_PDF); ! // ! // FileOutputStream out = new FileOutputStream("c:\\temp\\test.pdf"); ! // driver.setOutputStream(out); ! // ! // InputStream is = WikiPDFExporter.class.getResourceAsStream(xslFileName); ! // Source xsltSrc = new StreamSource(is); ! // Transformer transformer = m_transformerFactory.newTransformer(xsltSrc); ! // ! // Result res = new SAXResult(driver.getContentHandler()); ! // ! // Source src = new DOMSource(xmlDocument); ! // ! // transformer.transform(src, res); ! // is.close(); ! // out.close(); ! // // response.setContentType("application/pdf"); ! // // response.setContentLength(out.size()); ! // // ! // // //Send content to Browser ! // // response.getOutputStream().write(out.toByteArray()); ! // // response.getOutputStream().flush(); ! // } ! // public static String TEST = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" + ! // " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + ! // "\n" + ! // "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en_US\" xml:lang=\"en_US\">\n" + ! // "<head>\n" + ! // "</head>\n" + ! // "<body>\n" + ! // "<b>Hello World</b>\n"+ ! // "</body></html>"; ! // public static void main(String[] args) { ! // try { ! // createPDF("test",TEST, "xhtml2fo.xsl"); ! // } catch (Exception e) { ! // e.printStackTrace(); ! // } ! // } } \ No newline at end of file --- 463,520 ---- // } ! // private static void createPDF(final String title, final String ! // htmlContent, ! // final String xslFileName) throws Exception { ! // TransformerFactory m_transformerFactory = TransformerFactory ! // .newInstance(); ! // ! // InputStream in = new ByteArrayInputStream(("<title>" + title ! // + "</title>" + htmlContent).getBytes("utf-8")); ! // ! // Tidy tidy = new Tidy(); ! // tidy.setXmlOut(true); ! // org.w3c.dom.Document xmlDocument = tidy.parseDOM(in, null); ! // ! // Driver driver = new Driver(); ! // driver.setRenderer(Driver.RENDER_PDF); ! // ! // FileOutputStream out = new FileOutputStream("c:\\temp\\test.pdf"); ! // driver.setOutputStream(out); ! // ! // InputStream is = WikiPDFExporter.class.getResourceAsStream(xslFileName); ! // Source xsltSrc = new StreamSource(is); ! // Transformer transformer = m_transformerFactory.newTransformer(xsltSrc); ! // ! // Result res = new SAXResult(driver.getContentHandler()); ! // ! // Source src = new DOMSource(xmlDocument); ! // ! // transformer.transform(src, res); ! // is.close(); ! // out.close(); ! // // response.setContentType("application/pdf"); ! // // response.setContentLength(out.size()); ! // // ! // // //Send content to Browser ! // // response.getOutputStream().write(out.toByteArray()); ! // // response.getOutputStream().flush(); ! // } ! // public static String TEST = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML ! // 1.0 Transitional//EN\"\n" + ! // " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + ! // "\n" + ! // "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en_US\" ! // xml:lang=\"en_US\">\n" + ! // "<head>\n" + ! // "</head>\n" + ! // "<body>\n" + ! // "<b>Hello World</b>\n"+ ! // "</body></html>"; ! // public static void main(String[] args) { ! // try { ! // createPDF("test",TEST, "xhtml2fo.xsl"); ! // } catch (Exception e) { ! // e.printStackTrace(); ! // } ! // } } \ No newline at end of file |
|
From: Axel C. K. <ax...@us...> - 2005-12-20 20:57:36
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1318/lib Added Files: itext-1.3.6.jar Log Message: New iText version --- NEW FILE: itext-1.3.6.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Axel C. K. <ax...@us...> - 2005-12-20 20:55:29
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1029/lib Modified Files: plog4u.jar Log Message: Fixed some parser bugs Index: plog4u.jar =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/lib/plog4u.jar,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 Binary files /tmp/cvsQhIDN9 and /tmp/cvsbQHYDN differ |
|
From: Axel C. K. <ax...@us...> - 2005-12-20 20:54:45
|
Update of /cvsroot/plog4u/org.jzonic.yawiki.wikipedia.test/src/org/jzonic/yawiki/wikipedia/test/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv919/src/org/jzonic/yawiki/wikipedia/test/filter Modified Files: ItalicFilterTest.java BasicFilterTest.java BoldFilterTest.java Log Message: Fixed some parser bugs Index: BoldFilterTest.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia.test/src/org/jzonic/yawiki/wikipedia/test/filter/BoldFilterTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BoldFilterTest.java 30 Aug 2005 16:56:00 -0000 1.2 --- BoldFilterTest.java 20 Dec 2005 20:54:35 -0000 1.3 *************** *** 19,23 **** return new TestSuite(BoldFilterTest.class); } ! public void testBold() { assertEquals("<p><b>Text</b>\n</p>", filter.filter("'''Text'''", filterContext, null)); --- 19,31 ---- return new TestSuite(BoldFilterTest.class); } ! public void testBoldItalic() { ! // close tags if user forget it: ! assertEquals("<p><b><i>kursiv und fett</i></b><br>\n" + ! "<br>\n" + ! "test\n" + ! "</p>", filter.filter("'''''kursiv und fett'''''<br />\n" + ! "<br />\n" + ! "test", filterContext, null)); ! } public void testBold() { assertEquals("<p><b>Text</b>\n</p>", filter.filter("'''Text'''", filterContext, null)); *************** *** 29,39 **** } - public void testBoldItalic() { - // close tags if user forget it: - assertEquals("<p><b>Text<i></i></b>\n</p>", filter.filter("\'\'\'\'\'kursiv und fett\'\'\' \'\'<br />\n" + - "<br />\n" + - "test", filterContext, null)); - } - public void testBoldItalicStack() { // close tags if user forget it: --- 37,40 ---- Index: ItalicFilterTest.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia.test/src/org/jzonic/yawiki/wikipedia/test/filter/ItalicFilterTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ItalicFilterTest.java 30 Aug 2005 16:56:00 -0000 1.2 --- ItalicFilterTest.java 20 Dec 2005 20:54:35 -0000 1.3 *************** *** 19,29 **** return new TestSuite(ItalicFilterTest.class); } ! public void testItalic() { ! assertEquals("<em>Text</em>", filter.filter("''Text''", filterContext, null)); } public void testItalicWithPunctuation() { ! assertEquals("<em>Text</em>:", filter.filter("''Text'':", filterContext, null)); } } --- 19,37 ---- return new TestSuite(ItalicFilterTest.class); } ! ! ! public void testEM() { ! assertEquals("<p>a <em> project </em>.\n" + ! "</p>", filter.filter("a <em> project </em>.", filterContext, null)); ! } ! public void testItalic() { ! assertEquals("<p><i>Text</i>\n" + ! "</p>", filter.filter("''Text''", filterContext, null)); } public void testItalicWithPunctuation() { ! assertEquals("<p><i>Text</i>:\n" + ! "</p>", filter.filter("''Text'':", filterContext, null)); } } Index: BasicFilterTest.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia.test/src/org/jzonic/yawiki/wikipedia/test/filter/BasicFilterTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BasicFilterTest.java 30 Aug 2005 16:56:00 -0000 1.2 --- BasicFilterTest.java 20 Dec 2005 20:54:35 -0000 1.3 *************** *** 20,23 **** --- 20,29 ---- } + public void testTT() { + assertEquals("<p><b>hosted by:</b><br />\n" + + "</p>", filter.filter("'''hosted by:'''<br>", filterContext, + null)); + } + public void testBlankInput() { assertEquals("", filter.filter("", filterContext, null)); *************** *** 41,47 **** public void testParagraph3() { ! assertEquals("<p>This is a simple paragraph.\n" + ! "</p><p>A second paragraph.\n" + ! "</p>", filter.filter( "This is a simple paragraph.\n\nA second paragraph.", filterContext, null)); --- 47,52 ---- public void testParagraph3() { ! assertEquals("<p>This is a simple paragraph.\n" ! + "</p><p>A second paragraph.\n" + "</p>", filter.filter( "This is a simple paragraph.\n\nA second paragraph.", filterContext, null)); *************** *** 62,99 **** } - public void testItalicAndBold() { - assertEquals( - "<ul><li>plain\n" - + "</li><li>plain<i>italic</i>plain\n" - + "</li><li>plain<i>italic</i>plain<i>italic</i>plain\n" - + "</li><li>plain<b>bold</b>plain\n" - + "</li><li>plain<b>bold</b>plain<b>bold</b>plain\n" - + "</li><li>plain<i>italic</i>plain<b>bold</b>plain\n" - + "</li><li>plain<b>bold</b>plain<i>italic</i>plain\n" - + "</li><li>plain<i>italic<b>bold-italic</b>italic</i>plain\n" - + "</li><li>plain<b>bold<i>bold-italic</i>bold</b>plain\n" - + "</li><li>plain<b><i>bold-italic<b>italic<i>plain</i></b></i></b>\n" - + "</li><li>plain<b><i>bold-italic</i>bold</b>plain\n" - + "</li><li>plain<i>italic<b>bold-italic</b></i>plain\n" - + "</li><li>plain<b>bold<i>bold-italic<b><i>plain</i></b></i></b>\n" - + "</li><li>plain l<b>italic<i>plain</i></b>\n" - + "</li></ul>", - filter - .filter( - "* plain\n" - + "* plain\'\'italic\'\'plain\n" - + "* plain\'\'italic\'\'plain\'\'italic\'\'plain\n" - + "* plain\'\'\'bold\'\'\'plain\n" - + "* plain\'\'\'bold\'\'\'plain\'\'\'bold\'\'\'plain\n" - + "* plain\'\'italic\'\'plain\'\'\'bold\'\'\'plain\n" - + "* plain\'\'\'bold\'\'\'plain\'\'italic\'\'plain\n" - + "* plain\'\'italic\'\'\'bold-italic\'\'\'italic\'\'plain\n" - + "* plain\'\'\'bold\'\'bold-italic\'\'bold\'\'\'plain\n" - + "* plain\'\'\'\'\'bold-italic\'\'\'italic\'\'plain\n" - + "* plain\'\'\'\'\'bold-italic\'\'bold\'\'\'plain\n" - + "* plain\'\'italic\'\'\'bold-italic\'\'\'\'\'plain\n" - + "* plain\'\'\'bold\'\'bold-italic\'\'\'\'\'plain\n" - + "* plain l\'\'\'italic\'\'plain", - filterContext, null)); - } } \ No newline at end of file --- 67,69 ---- |
|
From: Axel C. K. <ax...@us...> - 2005-12-20 20:53:28
|
Update of /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/tags In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv764/src/org/jzonic/yawiki/wikipedia/filter/tags Modified Files: FontTag.java DivTag.java OpenTagToken.java CloseTagToken.java TableTag.java Log Message: Fixed some parser bugs Index: CloseTagToken.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/tags/CloseTagToken.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CloseTagToken.java 1 Jul 2005 18:50:29 -0000 1.1 --- CloseTagToken.java 20 Dec 2005 20:53:19 -0000 1.2 *************** *** 2,30 **** public class CloseTagToken extends AbstractTag { ! private String fTagName; ! private String fCloseTag; ! public CloseTagToken(int token, String name, String closeTag) { ! super(token); ! fTagName = name; ! fCloseTag = closeTag; ! } ! public String getTagName() { ! return fTagName; ! } ! public String getCloseTag() { ! return fCloseTag; ! } ! public void setTagName(String name) { ! fTagName = name; ! } ! public void setCloseTag(String closeTag) { ! fCloseTag = closeTag; ! } ! } --- 2,40 ---- public class CloseTagToken extends AbstractTag { ! private String fTagName; ! private String fCloseTag; ! public CloseTagToken(int token, String name) { ! super(token); ! fTagName = name; ! fCloseTag = "</" + name + ">"; ! } ! public CloseTagToken(int token, String name, String closeTag) { ! super(token); ! fTagName = name; ! // String ttag = "</" + name + ">"; ! // if (!ttag.equals(closeTag)) { ! // System.out.println(""); ! // } ! fCloseTag = closeTag; ! } ! ! public String getTagName() { ! return fTagName; ! } ! public String getCloseTag() { ! return fCloseTag; ! } ! public void setTagName(String name) { ! fTagName = name; ! } ! public void setCloseTag(String closeTag) { ! fCloseTag = closeTag; ! } + } Index: TableTag.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/tags/TableTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TableTag.java 1 Jul 2005 18:50:29 -0000 1.1 --- TableTag.java 20 Dec 2005 20:53:19 -0000 1.2 *************** *** 4,8 **** public TableTag(int token, String name, String openTag) { ! super(token, name, openTag); } --- 4,8 ---- public TableTag(int token, String name, String openTag) { ! super(token, name); } Index: FontTag.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/tags/FontTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FontTag.java 1 Jul 2005 18:50:29 -0000 1.1 --- FontTag.java 20 Dec 2005 20:53:19 -0000 1.2 *************** *** 4,8 **** public FontTag(int token, String name, String openTag) { ! super(token, name, openTag); } --- 4,8 ---- public FontTag(int token, String name, String openTag) { ! super(token, name); } Index: OpenTagToken.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/tags/OpenTagToken.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OpenTagToken.java 1 Jul 2005 18:50:29 -0000 1.1 --- OpenTagToken.java 20 Dec 2005 20:53:19 -0000 1.2 *************** *** 7,13 **** --- 7,23 ---- private String fOpenTag; + public OpenTagToken(int token, String name) { + super(token); + fTagName = name; + fOpenTag = "<" + name + ">"; + } + public OpenTagToken(int token, String name, String openTag) { super(token); fTagName = name; + // String ttag = "<" + name + ">"; + // if (!ttag.equals(openTag)) { + // System.out.println(openTag); + // } fOpenTag = openTag; } Index: DivTag.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/tags/DivTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DivTag.java 1 Jul 2005 18:50:29 -0000 1.1 --- DivTag.java 20 Dec 2005 20:53:19 -0000 1.2 *************** *** 4,8 **** public DivTag(int token, String name, String openTag) { ! super(token, name, openTag); } --- 4,8 ---- public DivTag(int token, String name, String openTag) { ! super(token, name); } |
|
From: Axel C. K. <ax...@us...> - 2005-12-20 20:52:46
|
Update of /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv648/src/org/jzonic/yawiki/wikipedia/filter Modified Files: WikipediaParser.java WikipediaFilter.java TokenStack.java Log Message: Fixed some parser bugs Index: WikipediaParser.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/WikipediaParser.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WikipediaParser.java 21 Oct 2005 18:55:48 -0000 1.10 --- WikipediaParser.java 20 Dec 2005 20:52:37 -0000 1.11 *************** *** 188,192 **** private List fCategories; ! private RenderEngine fWikiEngine=null; // TODO check, if this counter is correct in recursions: --- 188,192 ---- private List fCategories; ! private RenderEngine fWikiEngine = null; // TODO check, if this counter is correct in recursions: *************** *** 264,270 **** fPageName = (String) fContext.getRenderContext().get("PageName"); ! fDomainName = (String) fContext.getRenderContext().get("DomainName"); ! // try { // SnipMacroParameter params = (SnipMacroParameter) --- 264,270 ---- fPageName = (String) fContext.getRenderContext().get("PageName"); ! fDomainName = (String) fContext.getRenderContext().get("DomainName"); ! // try { // SnipMacroParameter params = (SnipMacroParameter) *************** *** 410,423 **** } } ! public static String copyWhite(String text ) { ! StringBuffer buffer = new StringBuffer(text.length()+32); copyWhite(text, buffer); return buffer.toString(); } /** * copy the text in the resulting buffer and escape special html characters * (< > " & ') * ! * @param buffer add converted text into the resulting buffer */ public static void copyWhite(String text, StringBuffer buffer) { --- 410,426 ---- } } ! ! public static String copyWhite(String text) { ! StringBuffer buffer = new StringBuffer(text.length() + 32); copyWhite(text, buffer); return buffer.toString(); } + /** * copy the text in the resulting buffer and escape special html characters * (< > " & ') * ! * @param buffer ! * add converted text into the resulting buffer */ public static void copyWhite(String text, StringBuffer buffer) { *************** *** 429,434 **** case '\r': // if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, ! currentIndex - 1)); lastIndex = currentIndex; } --- 432,436 ---- case '\r': // if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, currentIndex - 1)); lastIndex = currentIndex; } *************** *** 436,441 **** case '<': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, ! currentIndex - 1)); lastIndex = currentIndex; } --- 438,442 ---- case '<': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, currentIndex - 1)); lastIndex = currentIndex; } *************** *** 444,449 **** case '>': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, ! currentIndex - 1)); lastIndex = currentIndex; } else { --- 445,449 ---- case '>': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, currentIndex - 1)); lastIndex = currentIndex; } else { *************** *** 454,459 **** case '&': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, ! currentIndex - 1)); lastIndex = currentIndex; } else { --- 454,458 ---- case '&': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, currentIndex - 1)); lastIndex = currentIndex; } else { *************** *** 464,469 **** case '\'': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, ! currentIndex - 1)); lastIndex = currentIndex; } else { --- 463,467 ---- case '\'': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, currentIndex - 1)); lastIndex = currentIndex; } else { *************** *** 474,479 **** case '\"': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, ! currentIndex - 1)); lastIndex = currentIndex; } else { --- 472,476 ---- case '\"': // special html escape character if (lastIndex < (currentIndex - 1)) { ! buffer.append(text.substring(lastIndex, currentIndex - 1)); lastIndex = currentIndex; } else { *************** *** 972,976 **** - startHeadPosition - (1 + levelHeader)); ! head = copyWhite(head); levelHeader++; --- 969,973 ---- - startHeadPosition - (1 + levelHeader)); ! head = copyWhite(head); levelHeader++; *************** *** 985,989 **** // set scanner poiner to '\n' character: if (isStartOfLine()) { ! setPosition(fCurrentPosition - 2); WPList list = wpList(); if (list != null && list.size() > 0) { --- 982,986 ---- // set scanner poiner to '\n' character: if (isStartOfLine()) { ! setPosition(fCurrentPosition - 2); WPList list = wpList(); if (list != null && list.size() > 0) { *************** *** 1230,1233 **** --- 1227,1238 ---- case '\'': if (getNextChar('\'')) { + if (!fTokenStack.isEmpty()) { + Object topToken = fTokenStack.peek(); + if (topToken instanceof AbstractTag + && ((AbstractTag) topToken).getToken() == WikipediaFilter.TokenITALIC) { + copyWhite(fWhiteStart, fWhiteStartPosition, 2); + return WikipediaFilter.TokenITALIC; + } + } if (getNextChar('\'')) { copyWhite(fWhiteStart, fWhiteStartPosition, 3); *************** *** 1534,1538 **** } else { fResultBuffer.append("<li>"); ! copyWhite(innerTag.substring(listStart, listEnd), fResultBuffer); fResultBuffer.append("</li>"); } --- 1539,1544 ---- } else { fResultBuffer.append("<li>"); ! copyWhite(innerTag.substring(listStart, listEnd), ! fResultBuffer); fResultBuffer.append("</li>"); } *************** *** 1545,1549 **** if (listStart < innerTag.length()) { fResultBuffer.append("<li>"); ! copyWhite(innerTag.substring(listStart, innerTag.length()), fResultBuffer); fResultBuffer.append("</li>"); } --- 1551,1556 ---- if (listStart < innerTag.length()) { fResultBuffer.append("<li>"); ! copyWhite(innerTag.substring(listStart, innerTag.length()), ! fResultBuffer); fResultBuffer.append("</li>"); } *************** *** 2406,2410 **** name = Encoder.escape(name); ! String view; if (-1 != pipeIndex) { view = alias + suffix; --- 2413,2417 ---- name = Encoder.escape(name); ! String view; if (-1 != pipeIndex) { view = alias + suffix; *************** *** 2413,2417 **** } ! name=Encoder.encode(name); if (handleNamespaceLinks(name, view)) { return; --- 2420,2424 ---- } ! name = Encoder.encode(name); if (handleNamespaceLinks(name, view)) { return; *************** *** 2420,2424 **** if (name.startsWith("Image:") || name.startsWith("Bild:")) { // server part of rendering images ! if (fImageBaseURL == null && (fWikiEngine instanceof ImageRenderEngine)) { --- 2427,2431 ---- if (name.startsWith("Image:") || name.startsWith("Bild:")) { // server part of rendering images ! if (fImageBaseURL == null && (fWikiEngine instanceof ImageRenderEngine)) { *************** *** 2514,2518 **** } } else { ! // cannot display/create wiki, so just display the text fResultBuffer.append(view); } --- 2521,2526 ---- } } else { ! // cannot display/create wiki, so just display the ! // text fResultBuffer.append(view); } *************** *** 2554,2558 **** private boolean handleNamespaceLinks(String name, String view) { int interwikiIndex = name.indexOf(':'); ! if (interwikiIndex != (-1)) { // String interwiki; --- 2562,2566 ---- private boolean handleNamespaceLinks(String name, String view) { int interwikiIndex = name.indexOf(':'); ! if (interwikiIndex != (-1)) { // String interwiki; *************** *** 2596,2606 **** case 'd': // deutsches bliki wiki if (name.length() > 2) { ! return handleInterwiki("http://www.plog4u.de/index.php/", ! name, view, 1); } case 'e': // englisches bliki wiki if (name.length() > 2) { ! return handleInterwiki("http://www.plog4u.org/index.php/", ! name, view, 1); } case 's': // source --- 2604,2616 ---- case 'd': // deutsches bliki wiki if (name.length() > 2) { ! return handleInterwiki( ! "http://www.plog4u.de/index.php/", name, view, ! 1); } case 'e': // englisches bliki wiki if (name.length() > 2) { ! return handleInterwiki( ! "http://www.plog4u.org/index.php/", name, view, ! 1); } case 's': // source *************** *** 2699,2704 **** /** ! * append a link to the StringBuffer ! * the name and the view should already conatin escaped entities for >,<,... */ public static StringBuffer appendLink(StringBuffer buffer, String name, --- 2709,2714 ---- /** ! * append a link to the StringBuffer the name and the view should already ! * conatin escaped entities for >,<,... */ public static StringBuffer appendLink(StringBuffer buffer, String name, Index: WikipediaFilter.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/WikipediaFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WikipediaFilter.java 20 Aug 2005 15:13:57 -0000 1.2 --- WikipediaFilter.java 20 Dec 2005 20:52:37 -0000 1.3 *************** *** 163,225 **** final static AbstractTag HTML_HR_OPEN = new SpecialTagToken(TokenHTML_HR_OPEN, "hr", "<hr />"); ! final static AbstractTag HTML_EM_CLOSE = new CloseTagToken(TokenHTML_EM_CLOSE, "em", "</i>"); ! final static AbstractTag HTML_EM_OPEN = new OpenTagToken(TokenHTML_EM_OPEN, "em", "<i>"); ! final static AbstractTag HTML_H1_CLOSE = new CloseTagToken(TokenHTML_H1_CLOSE, "h1", "</h1>"); ! final static AbstractTag HTML_H1_OPEN = new OpenTagToken(TokenHTML_H1_OPEN, "h1", "<h1>"); ! final static AbstractTag HTML_H2_CLOSE = new CloseTagToken(TokenHTML_H2_CLOSE, "h2", "</h2>"); ! final static AbstractTag HTML_H2_OPEN = new OpenTagToken(TokenHTML_H2_OPEN, "h2", "<h2>"); ! final static AbstractTag HTML_H3_CLOSE = new CloseTagToken(TokenHTML_H3_CLOSE, "h3", "</h3>"); ! final static AbstractTag HTML_H3_OPEN = new OpenTagToken(TokenHTML_H3_OPEN, "h3", "<h3>"); ! final static AbstractTag HTML_H4_CLOSE = new CloseTagToken(TokenHTML_H4_CLOSE, "h4", "</h4>"); ! final static AbstractTag HTML_H4_OPEN = new OpenTagToken(TokenHTML_H4_OPEN, "h4", "<h4>"); ! final static AbstractTag HTML_H5_CLOSE = new CloseTagToken(TokenHTML_H5_CLOSE, "h5", "</h5>"); ! final static AbstractTag HTML_H5_OPEN = new OpenTagToken(TokenHTML_H5_OPEN, "h5", "<h5>"); ! final static AbstractTag HTML_H6_CLOSE = new CloseTagToken(TokenHTML_H6_CLOSE, "h6", "</h6>"); ! final static AbstractTag HTML_H6_OPEN = new OpenTagToken(TokenHTML_H6_OPEN, "h6", "<h6>"); ! final static AbstractTag HTML_ITALIC_CLOSE = new CloseTagToken(TokenHTML_ITALIC_CLOSE, "i", "</i>"); ! final static AbstractTag HTML_ITALIC_OPEN = new OpenTagToken(TokenHTML_ITALIC_OPEN, "i", "<i>"); ! final static AbstractTag HTML_BOLD_CLOSE = new CloseTagToken(TokenHTML_BOLD_CLOSE, "b", "</b>"); ! final static AbstractTag HTML_BOLD_OPEN = new OpenTagToken(TokenHTML_BOLD_OPEN, "b", "<b>"); // ! final static AbstractTag HTML_PARAGRAPH_CLOSE = new CloseTagToken(TokenHTML_PARAGRAPH_CLOSE, "p", "</p>"); ! final static AbstractTag HTML_PARAGRAPH_OPEN = new OpenTagToken(TokenHTML_PARAGRAPH_OPEN, "p", "<p>"); ! final static AbstractTag HTML_PRE_CLOSE = new CloseTagToken(TokenHTML_PRE_CLOSE, "pre", "</pre>"); ! final static AbstractTag HTML_PRE_OPEN = new OpenTagToken(TokenHTML_PRE_OPEN, "pre", "<pre>"); ! final static AbstractTag HTML_BLOCKQUOTE_CLOSE = new CloseTagToken(TokenHTML_BLOCKQUOTE_CLOSE, "blockquote", "</blockquote>"); ! final static AbstractTag HTML_BLOCKQUOTE_OPEN = new OpenTagToken(TokenHTML_BLOCKQUOTE_OPEN, "blockquote", "<blockquote>"); ! final static AbstractTag HTML_STRIKE_CLOSE = new CloseTagToken(TokenHTML_STRIKE_CLOSE, "strike", "</strike>"); ! final static AbstractTag HTML_STRIKE_OPEN = new OpenTagToken(TokenHTML_STRIKE_OPEN, "strike", "<strike>"); ! final static AbstractTag HTML_STRONG_CLOSE = new CloseTagToken(TokenHTML_STRONG_CLOSE, "strong", "</b>"); ! final static AbstractTag HTML_STRONG_OPEN = new OpenTagToken(TokenHTML_STRONG_OPEN, "strong", "<b>"); ! final static AbstractTag HTML_UNDERLINE_CLOSE = new CloseTagToken(TokenHTML_UNDERLINE_CLOSE, "u", "</u>"); ! final static AbstractTag HTML_UNDERLINE_OPEN = new OpenTagToken(TokenHTML_UNDERLINE_OPEN, "u", "<u>"); ! final static AbstractTag HTML_SUB_CLOSE = new CloseTagToken(TokenHTML_SUB_CLOSE, "sub", "</sub>"); ! final static AbstractTag HTML_SUB_OPEN = new OpenTagToken(TokenHTML_SUB_OPEN, "sub", "<sub>"); ! final static AbstractTag HTML_SUP_CLOSE = new CloseTagToken(TokenHTML_SUP_CLOSE, "sup", "</sup>"); ! final static AbstractTag HTML_SUP_OPEN = new OpenTagToken(TokenHTML_SUP_OPEN, "sup", "<sup>"); ! final static AbstractTag HTML_CENTER_OPEN = new OpenTagToken(TokenHTML_CENTER_OPEN, "center", "<center>"); ! final static AbstractTag HTML_CENTER_CLOSE = new CloseTagToken(TokenHTML_CENTER_CLOSE, "center", "</center>"); ! final static AbstractTag HTML_TT_OPEN = new OpenTagToken(TokenHTML_TT_OPEN, "tt", "<tt>"); ! final static AbstractTag HTML_TT_CLOSE = new CloseTagToken(TokenHTML_TT_CLOSE, "tt", "</tt>"); ! final static AbstractTag HTML_MATH_OPEN = new OpenTagToken(TokenHTML_MATH_OPEN, "math", "<math>"); ! final static AbstractTag HTML_MATH_CLOSE = new CloseTagToken(TokenHTML_MATH_CLOSE, "math", "</math>"); final static AbstractTag HTML_TABLE_OPEN = new TableTag(TokenHTML_TABLE_OPEN, "table", "<table>"); ! final static AbstractTag HTML_TABLE_CLOSE = new CloseTagToken(TokenHTML_TABLE_CLOSE, "table", "</table>"); ! final static AbstractTag HTML_CAPTION_OPEN = new OpenTagToken(TokenHTML_CAPTION_OPEN, "caption", "<caption>"); ! final static AbstractTag HTML_CAPTION_CLOSE = new CloseTagToken(TokenHTML_CAPTION_CLOSE, "caption", "</caption>"); ! final static AbstractTag HTML_TH_OPEN = new OpenTagToken(TokenHTML_TH_OPEN, "th", "<th>"); ! final static AbstractTag HTML_TH_CLOSE = new CloseTagToken(TokenHTML_TH_CLOSE, "th", "</th>"); ! final static AbstractTag HTML_TR_OPEN = new OpenTagToken(TokenHTML_TR_OPEN, "tr", "<tr>"); ! final static AbstractTag HTML_TR_CLOSE = new CloseTagToken(TokenHTML_TR_CLOSE, "tr", "</tr>"); ! final static AbstractTag HTML_TD_OPEN = new OpenTagToken(TokenHTML_TD_OPEN, "td", "<td>"); ! final static AbstractTag HTML_TD_CLOSE = new CloseTagToken(TokenHTML_TD_CLOSE, "td", "</td>"); final static AbstractTag HTML_FONT_OPEN = new FontTag(TokenHTML_FONT_OPEN, "font", "<font>"); ! final static AbstractTag HTML_FONT_CLOSE = new CloseTagToken(TokenHTML_FONT_CLOSE, "font", "</font>"); final static AbstractTag HTML_DIV_OPEN = new DivTag(TokenHTML_DIV_OPEN, "div", "<div>"); ! final static AbstractTag HTML_DIV_CLOSE = new CloseTagToken(TokenHTML_DIV_CLOSE, "div", "</div>"); final static AbstractTag HTML_P_OPEN = new DivTag(TokenHTML_P_OPEN, "p", "<p>"); final static AbstractTag HTML_P_CLOSE = new CloseTagToken(TokenHTML_P_CLOSE, "p", "\n</p>"); --- 163,225 ---- final static AbstractTag HTML_HR_OPEN = new SpecialTagToken(TokenHTML_HR_OPEN, "hr", "<hr />"); ! final static AbstractTag HTML_EM_CLOSE = new CloseTagToken(TokenHTML_EM_CLOSE, "em"); ! final static AbstractTag HTML_EM_OPEN = new OpenTagToken(TokenHTML_EM_OPEN, "em"); ! final static AbstractTag HTML_H1_CLOSE = new CloseTagToken(TokenHTML_H1_CLOSE, "h1"); ! final static AbstractTag HTML_H1_OPEN = new OpenTagToken(TokenHTML_H1_OPEN, "h1"); ! final static AbstractTag HTML_H2_CLOSE = new CloseTagToken(TokenHTML_H2_CLOSE, "h2"); ! final static AbstractTag HTML_H2_OPEN = new OpenTagToken(TokenHTML_H2_OPEN, "h2"); ! final static AbstractTag HTML_H3_CLOSE = new CloseTagToken(TokenHTML_H3_CLOSE, "h3"); ! final static AbstractTag HTML_H3_OPEN = new OpenTagToken(TokenHTML_H3_OPEN, "h3"); ! final static AbstractTag HTML_H4_CLOSE = new CloseTagToken(TokenHTML_H4_CLOSE, "h4"); ! final static AbstractTag HTML_H4_OPEN = new OpenTagToken(TokenHTML_H4_OPEN, "h4"); ! final static AbstractTag HTML_H5_CLOSE = new CloseTagToken(TokenHTML_H5_CLOSE, "h5"); ! final static AbstractTag HTML_H5_OPEN = new OpenTagToken(TokenHTML_H5_OPEN, "h5"); ! final static AbstractTag HTML_H6_CLOSE = new CloseTagToken(TokenHTML_H6_CLOSE, "h6"); ! final static AbstractTag HTML_H6_OPEN = new OpenTagToken(TokenHTML_H6_OPEN, "h6"); ! final static AbstractTag HTML_ITALIC_CLOSE = new CloseTagToken(TokenHTML_ITALIC_CLOSE, "i"); ! final static AbstractTag HTML_ITALIC_OPEN = new OpenTagToken(TokenHTML_ITALIC_OPEN, "i"); ! final static AbstractTag HTML_BOLD_CLOSE = new CloseTagToken(TokenHTML_BOLD_CLOSE, "b"); ! final static AbstractTag HTML_BOLD_OPEN = new OpenTagToken(TokenHTML_BOLD_OPEN, "b"); // ! final static AbstractTag HTML_PARAGRAPH_CLOSE = new CloseTagToken(TokenHTML_PARAGRAPH_CLOSE, "p", "\n</p>"); ! final static AbstractTag HTML_PARAGRAPH_OPEN = new OpenTagToken(TokenHTML_PARAGRAPH_OPEN, "p"); ! final static AbstractTag HTML_PRE_CLOSE = new CloseTagToken(TokenHTML_PRE_CLOSE, "pre"); ! final static AbstractTag HTML_PRE_OPEN = new OpenTagToken(TokenHTML_PRE_OPEN, "pre"); ! final static AbstractTag HTML_BLOCKQUOTE_CLOSE = new CloseTagToken(TokenHTML_BLOCKQUOTE_CLOSE, "blockquote"); ! final static AbstractTag HTML_BLOCKQUOTE_OPEN = new OpenTagToken(TokenHTML_BLOCKQUOTE_OPEN, "blockquote"); ! final static AbstractTag HTML_STRIKE_CLOSE = new CloseTagToken(TokenHTML_STRIKE_CLOSE, "strike"); ! final static AbstractTag HTML_STRIKE_OPEN = new OpenTagToken(TokenHTML_STRIKE_OPEN, "strike"); ! final static AbstractTag HTML_STRONG_CLOSE = new CloseTagToken(TokenHTML_STRONG_CLOSE, "strong"); ! final static AbstractTag HTML_STRONG_OPEN = new OpenTagToken(TokenHTML_STRONG_OPEN, "strong"); ! final static AbstractTag HTML_UNDERLINE_CLOSE = new CloseTagToken(TokenHTML_UNDERLINE_CLOSE, "u"); ! final static AbstractTag HTML_UNDERLINE_OPEN = new OpenTagToken(TokenHTML_UNDERLINE_OPEN, "u"); ! final static AbstractTag HTML_SUB_CLOSE = new CloseTagToken(TokenHTML_SUB_CLOSE, "sub"); ! final static AbstractTag HTML_SUB_OPEN = new OpenTagToken(TokenHTML_SUB_OPEN, "sub"); ! final static AbstractTag HTML_SUP_CLOSE = new CloseTagToken(TokenHTML_SUP_CLOSE, "sup"); ! final static AbstractTag HTML_SUP_OPEN = new OpenTagToken(TokenHTML_SUP_OPEN, "sup"); ! final static AbstractTag HTML_CENTER_OPEN = new OpenTagToken(TokenHTML_CENTER_OPEN, "center"); ! final static AbstractTag HTML_CENTER_CLOSE = new CloseTagToken(TokenHTML_CENTER_CLOSE, "center"); ! final static AbstractTag HTML_TT_OPEN = new OpenTagToken(TokenHTML_TT_OPEN, "tt"); ! final static AbstractTag HTML_TT_CLOSE = new CloseTagToken(TokenHTML_TT_CLOSE, "tt"); ! final static AbstractTag HTML_MATH_OPEN = new OpenTagToken(TokenHTML_MATH_OPEN, "math"); ! final static AbstractTag HTML_MATH_CLOSE = new CloseTagToken(TokenHTML_MATH_CLOSE, "math"); final static AbstractTag HTML_TABLE_OPEN = new TableTag(TokenHTML_TABLE_OPEN, "table", "<table>"); ! final static AbstractTag HTML_TABLE_CLOSE = new CloseTagToken(TokenHTML_TABLE_CLOSE, "table"); ! final static AbstractTag HTML_CAPTION_OPEN = new OpenTagToken(TokenHTML_CAPTION_OPEN, "caption"); ! final static AbstractTag HTML_CAPTION_CLOSE = new CloseTagToken(TokenHTML_CAPTION_CLOSE, "caption"); ! final static AbstractTag HTML_TH_OPEN = new OpenTagToken(TokenHTML_TH_OPEN, "th"); ! final static AbstractTag HTML_TH_CLOSE = new CloseTagToken(TokenHTML_TH_CLOSE, "th"); ! final static AbstractTag HTML_TR_OPEN = new OpenTagToken(TokenHTML_TR_OPEN, "tr"); ! final static AbstractTag HTML_TR_CLOSE = new CloseTagToken(TokenHTML_TR_CLOSE, "tr"); ! final static AbstractTag HTML_TD_OPEN = new OpenTagToken(TokenHTML_TD_OPEN, "td"); ! final static AbstractTag HTML_TD_CLOSE = new CloseTagToken(TokenHTML_TD_CLOSE, "td"); final static AbstractTag HTML_FONT_OPEN = new FontTag(TokenHTML_FONT_OPEN, "font", "<font>"); ! final static AbstractTag HTML_FONT_CLOSE = new CloseTagToken(TokenHTML_FONT_CLOSE, "font"); final static AbstractTag HTML_DIV_OPEN = new DivTag(TokenHTML_DIV_OPEN, "div", "<div>"); ! final static AbstractTag HTML_DIV_CLOSE = new CloseTagToken(TokenHTML_DIV_CLOSE, "div"); final static AbstractTag HTML_P_OPEN = new DivTag(TokenHTML_P_OPEN, "p", "<p>"); final static AbstractTag HTML_P_CLOSE = new CloseTagToken(TokenHTML_P_CLOSE, "p", "\n</p>"); *************** *** 228,248 **** final static AbstractTag LIST_UL_START = new AbstractTag(TokenLIST_UL_START); ! final static AbstractTag HTML_VAR_OPEN = new OpenTagToken(TokenHTML_VAR_OPEN, "var", "<var>"); ! final static AbstractTag HTML_VAR_CLOSE = new CloseTagToken(TokenHTML_VAR_CLOSE, "var", "</var>"); ! final static AbstractTag HTML_CODE_OPEN = new OpenTagToken(TokenHTML_CODE_OPEN, "code", "<code>"); ! final static AbstractTag HTML_CODE_CLOSE = new CloseTagToken(TokenHTML_CODE_CLOSE, "code", "</code>"); // strikethrough ! final static AbstractTag HTML_S_OPEN = new OpenTagToken(TokenHTML_S_OPEN, "s", "<s>"); ! final static AbstractTag HTML_S_CLOSE = new CloseTagToken(TokenHTML_S_CLOSE, "s", "</s>"); // small ! final static AbstractTag HTML_SMALL_OPEN = new OpenTagToken(TokenHTML_SMALL_OPEN, "small", "<small>"); ! final static AbstractTag HTML_SMALL_CLOSE = new CloseTagToken(TokenHTML_SMALL_CLOSE, "small", "</small>"); ! final static AbstractTag HTML_BIG_OPEN = new OpenTagToken(TokenHTML_BIG_OPEN, "big", "<big>"); ! final static AbstractTag HTML_BIG_CLOSE = new CloseTagToken(TokenHTML_BIG_CLOSE, "big", "</big>"); ! final static AbstractTag HTML_DEL_OPEN = new OpenTagToken(TokenHTML_DEL_OPEN, "del", "<del>"); ! final static AbstractTag HTML_DEL_CLOSE = new CloseTagToken(TokenHTML_DEL_CLOSE, "del", "</del>"); final static HashMap OPEN_TAGS = new HashMap(); --- 228,248 ---- final static AbstractTag LIST_UL_START = new AbstractTag(TokenLIST_UL_START); ! final static AbstractTag HTML_VAR_OPEN = new OpenTagToken(TokenHTML_VAR_OPEN, "var"); ! final static AbstractTag HTML_VAR_CLOSE = new CloseTagToken(TokenHTML_VAR_CLOSE, "var"); ! final static AbstractTag HTML_CODE_OPEN = new OpenTagToken(TokenHTML_CODE_OPEN, "code"); ! final static AbstractTag HTML_CODE_CLOSE = new CloseTagToken(TokenHTML_CODE_CLOSE, "code"); // strikethrough ! final static AbstractTag HTML_S_OPEN = new OpenTagToken(TokenHTML_S_OPEN, "s"); ! final static AbstractTag HTML_S_CLOSE = new CloseTagToken(TokenHTML_S_CLOSE, "s"); // small ! final static AbstractTag HTML_SMALL_OPEN = new OpenTagToken(TokenHTML_SMALL_OPEN, "small"); ! final static AbstractTag HTML_SMALL_CLOSE = new CloseTagToken(TokenHTML_SMALL_CLOSE, "small"); ! final static AbstractTag HTML_BIG_OPEN = new OpenTagToken(TokenHTML_BIG_OPEN, "big"); ! final static AbstractTag HTML_BIG_CLOSE = new CloseTagToken(TokenHTML_BIG_CLOSE, "big"); ! final static AbstractTag HTML_DEL_OPEN = new OpenTagToken(TokenHTML_DEL_OPEN, "del"); ! final static AbstractTag HTML_DEL_CLOSE = new CloseTagToken(TokenHTML_DEL_CLOSE, "del"); final static HashMap OPEN_TAGS = new HashMap(); Index: TokenStack.java =================================================================== RCS file: /cvsroot/plog4u/org.jzonic.yawiki.wikipedia/src/org/jzonic/yawiki/wikipedia/filter/TokenStack.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TokenStack.java 14 Jul 2005 21:35:07 -0000 1.2 --- TokenStack.java 20 Dec 2005 20:52:37 -0000 1.3 *************** *** 3,6 **** --- 3,8 ---- import java.util.ArrayList; + import org.jzonic.yawiki.wikipedia.filter.tags.AbstractTag; + public class TokenStack extends ArrayList { *************** *** 17,22 **** * @return */ ! public Object peek() { ! return get(size()-1); } /** --- 19,24 ---- * @return */ ! public AbstractTag peek() { ! return (AbstractTag)get(size()-1); } /** *************** *** 30,34 **** * @return */ ! public boolean push(Object item) { return add(item); } --- 32,36 ---- * @return */ ! public boolean push(AbstractTag item) { return add(item); } |
|
From: Axel C. K. <ax...@us...> - 2005-10-25 17:08:41
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/htmlparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5379/src/net/sourceforge/phpeclipse/wiki/actions/htmlparser Modified Files: HTML2WikipediaExtractor.java Log Message: Improved handling of HTML tags containing no content Index: HTML2WikipediaExtractor.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/htmlparser/HTML2WikipediaExtractor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HTML2WikipediaExtractor.java 25 Oct 2005 17:06:42 -0000 1.5 --- HTML2WikipediaExtractor.java 25 Oct 2005 17:08:28 -0000 1.6 *************** *** 652,655 **** --- 652,656 ---- if (fWikiStartTag == null || !fWikiStartTag.equals(tagProperties.wikiStart)) { + // add closing tag only, if opening tag was added to the buffer fBuffer.append(tagProperties.wikiStop); } |
|
From: Axel C. K. <ax...@us...> - 2005-10-25 17:06:57
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/htmlparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4506/src/net/sourceforge/phpeclipse/wiki/actions/htmlparser Modified Files: HTML2WikipediaExtractor.java Log Message: Improved handling of HTML tags containing no content Index: HTML2WikipediaExtractor.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/htmlparser/HTML2WikipediaExtractor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HTML2WikipediaExtractor.java 9 May 2005 20:13:51 -0000 1.4 --- HTML2WikipediaExtractor.java 25 Oct 2005 17:06:42 -0000 1.5 *************** *** 21,657 **** * Extract Wikipedia syntax text from a web page or html fragment. * ! * @author ax...@gm... for the <a href="http://www.sf.net/projects/plog4u">Plog4U Eclipse Wikipedia Editor Plugin </a> */ public class HTML2WikipediaExtractor extends NodeVisitor { ! public static final HashMap TAG_MAP = new HashMap(); ! public static final String[] TAG_NAME = { ! "CENTER", [...1277 lines suppressed...] ! /** ! * Mainline. ! * ! * @param args ! * The command line arguments. ! */ ! public static void main(String[] args) { ! try { ! HTML2WikipediaExtractor ex = new HTML2WikipediaExtractor(); ! ex.setInputHTML(TEST2); ! // ex.setIgnoreToggleId("bodyContent"); ! String res = ex.extractStrings(); ! ! System.out.println(res); ! } catch (ParserException e) { ! e.printStackTrace(); ! } ! } } \ No newline at end of file |
|
From: Axel C. K. <ax...@us...> - 2005-10-21 19:50:29
|
Update of /cvsroot/plog4u/org.plog4u.webbrowser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10209 Modified Files: plugin.xml Log Message: Moved to new package name org.plog4u Index: plugin.xml =================================================================== RCS file: /cvsroot/plog4u/org.plog4u.webbrowser/plugin.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plugin.xml 21 Oct 2005 19:44:08 -0000 1.1 --- plugin.xml 21 Oct 2005 19:50:21 -0000 1.2 *************** *** 21,25 **** <library name="webbrowser.jar"> <export name="*"/> - <packages prefixes="org.plog4u.webbrowser"/> </library> </runtime> --- 21,24 ---- |
|
From: Axel C. K. <ax...@us...> - 2005-10-21 19:49:05
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9774/lib Modified Files: plog4u.jar Added Files: itext-1.3.jar Log Message: Moved to new package name org.plog4u Index: plog4u.jar =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/lib/plog4u.jar,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvs5rDvrK and /tmp/cvsiXIYpB differ --- NEW FILE: itext-1.3.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Axel C. K. <ax...@us...> - 2005-10-21 19:47:25
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9534 Modified Files: plugin.xml Log Message: Moved to new package name org.plog4u Index: plugin.xml =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/plugin.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** plugin.xml 28 Sep 2005 19:31:11 -0000 1.18 --- plugin.xml 21 Oct 2005 19:47:16 -0000 1.19 *************** *** 4,8 **** id="net.sourceforge.phpeclipse.wiki" name="Wikipedia Editor Plug-in" ! version="1.1.8" provider-name="www.plog4u.org" class="net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin"> --- 4,8 ---- id="net.sourceforge.phpeclipse.wiki" name="Wikipedia Editor Plug-in" ! version="1.1.9" provider-name="www.plog4u.org" class="net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin"> *************** *** 18,22 **** <library name="lib/tex4java.jar"/> <library name="lib/xmlrpc-2.1-dev.jar"/> - <library name="lib/radeox.jar"/> <library name="lib/commons-logging.jar"/> <library name="lib/commons-httpclient-3.0-rc2.jar"/> --- 18,21 ---- *************** *** 24,28 **** <library name="lib/xstream-1.1.jar"/> <library name="lib/plog4u.jar"/> ! <library name="lib/itext.jar"/> <library name="lib/htmlparser.jar"/> <library name="lib/velocity-dep-1.4.jar"/> --- 23,27 ---- <library name="lib/xstream-1.1.jar"/> <library name="lib/plog4u.jar"/> ! <library name="lib/itext-1.3.jar"/> <library name="lib/htmlparser.jar"/> <library name="lib/velocity-dep-1.4.jar"/> *************** *** 51,55 **** <import plugin="org.eclipse.ui.console"/> <import plugin="org.eclipse.ui.workbench.texteditor"/> ! <import plugin="net.sourceforge.phpeclipse.webbrowser"/> </requires> --- 50,54 ---- <import plugin="org.eclipse.ui.console"/> <import plugin="org.eclipse.ui.workbench.texteditor"/> ! <import plugin="org.plog4u.webbrowser"/> </requires> |
|
From: Axel C. K. <ax...@us...> - 2005-10-21 19:47:02
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/ui/internal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9461/src/net/sourceforge/phpeclipse/wiki/ui/internal Modified Files: ConfigurationPrefrencesDialog.java Log Message: Moved to new package name org.plog4u Index: ConfigurationPrefrencesDialog.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/ui/internal/ConfigurationPrefrencesDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConfigurationPrefrencesDialog.java 24 Feb 2005 05:14:34 -0000 1.1 --- ConfigurationPrefrencesDialog.java 21 Oct 2005 19:46:51 -0000 1.2 *************** *** 11,15 **** package net.sourceforge.phpeclipse.wiki.ui.internal; - import net.sourceforge.phpeclipse.webbrowser.internal.ContextIds; import net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin; import net.sourceforge.phpeclipse.wiki.internal.IConfigurationWorkingCopy; --- 11,14 ---- *************** *** 24,27 **** --- 23,27 ---- import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.help.WorkbenchHelp; + import org.plog4u.webbrowser.internal.ContextIds; /** |
|
From: Axel C. K. <ax...@us...> - 2005-10-21 19:46:40
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/internal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9419/src/net/sourceforge/phpeclipse/wiki/internal Modified Files: ConfigurationManager.java Log Message: Moved to new package name org.plog4u Index: ConfigurationManager.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/internal/ConfigurationManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConfigurationManager.java 24 Feb 2005 05:01:40 -0000 1.1 --- ConfigurationManager.java 21 Oct 2005 19:46:31 -0000 1.2 *************** *** 18,25 **** import java.util.Map; - import net.sourceforge.phpeclipse.webbrowser.internal.Trace; import net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin; import org.eclipse.core.runtime.Preferences; /** * --- 18,25 ---- import java.util.Map; import net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin; import org.eclipse.core.runtime.Preferences; + import org.plog4u.webbrowser.internal.Trace; /** * |
|
From: Axel C. K. <ax...@us...> - 2005-10-21 19:46:24
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9381/src/net/sourceforge/phpeclipse/wiki/export/pdf Modified Files: WikiPDFExporter.java WikiPDFExportWizardPage.java Log Message: Moved to new package name org.plog4u Index: WikiPDFExporter.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf/WikiPDFExporter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WikiPDFExporter.java 28 Sep 2005 19:29:19 -0000 1.8 --- WikiPDFExporter.java 21 Oct 2005 19:46:16 -0000 1.9 *************** *** 2,9 **** import java.awt.Color; - import java.io.ByteArrayInputStream; import java.io.FileOutputStream; import java.io.IOException; - import java.io.InputStream; import java.io.StringReader; import java.lang.reflect.InvocationTargetException; --- 2,7 ---- *************** *** 12,23 **** import java.util.List; - import javax.xml.transform.Result; - import javax.xml.transform.Source; - import javax.xml.transform.Transformer; - import javax.xml.transform.TransformerFactory; - import javax.xml.transform.dom.DOMSource; - import javax.xml.transform.sax.SAXResult; - import javax.xml.transform.stream.StreamSource; - import net.sourceforge.phpeclipse.wiki.builder.CreatePageAction; import net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin; --- 10,13 ---- Index: WikiPDFExportWizardPage.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/export/pdf/WikiPDFExportWizardPage.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WikiPDFExportWizardPage.java 28 Sep 2005 19:01:52 -0000 1.3 --- WikiPDFExportWizardPage.java 21 Oct 2005 19:46:16 -0000 1.4 *************** *** 17,21 **** import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; - import org.eclipse.jface.dialogs.DialogSettings; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogSettings; --- 17,20 ---- |
|
From: Axel C. K. <ax...@us...> - 2005-10-21 19:45:41
|
Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/httpquery In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9254/src/net/sourceforge/phpeclipse/wiki/actions/httpquery Modified Files: AbstractHTTPQueryAction.java Log Message: Moved to new package name org.plog4u Index: AbstractHTTPQueryAction.java =================================================================== RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/httpquery/AbstractHTTPQueryAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractHTTPQueryAction.java 9 May 2005 20:13:42 -0000 1.2 --- AbstractHTTPQueryAction.java 21 Oct 2005 19:45:33 -0000 1.3 *************** *** 5,9 **** import java.util.Properties; - import net.sourceforge.phpeclipse.webbrowser.views.BrowserView; import net.sourceforge.phpeclipse.wiki.internal.Configuration; import net.sourceforge.phpeclipse.wiki.internal.ConfigurationWorkingCopy; --- 5,8 ---- *************** *** 21,24 **** --- 20,24 ---- import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; + import org.plog4u.webbrowser.views.BrowserView; public abstract class AbstractHTTPQueryAction implements IEditorActionDelegate { |