Standarized target names to close #353

phrack · Jan 24, 2016 · 0d01906 · 0d01906
1 parent 970f0f1
commit 0d01906
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 45 deletions.
diff --git a/courses/steel_challenge/accelerator.course b/courses/steel_challenge/accelerator.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_rectangle.target" x="70.000000" y="115.000000" width="51.757019" height="184.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="478.000000" y="-133.000000" width="39.635498" height="107.000000" />
-	<target file="targets/steel_challenge_stop_circle.target" x="188.000000" y="20.000000" width="74.000000" height="142.000000" />
-	<target file="targets/steel_challenge_circle.target" x="331.000000" y="-118.000000" width="53.564941" height="105.000000" />
-	<target file="targets/steel_challenge_circle.target" x="-93.000000" y="142.000000" width="74.655838" height="154.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="70.000000" y="115.000000" width="51.757019" height="184.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="478.000000" y="-133.000000" width="39.635498" height="107.000000" />
+	<target file="targets/Steel_Challenge_Stop_Circle.target" x="188.000000" y="20.000000" width="74.000000" height="142.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="331.000000" y="-118.000000" width="53.564941" height="105.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="-93.000000" y="142.000000" width="74.655838" height="154.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/courses/steel_challenge/five_to_go.course b/courses/steel_challenge/five_to_go.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_stop_circle.target" x="406.000000" y="170.000000" width="56.000000" height="99.000000" />
-	<target file="targets/steel_challenge_circle.target" x="23.000000" y="72.000000" width="61.532471" height="118.000000" />
-	<target file="targets/steel_challenge_circle.target" x="267.000000" y="-42.000000" width="39.350647" height="69.000000" />
-	<target file="targets/steel_challenge_circle.target" x="385.000000" y="-120.000000" width="36.350708" height="70.000000" />
-	<target file="targets/steel_challenge_circle.target" x="-96.000000" y="174.000000" width="57.532471" height="121.000000" />
+	<target file="targets/Steel_Challenge_Stop_Circle.target" x="406.000000" y="170.000000" width="56.000000" height="99.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="23.000000" y="72.000000" width="61.532471" height="118.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="267.000000" y="-42.000000" width="39.350647" height="69.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="385.000000" y="-120.000000" width="36.350708" height="70.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="-96.000000" y="174.000000" width="57.532471" height="121.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/courses/steel_challenge/outerlimits.course b/courses/steel_challenge/outerlimits.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_stop_circle.target" x="164.000000" y="148.000000" width="68.000000" height="130.000000" />
-	<target file="targets/steel_challenge_circle.target" x="-69.000000" y="41.000000" width="55.525970" height="119.000000" />
-	<target file="targets/steel_challenge_circle.target" x="386.000000" y="49.000000" width="55.526001" height="119.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="96.000000" y="-109.000000" width="54.672882" height="163.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="324.000000" y="-112.000000" width="54.672913" height="163.000000" />
+	<target file="targets/Steel_Challenge_Stop_Circle.target" x="164.000000" y="148.000000" width="68.000000" height="130.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="-69.000000" y="41.000000" width="55.525970" height="119.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="386.000000" y="49.000000" width="55.526001" height="119.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="96.000000" y="-109.000000" width="54.672882" height="163.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="324.000000" y="-112.000000" width="54.672913" height="163.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/courses/steel_challenge/pendulum.course b/courses/steel_challenge/pendulum.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_circle.target" x="34.000000" y="-21.000000" width="28.259735" height="59.000000" />
-	<target file="targets/steel_challenge_circle.target" x="295.000000" y="-21.000000" width="28.259766" height="59.000000" />
-	<target file="targets/steel_challenge_circle.target" x="-106.000000" y="-25.000000" width="35.612827" height="72.000000" />
-	<target file="targets/steel_challenge_circle.target" x="430.441935" y="-25.000000" width="36.376648" height="72.000000" />
-	<target file="targets/steel_challenge_stop_circle.target" x="167.000000" y="130.000000" width="57.000000" height="106.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="34.000000" y="-21.000000" width="28.259735" height="59.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="295.000000" y="-21.000000" width="28.259766" height="59.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="-106.000000" y="-25.000000" width="35.612827" height="72.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="430.441935" y="-25.000000" width="36.376648" height="72.000000" />
+	<target file="targets/Steel_Challenge_Stop_Circle.target" x="167.000000" y="130.000000" width="57.000000" height="106.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/courses/steel_challenge/roundabout.course b/courses/steel_challenge/roundabout.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_circle.target" x="-82.000000" y="-66.000000" width="38.337662" height="71.000000" />
-	<target file="targets/steel_challenge_circle.target" x="-5.000000" y="138.000000" width="65.525970" height="126.000000" />
-	<target file="targets/steel_challenge_circle.target" x="416.000000" y="-122.000000" width="39.324707" height="76.000000" />
-	<target file="targets/steel_challenge_circle.target" x="403.000000" y="160.000000" width="61.467529" height="113.000000" />
-	<target file="targets/steel_challenge_stop_circle.target" x="260.000000" y="52.000000" width="63.000000" height="112.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="-82.000000" y="-66.000000" width="38.337662" height="71.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="-5.000000" y="138.000000" width="65.525970" height="126.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="416.000000" y="-122.000000" width="39.324707" height="76.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="403.000000" y="160.000000" width="61.467529" height="113.000000" />
+	<target file="targets/Steel_Challenge_Stop_Circle.target" x="260.000000" y="52.000000" width="63.000000" height="112.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/courses/steel_challenge/showdown.course b/courses/steel_challenge/showdown.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_stop_circle.target" x="171.000000" y="32.000000" width="47.000000" height="96.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="464.000000" y="-86.000000" width="54.654175" height="136.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="-49.000000" y="-86.000000" width="54.654205" height="146.000000" />
-	<target file="targets/steel_challenge_circle.target" x="37.000000" y="106.000000" width="52.500000" height="105.000000" />
-	<target file="targets/steel_challenge_circle.target" x="307.000000" y="104.000000" width="52.500000" height="105.000000" />
+	<target file="targets/Steel_Challenge_Stop_Circle.target" x="171.000000" y="32.000000" width="47.000000" height="96.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="464.000000" y="-86.000000" width="54.654175" height="136.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="-49.000000" y="-86.000000" width="54.654205" height="146.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="37.000000" y="106.000000" width="52.500000" height="105.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="307.000000" y="104.000000" width="52.500000" height="105.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/courses/steel_challenge/smoke_and_hope.course b/courses/steel_challenge/smoke_and_hope.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_rectangle.target" x="86.000000" y="-36.000000" width="27.000000" height="90.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="324.962963" y="-31.990000" width="27.000000" height="90.000000" />
-	<target file="targets/steel_challenge_stop_circle.target" x="157.000000" y="-137.000000" width="31.000000" height="59.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="460.000000" y="95.000000" width="36.000000" height="133.000000" />
-	<target file="targets/steel_challenge_rectangle.target" x="-48.000000" y="93.000000" width="36.000000" height="133.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="86.000000" y="-36.000000" width="27.000000" height="90.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="324.962963" y="-31.990000" width="27.000000" height="90.000000" />
+	<target file="targets/Steel_Challenge_Stop_Circle.target" x="157.000000" y="-137.000000" width="31.000000" height="59.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="460.000000" y="95.000000" width="36.000000" height="133.000000" />
+	<target file="targets/Steel_Challenge_Rectangle.target" x="-48.000000" y="93.000000" width="36.000000" height="133.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/courses/steel_challenge/speed_option.course b/courses/steel_challenge/speed_option.course
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <course>
-	<target file="targets/steel_challenge_stop_rectangle.target" x="-32.140187" y="-96.758278" width="43.999996" height="132.000000" />
-	<target file="targets/steel_challenge_circle.target" x="118.000000" y="-21.000000" width="32.324646" height="62.000000" />
-	<target file="targets/steel_challenge_circle.target" x="16.000000" y="139.000000" width="45.454559" height="90.000000" />
-	<target file="targets/steel_challenge_circle.target" x="296.000000" y="186.306452" width="42.383118" height="78.000000" />
-	<target file="targets/steel_challenge_circle.target" x="399.000000" y="73.000000" width="46.473999" height="92.000000" />
+	<target file="targets/Steel_Challenge_Stop_Rectangle.target" x="-32.140187" y="-96.758278" width="43.999996" height="132.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="118.000000" y="-21.000000" width="32.324646" height="62.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="16.000000" y="139.000000" width="45.454559" height="90.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="296.000000" y="186.306452" width="42.383118" height="78.000000" />
+	<target file="targets/Steel_Challenge_Circle.target" x="399.000000" y="73.000000" width="46.473999" height="92.000000" />
 	<resolution width="640.000000" height="483.000000" />
 </course>
