package org.multibit.hd.core.dto;

import com.google.bitcoin.core.Wallet;

/**
 * <p>Data object wrapping a Wallet and WalletId
 *  
 */
public class WalletData {

  private final Wallet wallet;

  private final WalletId walletId;

  private CharSequence password;

  public WalletData(WalletId walletId, Wallet wallet) {

    this.walletId = walletId;
    this.wallet = wallet;
  }

  public Wallet getWallet() {
    return wallet;
  }

  public WalletId getWalletId() {
    return walletId;
  }

  public CharSequence getPassword() {
    return password;
  }

  public void setPassword(CharSequence password) {
    this.password = password;
  }

  @Override
  public String toString() {
    return "WalletData{" +
            "walletId=" + walletId +
            ", wallet=" + wallet +
            '}';
  }
}

@@ -120,20 +120,39 @@
 WalletId
-%0A * 
+%3C/p%3E%0A *%0A * @since 0.0.1
 %C2%A0%0A */%0Apu
@@ -244,16 +244,71 @@
 letId;%0A%0A
+  private String name;%0A%0A  private String description;%0A%0A
   privat
@@ -715,16 +715,431 @@
 d;%0A  %7D%0A%0A
+  /**%0A   * @return The wallet name (e.g. %22ACME Ltd%22)%0A   */%0A  public String getName() %7B%0A    return name;%0A  %7D%0A%0A  public void setName(String name) %7B%0A    this.name = name;%0A  %7D%0A%0A  /**%0A   * @return The longer description (e.g. %22The ACME Ltd business wallet%22)%0A   */%0A  public String getDescription() %7B%0A    return description;%0A  %7D%0A%0A  public void setDescription(String description) %7B%0A    this.description = description;%0A  %7D%0A%0A
   @Overr
@@ -1204,23 +1204,46 @@
 +%0A      
+%22wallet=%22 + wallet +%0A
       %22
+, 
 walletId
@@ -1268,43 +1268,108 @@
     
-      %22, wallet=%22 + wallet +%0A      
+%22, name='%22 + name + '%5C'' +%0A      %22, description='%22 + description + '%5C'' +%0A      %22, password=****%22 +%0A
     

Add name, description fields to WalletData