Moved some general utilites to swing-utils

* BufferedImageIcon * KeyValueComboBox * SwingUtil
sebkur · Sep 3, 2016 · 52db32d · 52db32d
1 parent ed98872
commit 52db32d
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 281 deletions.
diff --git a/project/build.gradle b/project/build.gradle
@@ -20,8 +20,8 @@ dependencies {
     compile 'de.topobyte:commons-cli-helper:0.0.1'
     compile 'de.topobyte:jts2awt:0.0.1'
     compile 'de.topobyte:adt-tree:0.0.6'
-    compile 'de.topobyte:awt-utils:0.0.2'
-    compile 'de.topobyte:swing-utils:0.0.1'
+    compile 'de.topobyte:awt-utils:0.0.3'
+    compile 'de.topobyte:swing-utils:0.0.3'
     compile 'de.topobyte:no-awt:0.0.1'
     compile 'de.topobyte:no-awt-javagraphics-clipper:0.0.1'
     compile 'de.topobyte:chromaticity-core:0.0.1'

diff --git a/.../src/main/java/de/topobyte/livecg/algorithms/frechet/distanceterrain/DistanceTerrain.java b/.../src/main/java/de/topobyte/livecg/algorithms/frechet/distanceterrain/DistanceTerrain.java
@@ -22,10 +22,10 @@
 
 import javax.swing.JPanel;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.core.export.SizeProvider;
 import de.topobyte.livecg.core.geometry.geom.Chain;
 import de.topobyte.livecg.core.painting.backend.awt.AwtPainter;
-import de.topobyte.livecg.util.SwingUtil;
 
 public class DistanceTerrain extends JPanel implements SizeProvider
 {
@@ -53,7 +53,7 @@ public void paint(Graphics graphics)
 	{
 		super.paint(graphics);
 		Graphics2D g = (Graphics2D) graphics;
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 
 		painter.setGraphics(g);
 		terrainPainter.setWidth(getWidth());

diff --git a/.../main/java/de/topobyte/livecg/algorithms/frechet/distanceterrain/segment/SegmentPane.java b/.../main/java/de/topobyte/livecg/algorithms/frechet/distanceterrain/segment/SegmentPane.java
@@ -22,13 +22,13 @@
 
 import javax.swing.JPanel;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.algorithms.frechet.distanceterrain.ConfigChangedListener;
 import de.topobyte.livecg.algorithms.frechet.distanceterrain.DistanceTerrainConfig;
 import de.topobyte.livecg.algorithms.frechet.distanceterrain.DistanceTerrainPainterSegments;
 import de.topobyte.livecg.algorithms.frechet.freespace.calc.LineSegment;
 import de.topobyte.livecg.core.painting.backend.awt.AwtPainter;
 import de.topobyte.livecg.ui.segmenteditor.SegmentChangeListener;
-import de.topobyte.livecg.util.SwingUtil;
 
 public class SegmentPane extends JPanel implements SegmentChangeListener,
 		ConfigChangedListener
@@ -69,7 +69,7 @@ public void paint(Graphics graphics)
 	{
 		super.paint(graphics);
 		Graphics2D g = (Graphics2D) graphics;
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 
 		painter.setGraphics(g);
 		terrainPainter.setWidth(getWidth());

diff --git a/project/src/main/java/de/topobyte/livecg/algorithms/frechet/freespace/FreeSpaceDiagram.java b/project/src/main/java/de/topobyte/livecg/algorithms/frechet/freespace/FreeSpaceDiagram.java
@@ -22,10 +22,10 @@
 
 import javax.swing.JPanel;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.core.export.SizeProvider;
 import de.topobyte.livecg.core.geometry.geom.Chain;
 import de.topobyte.livecg.core.painting.backend.awt.AwtPainter;
-import de.topobyte.livecg.util.SwingUtil;
 
 public class FreeSpaceDiagram extends JPanel implements EpsilonSettable,
 		SizeProvider
@@ -58,7 +58,7 @@ public void paint(Graphics graphics)
 	{
 		super.paint(graphics);
 		Graphics2D g = (Graphics2D) graphics;
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 
 		painter.setGraphics(g);
 

diff --git a/...ct/src/main/java/de/topobyte/livecg/algorithms/frechet/freespace/segment/SegmentPane.java b/...ct/src/main/java/de/topobyte/livecg/algorithms/frechet/freespace/segment/SegmentPane.java
@@ -22,16 +22,16 @@
 
 import javax.swing.JPanel;
 
-import de.topobyte.livecg.algorithms.frechet.freespace.FreeSpaceConfig;
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.algorithms.frechet.freespace.EpsilonSettable;
+import de.topobyte.livecg.algorithms.frechet.freespace.FreeSpaceConfig;
 import de.topobyte.livecg.algorithms.frechet.freespace.FreeSpacePainterSegments;
 import de.topobyte.livecg.algorithms.frechet.freespace.calc.FreeSpaceUtil;
 import de.topobyte.livecg.algorithms.frechet.freespace.calc.Interval;
 import de.topobyte.livecg.algorithms.frechet.freespace.calc.LineSegment;
 import de.topobyte.livecg.core.painting.backend.awt.AwtPainter;
 import de.topobyte.livecg.ui.segmenteditor.SegmentChangeListener;
 import de.topobyte.livecg.util.DoubleUtil;
-import de.topobyte.livecg.util.SwingUtil;
 
 public class SegmentPane extends JPanel implements SegmentChangeListener,
 		EpsilonSettable
@@ -89,7 +89,7 @@ public void segmentChanged()
 	public void paint(Graphics graphics)
 	{
 		Graphics2D g = (Graphics2D) graphics;
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 
 		painter.setGraphics(g);
 		visualizationPainter.setSize(getWidth(), getHeight());

diff --git a/project/src/main/java/de/topobyte/livecg/algorithms/jts/buffer/Settings.java b/project/src/main/java/de/topobyte/livecg/algorithms/jts/buffer/Settings.java
@@ -32,7 +32,7 @@
 import com.vividsolutions.jts.operation.buffer.BufferParameters;
 
 import de.topobyte.livecg.util.ZoomInput;
-import de.topobyte.livecg.util.swing.KeyValueComboBox;
+import de.topobyte.swing.util.combobox.KeyValueComboBox;
 
 public class Settings extends JToolBar implements ItemListener, ActionListener
 {

diff --git a/project/src/main/java/de/topobyte/livecg/algorithms/polygon/shortestpath/SleevePanel.java b/project/src/main/java/de/topobyte/livecg/algorithms/polygon/shortestpath/SleevePanel.java
@@ -28,6 +28,7 @@
 
 import javax.swing.JPanel;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.algorithms.polygon.monotonepieces.SplitResult;
 import de.topobyte.livecg.algorithms.polygon.triangulation.generic.TriangulationOperation;
 import de.topobyte.livecg.algorithms.polygon.util.Diagonal;
@@ -39,7 +40,6 @@
 import de.topobyte.livecg.core.geometry.geom.Polygon;
 import de.topobyte.livecg.core.geometry.geom.PolygonHelper;
 import de.topobyte.livecg.util.ShapeUtilAwt;
-import de.topobyte.livecg.util.SwingUtil;
 import de.topobyte.livecg.util.circular.IntRing;
 import de.topobyte.livecg.util.graph.Edge;
 import de.topobyte.livecg.util.graph.Graph;
@@ -99,7 +99,7 @@ public SleevePanel(Polygon polygon, Node nodeStart, Node nodeTarget)
 	public void paint(Graphics graphics)
 	{
 		Graphics2D g = (Graphics2D) graphics;
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 
 		Area shape = AwtHelper.toShape(polygon);
 		g.setColor(new Color(0x66ff0000, true));

diff --git a/project/src/main/java/de/topobyte/livecg/core/export/GraphicsExporter.java b/project/src/main/java/de/topobyte/livecg/core/export/GraphicsExporter.java
@@ -18,13 +18,13 @@
 package de.topobyte.livecg.core.export;
 
 import java.awt.Graphics2D;
-import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 
 import javax.imageio.ImageIO;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.core.painting.VisualizationPainter;
 import de.topobyte.livecg.core.painting.backend.awt.AwtPainter;
 
@@ -39,8 +39,7 @@ public static void exportPNG(File file,
 				BufferedImage.TYPE_4BYTE_ABGR);
 
 		Graphics2D graphics = image.createGraphics();
-		graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-				RenderingHints.VALUE_ANTIALIAS_ON);
+		GraphicsUtil.useAntialiasing(graphics, true);
 
 		AwtPainter painter = new AwtPainter(graphics);
 

diff --git a/project/src/main/java/de/topobyte/livecg/core/scrolling/ScenePanel.java b/project/src/main/java/de/topobyte/livecg/core/scrolling/ScenePanel.java
@@ -29,10 +29,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.core.geometry.geom.Rectangle;
 import de.topobyte.livecg.core.painting.VisualizationPainter;
 import de.topobyte.livecg.core.painting.backend.awt.AwtPainter;
-import de.topobyte.livecg.util.SwingUtil;
 
 public class ScenePanel extends JPanel implements ViewportWithSignals,
 		HasScene, HasMargin
@@ -76,7 +76,7 @@ public void paint(Graphics graphics)
 	{
 		super.paint(graphics);
 		Graphics2D g = (Graphics2D) graphics;
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 
 		painter.setGraphics(g);
 		visualizationPainter.setWidth(getWidth());

diff --git a/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/GeometryEditPane.java b/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/GeometryEditPane.java
@@ -40,6 +40,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.core.config.LiveConfig;
 import de.topobyte.livecg.core.geometry.geom.Chain;
 import de.topobyte.livecg.core.geometry.geom.Coordinate;
@@ -63,7 +64,6 @@
 import de.topobyte.livecg.ui.geometryeditor.mousemode.MouseMode;
 import de.topobyte.livecg.ui.geometryeditor.mousemode.MouseModeListener;
 import de.topobyte.livecg.ui.geometryeditor.mousemode.MouseModeProvider;
-import de.topobyte.livecg.util.SwingUtil;
 
 public class GeometryEditPane extends JPanel implements MouseModeProvider,
 		ContentChangedListener, ViewportWithSignals, HasScene, HasMargin
@@ -459,7 +459,7 @@ public void paint(Graphics graphics)
 	{
 		super.paint(graphics);
 		Graphics2D g = (Graphics2D) graphics;
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 
 		AwtPainter painter = new AwtPainter(g);
 		paint(painter);

diff --git a/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/FilePropertiesAction.java b/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/FilePropertiesAction.java
@@ -30,7 +30,7 @@
 import de.topobyte.livecg.ui.geometryeditor.Content;
 import de.topobyte.livecg.ui.geometryeditor.FilePropertiesDialog;
 import de.topobyte.livecg.ui.geometryeditor.GeometryEditPane;
-import de.topobyte.livecg.util.SwingUtil;
+import de.topobyte.swing.util.Components;
 
 public class FilePropertiesAction extends BasicAction
 {
@@ -54,7 +54,7 @@ public FilePropertiesAction(JComponent component, GeometryEditPane editPane)
 	@Override
 	public void actionPerformed(ActionEvent event)
 	{
-		JFrame frame = SwingUtil.getContainingFrame(component);
+		JFrame frame = Components.getContainingFrame(component);
 		Content content = editPane.getContent();
 		FilePropertiesDialog dialog = new FilePropertiesDialog(frame, content);
 

diff --git a/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/LoadAction.java b/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/LoadAction.java
@@ -37,7 +37,7 @@
 import de.topobyte.livecg.core.geometry.geom.Chain;
 import de.topobyte.livecg.ui.action.BasicAction;
 import de.topobyte.livecg.ui.geometryeditor.GeometryEditPane;
-import de.topobyte.livecg.util.SwingUtil;
+import de.topobyte.swing.util.Components;
 
 public class LoadAction extends BasicAction
 {
@@ -60,7 +60,7 @@ public LoadAction(JComponent component, GeometryEditPane editPane)
 	@Override
 	public void actionPerformed(ActionEvent e)
 	{
-		JFrame frame = SwingUtil.getContainingFrame(component);
+		JFrame frame = Components.getContainingFrame(component);
 		JFileChooser chooser = new JFileChooser();
 		int value = chooser.showOpenDialog(frame);
 		if (value == JFileChooser.APPROVE_OPTION) {

diff --git a/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/OpenAction.java b/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/OpenAction.java
@@ -35,7 +35,7 @@
 import de.topobyte.livecg.ui.action.BasicAction;
 import de.topobyte.livecg.ui.geometryeditor.Content;
 import de.topobyte.livecg.ui.geometryeditor.GeometryEditPane;
-import de.topobyte.livecg.util.SwingUtil;
+import de.topobyte.swing.util.Components;
 
 public class OpenAction extends BasicAction
 {
@@ -58,7 +58,7 @@ public OpenAction(JComponent component, GeometryEditPane editPane)
 	@Override
 	public void actionPerformed(ActionEvent event)
 	{
-		JFrame frame = SwingUtil.getContainingFrame(component);
+		JFrame frame = Components.getContainingFrame(component);
 		JFileChooser chooser = new JFileChooser();
 		int value = chooser.showOpenDialog(frame);
 		if (value == JFileChooser.APPROVE_OPTION) {

diff --git a/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/SaveAction.java b/project/src/main/java/de/topobyte/livecg/ui/geometryeditor/action/SaveAction.java
@@ -33,7 +33,7 @@
 import de.topobyte.livecg.ui.action.BasicAction;
 import de.topobyte.livecg.ui.geometryeditor.Content;
 import de.topobyte.livecg.ui.geometryeditor.GeometryEditPane;
-import de.topobyte.livecg.util.SwingUtil;
+import de.topobyte.swing.util.Components;
 
 public class SaveAction extends BasicAction
 {
@@ -56,7 +56,7 @@ public SaveAction(JComponent component, GeometryEditPane editPane)
 	@Override
 	public void actionPerformed(ActionEvent event)
 	{
-		JFrame frame = SwingUtil.getContainingFrame(component);
+		JFrame frame = Components.getContainingFrame(component);
 		JFileChooser chooser = new JFileChooser();
 		int value = chooser.showSaveDialog(frame);
 		if (value == JFileChooser.APPROVE_OPTION) {

diff --git a/project/src/main/java/de/topobyte/livecg/ui/segmenteditor/SegmentEditPane.java b/project/src/main/java/de/topobyte/livecg/ui/segmenteditor/SegmentEditPane.java
@@ -26,11 +26,11 @@
 
 import javax.swing.JPanel;
 
+import de.topobyte.awt.util.GraphicsUtil;
 import de.topobyte.livecg.core.geometry.geom.Chain;
 import de.topobyte.livecg.core.geometry.geom.Coordinate;
-import de.topobyte.livecg.core.scrolling.ViewportWithSignals;
 import de.topobyte.livecg.core.scrolling.ViewportListener;
-import de.topobyte.livecg.util.SwingUtil;
+import de.topobyte.livecg.core.scrolling.ViewportWithSignals;
 
 public class SegmentEditPane extends JPanel implements ViewportWithSignals
 {
@@ -101,9 +101,9 @@ private void draw(Graphics2D g, Chain editable, Color colorLine,
 			Color colorPoints, Color colorPoint0)
 	{
 		int n = editable.getNumberOfNodes();
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 		// line segments
-		SwingUtil.useAntialiasing(g, true);
+		GraphicsUtil.useAntialiasing(g, true);
 		g.setColor(colorLine);
 		g.setStroke(new BasicStroke(1.0f));
 		Coordinate last = editable.getCoordinate(0);
@@ -116,7 +116,7 @@ private void draw(Graphics2D g, Chain editable, Color colorLine,
 			g.drawLine(x1, y1, x2, y2);
 			last = current;
 		}
-		SwingUtil.useAntialiasing(g, false);
+		GraphicsUtil.useAntialiasing(g, false);
 		// points
 		g.setStroke(new BasicStroke(1.0f));
 		for (int i = 0; i < n; i++) {

diff --git a/project/src/main/java/de/topobyte/livecg/util/BufferedImageIcon.java b/project/src/main/java/de/topobyte/livecg/util/BufferedImageIcon.java
diff --git a/project/src/main/java/de/topobyte/livecg/util/ImageLoader.java b/project/src/main/java/de/topobyte/livecg/util/ImageLoader.java
@@ -27,6 +27,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.topobyte.swing.util.BufferedImageIcon;
+
 /**
  * @author Sebastian Kuerten ([email protected])
  * 
@@ -70,4 +72,5 @@ public static Icon load(String filename)
 		// unable to load image
 		return null;
 	}
+
 }