diff --git a/src/main/java/com/marginallyclever/makelangelo/MainMenu.java b/src/main/java/com/marginallyclever/makelangelo/MainMenu.java index bfce0a530..ca8266b5c 100644 --- a/src/main/java/com/marginallyclever/makelangelo/MainMenu.java +++ b/src/main/java/com/marginallyclever/makelangelo/MainMenu.java @@ -5,9 +5,9 @@ import com.marginallyclever.convenience.log.Log; import com.marginallyclever.convenience.log.LogPanel; import com.marginallyclever.makelangelo.firmwareuploader.FirmwareUploaderPanel; -import com.marginallyclever.makelangelo.makeart.TurtleModifierAction; +import com.marginallyclever.makelangelo.makeart.turtletool.TurtleTool; import com.marginallyclever.makelangelo.makeart.io.OpenFileChooser; -import com.marginallyclever.makelangelo.makeart.tools.*; +import com.marginallyclever.makelangelo.makeart.turtletool.*; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGenerator; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGeneratorFactory; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGeneratorPanel; @@ -366,13 +366,13 @@ private JMenu createToolsMenu() { menu.addSeparator(); - TurtleModifierAction a4 = new FlipTurtleAction(1,-1,Translator.get("FlipV")); + TurtleTool a4 = new FlipTurtleAction(1,-1,Translator.get("FlipV")); a4.putValue(Action.SMALL_ICON, new ImageIcon(Objects.requireNonNull(getClass().getResource("/com/marginallyclever/makelangelo/icons8-flip-horizontal-16.png")))); a4.setSource(app); a4.addModifierListener(app::setTurtle); menu.add(a4); - TurtleModifierAction a5 = new FlipTurtleAction(-1,1,Translator.get("FlipH")); + TurtleTool a5 = new FlipTurtleAction(-1,1,Translator.get("FlipH")); a5.putValue(Action.SMALL_ICON, new ImageIcon(Objects.requireNonNull(getClass().getResource("/com/marginallyclever/makelangelo/icons8-flip-vertical-16.png")))); a5.setSource(app); a5.addModifierListener(app::setTurtle); @@ -380,23 +380,27 @@ private JMenu createToolsMenu() { menu.addSeparator(); - TurtleModifierAction a1 = createModifier(new SimplifyTurtleAction(),null); + TurtleTool a1 = createModifier(new SimplifyTurtleAction(),null); a1.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_Y, SHORTCUT_CTRL));//"ctrl Y" //a1.putValue(Action.SMALL_ICON,new ImageIcon(Objects.requireNonNull(getClass().getResource("/com/marginallyclever/makelangelo/icons8-simplify-16.png")))); menu.add(a1); - TurtleModifierAction a2 = createModifier(new ReorderTurtleAction(),"/com/marginallyclever/makelangelo/icons8-sort-16.png"); + TurtleTool a2 = createModifier(new ReorderTurtleAction(),"/com/marginallyclever/makelangelo/icons8-sort-16.png"); a2.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_R, SHORTCUT_CTRL));//"ctrl R" menu.add(a2); - TurtleModifierAction a3 = createModifier(new InfillTurtleAction(), "/com/marginallyclever/makelangelo/icons8-fill-color-16.png"); + TurtleTool a3 = createModifier(new InfillTurtleAction(), "/com/marginallyclever/makelangelo/icons8-fill-color-16.png"); a3.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_I, SHORTCUT_CTRL));//"ctrl I" menu.add(a3); + LeastHopsTurtleAction a4 = createModifier(new LeastHopsTurtleAction(),"/com/marginallyclever/makelangelo/icons8-kangaroo-16.png"); + a4.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_H, SHORTCUT_CTRL));//"ctrl H" + menu.add(a4); + return menu; } - private TurtleModifierAction createModifier(TurtleModifierAction action, String resource) { + private TurtleTool createModifier(TurtleTool action, String resource) { if(resource!=null) { action.putValue(Action.SMALL_ICON, new ImageIcon(Objects.requireNonNull(getClass().getResource(resource)))); } @@ -413,7 +417,7 @@ private JMenuItem createMover(String label, String resource, ActionListener list return menuItem; } - private TurtleModifierAction createActionMenuItem(TurtleModifierAction action) { + private TurtleTool createActionMenuItem(TurtleTool action) { action.setSource(app); action.addModifierListener(app::setTurtle); return action; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/TurtleModifierListener.java b/src/main/java/com/marginallyclever/makelangelo/makeart/TurtleModifierListener.java index db42b6f2f..908bd3257 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/TurtleModifierListener.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/TurtleModifierListener.java @@ -1,18 +1,19 @@ package com.marginallyclever.makelangelo.makeart; +import com.marginallyclever.makelangelo.makeart.turtletool.TurtleTool; import com.marginallyclever.makelangelo.turtle.Turtle; import java.util.EventListener; /** - * {@link TurtleModifierListener} subscribe to {@link TurtleModifierAction}s in order + * {@link TurtleModifierListener} subscribe to {@link TurtleTool}s in order * to be notified when the action is complete. * @author Dan Royer * @since 7.31.0 */ public interface TurtleModifierListener extends EventListener { /** - * @param turtle the result of a {@link TurtleModifierAction} being run. + * @param turtle the result of a {@link TurtleTool} being run. */ void turtleModifiedEvent(Turtle turtle); } diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_CMYK_Circles.java b/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_CMYK_Circles.java index cd05eb2ba..a989e2e7e 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_CMYK_Circles.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_CMYK_Circles.java @@ -5,8 +5,8 @@ import com.marginallyclever.makelangelo.Translator; import com.marginallyclever.makelangelo.makeart.TransformedImage; import com.marginallyclever.makelangelo.makeart.imagefilter.FilterCMYK; -import com.marginallyclever.makelangelo.makeart.tools.InfillTurtle; -import com.marginallyclever.makelangelo.makeart.tools.RemoveExtraColorChangesFromTurtle; +import com.marginallyclever.makelangelo.makeart.turtletool.InfillTurtle; +import com.marginallyclever.makelangelo.makeart.turtletool.RemoveExtraColorChangesFromTurtle; import com.marginallyclever.makelangelo.paper.Paper; import com.marginallyclever.makelangelo.select.SelectReadOnlyText; import com.marginallyclever.makelangelo.select.SelectSlider; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_VoronoiStippling.java b/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_VoronoiStippling.java index 9e423e9d1..601ea8bba 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_VoronoiStippling.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/imageconverter/Converter_VoronoiStippling.java @@ -4,7 +4,7 @@ import com.marginallyclever.convenience.voronoi.VoronoiCell; import com.marginallyclever.makelangelo.Translator; import com.marginallyclever.makelangelo.makeart.TransformedImage; -import com.marginallyclever.makelangelo.makeart.tools.InfillTurtle; +import com.marginallyclever.makelangelo.makeart.turtletool.InfillTurtle; import com.marginallyclever.makelangelo.paper.Paper; import com.marginallyclever.makelangelo.select.SelectSlider; import com.marginallyclever.makelangelo.turtle.Turtle; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/imagefilter/ImageFilter.java b/src/main/java/com/marginallyclever/makelangelo/makeart/imagefilter/ImageFilter.java index 59d0f2594..62cbab300 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/imagefilter/ImageFilter.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/imagefilter/ImageFilter.java @@ -45,7 +45,7 @@ public static int decode32bit(int color) { * @param alpha 0-255 * @return RGB color */ - protected static int encode32bit(int red,int green,int blue,int alpha) { + public static int encode32bit(int red,int green,int blue,int alpha) { red &= 0xff; green &= 0xff; blue &= 0xff; @@ -57,7 +57,7 @@ protected static int encode32bit(int red,int green,int blue,int alpha) { * @param greyscale 0-255 * @return RGB fully opaque */ - protected static int encode32bit(int greyscale) { + public static int encode32bit(int greyscale) { greyscale &= 0xff; return encode32bit(greyscale,greyscale,greyscale,0xff); } diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/Generator_TruchetTiles.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/Generator_TruchetTiles.java index fa8cc5200..b12301e1b 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/Generator_TruchetTiles.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/Generator_TruchetTiles.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.CropTurtle; +import com.marginallyclever.makelangelo.makeart.turtletool.CropTurtle; import com.marginallyclever.makelangelo.makeart.truchet.*; import com.marginallyclever.makelangelo.select.SelectBoolean; import com.marginallyclever.makelangelo.select.SelectRandomSeed; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_Dragon.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_Dragon.java index da7c77a55..086232702 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_Dragon.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_Dragon.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator.fractal; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ResizeTurtleToPaperAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ResizeTurtleToPaperAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGenerator; import com.marginallyclever.makelangelo.select.SelectReadOnlyText; import com.marginallyclever.makelangelo.select.SelectSlider; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_GosperCurve.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_GosperCurve.java index d4fcb790a..aea36ef3e 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_GosperCurve.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_GosperCurve.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator.fractal; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ResizeTurtleToPaperAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ResizeTurtleToPaperAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGenerator; import com.marginallyclever.makelangelo.select.SelectReadOnlyText; import com.marginallyclever.makelangelo.select.SelectSlider; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_HilbertCurve.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_HilbertCurve.java index 47acc282c..5bbd8850e 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_HilbertCurve.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_HilbertCurve.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator.fractal; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ResizeTurtleToPaperAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ResizeTurtleToPaperAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGenerator; import com.marginallyclever.makelangelo.select.SelectReadOnlyText; import com.marginallyclever.makelangelo.select.SelectSlider; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_KochCurve.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_KochCurve.java index 5a7c3efdf..8a7f639fc 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_KochCurve.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_KochCurve.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator.fractal; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ResizeTurtleToPaperAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ResizeTurtleToPaperAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGenerator; import com.marginallyclever.makelangelo.select.SelectReadOnlyText; import com.marginallyclever.makelangelo.select.SelectSlider; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_LSystemTree.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_LSystemTree.java index b048cbbf8..66201e786 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_LSystemTree.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/fractal/Generator_LSystemTree.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator.fractal; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ResizeTurtleToPaperAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ResizeTurtleToPaperAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGenerator; import com.marginallyclever.makelangelo.select.SelectRandomSeed; import com.marginallyclever.makelangelo.select.SelectReadOnlyText; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/grid/Generator_GridHexagons.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/grid/Generator_GridHexagons.java index 48e5453f4..4b418f20a 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/grid/Generator_GridHexagons.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/grid/Generator_GridHexagons.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator.grid; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ResizeTurtleToPaperAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ResizeTurtleToPaperAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.TurtleGenerator; import com.marginallyclever.makelangelo.select.SelectDouble; import com.marginallyclever.makelangelo.turtle.Turtle; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/maze/Generator_MazeHoneycomb.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/maze/Generator_MazeHoneycomb.java index ab11482c1..07a673c57 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/maze/Generator_MazeHoneycomb.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtlegenerator/maze/Generator_MazeHoneycomb.java @@ -1,7 +1,7 @@ package com.marginallyclever.makelangelo.makeart.turtlegenerator.maze; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ResizeTurtleToPaperAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ResizeTurtleToPaperAction; import com.marginallyclever.makelangelo.select.SelectSlider; import com.marginallyclever.makelangelo.turtle.Turtle; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/CenterTurtleToPaperAction.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/CenterTurtleToPaperAction.java similarity index 73% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/CenterTurtleToPaperAction.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/CenterTurtleToPaperAction.java index afe43c1e0..d6d13bf79 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/CenterTurtleToPaperAction.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/CenterTurtleToPaperAction.java @@ -1,6 +1,5 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; -import com.marginallyclever.makelangelo.makeart.TurtleModifierAction; import com.marginallyclever.makelangelo.turtle.Turtle; import java.awt.geom.Rectangle2D; @@ -9,7 +8,7 @@ * Center the input {@link Turtle} to the origin. * @author Dan Royer */ -public class CenterTurtleToPaperAction extends TurtleModifierAction { +public class CenterTurtleToPaperAction extends TurtleTool { public CenterTurtleToPaperAction(String name) { super(name); diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/CropTurtle.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/CropTurtle.java similarity index 97% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/CropTurtle.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/CropTurtle.java index b8a326238..effc2155d 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/CropTurtle.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/CropTurtle.java @@ -1,4 +1,4 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.convenience.Clipper2D; import com.marginallyclever.convenience.Point2D; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/FlipTurtleAction.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/FlipTurtleAction.java similarity index 60% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/FlipTurtleAction.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/FlipTurtleAction.java index fcb00cbe8..bd1a13fa9 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/FlipTurtleAction.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/FlipTurtleAction.java @@ -1,11 +1,8 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; -import com.marginallyclever.makelangelo.makeart.TurtleModifierAction; import com.marginallyclever.makelangelo.turtle.Turtle; -import java.io.Serial; - -public class FlipTurtleAction extends TurtleModifierAction { +public class FlipTurtleAction extends TurtleTool { private final double scaleX,scaleY; public FlipTurtleAction(double x,double y,String name) { diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/InfillTurtle.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/InfillTurtle.java similarity index 99% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/InfillTurtle.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/InfillTurtle.java index 3e6e38ee9..83fd28378 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/InfillTurtle.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/InfillTurtle.java @@ -1,4 +1,4 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.convenience.LineCollection; import com.marginallyclever.convenience.LineSegment2D; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/InfillTurtleAction.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/InfillTurtleAction.java similarity index 77% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/InfillTurtleAction.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/InfillTurtleAction.java index dd60e078b..3ac0095c8 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/InfillTurtleAction.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/InfillTurtleAction.java @@ -1,12 +1,11 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.TurtleModifierAction; import com.marginallyclever.makelangelo.turtle.Turtle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class InfillTurtleAction extends TurtleModifierAction { +public class InfillTurtleAction extends TurtleTool { private static final Logger logger = LoggerFactory.getLogger(InfillTurtleAction.class); public InfillTurtleAction() { diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/RemoveExtraColorChangesFromTurtle.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/RemoveExtraColorChangesFromTurtle.java similarity index 94% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/RemoveExtraColorChangesFromTurtle.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/RemoveExtraColorChangesFromTurtle.java index 7d649ef8a..86c32bb0f 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/RemoveExtraColorChangesFromTurtle.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/RemoveExtraColorChangesFromTurtle.java @@ -1,4 +1,4 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.makelangelo.turtle.MovementType; import com.marginallyclever.makelangelo.turtle.Turtle; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/ReorderTurtleAction.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ReorderTurtleAction.java similarity index 97% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/ReorderTurtleAction.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ReorderTurtleAction.java index 933adb9ad..efdfd3ef2 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/ReorderTurtleAction.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ReorderTurtleAction.java @@ -1,10 +1,9 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.convenience.LineCollection; import com.marginallyclever.convenience.LineSegment2D; import com.marginallyclever.convenience.Point2D; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.TurtleModifierAction; import com.marginallyclever.makelangelo.turtle.Turtle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +20,7 @@ * @author Dan Royer * */ -public class ReorderTurtleAction extends TurtleModifierAction { +public class ReorderTurtleAction extends TurtleTool { private static final Logger logger = LoggerFactory.getLogger(ReorderTurtleAction.class); public ReorderTurtleAction() { diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/ResizeTurtleToPaperAction.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ResizeTurtleToPaperAction.java similarity index 87% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/ResizeTurtleToPaperAction.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ResizeTurtleToPaperAction.java index c1e58d9b2..269040ed0 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/ResizeTurtleToPaperAction.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ResizeTurtleToPaperAction.java @@ -1,6 +1,5 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; -import com.marginallyclever.makelangelo.makeart.TurtleModifierAction; import com.marginallyclever.makelangelo.paper.Paper; import com.marginallyclever.makelangelo.turtle.Turtle; @@ -10,7 +9,7 @@ * Scale the input {@link Turtle} to fit the margins of the {@link Paper} provided. * @author Dan Royer */ -public class ResizeTurtleToPaperAction extends TurtleModifierAction { +public class ResizeTurtleToPaperAction extends TurtleTool { private final Paper myPaper; private final boolean fillPage; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/RotateTurtlePanel.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/RotateTurtlePanel.java similarity index 98% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/RotateTurtlePanel.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/RotateTurtlePanel.java index cc6f84be8..2a48dfdb2 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/RotateTurtlePanel.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/RotateTurtlePanel.java @@ -1,4 +1,4 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.makelangelo.Translator; import com.marginallyclever.makelangelo.turtle.Turtle; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/ScaleTurtlePanel.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ScaleTurtlePanel.java similarity index 98% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/ScaleTurtlePanel.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ScaleTurtlePanel.java index 9cea2b93d..8a7ace2ad 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/ScaleTurtlePanel.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/ScaleTurtlePanel.java @@ -1,4 +1,4 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.makelangelo.Translator; import com.marginallyclever.makelangelo.turtle.Turtle; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/SimplifyTurtleAction.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/SimplifyTurtleAction.java similarity index 92% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/SimplifyTurtleAction.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/SimplifyTurtleAction.java index 4a8a44638..fa3f264ff 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/SimplifyTurtleAction.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/SimplifyTurtleAction.java @@ -1,8 +1,7 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.convenience.LineCollection; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.TurtleModifierAction; import com.marginallyclever.makelangelo.turtle.Turtle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +14,7 @@ * @author Dan Royer * @since 7.31.0 */ -public class SimplifyTurtleAction extends TurtleModifierAction { +public class SimplifyTurtleAction extends TurtleTool { private static final Logger logger = LoggerFactory.getLogger(SimplifyTurtleAction.class); private static double distanceTolerance = 1.6; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/TranslateTurtlePanel.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/TranslateTurtlePanel.java similarity index 98% rename from src/main/java/com/marginallyclever/makelangelo/makeart/tools/TranslateTurtlePanel.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/TranslateTurtlePanel.java index 799fe0935..de646f499 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/tools/TranslateTurtlePanel.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/TranslateTurtlePanel.java @@ -1,4 +1,4 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.makelangelo.Translator; import com.marginallyclever.makelangelo.turtle.Turtle; diff --git a/src/main/java/com/marginallyclever/makelangelo/makeart/TurtleModifierAction.java b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/TurtleTool.java similarity index 78% rename from src/main/java/com/marginallyclever/makelangelo/makeart/TurtleModifierAction.java rename to src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/TurtleTool.java index 3126454d9..bdd39e47c 100644 --- a/src/main/java/com/marginallyclever/makelangelo/makeart/TurtleModifierAction.java +++ b/src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/TurtleTool.java @@ -1,6 +1,7 @@ -package com.marginallyclever.makelangelo.makeart; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.makelangelo.Makelangelo; +import com.marginallyclever.makelangelo.makeart.TurtleModifierListener; import com.marginallyclever.makelangelo.turtle.Turtle; import javax.swing.*; @@ -8,20 +9,20 @@ import java.awt.event.ActionEvent; /** - * {@link TurtleModifierAction} is the base class for all Actions which modify a {@link Turtle}. + * {@link TurtleTool} is the base class for all Actions which modify a {@link Turtle}. * Some examples might be scale, flip, rotate, reorder, etc. * @author Dan Royer * @since 7.31.0 */ -public abstract class TurtleModifierAction extends AbstractAction { +public abstract class TurtleTool extends AbstractAction { private final EventListenerList listeners = new EventListenerList(); private Makelangelo myMakelangelo; - public TurtleModifierAction(String string) { + public TurtleTool(String string) { super(string); } - public TurtleModifierAction(String string,Icon icon) { + public TurtleTool(String string, Icon icon) { super(string,icon); } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 7566598e5..0208330a6 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -33,7 +33,7 @@ exports com.marginallyclever.makelangelo; exports com.marginallyclever.makelangelo.makeart; exports com.marginallyclever.makelangelo.makeart.imagefilter; - exports com.marginallyclever.makelangelo.makeart.tools; + exports com.marginallyclever.makelangelo.makeart.turtletool; exports com.marginallyclever.makelangelo.paper; exports com.marginallyclever.makelangelo.plotter.plottersettings; exports com.marginallyclever.makelangelo.turtle; diff --git a/src/main/resources/com/marginallyclever/makelangelo/icons8-kangaroo-16.png b/src/main/resources/com/marginallyclever/makelangelo/icons8-kangaroo-16.png new file mode 100644 index 000000000..d1664f7bf Binary files /dev/null and b/src/main/resources/com/marginallyclever/makelangelo/icons8-kangaroo-16.png differ diff --git a/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadDXFTest.java b/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadDXFTest.java index da47d2282..fe52420cb 100644 --- a/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadDXFTest.java +++ b/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadDXFTest.java @@ -1,8 +1,8 @@ package com.marginallyclever.makelangelo.makeart.io; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ReorderTurtleAction; -import com.marginallyclever.makelangelo.makeart.tools.SimplifyTurtleAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ReorderTurtleAction; +import com.marginallyclever.makelangelo.makeart.turtletool.SimplifyTurtleAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.Generator_TruchetTiles; import com.marginallyclever.makelangelo.paper.Paper; import com.marginallyclever.makelangelo.plotter.plottersettings.PlotterSettingsManager; diff --git a/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadGCodeTest.java b/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadGCodeTest.java index 4026254c4..4822d27e2 100644 --- a/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadGCodeTest.java +++ b/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadGCodeTest.java @@ -1,8 +1,8 @@ package com.marginallyclever.makelangelo.makeart.io; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ReorderTurtleAction; -import com.marginallyclever.makelangelo.makeart.tools.SimplifyTurtleAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ReorderTurtleAction; +import com.marginallyclever.makelangelo.makeart.turtletool.SimplifyTurtleAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.Generator_TruchetTiles; import com.marginallyclever.makelangelo.paper.Paper; import com.marginallyclever.makelangelo.plotter.plottersettings.PlotterSettingsManager; diff --git a/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadSVGTest.java b/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadSVGTest.java index 71ee914dd..d5a8a55df 100644 --- a/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadSVGTest.java +++ b/src/test/java/com/marginallyclever/makelangelo/makeart/io/SaveAndLoadSVGTest.java @@ -1,8 +1,8 @@ package com.marginallyclever.makelangelo.makeart.io; import com.marginallyclever.makelangelo.Translator; -import com.marginallyclever.makelangelo.makeart.tools.ReorderTurtleAction; -import com.marginallyclever.makelangelo.makeart.tools.SimplifyTurtleAction; +import com.marginallyclever.makelangelo.makeart.turtletool.ReorderTurtleAction; +import com.marginallyclever.makelangelo.makeart.turtletool.SimplifyTurtleAction; import com.marginallyclever.makelangelo.makeart.turtlegenerator.Generator_TruchetTiles; import com.marginallyclever.makelangelo.paper.Paper; import com.marginallyclever.makelangelo.plotter.plottersettings.PlotterSettingsManager; diff --git a/src/test/java/com/marginallyclever/makelangelo/makeart/tools/TestCropTurtle.java b/src/test/java/com/marginallyclever/makelangelo/makeart/turtletool/TestCropTurtle.java similarity index 98% rename from src/test/java/com/marginallyclever/makelangelo/makeart/tools/TestCropTurtle.java rename to src/test/java/com/marginallyclever/makelangelo/makeart/turtletool/TestCropTurtle.java index 8c40102a0..f13cae7bd 100644 --- a/src/test/java/com/marginallyclever/makelangelo/makeart/tools/TestCropTurtle.java +++ b/src/test/java/com/marginallyclever/makelangelo/makeart/turtletool/TestCropTurtle.java @@ -1,4 +1,4 @@ -package com.marginallyclever.makelangelo.makeart.tools; +package com.marginallyclever.makelangelo.makeart.turtletool; import com.marginallyclever.makelangelo.turtle.Turtle; import org.junit.jupiter.api.Assertions;