From 313b6836b7b9f6a3635069af3172a275e2145ba4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Sep 2010 20:37:54 +0100 Subject: [PATCH] rename com.tedpearson.ypp.market.* to net.chiark.yarrg.* --- .gitignore | 2 +- LICENCE | 3 ++- accessibility.properties | 2 +- build-sh | 8 ++++---- jarrg | 4 ++-- src/Jarrg.xml | 4 ++-- .../ypp/market => net/chiark/yarrg}/ControlPanel.java | 6 +++--- .../ypp/market => net/chiark/yarrg}/MarketUploader.java | 4 ++-- src/winsetup.nsi | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) rename src/{com/tedpearson/ypp/market => net/chiark/yarrg}/ControlPanel.java (91%) rename src/{com/tedpearson/ypp/market => net/chiark/yarrg}/MarketUploader.java (99%) diff --git a/.gitignore b/.gitignore index d3ef8c3..7d36bd5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ jarrg-setup.exe jarrg.tar.gz jarrg-debug-* src/build/ -src/com/tedpearson/ypp/market/Version.java +src/net/chiark/yarrg/Version.java diff --git a/LICENCE b/LICENCE index ad4eaca..57e176e 100644 --- a/LICENCE +++ b/LICENCE @@ -3,9 +3,10 @@ Jarrg (and Yarrg) are Free Software. The Linux "jarrg" wrapper script is: Copyright (C) 2009-2010 Ian Jackson -com.tedpearson.* Java source code is: +net.chiark.yarrg.* Java code (except ClientHttpRequest) is: Copyright (C) 2009 Ted Pearson and Owen Dunn Copyright (C) 2010 Owen Dunn and Ian Jackson +(much of this code was originally com.tedpearson.ypp.market.*) net.chiark.yarrg.ClientHttpRequest is copyright Vlad Petryshev, Ted Pearson, and Owen Dunn and licensed under the Apache license diff --git a/accessibility.properties b/accessibility.properties index cc36ba7..eb99bda 100644 --- a/accessibility.properties +++ b/accessibility.properties @@ -1 +1 @@ -assistive_technologies=com.tedpearson.ypp.market.MarketUploader +assistive_technologies=net.chiark.yarrg.MarketUploader diff --git a/build-sh b/build-sh index 3aae4b2..24b8a0a 100755 --- a/build-sh +++ b/build-sh @@ -18,14 +18,14 @@ if [ x"`git diff 2>/dev/null || echo x`" != x ]; then revision="$revision-local" fi -cat >src/com/tedpearson/ypp/market/Version.java <src/net/chiark/yarrg/Version.java <"$wrapper" #exec 4>&- yppclass=com.threerings.yohoho.client.YoApp - atclass=com.tedpearson.ypp.market.MarketUploader + atclass=net.chiark.yarrg.MarketUploader args=( "$@" ) nargs=${#args[*]} diff --git a/src/Jarrg.xml b/src/Jarrg.xml index b48e7a9..49b937f 100644 --- a/src/Jarrg.xml +++ b/src/Jarrg.xml @@ -22,7 +22,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/src/com/tedpearson/ypp/market/ControlPanel.java b/src/net/chiark/yarrg/ControlPanel.java similarity index 91% rename from src/com/tedpearson/ypp/market/ControlPanel.java rename to src/net/chiark/yarrg/ControlPanel.java index bbd75f6..b4dc305 100644 --- a/src/com/tedpearson/ypp/market/ControlPanel.java +++ b/src/net/chiark/yarrg/ControlPanel.java @@ -1,4 +1,4 @@ -package com.tedpearson.ypp.market; +package net.chiark.yarrg; import javax.swing.*; import java.awt.*; @@ -32,7 +32,7 @@ public class ControlPanel extends JFrame { liveortest.add(testing); String version_label = " version: " + - com.tedpearson.ypp.market.Version.version; + net.chiark.yarrg.Version.version; JLabel version = new JLabel(version_label); final JCheckBox enableDebug = new JCheckBox("Write debug files?", prefs.getBoolean("writeDebugFiles", false)); @@ -46,7 +46,7 @@ public class ControlPanel extends JFrame { add(version); add(enableDebug); - final int exitstatus = Integer.parseInt(System.getProperty("com.tedpearson.ypp.market.controlpanel.exitstatus", "0")); + final int exitstatus = Integer.parseInt(System.getProperty("net.chiark.yarrg.controlpanel.exitstatus", "0")); JButton but = new JButton("Save options"); add(but); diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/net/chiark/yarrg/MarketUploader.java similarity index 99% rename from src/com/tedpearson/ypp/market/MarketUploader.java rename to src/net/chiark/yarrg/MarketUploader.java index 90a920a..234da5f 100644 --- a/src/com/tedpearson/ypp/market/MarketUploader.java +++ b/src/net/chiark/yarrg/MarketUploader.java @@ -1,4 +1,4 @@ -package com.tedpearson.ypp.market; +package net.chiark.yarrg; import java.awt.*; import java.awt.event.*; @@ -50,7 +50,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis // Yarrg protocol parameters private final static String YARRG_CLIENTNAME = "jpctb greenend"; private final static String YARRG_CLIENTVERSION = - com.tedpearson.ypp.market.Version.version; + net.chiark.yarrg.Version.version; private final static String YARRG_CLIENTFIXES = "bug-094"; private final static String YARRG_LIVE_URL = "http://upload.yarrg.chiark.net/commod-update-receiver"; private final static String YARRG_TEST_URL = "http://upload.yarrg.chiark.net/test/commod-update-receiver"; diff --git a/src/winsetup.nsi b/src/winsetup.nsi index 32348d6..829606d 100644 --- a/src/winsetup.nsi +++ b/src/winsetup.nsi @@ -82,5 +82,5 @@ CreateShortCut "$DESKTOP\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \ CreateShortCut "$SMPROGRAMS\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \ "-jar getdown-dop.jar ." "$YPPDIR\app_icon.ico" 0 SW_SHOWNORMAL CreateShortCut "$SMPROGRAMS\JARRG Control Panel.lnk" \ -"$INSTDIR\jre\bin\javaw.exe" "com.tedpearson.ypp.market.ControlPanel" +"$INSTDIR\jre\bin\javaw.exe" "net.chiark.yarrg.ControlPanel" FunctionEnd -- 2.30.2