changed something when working on PKI CLI in SharkMessenger. Mostly, util functions.

Author: thsc42

src/main/java/net/sharksystem/asap/ASAPEncounterManagerImpl.java

@@ -1,7 +1,7 @@
 package net.sharksystem.asap;
 
 import net.sharksystem.SharkException;
-import net.sharksystem.asap.fs.ExtraDataFS;
+import net.sharksystem.fs.ExtraDataFS;
 import net.sharksystem.asap.protocol.ASAPConnection;
 import net.sharksystem.asap.protocol.ASAPConnectionListener;
 import net.sharksystem.asap.utils.ASAPSerialization;

src/main/java/net/sharksystem/asap/apps/TCPServerSocketAcceptor.java

@@ -13,14 +13,19 @@ public class TCPServerSocketAcceptor implements StreamPairCreatedListener {
     private final ASAPEncounterManager encounterManager;
     private final SocketFactory socketFactory;
 
-    public TCPServerSocketAcceptor(int portNumber, ASAPEncounterManager encounterManager) throws IOException {
+    public TCPServerSocketAcceptor(int portNumber, ASAPEncounterManager encounterManager, boolean remainOpen)
+            throws IOException {
         this.encounterManager = encounterManager;
-        this.socketFactory = new SocketFactory(portNumber, this);
+        this.socketFactory = new SocketFactory(portNumber, this, remainOpen);
 
         Log.writeLog(this, "start socket factory - no race condition assumed");
         new Thread(socketFactory).start();
     }
 
+    public TCPServerSocketAcceptor(int portNumber, ASAPEncounterManager encounterManager) throws IOException {
+        this(portNumber, encounterManager, false);
+    }
+
     public void close() throws IOException {
         this.socketFactory.close();
     }

src/main/java/net/sharksystem/asap/cmdline/CmdLineUI.java

@@ -4,7 +4,7 @@
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.engine.ASAPInternalStorage;
 import net.sharksystem.asap.engine.*;
-import net.sharksystem.utils.fs.FSUtils;
+import net.sharksystem.fs.FSUtils;
 
 import java.io.*;
 import java.util.*;

src/main/java/net/sharksystem/asap/engine/ASAPChunkStorageFS.java

@@ -6,7 +6,7 @@
 import net.sharksystem.asap.ASAPChunkStorage;
 import net.sharksystem.asap.ASAPMessages;
 import net.sharksystem.utils.Log;
-import net.sharksystem.utils.fs.FSUtils;
+import net.sharksystem.fs.FSUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;

src/main/java/net/sharksystem/asap/engine/ASAPInternalPeer.java

@@ -5,7 +5,7 @@
 import net.sharksystem.asap.ASAPSecurityException;
 import net.sharksystem.asap.protocol.*;
 import net.sharksystem.asap.crypto.ASAPKeyStore;
-import net.sharksystem.asap.fs.ExtraData;
+import net.sharksystem.fs.ExtraData;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/main/java/net/sharksystem/asap/engine/ASAPInternalPeerFS.java

@@ -3,8 +3,8 @@
 import net.sharksystem.SharkException;
 import net.sharksystem.asap.ASAPEncounterConnectionType;
 import net.sharksystem.asap.crypto.*;
-import net.sharksystem.asap.fs.ExtraData;
-import net.sharksystem.asap.fs.ExtraDataFS;
+import net.sharksystem.fs.ExtraData;
+import net.sharksystem.fs.ExtraDataFS;
 import net.sharksystem.utils.*;
 import net.sharksystem.asap.ASAP;
 import net.sharksystem.asap.ASAPException;
@@ -711,4 +711,9 @@ public void putExtra(CharSequence key, byte[] value) throws IOException, SharkEx
     public byte[] getExtra(CharSequence key) throws IOException, SharkException {
         return this.getExtraData().getExtra(key);
     }
+
+    @Override
+    public void removeAll() throws IOException, SharkException {
+        this.getExtraData().removeAll();
+    }
 }

…a/net/sharksystem/asap/fs/ExtraData.java …n/java/net/sharksystem/fs/ExtraData.javasrc/main/java/net/sharksystem/asap/fs/ExtraData.java renamed to src/main/java/net/sharksystem/fs/ExtraData.java src/main/java/net/sharksystem/asap/fs/ExtraData.java renamed to src/main/java/net/sharksystem/fs/ExtraData.java

@@ -1,10 +1,14 @@
-package net.sharksystem.asap.fs;
+package net.sharksystem.fs;
 
 import net.sharksystem.SharkException;
 
 import java.io.IOException;
 
 public interface ExtraData {
+    // remember a parameter with a key
     void putExtra(CharSequence key, byte[] value) throws IOException, SharkException;
+    // get a parameter by a key
     byte[] getExtra(CharSequence key) throws IOException, SharkException;
+    // remove all data
+    void removeAll() throws IOException, SharkException;
 }

…net/sharksystem/asap/fs/ExtraDataFS.java …java/net/sharksystem/fs/ExtraDataFS.javasrc/main/java/net/sharksystem/asap/fs/ExtraDataFS.java renamed to src/main/java/net/sharksystem/fs/ExtraDataFS.java src/main/java/net/sharksystem/asap/fs/ExtraDataFS.java renamed to src/main/java/net/sharksystem/fs/ExtraDataFS.java

@@ -1,4 +1,4 @@
-package net.sharksystem.asap.fs;
+package net.sharksystem.fs;
 
 import net.sharksystem.SharkException;
 import net.sharksystem.asap.ASAPException;
@@ -17,7 +17,6 @@ public class ExtraDataFS implements ExtraData {
 
     public ExtraDataFS(CharSequence rootFolderName) throws SharkException, IOException {
         this(rootFolderName, EXTRA_FILE_EXTENSION);
-
     }
 
     public ExtraDataFS(CharSequence rootFolder, CharSequence fileName) throws IOException, SharkException {
@@ -147,4 +146,9 @@ public byte[] getExtra(CharSequence key) throws IOException, SharkException {
         this.restoreExtraData();
         return this.extraData.get(key);
     }
+
+    @Override
+    public void removeAll() {
+        this.getExtraFile().delete();
+    }
 }

…va/net/sharksystem/utils/fs/FSUtils.java …ain/java/net/sharksystem/fs/FSUtils.javasrc/main/java/net/sharksystem/utils/fs/FSUtils.java renamed to src/main/java/net/sharksystem/fs/FSUtils.java src/main/java/net/sharksystem/utils/fs/FSUtils.java renamed to src/main/java/net/sharksystem/fs/FSUtils.java

@@ -1,4 +1,4 @@
-package net.sharksystem.utils.fs;
+package net.sharksystem.fs;
 
 import net.sharksystem.utils.Log;
 

src/main/java/net/sharksystem/utils/Utils.java

@@ -3,10 +3,8 @@
 import net.sharksystem.asap.ASAP;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 public class Utils {
     public static String url2FileName(String url) {
@@ -120,4 +118,9 @@ public static String byteArray2String(byte[] b) {
 
         return sb.toString();
     }
+
+    public static String calendar2String(Calendar calendarObject) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS Z");
+        return dateFormat.format(calendarObject.getTime());
+    }
 }