[hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/cache DummyCachedPageGenerator.java
Status: Pre-Alpha
Brought to you by:
jsurfer
Menu
▾
▴
[hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/cache DummyCachedPageGenerator.java,1.2,1.3 CachedPage.java,1.3,1.4 CachedPageGenerator.java,1.2,1.3 ICachedPageGenerator.java,1.2,1.3
|
From: Klaus H. <js...@us...> - 2004-05-12 21:20:24
|
Update of /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15572/WEB-INF/src/org/hartmath/server/cache Modified Files: DummyCachedPageGenerator.java CachedPage.java CachedPageGenerator.java ICachedPageGenerator.java Log Message: Improved wikipedi syntax for internal/external links Index: ICachedPageGenerator.java =================================================================== RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/cache/ICachedPageGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ICachedPageGenerator.java 2 May 2004 17:34:10 -0000 1.2 --- ICachedPageGenerator.java 12 May 2004 21:20:14 -0000 1.3 *************** *** 25,29 **** public void addHTML(String text); ! public void addLink(String text); public void addMacro(String text); public void addMath(String[] mathStrings); --- 25,30 ---- public void addHTML(String text); ! public void addSnipLink(String text); ! public void addWikipediaLink(String text, String suffix); public void addMacro(String text); public void addMath(String[] mathStrings); Index: DummyCachedPageGenerator.java =================================================================== RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/cache/DummyCachedPageGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DummyCachedPageGenerator.java 2 May 2004 17:34:10 -0000 1.2 --- DummyCachedPageGenerator.java 12 May 2004 21:20:13 -0000 1.3 *************** *** 29,35 **** } ! public void addLink(String text) { } public void addMacro(String text) { --- 29,40 ---- } ! public void addSnipLink(String text) { } + + public void addWikipediaLink(String text, String suffix) { + + } + public void addMacro(String text) { Index: CachedPage.java =================================================================== RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/cache/CachedPage.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CachedPage.java 2 May 2004 17:34:10 -0000 1.3 --- CachedPage.java 12 May 2004 21:20:13 -0000 1.4 *************** *** 43,50 **** } ! protected void addLinkToBuffer(String text) { CachedWikipediaFilter.handleSnipLink(fResult, fWikiEngine, text); } protected void addMacroToBuffer(String text) { CachedWikipediaFilter.createMacro(fResult, text, fContext, fMacros); --- 43,54 ---- } ! protected void addSnipLinkToBuffer(String text) { CachedWikipediaFilter.handleSnipLink(fResult, fWikiEngine, text); } + protected void addWikipediaLinkToBuffer(String[] pair) { + CachedWikipediaFilter.handleWikipediaLink(fResult, fWikiEngine, pair[0], pair[1]); + } + protected void addMacroToBuffer(String text) { CachedWikipediaFilter.createMacro(fResult, text, fContext, fMacros); *************** *** 68,74 **** addTextToBuffer(text); break; ! case CachedPageGenerator.LINK : text = (String) fTextList.get(i); ! addLinkToBuffer(text); break; case CachedPageGenerator.MACRO : --- 72,78 ---- addTextToBuffer(text); break; ! case CachedPageGenerator.SNIP_LINK : text = (String) fTextList.get(i); ! addSnipLinkToBuffer(text); break; case CachedPageGenerator.MACRO : *************** *** 80,83 **** --- 84,91 ---- addMathToBuffer(mathStrings); break; + case CachedPageGenerator.WIKIPEDIA_LINK : + String [] pair = (String []) fTextList.get(i); + addWikipediaLinkToBuffer(pair); + break; } } Index: CachedPageGenerator.java =================================================================== RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/cache/CachedPageGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CachedPageGenerator.java 2 May 2004 17:34:10 -0000 1.2 --- CachedPageGenerator.java 12 May 2004 21:20:14 -0000 1.3 *************** *** 25,34 **** public final static int HTML = 1; public final static Integer HTML_TEXT = new Integer(HTML); ! public final static int LINK = 2; ! public final static Integer LINK_TEXT = new Integer(LINK); public final static int MACRO = 3; public final static Integer MACRO_TEXT = new Integer(MACRO); public final static int MATH = 4; public final static Integer MATH_TEXT = new Integer(MATH); String fClassName; --- 25,36 ---- public final static int HTML = 1; public final static Integer HTML_TEXT = new Integer(HTML); ! public final static int SNIP_LINK = 2; ! public final static Integer SNIP_LINK_TEXT = new Integer(SNIP_LINK); public final static int MACRO = 3; public final static Integer MACRO_TEXT = new Integer(MACRO); public final static int MATH = 4; public final static Integer MATH_TEXT = new Integer(MATH); + public final static int WIKIPEDIA_LINK = 5; + public final static Integer WIKIPEDIA_LINK_TEXT = new Integer(WIKIPEDIA_LINK); String fClassName; *************** *** 56,76 **** fCurrentIndex++; } ! public void addLink(String text) { // fCodeVisitor.visitVarInsn(ALOAD, 0); // fCodeVisitor.visitLdcInsn(text); // fCodeVisitor.visitMethodInsn(INVOKEVIRTUAL, "org/hartmath/server/asm/ASMPage", "emitLink", "(Ljava/lang/String;)V"); if (fCurrentIndex == fTypeList.size()) { ! fTypeList.add(LINK_TEXT); fTextList.add(text); } else { ! fTypeList.add(fCurrentIndex, LINK_TEXT); fTextList.add(fCurrentIndex, text); } fCurrentIndex++; } public void addMacro(String text) { - // fCodeVisitor.visitVarInsn(ALOAD, 0); - // fCodeVisitor.visitLdcInsn(text); - // fCodeVisitor.visitMethodInsn(INVOKEVIRTUAL, "org/hartmath/server/asm/ASMPage", "emitMacro", "(Ljava/lang/String;)V"); if (fCurrentIndex == fTypeList.size()) { fTypeList.add(MACRO_TEXT); --- 58,88 ---- fCurrentIndex++; } ! public void addSnipLink(String text) { // fCodeVisitor.visitVarInsn(ALOAD, 0); // fCodeVisitor.visitLdcInsn(text); // fCodeVisitor.visitMethodInsn(INVOKEVIRTUAL, "org/hartmath/server/asm/ASMPage", "emitLink", "(Ljava/lang/String;)V"); if (fCurrentIndex == fTypeList.size()) { ! fTypeList.add(SNIP_LINK_TEXT); fTextList.add(text); } else { ! fTypeList.add(fCurrentIndex, SNIP_LINK_TEXT); fTextList.add(fCurrentIndex, text); } fCurrentIndex++; } + public void addWikipediaLink(String text, String suffix) { + String pair[] = new String[2]; + pair[0] = text; + pair[1] = suffix; + if (fCurrentIndex == fTypeList.size()) { + fTypeList.add(WIKIPEDIA_LINK_TEXT); + fTextList.add(pair); + } else { + fTypeList.add(fCurrentIndex, WIKIPEDIA_LINK_TEXT); + fTextList.add(fCurrentIndex, pair); + } + fCurrentIndex++; + } public void addMacro(String text) { if (fCurrentIndex == fTypeList.size()) { fTypeList.add(MACRO_TEXT); |