diff --git a/src/main/java/com/shootoff/gui/controller/ShootOFFController.java b/src/main/java/com/shootoff/gui/controller/ShootOFFController.java
@@ -1278,7 +1278,7 @@ public void newTarget(File path) {
 		String targetPath = path.getPath();
 
 		String targetName = targetPath.substring(targetPath.lastIndexOf(File.separator) + 1,
-				targetPath.lastIndexOf('.'));
+				targetPath.lastIndexOf('.')).replace("_", " ");
 
 		MenuItem addTargetItem = new MenuItem(targetName);
 		addTargetItem.setMnemonicParsing(false);

diff --git a/src/test/java/com/shootoff/courses/io/TestCourseIO.java b/src/test/java/com/shootoff/courses/io/TestCourseIO.java
@@ -43,7 +43,7 @@ public void setUp() throws ConfigurationException {
 		arenaController.init(config, new MockCanvasManager(config));
 		backgroundURL = "/arena/backgrounds/indoor_range.gif";
 		backgroundIsResource = true;
-		targetName = "targets/reset.target";
+		targetName = "targets/Reset.target";
 		targetX = 10;
 		targetY = 100;
 		targetWidth = 10;

diff --git a/src/test/java/com/shootoff/gui/TestTarget.java b/src/test/java/com/shootoff/gui/TestTarget.java
@@ -60,9 +60,9 @@ public void setUp() throws ConfigurationException {
 
 		targets = new ArrayList<Target>();
 		pepperPopper = canvasManager.addTarget(
-				new Target(TargetIO.loadTarget(new File("targets/pepper_popper.target")).get(), targets));
+				new Target(TargetIO.loadTarget(new File("targets/Pepper_Popper.target")).get(), targets));
 		targets.add(pepperPopper);
-		targets.add(new Target(TargetIO.loadTarget(new File("targets/reset.target")).get(), targets));
+		targets.add(new Target(TargetIO.loadTarget(new File("targets/Reset.target")).get(), targets));
 	}
 
 	@Test

