fixed packages

README.md

@@ -12,7 +12,7 @@ If you have any ideas please submit a request (I am totally not a Java guy so...
 - [x] updateLeafToRoot
 - [x] getDigest
 
-#### com.flashwifi.flashwrapper.Model.Transfer
+#### Transfer
 - [x] prepare
 - [x] compose
 - [x] close (needs testing)
@@ -28,7 +28,7 @@ If you have any ideas please submit a request (I am totally not a Java guy so...
 1. Clone repo
 2. Update maven ressources
 3. That's it.
-4. You can run a test transaction by running the main func in the com.flashwifi.flashwrapper.Main Class.
+4. You can run a test transaction by running the main func in the Main Class.
 
 
 

src/main/java/iotaFlashWrapper/Helpers.java

@@ -1,6 +1,6 @@
-package com.flashwifi.flashwrapper;
+package iotaFlashWrapper;
 
-import com.flashwifi.flashwrapper.Model.*;
+import iotaFlashWrapper.Model.*;
 
 
 import java.util.ArrayList;
@@ -76,7 +76,7 @@ public class Helpers {
     public static void applyTransfers(UserObject user, ArrayList<Bundle> bundles) {
         FlashObject flash = IotaFlashBridge.applyTransfersToUser(user, bundles);
         user.setFlash(flash);
-        //        com.flashwifi.flashwrapper.IotaFlashBridge.applyTransfers(
+        //        IotaFlashBridge.applyTransfers(
 //                user.getFlash().getRoot(),
 //                user.getFlash().getDeposits(),
 //                user.getFlash().getOutputs(),

src/main/java/iotaFlashWrapper/IotaFlashBridge.java

@@ -1,8 +1,7 @@
-package com.flashwifi.flashwrapper;
-
-import com.flashwifi.flashwrapper.Model.*;
+package iotaFlashWrapper;
 import com.eclipsesource.v8.*;
 import com.eclipsesource.v8.utils.V8ObjectUtils;
+import iotaFlashWrapper.Model.*;
 
 
 import java.io.IOException;
@@ -32,7 +31,7 @@ public class IotaFlashBridge {
         transfer = (V8Object) engine.executeScript("iotaFlash.transfer");
         helper = (V8Object) engine.executeScript("Helper");
 
-        com.flashwifi.flashwrapper.Model.Console console = new com.flashwifi.flashwrapper.Model.Console();
+        Console console = new Console();
         V8Object v8Console = new V8Object(engine);
         engine.add("console", v8Console);
         v8Console.registerJavaMethod(console, "log", "log", new Class<?>[] { String.class });

src/main/java/iotaFlashWrapper/IotaFlashInterface.java

@@ -1,9 +1,9 @@
-package com.flashwifi.flashwrapper;
+package iotaFlashWrapper;
 
-import com.flashwifi.flashwrapper.Model.Bundle;
-import com.flashwifi.flashwrapper.Model.Digest;
-import com.flashwifi.flashwrapper.Model.MultisigAddress;
-import com.flashwifi.flashwrapper.Model.Transfer;
+import iotaFlashWrapper.Model.Bundle;
+import iotaFlashWrapper.Model.Digest;
+import iotaFlashWrapper.Model.MultisigAddress;
+import iotaFlashWrapper.Model.Transfer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +14,7 @@ public interface IotaFlashInterface {
 
     public void updateLeafToRoot(MultisigAddress root);
 
-    // com.flashwifi.flashwrapper.Model.Transfer
+    // Transfer
     public Object prepare(ArrayList<String> settlementAddresses, ArrayList<Integer> deposits, int index, ArrayList<Transfer> transfers);
     public List<Object> compose(int balance, ArrayList<Integer> deposits, ArrayList<Transfer> outputs, MultisigAddress root, String remainderAddress, ArrayList<Bundle> history, ArrayList<Transfer> transfers, boolean close);
 

src/main/java/iotaFlashWrapper/Main.java

@@ -1,6 +1,6 @@
-package com.flashwifi.flashwrapper;
+package iotaFlashWrapper;
 
-import com.flashwifi.flashwrapper.Model.*;
+import iotaFlashWrapper.Model.*;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -134,7 +134,7 @@ public class Main {
 /*
 
         // Supplying the CORRECT varibles to create a closing bundle
-                bundles = com.flashwifi.flashwrapper.Helpers.createTransaction(
+                bundles = Helpers.createTransaction(
                         oneFlash,
                         oneFlash.getFlash().getSettlementAddresses(),
                         true
@@ -144,10 +144,10 @@ public class Main {
         /// SIGN BUNDLES
 
         // Get signatures for the bundles
-                oneSignatures = com.flashwifi.flashwrapper.Helpers.signTransaction(oneFlash, bundles)
+                oneSignatures = Helpers.signTransaction(oneFlash, bundles)
 
         // Generate USER TWO'S Singatures
-                twoSignatures = com.flashwifi.flashwrapper.Helpers.signTransaction(twoFlash, bundles)
+                twoSignatures = Helpers.signTransaction(twoFlash, bundles)
 
         // Sign bundle with your USER ONE'S signatures
                 signedBundles = transfer.appliedSignatures(bundles, oneSignatures)
@@ -159,12 +159,12 @@ public class Main {
         /// APPLY SIGNED BUNDLES
 
         // Apply transfers to User ONE
-                oneFlash = com.flashwifi.flashwrapper.Helpers.applyTransfers(oneFlash, signedBundles)
+                oneFlash = Helpers.applyTransfers(oneFlash, signedBundles)
         // Save latest channel bundles
                 oneFlash.bundles = signedBundles
 
         // Apply transfers to User TWO
-                twoFlash = com.flashwifi.flashwrapper.Helpers.applyTransfers(twoFlash, signedBundles)
+                twoFlash = Helpers.applyTransfers(twoFlash, signedBundles)
         // Save latest channel bundles
                 twoFlash.bundles = signedBundles
 

src/main/java/iotaFlashWrapper/Model/Bundle.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/iotaFlashWrapper/Model/Console.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 
 public class Console {

src/main/java/iotaFlashWrapper/Model/CreateTransactionHelperObject.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 public class CreateTransactionHelperObject {
     private int generate = 0;

src/main/java/iotaFlashWrapper/Model/Digest.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/iotaFlashWrapper/Model/FlashObject.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/iotaFlashWrapper/Model/MultisigAddress.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import com.eclipsesource.v8.V8;
 import com.eclipsesource.v8.V8Object;

src/main/java/iotaFlashWrapper/Model/Signature.java

@@ -1,10 +1,10 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This class represents an com.flashwifi.flashwrapper.Model.Signature.
+ * This class represents an Signature.
  *
  * @author Adrian
  **/
@@ -15,7 +15,7 @@ public class Signature {
     private List<String> signatureFragments;
 
     /**
-     * Initializes a new instance of the com.flashwifi.flashwrapper.Model.Signature class.
+     * Initializes a new instance of the Signature class.
      */
     public Signature() {
         this.signatureFragments = new ArrayList<>();

src/main/java/iotaFlashWrapper/Model/Transaction.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/iotaFlashWrapper/Model/Transfer.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import com.google.gson.Gson;
 

src/main/java/iotaFlashWrapper/Model/UserObject.java

@@ -1,4 +1,4 @@
-package com.flashwifi.flashwrapper.Model;
+package iotaFlashWrapper.Model;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/iotaFlashWrapper/V8Converter.java

@@ -1,10 +1,10 @@
-package com.flashwifi.flashwrapper;
+package iotaFlashWrapper;
 
-import com.flashwifi.flashwrapper.Model.*;
 import com.eclipsesource.v8.V8;
 import com.eclipsesource.v8.V8Array;
 import com.eclipsesource.v8.V8Object;
 import com.eclipsesource.v8.utils.V8ObjectUtils;
+import iotaFlashWrapper.Model.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;