Gutter Background

- Added gutterBackgroundColor with the according functions to read and
write to xml
- Adjusted theme.dtd to support the new gutter background color

- Removed a stacktrace before a throw

- Made GutterBorder public so that the margin can be changed

Author: Haeri

src/main/java/org/fife/ui/rsyntaxtextarea/Theme.java

@@ -95,6 +95,7 @@ public class Theme {
 
 	public SyntaxScheme scheme;
 
+	public Color gutterBackgroundColor;
 	public Color gutterBorderColor;
 	public Color activeLineRangeColor;
 	public boolean iconRowHeaderInheritsGutterBG;
@@ -158,7 +159,7 @@ public Theme(RSyntaxTextArea textArea) {
 
 		Gutter gutter = RSyntaxUtilities.getGutter(textArea);
 		if (gutter!=null) {
-			bgColor = gutter.getBackground();
+			gutterBackgroundColor = gutter.getBackground();
 			gutterBorderColor = gutter.getBorderColor();
 			activeLineRangeColor = gutter.getActiveLineRangeColor();
 			iconRowHeaderInheritsGutterBG = gutter.getIconRowHeaderInheritsGutterBackground();
@@ -208,7 +209,7 @@ public void apply(RSyntaxTextArea textArea) {
 
 		Gutter gutter = RSyntaxUtilities.getGutter(textArea);
 		if (gutter!=null) {
-			gutter.setBackground(bgColor);
+			gutter.setBackground(gutterBackgroundColor);
 			gutter.setBorderColor(gutterBorderColor);
 			gutter.setActiveLineRangeColor(activeLineRangeColor);
 			gutter.setIconRowHeaderInheritsGutterBackground(iconRowHeaderInheritsGutterBG);
@@ -444,6 +445,10 @@ public void save(OutputStream out) throws IOException {
 			}
 			root.appendChild(elem);
 
+			elem = doc.createElement("gutterBackground");
+			elem.setAttribute("color", colorToString(gutterBackgroundColor));
+			root.appendChild(elem);
+			
 			elem = doc.createElement("gutterBorder");
 			elem.setAttribute("color", colorToString(gutterBorderColor));
 			root.appendChild(elem);
@@ -620,7 +625,7 @@ public static void load(Theme theme, InputStream in) throws IOException {
 				is.setEncoding("UTF-8");
 				reader.parse(is);
 			} catch (/*SAX|ParserConfiguration*/Exception se) {
-				se.printStackTrace();
+//				se.printStackTrace();
 				throw new IOException(se.toString());
 			}
 		}
@@ -655,6 +660,7 @@ public void startElement(String uri, String localName, String qName,
 				String color = attrs.getValue("color");
 				if (color!=null) {
 					theme.bgColor = stringToColor(color, getDefaultBG());
+					theme.gutterBackgroundColor = theme.bgColor;
 				}
 				else {
 					String img = attrs.getValue("image");
@@ -703,6 +709,13 @@ else if ("foldIndicator".equals(qName)) {
 				theme.armedFoldBG = stringToColor(color);
 			}
 
+			else if ("gutterBackground".equals(qName)) {
+				String color = attrs.getValue("color");
+				if (color!=null) {
+					theme.gutterBackgroundColor = stringToColor(color);
+				}
+			}
+
 			else if ("gutterBorder".equals(qName)) {
 				String color = attrs.getValue("color");
 				theme.gutterBorderColor = stringToColor(color);

src/main/java/org/fife/ui/rtextarea/Gutter.java

@@ -874,12 +874,12 @@ public void setBorder(Border border) {
 	/**
 	 * The border used by the gutter.
 	 */
-	private static class GutterBorder extends EmptyBorder {
+	public static class GutterBorder extends EmptyBorder {
 
 		private Color color;
 		private Rectangle visibleRect;
 
-		GutterBorder(int top, int left, int bottom, int right) {
+		public GutterBorder(int top, int left, int bottom, int right) {
 			super(top, left, bottom, right);
 			color = new Color(221, 221, 221);
 			visibleRect = new Rectangle();

src/main/resources/org/fife/ui/rsyntaxtextarea/themes/theme.dtd

@@ -1,7 +1,7 @@
 <!-- DTD for RSyntaxTextArea Theme XML. See /themes folder for examples. -->
 <!ELEMENT RSyntaxTheme (baseFont?, background, caret, selection,
       currentLineHighlight, marginLine, markAllHighlight, markOccurrencesHighlight,
-      matchedBracket, hyperlinks, secondaryLanguages, gutterBorder, lineNumbers,
+      matchedBracket, hyperlinks, secondaryLanguages, gutterBackground?, gutterBorder, lineNumbers,
       foldIndicator, iconRowHeader?, tokenStyles)>
 <!ELEMENT background EMPTY>
 <!ELEMENT baseFont EMPTY>
@@ -15,6 +15,7 @@
 <!ELEMENT hyperlinks EMPTY>
 <!ELEMENT secondaryLanguages (language+)>
 <!ELEMENT language EMPTY>
+<!ELEMENT gutterBackground EMPTY>
 <!ELEMENT gutterBorder EMPTY>
 <!ELEMENT lineNumbers EMPTY>
 <!ELEMENT foldIndicator EMPTY>
@@ -56,6 +57,8 @@
 <!ATTLIST language
       index      (1|2|3) #REQUIRED
       bg         CDATA   #REQUIRED>
+<!ATTLIST gutterBackground
+      color      CDATA #REQUIRED>
 <!ATTLIST gutterBorder
       color      CDATA #REQUIRED>
 <!ATTLIST lineNumbers