Fixed backwards compatibility issue with older files failing to open because of an issue with 'Mini Toggle Switch' component serialization

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -3734,13 +3734,17 @@
 			<releaseDate>2022-02-27 00:00:00.000 CET</releaseDate>
 			<name></name>
 			<changes>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Fixed backwards compatibility issue with older files failing to open because of an issue with 'Mini Toggle Switch' component serialization</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Separate WIRING layer (containing Hookup Wire and Twisted Wire at the moment) from TRACE layer and render it above the COMPONENT layer by default</description>
 				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
-					<description>Upgrade OSX application package built-in Java JRE to version 1.8.0_321-b07</description>
+					<description>Upgrade OSX application package built-in Java to JRE 1.8.0_321-b07</description>
 				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>

diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java

@@ -69,7 +69,9 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
   private static Color BORDER_COLOR = BODY_COLOR.darker();
   private static Color CIRCLE_COLOR = Color.decode("#FFFFAA");
 
-  protected Point2D[] controlPoints = new Point2D[] {new Point2D.Double(0, 0)};
+  protected Point2D[] controlPoints = new Point2D[] {new Point2D.Double(0, 0)};
+  @Deprecated
+  protected String name;
   transient protected Shape body;
   protected ToggleSwitchType switchType = ToggleSwitchType.DPDT;
   private OrientationHV orientation = OrientationHV.VERTICAL;
@@ -197,15 +199,19 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
     body = null;
   }
 
-  @EditableProperty
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public void setName(String name) {
-    this.name = name;
+  @EditableProperty(defaultable = false)
+  @Override
+  public String getName() {
+    if (super.name != null) {
+      return super.name;
+    }
+    return name;
+  }
+
+  @Override
+  public void setName(String name) {
+    super.name = name;
+    this.name = null;
   }
 
   @EditableProperty(name = "Type")

diylc/diylc-swing/dict.txt

@@ -85,10 +85,8 @@ SPDT
 SPDT  (Center OFF)
 SPST
 Srpski
-TR1
 Tick Width
 Ticks
-W2
 Wiring
 Xnor
 Xor