diff --git a/src/test/java/com/shootoff/plugins/TestDuelingTree.java b/src/test/java/com/shootoff/plugins/TestDuelingTree.java
@@ -52,7 +52,7 @@ public void setUp() throws ConfigurationException, NoSuchFieldException, Securit
 
 		targets = new ArrayList<Group>();
 		Group duelTree = TargetIO.loadTarget(new File("targets" + File.separator + 
-				"duel_tree.target")).get();
+				"Duel_Tree.target")).get();
 		targets.add(duelTree);
 
 		leftPaddles = new ArrayList<TargetRegion>();

diff --git a/targets/duel_tree.target → targets/Duel_Tree.target b/targets/duel_tree.target → targets/Duel_Tree.target
diff --git a/targets/musical_target.target → targets/Musical_Target.target b/targets/musical_target.target → targets/Musical_Target.target
diff --git a/targets/pepper_popper.target → targets/Pepper_Popper.target b/targets/pepper_popper.target → targets/Pepper_Popper.target
diff --git a/targets/plate_rack.target → targets/Plate_Rack.target b/targets/plate_rack.target → targets/Plate_Rack.target
diff --git a/targets/plate_rack_silhouette.target → targets/Plate_Rack_Silhouette.target b/targets/plate_rack_silhouette.target → targets/Plate_Rack_Silhouette.target
diff --git a/targets/reset.target → targets/Reset.target b/targets/reset.target → targets/Reset.target
diff --git a/targets/steel_challenge_circle.target → targets/Steel_Challenge_Circle.target b/targets/steel_challenge_circle.target → targets/Steel_Challenge_Circle.target
diff --git a/targets/steel_challenge_rectangle.target → targets/Steel_Challenge_Rectangle.target b/targets/steel_challenge_rectangle.target → targets/Steel_Challenge_Rectangle.target
diff --git a/targets/steel_challenge_stop_circle.target → targets/Steel_Challenge_Stop_Circle.target b/targets/steel_challenge_stop_circle.target → targets/Steel_Challenge_Stop_Circle.target
diff --git a/...ets/steel_challenge_stop_rectangle.target → ...ets/Steel_Challenge_Stop_Rectangle.target b/...ets/steel_challenge_stop_rectangle.target → ...ets/Steel_Challenge_Stop_Rectangle.target