reorganize resource files

diylc/diylc-core/src/org/diylc/presenter/Presenter.java

@@ -104,7 +104,7 @@ public class Presenter implements IPlugInPort {
   // Read the latest version from the local update.xml file
 	static {
 		try {
-			URL resource = Presenter.class.getClassLoader().getResource("org/diylc/presenter/update.xml");
+			URL resource = Presenter.class.getResource("update.xml");
 			if (resource != null) {
 				BufferedInputStream in = new BufferedInputStream(resource.openStream());
 				XStream xStream = new XStream(new DomDriver());
@@ -131,7 +131,7 @@ public class Presenter implements IPlugInPort {
 	private static Map<String, List<Template>> defaultVariantMap = null;
 	static {
 		try {
-			URL resource = Presenter.class.getClassLoader().getResource("org/diylc/presenter/variants.xml");
+			URL resource = Presenter.class.getResource("variants.xml");
 			if (resource != null) {
 				BufferedInputStream in = new BufferedInputStream(resource.openStream());
 				XStream xStream = new XStream(new DomDriver());

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

@@ -2701,7 +2701,7 @@
 			<versionNumber>
 				<major>4</major>
 				<minor>0</minor>
-				<build>0</build>
+				<build>1</build>
 			</versionNumber>
 			<releaseDate>2019-03-24 00:00:00.000 CET</releaseDate>
 			<name></name>

diylc/diylc-swing/build.xml

@@ -148,6 +148,8 @@
 			<zipfileset dir="." includes="diylc.exe" />			
 		</zip>
 	</target>
+	
+	<target name="full" depends="win,mac"/>
 
 	<target name="javadoc">
 		<javadoc access="public" author="true" classpathref="class.path" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="true" use="true" version="true">

diylc/diylc-swing/install.iss

@@ -14,10 +14,6 @@ AlwaysShowDirOnReadyPage=yes
 [Files]
 Source: "diylc.exe"; DestDir: "{app}"
 Source: "diylc.l4j.ini"; DestDir: "{app}"
-Source: "update.xml"; DestDir: "{app}"
-Source: "variants.xml"; DestDir: "{app}"
-Source: "config.properties"; DestDir: "{app}"
-Source: "splash.png"; DestDir: "{app}"
 Source: "diylc.ico"; DestDir: "{app}"
 Source: "build\jar\diylc.jar"; DestDir: "{app}"
 Source: "build\jar\lib\*"; DestDir: "{app}\lib"

diylc/diylc-swing/src/org/diylc/DIYLCStarter.java

@@ -61,7 +61,15 @@ public class DIYLCStarter {
   public static void main(String[] args) {
     // Initialize splash screen
     final SplashScreen splash = SplashScreen.getSplashScreen();
-    new DIYLCSplash(splash).start();    
+    URL splashUrl = Presenter.class.getClassLoader().getResource("org/diylc/splash.png");
+	if (splash != null) {
+		try {
+			splash.setImageURL(splashUrl);
+			new DIYLCSplash(splash).start();
+		} catch (NullPointerException | IllegalStateException | IOException e1) {
+			LOG.error("Could not initialize splash screen", e1);
+		}
+	}
 
     URL url = DIYLCStarter.class.getResource("log4j.properties");
     Properties properties = new Properties();
@@ -148,7 +156,7 @@ public class DIYLCStarter {
     properties = new Properties();
     try {
       LOG.info("Injecting default properties.");
-      URL resource = Presenter.class.getClassLoader().getResource("config.properties");
+      URL resource = Presenter.class.getResource("config.properties");
       if (resource != null) {
         properties.load(resource.openStream());
         PropertyInjector.injectProperties(properties);

diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java

@@ -442,7 +442,7 @@ public class MainFrame extends JFrame implements ISwingUI {
           fileName = "Untitled";
         }
         String modified = (Boolean) params[1] ? " (modified)" : "";
-        setTitle(String.format("DIYLC G3 version %s.%s - %s %s", plugInPort.getCurrentVersionNumber().getMinor(),
+        setTitle(String.format("DIYLC G4 version %s.%s - %s %s", plugInPort.getCurrentVersionNumber().getMinor(),
             plugInPort.getCurrentVersionNumber().getBuild(), fileName, modified));
       }
     }