Closed smithrachael closed 12 years ago
I am still trying to find a way to send our patches to Github's site. I could not find one though.
I don't think there is a web interface. Just commit it the standard way... maybe... github will support patch uploading in the future
How about forking the repo, and doing a pull request?
From d18e629808836a8ca53f8bf0032389c5937338f4 Mon Sep 17 00:00:00 2001 From: Smith Rachael smith.rachael.76@gmail.com Date: Fri, 6 Apr 2012 20:33:32 -0300 Subject: [PATCH] Little modifications to improve readability and maintainability.
.../src/net/tsu/TCPort/Broadcast/Broadcast.java | 8 + jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java | 200 ++++++----- .../net/tsu/TCPort/FileTransfer/FileTransfer.java | 40 ++- jtorchat 0.7.7/data/src/net/tsu/TCPort/TCPort.java | 91 +++--- .../data/src/net/tsu/TCPort/TorLoader.java | 378 ++++++++++---------- 5 files changed, 372 insertions(+), 345 deletions(-)
diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java index a375cde..6302a6c 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java
+++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Broadcast/Broadcast.java
@@ -163,6 +163,7 @@ public class Broadcast {
@@ -269,6 +270,7 @@ public class Broadcast { } }
@@ -281,11 +283,17 @@ public class Broadcast { } }
diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java index f29704c..3626edf 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java
+++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/Config.java
@@ -7,10 +7,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Properties;
import net.tsu.TCPort.util.Regex; import net.tsu.TCPort.util.Util; -import net.tsu.TCPort.language;
public class Config { @@ -62,66 +60,66 @@ public class Config { public static String Torbinary; public static String controlfile = "controlfile";
public static String answer="";
-// Linux only -public static String Torclose="torclose.sh"; -public static String torpid=Integer.toString(Util.myRandom(1000, 9999)); -// Only Windows -public static String TorWintorrc="torrc.txt"; -public static String TorWintorrcobf="torrcobf.txt"; -public static String Tortorrc; +
-public static int image_size; -public static int icon_size; -public static int icon_space; -public static String icon_folder;
public static String icon_folder;
static {
-if (TCPort.base_pwd != null ) -{ -BASE_DIR = TCPort.base_pwd; -} -else
- }
@@ -140,20 +138,20 @@ else Logger.log(Logger.NOTICE, "Config", "Using " + LANG_DIR + " as LANG_DIR");
- us = assign("ourId", null, prop);
@@ -178,50 +176,50 @@ else Config.icon_space = assignInt("icon_space", 2, prop);
Config.icon_folder = assign("ICON", "orginal", prop);
Logger.log(Logger.NOTICE, "Config", "Using " + ICON_DIR + " as ICON_DIR");
+ if (Config.buddyStart == 1 & Config.offlineMod == 0) {
+ if (Config.updateStart == 1 & Config.offlineMod == 0) {
+ public static void reloadSettings() { // reloads almost all settings
@@ -233,13 +231,13 @@ else } catch (IOException e) { System.err.println(e.getLocalizedMessage()); }
+ + SOCKS_PORT = assignInt("SOCKS_PORT", 11160, prop); LOCAL_PORT = assignInt("LOCAL_PORT", 8978, prop);
+
@@ -261,17 +259,17 @@ else Config.icon_size = assignInt("icon_size", 20, prop); Config.icon_space = assignInt("icon_space", 2, prop); Config.icon_folder = assign("ICON", "orginal", prop);
+ if (Config.buddyStart == 1) {
+ if (Config.updateStart == 1) {
+ Logger.log(Logger.INFO, "Config", "Using " + SOCKS_PORT + " as socks port and " + LOCAL_PORT + " as local port."); }
@@ -280,31 +278,35 @@ else public static final int KEEPALIVE_INTERVAL = (int) (Math.random()*120); //120; public static final int MAX_UNANSWERED_PINGS = 4;
public static final int CONNECT_TIMEOUT = 70;
+
public static final String CLIENT = "JTC [T2]";
+ private static int assignInt(String string, int def, Properties prop) { String x = (String) prop.get(string); int i = def;
}
public static String assign(String string, String s, Properties prop) { String x = (String) prop.get(string); String ret = s;
+ } diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java index b225695..929daaa 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java +++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/FileTransfer/FileTransfer.java @@ -16,8 +16,8 @@ import net.tsu.TCPort.util.Util;
public class FileTransfer {
private static HashMap<String, FileReceiver> receivers = new HashMap<String, FileReceiver>();
private static Listener lis;
@@ -26,7 +26,8 @@ public class FileTransfer { // wth return; }
@@ -36,6 +37,8 @@ public class FileTransfer {
private static class Listener implements IncomingCommandListener, CommandListener {
+ // Util.readTillLinebreak(is) @Override public void onCommand(Buddy buddy, String command, InputStream is) { @@ -44,7 +47,7 @@ public class FileTransfer { //Logger.oldOut.println("ft: " + command); try { if (command.startsWith("filename")) {
@@ -88,7 +91,7 @@ public class FileTransfer { String hash = Util.readStringTillChar(is, ' '); byte[] data = Util.unescape(Util.readBytesTillChar(is, '\n'));
@@ -134,11 +137,11 @@ public class FileTransfer { public void onCommand(Buddy buddy, String s) {
}}
+++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/TCPort.java
@@ -1,5 +1,6 @@ package net.tsu.TCPort;
+import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.lang.reflect.Field; @@ -12,7 +13,7 @@ import javax.swing.JTextField;
public class TCPort {
+ + public static void main(String[] args) {
- }
+ try {
+ Runtime.getRuntime().addShutdownHook(new Thread() {
@@ -62,14 +67,14 @@ public class TCPort { } } });
-TorLoader.loadTor();
+ + }, "Starting console.", "Console thread"); ThreadManager.registerWork(ThreadManager.DAEMON, new Runnable() {
@@ -136,7 +141,7 @@ TorLoader.loadTor(); public void run() { while (true) {
try {
+ if (Config.nowstart != "") { BuddyList.loadBuddiesRemote(Config.nowstart); @@ -145,21 +150,21 @@ TorLoader.loadTor(); if (Config.nowstartupdate != "") {
Config.LastCheck = Update.loadUpdate(Config.nowstartupdate);
+ + if (Config.LastCheck != "close") {
}
+ if (b.getStatus() >= Buddy.ONLINE && (b.ourSock == null || b.theirSock == null || b.ourSock.isClosed() || b.theirSock.isClosed())) { if (b.ourSock != null) b.ourSock.close(); @@ -198,7 +203,7 @@ TorLoader.loadTor(); } if (b.ourSock != null && b.theirSock != null && b.recievedPong && b.getTimeSinceLastStatus() > (Config.KEEPALIVE_INTERVAL - 20) * 1000) b.sendStatus(); // Sends status every 100 seconds supposed to be every
diff --git a/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java b/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java index e498dc4..7c94ded 100644 --- a/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java +++ b/jtorchat 0.7.7/data/src/net/tsu/TCPort/TorLoader.java @@ -9,6 +9,7 @@ import java.util.Scanner;
public class TorLoader {
@@ -20,227 +21,226 @@ public class TorLoader {
- else {
- "Start portable tor in *nix or linux");
- }
- Logger.log(Logger.INFO, "Tor", l);
- }}}}}}
- try { // testing other tor
- new Socket("127.0.0.1", Config.SOCKS_PORT);
- }
- }
- }
+ + +
- }
- tl.dispose();
- }}
}, "Starting Tor.", "Tor Monitor Thread");
}
public static void cleanUp() { synchronized(loadLock) { loadLock.notifyAll(); }
}
1.7.5.4