Improve AccountWindow, minor refactorings

Author: mikera

convex-core/src/main/java/convex/core/Constants.java

@@ -162,7 +162,8 @@ public class Constants {
 	 */
 	public static final long PRINT_LIMIT = 4096;
 
-	public static final AString PRINT_EXCEEDED_MESSAGE = Strings.create("<<Print limit exceeded>>");
+	public static final String PRINT_EXCEEDED_STRING = "<<Print limit exceeded>>";
+	public static final AString PRINT_EXCEEDED_MESSAGE = Strings.create(PRINT_EXCEEDED_STRING);
 
 	/**
 	 * Default port for Convex Peers

convex-core/src/main/java/convex/core/data/Cells.java

@@ -166,4 +166,16 @@ public static ABlobLike<CVMLong> getEncoding(ACell a) {
 		return a.getEncoding();
 	}
 
+	/**
+	 * Get the full storage size of a value, including size of an embedded encoding
+	 * @param a
+	 * @return
+	 */
+	public static long storageSize(ACell a) {
+		if (a==null) return 1;
+		long memSize=a.getMemorySize();
+		if (a.isEmbedded()) memSize+=a.getEncodingLength();
+		return memSize;
+	}
+
 }

convex-core/src/main/java/convex/core/lang/Juice.java

@@ -4,11 +4,11 @@
 import convex.core.data.ACell;
 import convex.core.data.ACountable;
 import convex.core.data.ADataStructure;
+import convex.core.data.Cells;
 import convex.core.data.prim.ANumeric;
 import convex.core.data.prim.CVMBigInteger;
 import convex.core.data.prim.CVMDouble;
 import convex.core.transactions.ATransaction;
