From 0f47403d0220757fed189b76e2071e25b1025cb8 Mon Sep 17 00:00:00 2001
From: Runemoro
Date: Wed, 3 Jun 2020 13:39:42 -0400
Subject: Split GUI code to separate module (#242)

* Split into modules

* Post merge compile fixes

Co-authored-by: modmuss50 <modmuss50@gmail.com>---
 .../enigma/gui/highlight/BoxHighlightPainter.java  | 69 ----------------------
 .../gui/highlight/SelectionHighlightPainter.java   | 31 ----------
 .../enigma/gui/highlight/TokenHighlightType.java   |  7 ---
 3 files changed, 107 deletions(-)
 delete mode 100644 src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
 delete mode 100644 src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
 delete mode 100644 src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java

(limited to 'src/main/java/cuchaz/enigma/gui/highlight')

diff --git a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
deleted file mode 100644
index cef6494..0000000
--- a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.gui.highlight;
-
-import cuchaz.enigma.config.Config;
-
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Highlighter;
-import javax.swing.text.JTextComponent;
-import java.awt.*;
-
-public class BoxHighlightPainter implements Highlighter.HighlightPainter {
-	private Color fillColor;
-	private Color borderColor;
-
-	protected BoxHighlightPainter(Color fillColor, Color borderColor) {
-		this.fillColor = fillColor;
-		this.borderColor = borderColor;
-	}
-
-	public static BoxHighlightPainter create(Config.AlphaColorEntry entry, Config.AlphaColorEntry entryOutline) {
-		return new BoxHighlightPainter(entry != null ? entry.get() : null, entryOutline != null ? entryOutline.get() : null);
-	}
-
-	public static Rectangle getBounds(JTextComponent text, int start, int end) {
-		try {
-			// determine the bounds of the text
-			Rectangle startRect = text.modelToView(start);
-			Rectangle endRect = text.modelToView(end);
-			Rectangle bounds = startRect.union(endRect);
-
-			// adjust the box so it looks nice
-			bounds.x -= 2;
-			bounds.width += 2;
-			bounds.y += 1;
-			bounds.height -= 2;
-
-			return bounds;
-		} catch (BadLocationException ex) {
-			// don't care... just return something
-			return new Rectangle(0, 0, 0, 0);
-		}
-	}
-
-	@Override
-	public void paint(Graphics g, int start, int end, Shape shape, JTextComponent text) {
-		Rectangle bounds = getBounds(text, start, end);
-
-		// fill the area
-		if (this.fillColor != null) {
-			g.setColor(this.fillColor);
-			g.fillRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4);
-		}
-
-		// draw a box around the area
-		g.setColor(this.borderColor);
-		g.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4);
-	}
-
-}
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
deleted file mode 100644
index 81a70a9..0000000
--- a/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.gui.highlight;
-
-import cuchaz.enigma.config.Config;
-
-import javax.swing.text.Highlighter;
-import javax.swing.text.JTextComponent;
-import java.awt.*;
-
-public class SelectionHighlightPainter implements Highlighter.HighlightPainter {
-
-	@Override
-	public void paint(Graphics g, int start, int end, Shape shape, JTextComponent text) {
-		// draw a thick border
-		Graphics2D g2d = (Graphics2D) g;
-		Rectangle bounds = BoxHighlightPainter.getBounds(text, start, end);
-		g2d.setColor(new Color(Config.getInstance().selectionHighlightColor));
-		g2d.setStroke(new BasicStroke(2.0f));
-		g2d.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4);
-	}
-}
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java b/src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java
deleted file mode 100644
index ae23f32..0000000
--- a/src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package cuchaz.enigma.gui.highlight;
-
-public enum TokenHighlightType {
-	OBFUSCATED,
-	DEOBFUSCATED,
-	PROPOSED
-}
-- 
cgit v1.2.3