Bugfixed error when pressing play

EvanBelcher · Jun 14, 2017 · 4dab991 · 4dab991
1 parent eed85c6
commit 4dab991
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 32 deletions.
diff --git a/DrillSweet2/dependency-reduced-pom.xml b/DrillSweet2/dependency-reduced-pom.xml
@@ -19,7 +19,6 @@
   <build>
     <resources>
       <resource>
-        <targetPath>.</targetPath>
         <directory>${resourceDir}</directory>
       </resource>
     </resources>

diff --git a/DrillSweet2/pom.xml b/DrillSweet2/pom.xml
@@ -88,8 +88,6 @@
         <resources>
             <resource>
                 <directory>${resourceDir}</directory>
-                <filtering>false</filtering>
-                <targetPath>.</targetPath>
             </resource>
         </resources>
 

diff --git a/DrillSweet2/src/main/java/com/evanbelcher/DrillSweet2/Main.java b/DrillSweet2/src/main/java/com/evanbelcher/DrillSweet2/Main.java
@@ -1,21 +1,3 @@
-/*
-		Drill Sweet 2 is a marching band drill creation software.
-		Copyright (C) 2017  Evan Belcher
-
-		This program 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.
-
-		This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 package com.evanbelcher.DrillSweet2;
 
 import com.evanbelcher.DrillSweet2.data.*;
@@ -43,7 +25,6 @@
 	private static State state;
 	private static GraphicsRunner graphicsRunner;
 	private static final String[] versions = { "1.0.0", "1.1.0", "1.2.0", "1.2.1", "1.3.0", "1.4.0", "1.4.1", "1.5.0" };
-
 	private static Gson gson;
 
 	/**
@@ -64,7 +45,7 @@ private static void deleteOldVersions() {
 		if (files != null)
 			for (File f : files)
 				for (int i = 0; i < versions.length - 1; i++)
-					if (f.getName().equals("DrillSweet 2 v" + versions[i] + ".exe"))
+					if (f.getName().equals("DrillSweet.2.v" + versions[i] + ".exe"))
 						f.delete();
 	}
 

diff --git a/DrillSweet2/src/main/java/com/evanbelcher/DrillSweet2/play/PlayerInternalFrame.java b/DrillSweet2/src/main/java/com/evanbelcher/DrillSweet2/play/PlayerInternalFrame.java
@@ -57,7 +57,7 @@ public PlayerInternalFrame(PagePlayer pagePlayer, GraphicsRunner graphicsRunner)
 		});
 		JButton rewind = new JButton(getIcon("rewind"));
 		rewind.addActionListener((ActionEvent e) -> state = "rewind");
-		JButton play = new JButton(getIcon("data"));
+		JButton play = new JButton(getIcon("play"));
 		play.addActionListener((ActionEvent e) -> state = "data");
 		JButton pause = new JButton(getIcon("pause"));
 		pause.addActionListener((ActionEvent e) -> state = "pause");

diff --git a/build.xml b/build.xml
@@ -1,39 +1,38 @@
 <?xml version="1.0"?>
-<project name="Sign DrillSweet 2" default="run">
+<project name="Sign Jar and Exe" default="run">
 
     <property file="build.properties"/>
 
     <target name="run" depends="signJar,makeExe,signExe"/>
 
     <target name="signJar">
-        <signjar jar="${ds2.dir}/DrillSweet2-${ds2.version}.jar"
-                 signedJar="${ds2.dir}/DrillSweet 2 v${ds2.version} Signed.jar"
+        <signjar jar="${code.dir}/DrillSweet2-${code.version}.jar"
+                 signedJar="${code.dir}/DrillSweet 2 v${code.version} Signed.jar"
                  alias="${auth.alias}"
                  keystore="${auth.keystore}"
                  storepass="${auth.pass}"
                  verbose="false"
                  tsaurl="${auth.tsaurl}"
                  force="true"
         />
-
     </target>
 
     <target name="makeExe">
         <taskdef name="launch4j"
                  classname="net.sf.launch4j.ant.Launch4jTask"
                  classpath="${launch4j.dir}/launch4j.jar
-			:${launch4j.dir}/lib/xtream.jar"
+                 :${launch4j.dir}/lib/xtream.jar"
         />
 
         <launch4j configFile="${launch4j.config}"
-                  jar="${ds2.dir}/DrillSweet 2 v${ds2.version} Signed.jar"
-                  outfile="${ds2.dir}/DrillSweet 2 v${ds2.version}.exe"
+                  jar="${code.dir}/DrillSweet 2 v${code.version} Signed.jar"
+                  outfile="${code.dir}/DrillSweet 2 v${code.version}.exe"
         />
     </target>
 
     <target name="signExe" depends="wait">
         <exec executable="${launch4j.dir}/sign4j/sign4j.exe">
-            <arg line="--verbose java -jar &quot;${jsign.dir}/jsign-2.0.jar&quot; -s &quot;${auth.keystore}&quot; -a ${auth.alias} --storepass ${auth.pass} --tsaurl ${auth.tsaurl} &quot;${ds2.dir}/DrillSweet 2 v${ds2.version}.exe&quot;"/>
+            <arg line="--verbose java -jar &quot;${jsign.dir}/jsign-2.0.jar&quot; -s &quot;${auth.keystore}&quot; -a ${auth.alias} --storepass ${auth.pass} --tsaurl ${auth.tsaurl} &quot;${code.dir}/DrillSweet 2 v${code.version}.exe&quot;"/>
         </exec>
     </target>