-import convex.core.util.Utils;
 
 /**
  * Static class defining juice costs for executable operations.
@@ -534,7 +534,7 @@ public static long calcAvailable(long balance, long juicePrice) {
 	 * @return
 	 */
 	public static long priceMemorySize(ACell a) {
-		return Juice.mul(Juice.TRANSACTION_PER_BYTE, Utils.fullMemorySize(a));
+		return Juice.mul(Juice.TRANSACTION_PER_BYTE, Cells.storageSize(a));
 	}
 
 	public static long priceTransaction(ATransaction tx) {

convex-core/src/main/java/convex/core/lang/RT.java

@@ -1036,7 +1036,9 @@ public static String toString(ACell a) {
 	 * @return Java String representation. May be "nil". May include message if print limit exceeded
 	 */
 	public static String toString(ACell a, long limit) {
-		return RT.print(a,limit).toString();
+		AString s=RT.print(a,limit);
+		if (s==null) return Constants.PRINT_EXCEEDED_STRING;
+		return s.toString();
 	}
 
 	/**

convex-core/src/main/java/convex/core/util/Utils.java

@@ -1428,18 +1428,6 @@ public static String joinStrings(List<String> strings, String separator) {
 		return sb.toString();
 	}
 
-	/**
-	 * Get the full memory size of a value, including size of an embedded encoding
-	 * @param a
-	 * @return
-	 */
-	public static long fullMemorySize(ACell a) {
-		if (a==null) return 1;
-		long memSize=a.getMemorySize();
-		if (a.isEmbedded()) memSize+=a.getEncodingLength();
-		return memSize;
-	}
-
 	/**
 	 * Long computation of (a*b)/c. Arguments and result must be in range 0..Long.MAX_VALUE
 	 * @param a First multiplicand

convex-core/src/test/java/convex/core/TransactionTest.java

@@ -29,7 +29,6 @@
 import convex.core.transactions.Multi;
 import convex.core.transactions.Transactions;
 import convex.core.transactions.Transfer;
-import convex.core.util.Utils;
 import convex.test.Samples;
 
 import static convex.test.Assertions.*;
@@ -60,7 +59,7 @@ public void testTransfer() {
 		long IBAL=state().getAccount(HERO).getBalance();
 		Transfer t1=Transfer.create(HERO, 1, VILLAIN, AMT);
 
-		long memSize=Utils.fullMemorySize(t1);
+		long memSize=Cells.storageSize(t1);
 
 		State s=apply(t1);
 		long expectedFees=(Juice.TRANSACTION+Juice.TRANSFER+Juice.TRANSACTION_PER_BYTE*memSize)*JP;

convex-core/src/test/java/convex/core/data/ObjectsTest.java

@@ -69,7 +69,7 @@ public static void doCellTests(ACell a) {
 
 	private static void doMemorySizeTests(ACell a) {
 		long ms=a.calcMemorySize();
-		long fms=Utils.fullMemorySize(a);
+		long fms=Cells.storageSize(a);
 		assertEquals(ms,a.getMemorySize());
 		int rc=a.getRefCount();
 		long elen=a.getEncodingLength();

convex-gui/src/main/java/convex/gui/actor/AccountInfoPanel.java

@@ -0,0 +1,76 @@
+package convex.gui.actor;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
+import convex.core.State;
+import convex.core.data.AccountStatus;
+import convex.core.data.Address;
+import convex.core.data.Cells;
+import convex.core.lang.RT;
+import convex.core.text.Text;
+import convex.gui.components.models.StateModel;
+import convex.gui.utils.Toolkit;
+
+@SuppressWarnings("serial")
+public class AccountInfoPanel extends JPanel {
+
+	protected Address addr;
+	protected JTextArea infoArea;
+
+	public AccountInfoPanel(StateModel<State> manager, Address address) {
+		this.addr = address;
+		setLayout(new BorderLayout(0, 0));
+
+		this.setPreferredSize(new Dimension(600, 400));
+
+		infoArea = new JTextArea();
+		add(infoArea, BorderLayout.CENTER);
+		infoArea.setBackground(null);
+		infoArea.setFont(Toolkit.SMALL_MONO_FONT);
+
+		manager.addPropertyChangeListener(e -> {
+			updateInfo((State) e.getNewValue());
+		});
+		updateInfo(manager.getValue());
+	}
+
+	private void updateInfo(State latestState) {
+
+		AccountStatus as = latestState.getAccount(addr);
+		
+		infoArea.setText(getInfoText(addr,as));
+	}
+	
+	public static String getInfoText(Address actor,AccountStatus as) {
+		if (as==null) {
+			return "Account "+actor+" does not exist in current State\n";
+		}
+		
+		StringBuilder sb = new StringBuilder();		
+		
+		sb.append("Account:        " + actor.toString() + "\n");
+		sb.append("\n");
+		sb.append("Account Key:    " + as.getAccountKey() + "\n");
+		sb.append("Sequence:       " + as.getSequence() + "\n");
+		sb.append("Balance:        " + Text.toFriendlyBalance(as.getBalance()) + "\n");
+		sb.append("Mem. Allowance: " + Text.toFriendlyNumber(as.getMemory()) + "\n");
+		sb.append("Allowance:      " + as.getMemory() + "\n");
+		sb.append("Controller:     " + as.getController() + "\n");
+		sb.append("Parent:         " + as.getParent() + "\n");
+		sb.append("Env Size:       " + RT.count(as.getEnvironment()) + "\n");
+		sb.append("Holding Size:   " + RT.count(as.getHolding(actor)) + "\n");
+		
+		sb.append("\n");
+		
+		sb.append("Storage Size:   "+Cells.storageSize(as)+"\n");
+		
+		sb.append("\n");
+		
+		return sb.toString();
+	}
+
+}

convex-gui/src/main/java/convex/gui/actor/ActorWindow.java renamed to convex-gui/src/main/java/convex/gui/actor/AccountWindow.java

@@ -12,26 +12,26 @@
 import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
-public class ActorWindow extends AbstractGUI {
-	Address contract;
+public class AccountWindow extends AbstractGUI {
+	Address account;
 
 	JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
 
-	public ActorWindow(Convex convex,StateModel<State> manager, Address contract) {
-		super ("Contract view - " + contract);
-		this.contract = contract;
+	public AccountWindow(Convex convex,StateModel<State> manager, Address account) {
+		super ("Account view - " + account);
+		this.account = account;
 		setLayout(new MigLayout());
-		AccountStatus as = manager.getValue().getAccount(contract);
+		AccountStatus as = manager.getValue().getAccount(account);
 
 		manager.addPropertyChangeListener(e -> {
 
 		});
 
 		add(tabbedPane, "dock center");
 
-		tabbedPane.add("Overview", new ActorInfoPanel(manager, contract));
-		tabbedPane.add("Environment", new StateTreePanel(as.getEnvironment()));
-		tabbedPane.add("Operations", new ActorInvokePanel(convex,manager, contract));
+		tabbedPane.add("Overview", new AccountInfoPanel(manager, account));
+		tabbedPane.add("Environment", new StateTreePanel((as==null)?null:as.getEnvironment()));
+		tabbedPane.add("Operations", new ActorInvokePanel(convex,manager, account));
 	}
 
 }