7.56.1 fix extra translations

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.marginallyclever</groupId>
 	<artifactId>Makelangelo</artifactId>
-	<version>7.56.0</version>
+	<version>7.56.1</version>
 	<name>Makelangelo</name>
 		<description>Makelangelo Software is a Java program that prepares art for CNC plotters.  It is especially designed for the Makelangelo Robot.
 It pairs really well with Marlin-polargraph, the code in the brain of the robot that receives instructions and moves the motors.</description>

src/main/java/com/marginallyclever/makelangelo/MainFrame.java

@@ -66,22 +66,12 @@ private void createDefaultLayout() {
         DockingPanel renderView = new DockingPanel("8e50154c-a149-4e95-9db5-4611d24cc0cc", "Preview");
         renderView.add(previewPanel, BorderLayout.CENTER);
         windows.add(renderView);
-        /*
-        DockingPanel treeView = new DockingPanel("c6b04902-7e53-42bc-8096-fa5d43289362", "Scene");
-        NodeTreeView nodeTreeView = new NodeTreeView();
-        treeView.add(nodeTreeView, BorderLayout.CENTER);
-        windows.add(treeView);
-
-        DockingPanel detailView = new DockingPanel("67e45223-79f5-4ce2-b15a-2912228b356f", "Details");
-        NodeDetailView FirmwareUploaderPanel = new FirmwareUploaderPanel();
-        detailView.add(nodeDetailView, BorderLayout.CENTER);
-        windows.add(detailView);
-*/
-        DockingPanel paperSettingsView = new DockingPanel("31ffe343-c085-44b1-9c61-28a049942287", Translator.get("OpenPaperSettings"));
+
+        DockingPanel paperSettingsView = new DockingPanel("31ffe343-c085-44b1-9c61-28a049942287", Translator.get("PaperSettings.Title"));
         paperSettingsView.add(paperSettingsPanel, BorderLayout.CENTER);
         windows.add(paperSettingsView);
 
-        DockingPanel machineSettingsView = new DockingPanel("67e525e8-111a-47c9-a490-127f94a99d1a", Translator.get("OpenPlotterSettings"));
+        DockingPanel machineSettingsView = new DockingPanel("67e525e8-111a-47c9-a490-127f94a99d1a", Translator.get("PlotterSettingsPanel.Title"));
         machineSettingsView.add(plotterSettingsPanel, BorderLayout.CENTER);
         windows.add(machineSettingsView);
 
@@ -93,11 +83,7 @@ private void createDefaultLayout() {
         DockingPanel logView = new DockingPanel("5e565f83-9734-4281-9828-92cd711939df", Translator.get("LogPanel.Title"));
         logView.add(logPanel, BorderLayout.CENTER);
         windows.add(logView);
-/*
-        DockingPanel editorView = new DockingPanel("3f8f54e1-af78-4994-a1c2-21a68ec294c9", "Editor");
-        editorView.add(editPanel, BorderLayout.CENTER);
-        windows.add(editorView);
-*/
+
         DockingPanel aboutView = new DockingPanel("976af87b-90f3-42ce-a5d6-e4ab663fbb15", Translator.get("MenuAbout"));
         aboutView.add(new AboutPanel(), BorderLayout.CENTER);
         windows.add(aboutView);

src/main/java/com/marginallyclever/makelangelo/plotter/Plotter.java

@@ -2,14 +2,14 @@
 
 import com.jogamp.opengl.GL2;
 import com.marginallyclever.convenience.Point2D;
-import com.marginallyclever.makelangelo.paper.Paper;
-import com.marginallyclever.makelangelo.plotter.plottersettings.PlotterSettings;
 import com.marginallyclever.makelangelo.apps.previewpanel.PreviewListener;
 import com.marginallyclever.makelangelo.apps.previewpanel.PreviewPanel;
+import com.marginallyclever.makelangelo.paper.Paper;
+import com.marginallyclever.makelangelo.plotter.plottersettings.PlotterSettings;
 import com.marginallyclever.makelangelo.turtle.TurtleMove;
 
+import javax.swing.event.EventListenerList;
 import java.security.InvalidParameterException;
-import java.util.ArrayList;
 
 /**
  * {@link Plotter} contains the live state of the drawing robot: the position of the pen, is it homed, and
@@ -32,34 +32,34 @@ public class Plotter implements PreviewListener, Cloneable {
 	@Override
 	public Object clone() throws CloneNotSupportedException {
 		Plotter b = (Plotter)super.clone();
-		b.listeners = new ArrayList<PlotterEventListener>();
+		b.listeners = new EventListenerList();
 		b.pos = new Point2D();
 		b.pos.set(this.pos);
 		return b;
 	}
 
 	// OBSERVER PATTERN
 
-	private ArrayList<PlotterEventListener> listeners = new ArrayList<PlotterEventListener>();
+	private EventListenerList listeners = new EventListenerList();
 
 	/**
 	 * Subscribe to listen to {@link PlotterEvent}s.
 	 * @param listener
 	 */
 	public void addPlotterEventListener(PlotterEventListener listener) {
-		listeners.add(listener);
+		listeners.add(PlotterEventListener.class,listener);
 	}
 
 	/**
 	 * unsubscribe from {@link PlotterEvent}s.
 	 * @param listener
 	 */
 	public void removePlotterEventListener(PlotterEventListener listener) {
-		listeners.remove(listener);
+		listeners.remove(PlotterEventListener.class,listener);
 	}
 
 	private void firePlotterEvent(PlotterEvent e) {
-		for (PlotterEventListener listener : listeners) listener.plotterEvent(e);
+		for (PlotterEventListener listener : listeners.getListeners(PlotterEventListener.class)) listener.plotterEvent(e);
 	}
 
 	// OBSERVER PATTERN ENDS

src/main/java/com/marginallyclever/makelangelo/plotter/PlotterEventListener.java

@@ -1,5 +1,5 @@
 package com.marginallyclever.makelangelo.plotter;
 
-public interface PlotterEventListener {
+public interface PlotterEventListener extends java.util.EventListener {
 	void plotterEvent(PlotterEvent e);
 }

src/main/resources/languages/english.xml

@@ -97,7 +97,6 @@
 	<string><key>MenuView.zoomOut</key><value>Zoom -</value></string>
 	<string><key>MenuView.zoomFit</key><value>Zoom to fit</value></string>
 	<string><key>MenuWindows</key><value>Windows</value></string>
-	<string><key>ShowLog</key><value>Show Log</value></string>
 	<string><key>OpenLogFolder</key><value>Open log folder</value></string>
 	<string><key>SierpinskiTriangleName</key><value>Sierpinski triangle</value></string>
 
@@ -229,8 +228,6 @@
 	<string><key>Package</key><value>Papercraft Box</value></string>
 	<string><key>Polyeder</key><value>Papercraft Polyhedron</value></string>
 	<string><key>Port</key><value>Port</value></string>
-	<string><key>OpenPaperSettings</key><value>Paper settings</value></string>
-	<string><key>OpenPlotterSettings</key><value>Plotter settings</value></string>
 	<string><key>FileTypeScratch3</key><value>Scratch 3</value></string>
 	<string><key>Open</key><value>Open file...</value></string>
 	<string><key>InfillTurtleAction.title</key><value>Fill in closed loops</value></string>