Remove and refactor xstream

Author: luis-c465

AccountConverter.pde

@@ -2,28 +2,24 @@ import java.util.*;
 import java.lang.reflect.Field;
 import processing.sound.*;
 
-import com.thoughtworks.xstream.*;
-import com.thoughtworks.xstream.security.*;
 import controlP5.*;
 
 String username;
 String password;
 
-// * DB
-XStream x = new XStream(new StaxDriver());
-PersistenceStrategy strategy;
-XmlArrayList l;
+ArrayList<Account> accounts = new ArrayList<Account>();
 
 // * Util classes
 Assets a = new Assets();
 Variables v = new Variables();
-TransitionIn transitionIn = new TransitionIn(a, v);
-TransitionOut transitionOut = new TransitionOut(a, v);
+
+TransitionIn transitionIn = new TransitionIn(this);
+TransitionOut transitionOut = new TransitionOut(this);
 
 // * Game classes
 // Table table = new Table(a, v);
-Intro intro = new Intro(a, v);
-SignIn signIn = new SignIn(a, v);
+Intro intro = new Intro(this);
+SignIn signIn = new SignIn(this);
 
 void setup() {
   size(1000, 1000);
@@ -40,23 +36,10 @@ void setup() {
   a._setup(this);
   v._setup();
 
-  // * SETUP DB
-  x.addPermission(AnyTypePermission.ANY);
-  strategy = new FilePersistenceStrategy(new File("/tmp"), x);
-
-  l = new XmlArrayList(strategy);
-  x.alias("account", Account.class);
-
-  x.registerConverter(new AccountConverter());
-  println("Amount of accounts" + l.size());
-  if (l.size() == 0) {
-    setupAccounts();
-  }
-
   // Setup inputs
   v.cp5 = new ControlP5(this);
   signIn.setup();
-
+  setupAccounts();
 
   // * SETUP CLASSES
 }
@@ -114,10 +97,10 @@ void setupAccounts() {
   Account y = new Account("y", 500, "Yellow");
   Account black = new Account("b", 8000, "Black");
 
-  l.add(sam);
-  l.add(r);
-  l.add(b);
-  l.add(g);
-  l.add(y);
-  l.add(black);
+  accounts.add(sam);
+  accounts.add(r);
+  accounts.add(b);
+  accounts.add(g);
+  accounts.add(y);
+  accounts.add(black);
 }

BankApp.pde

@@ -31,9 +31,7 @@ public abstract class Btn extends Obj {
 
   public boolean clicked = false;
 
-  public Btn(Assets a, Variables v) {
-    super(a, v);
-  }
+  public Btn(BankApp app) { super(app); }
 
   public void setup(){
     _setup();

Btn.pde

@@ -45,5 +45,5 @@ public class Intro extends Obj {
     }
   }
 
-  public Intro(Assets a, Variables v) { super(a, v); }
+  public Intro(BankApp app) { super(app); }
 }

Intro.pde

@@ -4,10 +4,12 @@
 public abstract class Obj {
   private Assets a;
   private Variables v;
+  private BankApp app;
 
-  public Obj(Assets a, Variables v) {
-    this.a = a;
-    this.v = v;
+  public Obj(BankApp app) {
+    this.a = app.a;
+    this.v = app.v;
+    this.app = app;
   }
 
   public void setup() {

Obj.pde

@@ -35,5 +35,5 @@ public class SignIn extends Obj {
     image(a.signIn, 0, 0);
   }
 
-  public SignIn(Assets a, Variables v) { super(a, v); }
+  public SignIn(BankApp app) { super(app); }
 }

SignIn.pde

@@ -14,5 +14,5 @@ public class Table extends Obj {
     rect(0, start, v.w, v.h);
   }
 
-  public Table(Assets a, Variables v) { super(a, v); }
+  public Table(BankApp app) { super(app); }
 }

Table.pde

@@ -74,5 +74,5 @@ public abstract class Transition extends Obj {
     beforeDone = false;
   }
 
-  public Transition(Assets a, Variables v) { super(a, v); }
+  public Transition(BankApp app) { super(app); }
 }

Transition.pde

@@ -4,8 +4,8 @@
  * The update method should be called durring each draw for this to work
  */
 public class TransitionIn extends Transition {
-  public TransitionIn(Assets a, Variables v) {
-    super(a, v);
+  public TransitionIn(BankApp app) {
+    super(app);
     v.transIn = this;
 
     starting_opacity = 0;
@@ -14,4 +14,5 @@ public class TransitionIn extends Transition {
     up = true;
     step = 8;
   }
+
 }

TransitionIn.pde

@@ -1,6 +1,6 @@
 public class TransitionOut extends Transition {
-  public TransitionOut(Assets a, Variables v) {
-    super(a, v);
+  public TransitionOut(BankApp app) {
+    super(app);
     v.transOut = this;
 
     starting_opacity = 255;