summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/serverconnection
diff options
context:
space:
mode:
authorSimon Rettberg2014-07-07 15:12:44 +0200
committerSimon Rettberg2014-07-07 15:12:44 +0200
commitdaa49262e30bfa3e10f411c18a2034ca48dcb3c2 (patch)
tree3108962e085b10e053d6a3c9e96692c683f75653 /src/main/java/org/openslx/imagemaster/serverconnection
parentAdd port to up- and download thingis (diff)
downloadmasterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.tar.gz
masterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.tar.xz
masterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.zip
more TODOs
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serverconnection')
-rw-r--r--src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java3
-rw-r--r--src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
index 1c12e70..61edf86 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
@@ -40,6 +40,7 @@ public class ConnectionHandler implements IncomingEvent
private static Map<String, ConnectionData> activeListeners = new HashMap<>();
private static List<Integer> possiblePorts = new LinkedList<>();
private static IncomingEvent eventHandler = new ConnectionHandler();
+ // TODO: There should only ever be one Listener instance in the whole application, running on a fixed port
static {
possiblePorts.add( 1234 );
@@ -138,7 +139,7 @@ public class ConnectionHandler implements IncomingEvent
// check if he was a downloading client
if ( activeListeners.get( token ).type == ConnectionData.UPLOADING ) {
- uploader.sendErrorCode( "You can not download, if you are uploading." );
+ uploader.sendErrorCode( "You can not download, if you are uploading." ); // TODO: Why not?
uploader.close();
return;
}
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java b/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java
index bf851bc..71e0b46 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java
@@ -24,6 +24,9 @@ public class UploadingImageInfos
* The missing blocks that need to be uploaded by the satellite.
*/
private List<Integer> missingBlocks;
+ // TODO: Do we have synchronization with the db yet? The list of missing blocks should
+ // be written to the DB periodically so when the server restarts we know which blocks are already
+ // complete...
/**
* The list of blocks that the satellite received last.
* (This could be used to tell the CRCChecker to check these blocks.
@@ -46,7 +49,8 @@ public class UploadingImageInfos
this.crcFilename = crcFilename;
}
- protected void removeBlock( int number )
+ protected void removeBlock!result ) {
+ /*( int number )
{
this.missingBlocks.remove( number );
}