Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[14499] plugins/Code2HTML/trunk/code2html
|
From: <rfr...@us...> - 2009-01-28 14:13:39
|
Revision: 14499
http://jedit.svn.sourceforge.net/jedit/?rev=14499&view=rev
Author: rfrancois
Date: 2009-01-28 14:13:35 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
small fixes to comply with new implementation
Modified Paths:
--------------
plugins/Code2HTML/trunk/code2html/CommandLineConfig.java
plugins/Code2HTML/trunk/code2html/Main.java
Modified: plugins/Code2HTML/trunk/code2html/CommandLineConfig.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/CommandLineConfig.java 2009-01-28 13:54:17 UTC (rev 14498)
+++ plugins/Code2HTML/trunk/code2html/CommandLineConfig.java 2009-01-28 14:13:35 UTC (rev 14499)
@@ -1,99 +1,94 @@
/*
- * CommandLineConfig.java
- * Copyright (c) 2002 Andre Kaplan
+ * CommandLineConfig.java
+ * Copyright (c) 2002 Andre Kaplan
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
+
package code2html;
import org.gjt.sp.jedit.syntax.SyntaxStyle;
-import code2html.html.AbstractGutter;
-import code2html.html.AbstractStyle;
-import code2html.html.CSSGutter;
-import code2html.html.CSSStyle;
-import code2html.html.HTMLGutter;
-import code2html.html.HTMLStyle;
-import code2html.html.HtmlPainter;
+import code2html.impl.htmlcss.HtmlCssGutter;
+import code2html.impl.html.HtmlGutter;
+import code2html.impl.html.HtmlPainter;
+import code2html.impl.htmlcss.HtmlCssStyle;
+import code2html.impl.html.HtmlStyle;
+import code2html.generic.* ;
import code2html.line.LineTabExpander;
import code2html.line.LineWrapper;
+import code2html.generic.Config ;
-/**
- * Command line configuration for the Code2HTML plugin
- *
- *@author Andre Kaplan
- *@version 0.5
- */
-public class CommandLineConfig implements Config {
- private AbstractGutter gutter = null;
- private HtmlPainter painter = null;
- private AbstractStyle style = null;
+public class CommandLineConfig implements Config
+{
+ public static class Arguments
+ {
+ public int gutterSize = 3;
+ public int tabSize = 8;
+ public int wrap = 0;
+ public int highlightInterval = 5;
+
+ public boolean useCSS = true;
+ public boolean showGutter = true;
+
+ public SyntaxStyle[] styles = null;
+ public PropertyAccessor propertyAccessor = null;
+ }
+
+
+ private Style style = null;
+ private GenericGutter gutter = null;
+ private GenericPainter painter = null;
private LineTabExpander tabExpander = null;
- private LineWrapper wrapper = null;
+ private LineWrapper wrapper = null;
- /**
- * CommandLineConfig Constructor
- *
- *@param args Holds the properties to be used in the generated code
- */
public CommandLineConfig(Arguments args) {
- if (args.wrap < 0) {
- args.wrap = 0;
- }
+ if (args.wrap < 0) { args.wrap = 0; }
+
if (args.useCSS) {
- this.style = new CSSStyle();
+ this.style = new HtmlCssStyle();
} else {
- this.style = new HTMLStyle();
+ this.style = new HtmlStyle();
}
PropertyAccessor accessor = args.propertyAccessor;
-
if (args.showGutter) {
String bgColor = accessor.getProperty(
- "view.gutter.bgColor", "#ffffff");
+ "view.gutter.bgColor", "#ffffff"
+ );
String fgColor = accessor.getProperty(
- "view.gutter.fgColor", "#8080c0");
+ "view.gutter.fgColor", "#8080c0"
+ );
String highlightColor = accessor.getProperty(
- "view.gutter.highlightColor", "#000000");
+ "view.gutter.highlightColor", "#000000"
+ );
if (args.useCSS) {
- this.gutter = new CSSGutter(
- bgColor,
- fgColor,
- highlightColor,
- args.border,
- AbstractGutter.getSpacerFor(args.gutterSize),
- args.gutterFontSize,
- args.highlightInterval,
- args.showNumbers,
- args.showGutter);
+ this.gutter = new HtmlCssGutter(
+ bgColor, fgColor, highlightColor, args.highlightInterval
+ );
} else {
- this.gutter = new HTMLGutter(
- bgColor,
- fgColor,
- highlightColor,
- args.border,
- AbstractGutter.getSpacerFor(args.gutterSize),
- args.gutterFontSize,
- args.highlightInterval,
- args.showNumbers,
- args.showGutter);
+ this.gutter = new HtmlGutter(
+ bgColor, fgColor, highlightColor, args.highlightInterval
+ );
}
+ this.gutter.setGutterSize(args.gutterSize);
}
this.tabExpander = new LineTabExpander(args.tabSize);
@@ -103,119 +98,33 @@
}
this.painter = new HtmlPainter(
- args.styles,
- this.style,
- this.gutter,
- this.tabExpander,
- this.wrapper);
+ args.styles, this.style, this.gutter, this.tabExpander, this.wrapper
+ );
}
-
- /**
- * Gets the gutter of the object
- *
- *@return The gutter value
- */
- public AbstractGutter getGutter() {
+ @Override
+ public GenericGutter getGutter() {
return this.gutter;
}
-
- /**
- * Gets the painter of the object
- *
- *@return The painter value
- */
- public HtmlPainter getPainter() {
- return this.painter;
- }
-
-
- /**
- * Gets the style of the object
- *
- *@return The style value
- */
- public AbstractStyle getStyle() {
+ @Override
+ public Style getStyle() {
return this.style;
- }
+ };
-
- /**
- * Gets the tab expander of the object
- *
- *@return The tab expander value
- */
+ @Override
public LineTabExpander getTabExpander() {
return this.tabExpander;
}
-
- /**
- * Gets the wrapper of the object
- *
- *@return The wrapper value
- */
+ @Override
public LineWrapper getWrapper() {
return this.wrapper;
}
-
- /**
- * Holds properties relating to the output code
- *
- *@author Andre Kaplan
- *@version 0.5
- *@todo This should really be called something different, along the
- * lines of properties or similar
- *@todo Make this implement Config & pass config args to anything
- * requesting one of this -> ? Or not ?
- */
- public static class Arguments {
- /**
- * The size of the Gutter
- */
- public int gutterSize = 3;
- /**
- * The interval at which to highlight the gutter number
- */
- public int highlightInterval = 5;
- /**
- * A property accessor
- */
- public PropertyAccessor propertyAccessor = null;
- /**
- * Whether to show the gutter
- */
- public boolean showGutter = true;
- /**
- * Whether to show line numbers
- */
- public boolean showNumbers = true;
- /**
- * The font size for the gutter text (CSS only)
- */
- public String gutterFontSize = "10";
- /**
- * A list of styles
- */
- public SyntaxStyle[] styles = null;
- /**
- * The defauklt size of the tab character
- */
- public int tabSize = 8;
- /**
- * Whether to use CSS in the generated code
- */
- public boolean useCSS = true;
- /**
- * Wrap column
- */
- public int wrap = 0;
- /**
- * The gutter border for HTML mode
- */
- public String border = ":";
+ @Override
+ public GenericPainter getPainter() {
+ return this.painter;
}
}
Modified: plugins/Code2HTML/trunk/code2html/Main.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/Main.java 2009-01-28 13:54:17 UTC (rev 14498)
+++ plugins/Code2HTML/trunk/code2html/Main.java 2009-01-28 14:13:35 UTC (rev 14499)
@@ -48,11 +48,8 @@
import com.microstar.xml.XmlException;
import com.microstar.xml.XmlParser;
-import code2html.html.CSSStyle;
-import code2html.html.HtmlDocument;
-import code2html.html.AbstractGutter;
-import code2html.html.HtmlPainter;
-import code2html.html.AbstractStyle;
+import code2html.generic.* ;
+import code2html.impl.htmlcss. * ;
import code2html.syntax.ParserRuleSet;
import code2html.syntax.TokenMarker;
@@ -102,15 +99,15 @@
TokenMarker tokenMarker,
Reader r,
Writer w) {
- AbstractStyle style = config.getStyle();
- AbstractGutter gutter = config.getGutter();
- HtmlPainter painter = config.getPainter();
+ Style style = config.getStyle();
+ GenericGutter gutter = config.getGutter();
+ GenericPainter painter = config.getPainter();
try {
BufferedReader reader = new BufferedReader(r);
BufferedWriter writer = new BufferedWriter(w);
- HtmlDocument document = new HtmlDocument(
+ GenericDocument document = new HtmlCssDocument(
Main.getProperty("view.bgColor", "#ffffff"),
Main.getProperty("view.fgColor", "#000000"),
painter.getSyntaxStyles(),
@@ -119,7 +116,7 @@
"Code2HTML",
jEdit.getProperty("plugin.code2html.line.separator"));
- document.htmlOpen(writer);
+ document.open(writer);
Segment seg = new Segment();
String line = null;
@@ -154,7 +151,7 @@
writer.newLine();
}
- document.htmlClose(writer);
+ document.close(writer);
writer.flush();
writer.close();
} catch (IOException ioe) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|