Renamed to HTMLBuilder, set RGB fields to final

Signed-off-by: Rob Stryker <[email protected]>

Author: Rob Stryker

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java

@@ -23,7 +23,7 @@
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 
-import org.eclipse.text.html.BaseHTMLPrinter;
+import org.eclipse.text.html.HTMLBuilder;
 
 import org.eclipse.jface.resource.JFaceColors;
 import org.eclipse.jface.resource.JFaceResources;
@@ -36,7 +36,7 @@
  * Moved into this package from <code>org.eclipse.jface.internal.text.revisions</code>.</p>
  */
 public class HTMLPrinter {
-	private static final BaseHTMLPrinter CORE= new BaseHTMLPrinter();
+	private static final HTMLBuilder CORE= new HTMLBuilder();
 
 	static {
 		final Display display= Display.getDefault();
@@ -87,7 +87,7 @@ private static void cacheColors(Display display) {
 	 * @see #addPreFormatted(StringBuilder, String) for rendering with an {@link HTML2TextReader}
 	 */
 	public static String convertToHTMLContent(String content) {
-		return BaseHTMLPrinter.convertToHTMLContent(content);
+		return HTMLBuilder.convertToHTMLContent(content);
 	}
 
 	/**
@@ -106,11 +106,11 @@ public static String convertToHTMLContent(String content) {
 	 * @since 3.7
 	 */
 	public static String convertToHTMLContentWithWhitespace(String content) {
-		return BaseHTMLPrinter.convertToHTMLContentWithWhitespace(content);
+		return HTMLBuilder.convertToHTMLContentWithWhitespace(content);
 	}
 
 	public static String read(Reader rd) {
-		return BaseHTMLPrinter.read(rd);
+		return HTMLBuilder.read(rd);
 	}
 
 	/**
@@ -477,6 +477,6 @@ private static void runOp(StringBuffer buffer, BuilderBuffer bf) {
 	public static String convertTopLevelFont(String styles, FontData fontData) {
 		boolean bold= (fontData.getStyle() & SWT.BOLD) != 0;
 		boolean italic= (fontData.getStyle() & SWT.ITALIC) != 0;
-		return BaseHTMLPrinter.convertTopLevelFont(styles, bold, italic, fontData.getHeight(), fontData.getName());
+		return HTMLBuilder.convertTopLevelFont(styles, bold, italic, fontData.getHeight(), fontData.getName());
 	}
 }

bundles/org.eclipse.text/src/org/eclipse/text/html/BaseHTMLPrinter.java renamed to bundles/org.eclipse.text/src/org/eclipse/text/html/HTMLBuilder.java

@@ -26,7 +26,7 @@
  *
  * @since 3.14
  */
-public class BaseHTMLPrinter {
+public class HTMLBuilder {
 
 	private static volatile RGB DEFAULT_BG_COLOR_RGB= new RGB(255, 255, 225); // CoreRGB value of info bg color on WindowsXP
 	private static volatile RGB DEFAULT_FG_COLOR_RGB= new RGB(0, 0, 0); // CoreRGB value of info fg color on WindowsXP
@@ -44,11 +44,11 @@ public class BaseHTMLPrinter {
 	private RGB linkColor;
 	private RGB alinkColor;
 
-	public BaseHTMLPrinter() {
+	public HTMLBuilder() {
 		this(DEFAULT_BG_COLOR_RGB, DEFAULT_FG_COLOR_RGB, DEFAULT_LINK_COLOR_RGB, DEFAULT_ACTIVE_LINK_COLOR_RGB);
 	}
 
-	public BaseHTMLPrinter(RGB bg, RGB fg, RGB link, RGB alink) {
+	public HTMLBuilder(RGB bg, RGB fg, RGB link, RGB alink) {
 		setColors(bg, fg, link, alink);
 	}
 

bundles/org.eclipse.text/src/org/eclipse/text/html/RGB.java

@@ -41,17 +41,17 @@ public final class RGB implements Serializable {
 	/**
 	 * the red component of the RGB
 	 */
-	public int red;
+	public final int red;
 
 	/**
 	 * the green component of the RGB
 	 */
-	public int green;
+	public final int green;
 
 	/**
 	 * the blue component of the RGB
 	 */
-	public int blue;
+	public final int blue;
 
 	static final long serialVersionUID = 3258415023461249074L;