From 3609b4186270df8e3cf0b4dec2f87b4b2ccfed71 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 5 Sep 2010 12:25:23 +0100
Subject: [PATCH] Replace some occurences of PCTB with Jarrg, for new name

---
 build-sh                                          | 2 +-
 jarrg                                             | 6 +++---
 src/{PCTB.xml => Jarrg.xml}                       | 4 ++--
 src/com/tedpearson/ypp/market/ControlPanel.java   | 2 +-
 src/com/tedpearson/ypp/market/MarketUploader.java | 4 ++--
 src/winsetup.nsi                                  | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{PCTB.xml => Jarrg.xml} (92%)

diff --git a/build-sh b/build-sh
index a60db93..3aae4b2 100755
--- a/build-sh
+++ b/build-sh
@@ -29,7 +29,7 @@ rm -f src/build/com/tedpearson/ypp/market/ControlPanel.class
 rm -f *.jar
 
 cd src
-ant -f PCTB.xml
+ant -f Jarrg.xml
 cd ..
 
 echo "
diff --git a/jarrg b/jarrg
index 09dbbcd..d5db77c 100755
--- a/jarrg
+++ b/jarrg
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# This is jarrg, a wrapper script for plumbing Ted Pearson's Java PCTB
+# This is jarrg, a wrapper script for plumbing the Jarrg
 # client into a JVM on Linux.
 
 # This program is Free Software.  Copyright (C) 2009 Ian Jackson.
@@ -171,7 +171,7 @@ if $check_only; then echo "Check successful."; exit 0; fi
 set +e
 $setup_only_simulate "$realjava" \
  -Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
- -jar "$srcjardir/PCTB-ControlPanel.jar"
+ -jar "$srcjardir/Jarrg-ControlPanel.jar"
 rc=$?
 set -e
 
@@ -188,7 +188,7 @@ esac
 
 rm -rf -- "$jtmp"
 mkdir -- "$jtmp" "$extdir" "$linkfarm"
-cp "$srcjardir"/PCTB*.jar "$extdir"
+cp "$srcjardir"/Jarrg*.jar "$extdir"
 
 cp -Rs "$javadir"/. "$linkfarm"/.
 
diff --git a/src/PCTB.xml b/src/Jarrg.xml
similarity index 92%
rename from src/PCTB.xml
rename to src/Jarrg.xml
index 2431422..2f77965 100644
--- a/src/PCTB.xml
+++ b/src/Jarrg.xml
@@ -20,13 +20,13 @@
 	</target>
 	
 	<target name="jar" depends="compile">
-		<jar jarfile="${src}/../PCTB-ControlPanel.jar">
+		<jar jarfile="${src}/../Jarrg-ControlPanel.jar">
 			<manifest>
 				<attribute name="Main-Class" value="com.tedpearson.ypp.market.ControlPanel"/>
 			</manifest>
 			<fileset dir="${build}" includes="**/ControlPanel*"/>
 		</jar>
-		<jar jarfile="${src}/../PCTB-Uploader.jar">
+		<jar jarfile="${src}/../Jarrg-Uploader.jar">
 			<fileset dir="${src}" includes="com/sun/**" />
 			<fileset dir="${build}" includes="**/Market*.class"/>
 			<fileset dir="${build}" includes="net/chiark/**, com/tedpearson/util/update/*.class"/>
diff --git a/src/com/tedpearson/ypp/market/ControlPanel.java b/src/com/tedpearson/ypp/market/ControlPanel.java
index 62886c1..0f15704 100644
--- a/src/com/tedpearson/ypp/market/ControlPanel.java
+++ b/src/com/tedpearson/ypp/market/ControlPanel.java
@@ -15,7 +15,7 @@ public class ControlPanel extends JFrame {
 	}
 	
 	public ControlPanel() {
-		super("PCTB Control Panel");
+		super("Jarrg Control Panel");
 		final Preferences prefs = Preferences.userNodeForPackage(getClass());
 		final JCheckBox toPCTB = new JCheckBox("Upload to PCTB?", prefs.getBoolean("uploadToPCTB", true));
 		final JCheckBox toYarrg = new JCheckBox("Upload to Yarrg?", prefs.getBoolean("uploadToYarrg", true));
diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 98c5dd8..4254f00 100644
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -282,7 +282,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 						resultSummary.setText("");
 						arbitrageResult.setText("");
 						try {
-							runPCTB();
+							runUpload();
 						} catch(Exception e) {
 							error(e.toString());
 							e.printStackTrace();
@@ -399,7 +399,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	*
 	*	@exception Exception if an error we didn't expect occured
 	*/
-	private void runPCTB() throws Exception {
+	private void runUpload() throws Exception {
 		progresslog("starting");
 
 		String yarrgts = "";
diff --git a/src/winsetup.nsi b/src/winsetup.nsi
index abfafbc..9627400 100644
--- a/src/winsetup.nsi
+++ b/src/winsetup.nsi
@@ -70,8 +70,8 @@ FunctionEnd
 Function CopyJRE
 CreateDirectory $INSTDIR\jre
 CopyFiles $JRE\*.* $INSTDIR\jre
-File /oname=$INSTDIR\jre\lib\ext\PCTB-Uploader.jar PCTB-Uploader.jar
-File /oname=$INSTDIR\jre\lib\ext\PCTB-ControlPanel.jar PCTB-ControlPanel.jar
+File /oname=$INSTDIR\jre\lib\ext\Jarrg-Uploader.jar Jarrg-Uploader.jar
+File /oname=$INSTDIR\jre\lib\ext\Jarrg-ControlPanel.jar Jarrg-ControlPanel.jar
 File /oname=$INSTDIR\jre\lib\accessibility.properties accessibility.properties
 FunctionEnd
 
-- 
2.30.2