Release 4.30.1

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

@@ -4037,5 +4037,21 @@
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>4</major>
+				<minor>30</minor>
+				<build>1</build>
+			</versionNumber>
+			<releaseDate>2022-10-23 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>Fix the build that wouldn't run due to a missing package</description>
+				</org.diylc.appframework.update.Change>				
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>

diylc/diylc-library/src/org/diylc/components/guitar/LeverSwitch.java

@@ -57,7 +57,7 @@ import org.diylc.utils.Constants;
     description = "Strat-style lever switch", zOrder = IDIYComponent.COMPONENT,
     instanceNamePrefix = "SW", keywordPolicy = KeywordPolicy.SHOW_TAG,
     keywordTag = "Guitar Wiring Diagram", transformer = AngledComponentTransformer.class)
-public class LeverSwitch extends AbstractAngledComponent<LeverSwitchType> implements ISwitch {
+public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitchType> implements ISwitch {
 
   private static final long serialVersionUID = 1L;
 
@@ -530,5 +530,22 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitchType> implem
           new int[] { 6, 8 },
           new int[] { 1, 9 }
           ) // position 6      
-      );
+      );
+  
+  public static enum LeverSwitchType {
+    
+    DP3T("DP3T (Standard 3-Position Strat)"), DP3T_5pos("DP3T (Standard 5-Position Strat)"), DP3T_5pos_Import("DP3T (Import 5-Position Strat)"),
+    _4P5T("4P5T (Super/Mega)"), DP4T("DP4T (4-Position Tele)"), _6_WAY_OG("DP4T (6-Position Oak Grigsby)"), DP5T("DP5T");
+
+    private String title;
+
+    private LeverSwitchType(String title) {
+      this.title = title;
+    }
+
+    @Override
+    public String toString() {
+      return title;
+    }
+  }
 }

diylc/diylc-library/src/org/diylc/components/guitar/LeverSwitchType.java

@@ -1,39 +0,0 @@
-/*
-
-    DIY Layout Creator (DIYLC).
-    Copyright (c) 2009-2018 held jointly by the individual authors.
-
-    This file is part of DIYLC.
-
-    DIYLC is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    DIYLC is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-package org.diylc.components.guitar;
-
-public enum LeverSwitchType {
-  
-  DP3T("DP3T (Standard 3-Position Strat)"), DP3T_5pos("DP3T (Standard 5-Position Strat)"), DP3T_5pos_Import("DP3T (Import 5-Position Strat)"),
-  _4P5T("4P5T (Super/Mega)"), DP4T("DP4T (4-Position Tele)"), _6_WAY_OG("DP4T (6-Position Oak Grigsby)"), DP5T("DP5T");
-
-  private String title;
-
-  private LeverSwitchType(String title) {
-    this.title = title;
-  }
-
-  @Override
-  public String toString() {
-    return title;
-  }
-}

diylc/diylc-swing/.classpath

@@ -18,6 +18,7 @@
 	<classpathentry kind="lib" path="lib/jar-loader.jar"/>
 	<classpathentry kind="lib" path="lib/svgSalamander-1.1.2.4.jar"/>
 	<classpathentry kind="lib" path="lib/xstream-1.4.19.jar"/>
+	<classpathentry kind="lib" path="lib/guava-31.1-jre.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
 	<classpathentry kind="lib" path="lib/java-http-proxy.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

diylc/diylc-swing/build.xml

@@ -10,10 +10,10 @@
 	<property name="jar.dir" value="${build.dir}/jar" />
 	<property name="report.dir" value="${build.dir}/junitreport" />
 	<property name="main.class" value="org.diylc.DIYLCStarter" />
-	<property name="diylc.version" value="4.30.0" />
+	<property name="diylc.version" value="4.30.1" />
 	
 	<property name="osx.jre8.path" value="jre\osx\jre8u321\Contents\Home\" />
-	<property name="osx.jre8m1.path" value="jre\osx\jre8zulu\Contents\Home\" />
+	<property name="osx.jre8m1.path" value="jre\osx\zulu-17.jre\Contents\Home\" />
 
 	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
 	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
@@ -131,7 +131,7 @@
 		        outputdirectory="${build.dir}"
 		        name="DIYLC"
 						jvmrequired="1.8"
-						copyright="2020 bancika"
+						copyright="2022 bancika"
 		        displayname="DIY Layout Creator"
 		        identifier="org.diylc.Desktop"
 		        shortversion="${diylc.version}"
@@ -151,6 +151,7 @@
 							extensions="diy" />
 				<runtime dir="${osx.jre8m1.path}" />
 				<arch name="arm64" />
+				<arch name="arm64e" />
 				<classpath file="${jar.dir}\diylc.jar" />
 				<classpath file="${jar.dir}\lib\*.jar" />
 				<classpath file="${jar.dir}\library\*.jar" />