From 4bc3afe4ff08b9f0c08952ec7f6e0ac930280cc5 Mon Sep 17 00:00:00 2001
From: asie
Date: Sat, 8 Dec 2018 11:21:18 +0100
Subject: add barebones plugin framework, cleanup
---
.../enigma/gui/highlight/BoxHighlightPainter.java | 13 +++++++------
.../gui/highlight/DeobfuscatedHighlightPainter.java | 21 ---------------------
.../gui/highlight/ObfuscatedHighlightPainter.java | 21 ---------------------
.../enigma/gui/highlight/OtherHighlightPainter.java | 21 ---------------------
4 files changed, 7 insertions(+), 69 deletions(-)
delete mode 100644 src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
delete mode 100644 src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
delete mode 100644 src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.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
index 976c215..10366ce 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
@@ -11,13 +11,14 @@
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 abstract class BoxHighlightPainter implements Highlighter.HighlightPainter {
-
+public class BoxHighlightPainter implements Highlighter.HighlightPainter {
private Color fillColor;
private Color borderColor;
@@ -26,6 +27,10 @@ public abstract class BoxHighlightPainter implements Highlighter.HighlightPainte
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
@@ -59,8 +64,4 @@ public abstract class BoxHighlightPainter implements Highlighter.HighlightPainte
g.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4);
}
- protected static Color getColor(int rgb, float alpha){
- Color baseColor = new Color(rgb);
- return new Color(baseColor.getRed(), baseColor.getGreen(), baseColor.getBlue(), (int)(255 * alpha));
- }
}
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
deleted file mode 100644
index 41aa97f..0000000
--- a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
+++ /dev/null
@@ -1,21 +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
- *
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.gui.highlight;
-
-import cuchaz.enigma.config.Config;
-
-public class DeobfuscatedHighlightPainter extends BoxHighlightPainter {
-
- public DeobfuscatedHighlightPainter() {
- super(getColor(Config.getInstance().deobfuscatedColor, Config.getInstance().deobfuscatedHiglightAlpha), getColor(Config.getInstance().deobfuscatedColorOutline, Config.getInstance().deobfuscatedOutlineAlpha));
- }
-}
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
deleted file mode 100644
index d735874..0000000
--- a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
+++ /dev/null
@@ -1,21 +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
- *
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.gui.highlight;
-
-import cuchaz.enigma.config.Config;
-
-public class ObfuscatedHighlightPainter extends BoxHighlightPainter {
-
- public ObfuscatedHighlightPainter() {
- super(getColor(Config.getInstance().obfuscatedColor, Config.getInstance().obfuscatedHiglightAlpha), getColor(Config.getInstance().obfuscatedColorOutline, Config.getInstance().obfuscatedOutlineAlpha));
- }
-}
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
deleted file mode 100644
index f4ae235..0000000
--- a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
+++ /dev/null
@@ -1,21 +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
- *
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.gui.highlight;
-
-import cuchaz.enigma.config.Config;
-
-public class OtherHighlightPainter extends BoxHighlightPainter {
-
- public OtherHighlightPainter() {
- super(null, getColor(Config.getInstance().otherColorOutline, Config.getInstance().otherOutlineAlpha));
- }
-}
--
cgit v1.2.3