Replace some occurences of PCTB with Jarrg, for new name

diff --git a/build-sh b/build-sh
index a60db93f5b52395605f3f9403e314da4bb8d96d6..3aae4b23d512d61beadcc65df5586bede739081c 100755 (executable)
--- 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 09dbbcde15a998531992d535b0ebc7eff6f10378..d5db77c544ddd5e00c54868521aa15f698eadfbc 100755 (executable)
--- 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 2431422ddb8dce5d1619922bc53d394199db14c6..2f77965606fd576a822a36fce938a57e47176cee 100644 (file)
--- 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 62886c16e6a88cb9310b0b129b58274ec8478879..0f15704403a011b22a9d626578da97003808a637 100644 (file)
--- 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 98c5dd8808ecbe1b1c3c21c04811f33afd495520..4254f002e20f234f1357d267f23b9588db80adf4 100644 (file)
--- 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 abfafbca0b69fc64d98d2453384c1c6fea1329f4..9627400e17f4db7bd57a8489a5a31adfc7cbcbf9 100644 (file)
--- 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