moved era calculation to a central (algebra) class.

Author: thsc42

src/net/sharksystem/asap/ASAP.java

@@ -0,0 +1,19 @@
+package net.sharksystem.asap;
+
+public class ASAP {
+    public static int nextEra(int workingEra) {
+        if(workingEra == Integer.MAX_VALUE) {
+            return 0;
+        }
+
+        return workingEra+1;
+    }
+
+    public static int previousEra(int workingEra) {
+        if(workingEra == 0) {
+            return Integer.MAX_VALUE;
+        }
+
+        return workingEra-1;
+    }
+}

src/net/sharksystem/asap/ASAPChunkStorageFS.java

@@ -131,7 +131,7 @@ public ASAPMessages getASAPChunkCache(CharSequence uri, int toEra) throws IOExce
         // go back 1000 eras
         int fromEra = toEra;
         for(int i = 0; i < 1000; i++) {
-            fromEra = ASAPEngine.previousEra(fromEra);
+            fromEra = ASAP.previousEra(fromEra);
         }
 
         return this.getASAPChunkCache(uri, fromEra, toEra);

src/net/sharksystem/asap/ASAPEngine.java

@@ -678,30 +678,14 @@ public void setDropDeliveredChunks(boolean drop) throws IOException {
         this.saveStatus();
     }
 
-    static int nextEra(int workingEra) {
-        if(workingEra == Integer.MAX_VALUE) {
-            return 0;
-        }
-        
-        return workingEra+1;
-    }
-    
     @Override
     public int getNextEra(int workingEra) {
-        return ASAPEngine.nextEra(workingEra);
+        return ASAP.nextEra(workingEra);
     }
 
-    static int previousEra(int workingEra) {
-        if(workingEra == 0) {
-            return Integer.MAX_VALUE;
-        }
-        
-        return workingEra-1;
-    }
-    
     @Override
     public int getPreviousEra(int workingEra) {
-        return ASAPEngine.previousEra(workingEra);
+        return ASAP.previousEra(workingEra);
     }
 
     private int getEraStartSync(String peer) {

src/net/sharksystem/asap/ASAPInMemoMessages.java

@@ -2,7 +2,6 @@
 
 import net.sharksystem.asap.apps.ASAPMessages;
 import net.sharksystem.asap.util.Log;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -89,7 +88,7 @@ private void syncChunkList() throws IOException {
                 if (finalLoop) {
                     anotherLoop = false;
                 } else {
-                    thisEra = ASAPEngine.nextEra(thisEra);
+                    thisEra = ASAP.nextEra(thisEra);
                     finalLoop = thisEra == this.toEra;
                 }
             }

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -513,7 +513,6 @@ public void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence ur
         asapOnlineMessageSender.sendASAPAssimilateMessage(format, urlTarget, recipients, messageAsBytes, era);
     }
 
-
     private Collection<ASAPEngine> getEngines() {
         Collection<ASAPEngine> engineList = new ArrayList<>();
 

test/net/sharksystem/asap/Point2PointTests.java

@@ -431,7 +431,7 @@ public void usageWithImmediateSync() throws IOException, ASAPException, Interrup
         Assert.assertEquals(BOB2ALICE_MESSAGE, aliceReceivedMessage);
 
         // #2 is in another era
-        aliceReceivedChunk = aliceIncomingBobStorage.getChunk(ALICE_BOB_CHAT_URL, ASAPEngine.nextEra(bobInitialEra));
+        aliceReceivedChunk = aliceIncomingBobStorage.getChunk(ALICE_BOB_CHAT_URL, ASAP.nextEra(bobInitialEra));
         aliceReceivedMessages = aliceReceivedChunk.getMessages();
         aliceReceivedMessage = aliceReceivedMessages.next();
         Assert.assertEquals(BOB2ALICE_MESSAGE2, aliceReceivedMessage);
@@ -446,7 +446,7 @@ public void usageWithImmediateSync() throws IOException, ASAPException, Interrup
         Assert.assertEquals(ALICE2BOB_MESSAGE, bobReceivedMessage);
 
         // #2 - in next era
-        bobReceivedChunk = bobIncomingAliceStorage.getChunk(ALICE_BOB_CHAT_URL, ASAPEngine.nextEra(aliceInitialEra));
+        bobReceivedChunk = bobIncomingAliceStorage.getChunk(ALICE_BOB_CHAT_URL, ASAP.nextEra(aliceInitialEra));
         bobReceivedMessages = bobReceivedChunk.getMessages();
         bobReceivedMessage = bobReceivedMessages.next();
         Assert.assertEquals(ALICE2BOB_MESSAGE2, bobReceivedMessage);