Changeset 732

Timestamp:

01/21/14 15:24:08 (10 years ago)

Author:

jts21

Message:

Implement settings for FrameShareTimeout and StartFrame. StartFrame does not currently support returning to the last visited frame

Location:

trunk/src/org/expeditee

Files:

• gui/Browser.java (modified) (1 diff)
• network/FrameShare.java (modified) (5 diffs)
• settings/UserSettings.java (modified) (1 diff)
• settings/network/NetworkSettings.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -290 +290 @@
                         // Go to the start frame if specified, otherwise go to the profile frame
                         Frame start = null;
+                        if(_startFrame == null) {
+                                _startFrame = UserSettings.StartFrame.get();
+                                if(_startFrame != null && !Character.isDigit(_startFrame.charAt(_startFrame.length() - 1)))
+                                        _startFrame = _startFrame + "1";
+                        }
                 if((start = FrameIO.LoadFrame(_startFrame)) != null) {
                         // Make sure HomeFrame gets set

trunk/src/org/expeditee/network/FrameShare.java

@@ -24 +24 @@
 import org.expeditee.io.FrameWriter;
 import org.expeditee.items.Text;
+import org.expeditee.settings.network.NetworkSettings;
 
 public class FrameShare {
 
         public static boolean disableNetworking = false;
-        
-        private static final int SOCKET_TIMEOUT = 1000;
 
         private static Collection<DefaultServer> _servers = new LinkedList<DefaultServer>();
@@ -151 +150 @@
                         // get a datagram socket
                         DatagramSocket socket = new DatagramSocket();
-                        socket.setSoTimeout(SOCKET_TIMEOUT * 2);
+                        socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get() * 2);
                         if (peerName == null) {
                                 for (Peer peer : _peers.values()) {
@@ -241 +240 @@
                         // get a datagram socket
                         DatagramSocket socket = new DatagramSocket(_port - 1);
-                        socket.setSoTimeout(SOCKET_TIMEOUT);
+                        socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get());
 
                         // message = peerName + " says " + message;
@@ -288 +287 @@
                         // get a datagram socket
                         DatagramSocket socket = new DatagramSocket(_port - 2);
-                        socket.setSoTimeout(SOCKET_TIMEOUT);
+                        socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get());
 
                         try {
@@ -323 +322 @@
                 try {
                         socket = new DatagramSocket(_port - 3);
-                        socket.setSoTimeout(SOCKET_TIMEOUT);
+                        socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get());
 
                         byte[] contentsBuf = frameset.getBytes();

trunk/src/org/expeditee/settings/UserSettings.java

@@ -45 +45 @@
         public static final IntegerSetting Gravity = new IntegerSetting("Distance the cursor has to be from a text item to select the text item", 3);
         
+        public static final StringSetting StartFrame = new StringSetting("The frame to go to when Expeditee is started (defaults to the profile frame)", null);
+        
         /*
          * Stuff that goes first

trunk/src/org/expeditee/settings/network/NetworkSettings.java

@@ -5 +5 @@
 import org.expeditee.items.Text;
 import org.expeditee.setting.FrameSetting;
+import org.expeditee.setting.IntegerSetting;
 import org.expeditee.setting.StringSetting;
 
@@ -13 +14 @@
         
         public static final StringSetting HomePage = new StringSetting("The home page for the JfxBrowser", "https://duckduckgo.com");
+        
+        public static final IntegerSetting FrameShareTimeout = new IntegerSetting("Timeout for FrameShare socket, in milliseconds", 1000);
         
         public static final FrameSetting FrameShare = new FrameSetting("Enable accessing remote frames") {