Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-06-20 05:29:35 +00:00
Code Issues Projects Releases Wiki Activity

tidying

Browse Source
This commit is contained in:
Denis Molony 2017-03-24 22:02:52 +11:00
parent 987c91690c
commit ae4547b419
5 changed files with 134 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/bytezone/diskbrowser/visicalc/AbstractValue.java
View File

@ -6,19 +6,19 @@ import java.util.List;
public abstract class AbstractValue implements Value//, Iterable<Value>
{
protected static final String FMT4 = "| %-9.9s : %-49.49s %-8.8s %-10.10s|%n";
protected static final String FMT2 = "| %-9.9s : %-69.69s|%n";
protected static final String FMT5 = "| %-9.9s : %-3.3s : %-44.44s%-8.8s %-10.10s|%n";
protected static final String LINE =
"+----------------------------------------------------------"
+ "------------------------+";
protected static final String FMT2 = "| %-9.9s : %-70.70s|%n";
protected static final String FMT4 = "| %-9.9s : %-50.50s %-8.8s %-10.10s|%n";
protected static final String FMT5 = "| %-9.9s : %-3.3s : %-45.45s%-8.8s %-10.10s|%n";
protected static final String LINE = "+--------------------------------------------"
+ "---------------------------------------+";
protected final Cell cell;
protected final String fullText;
protected ValueType valueType = ValueType.NUMBER; // could be BOOLEAN
protected double value;
protected boolean bool;
protected ValueType valueType = ValueType.NUMBER; // could be BOOLEAN
protected ValueResult valueResult = ValueResult.VALID;
protected List<Value> values = new ArrayList<Value> ();

256
src/com/bytezone/diskbrowser/visicalc/Cell.java
View File

@ -33,66 +33,8 @@ class Cell implements Value, Comparable<Cell>
cellType = CellType.EMPTY;
}
void reset ()
{
calculated = false;
}
Cell getCell (Address address)
{
return parent.getCell (address);
}
Cell getCell (String addressText)
{
return parent.getCell (addressText);
}
boolean cellExists (Address address)
{
return parent.cellExists (address);
}
Function getFunction (String text)
{
return parent.getFunction (this, text);
}
Value getExpressionValue (String text)
{
return new Expression (this, text).reduce ();
}
boolean isCellType (CellType cellType)
{
return this.cellType == cellType;
}
Sheet getParent ()
{
return parent;
}
Address getAddress ()
{
return address;
}
String getAddressText ()
{
return address.getText ();
}
void setFormat (String formatText)
{
// /FG - general
// /FD - default
// /FI - integer
// /F$ - two decimal places
// /FL - left justified
// /FR - right justified
// /F* - graph (histogram)
if (formatText.startsWith ("/T")) // lock titles
return;
@ -141,51 +83,24 @@ class Cell implements Value, Comparable<Cell>
setTestData (0);
}
private void setTestData (int choice)
void reset ()
{
// FUTURE.VC
if (choice == 1)
{
System.out.println ("****** Hardcoded values ******");
if (address.getRowKey () == 67)
fullText = "1000";
else if (address.getRowKey () == 131)
fullText = "10.5";
else if (address.getRowKey () == 195)
fullText = "12";
else if (address.getRowKey () == 259)
fullText = "8";
}
calculated = false;
}
// IRA.VC
if (choice == 2)
{
System.out.println ("****** Hardcoded values ******");
if (address.getRowKey () == 66)
fullText = "10";
else if (address.getRowKey () == 130)
fullText = "30";
else if (address.getRowKey () == 194)
fullText = "65";
else if (address.getRowKey () == 258)
fullText = "1000";
else if (address.getRowKey () == 386)
fullText = "15";
}
Value getExpressionValue (String text)
{
return new Expression (this, text).reduce ();
}
// CARLOAN.VC
if (choice == 3)
{
System.out.println ("****** Hardcoded values ******");
if (address.getRowKey () == 67)
fullText = "9375";
else if (address.getRowKey () == 131)
fullText = "4500";
else if (address.getRowKey () == 195)
fullText = "24";
else if (address.getRowKey () == 259)
fullText = "11.9";
}
boolean isCellType (CellType cellType)
{
return this.cellType == cellType;
}
Address getAddress ()
{
return address;
}
// format cell value for output
@ -243,6 +158,34 @@ class Cell implements Value, Comparable<Cell>
}
}
// --------------------------------------------------------------------------------//
// Sheet convenience methods
// --------------------------------------------------------------------------------//
Cell getCell (Address address)
{
return parent.getCell (address);
}
Cell getCell (String addressText)
{
return parent.getCell (addressText);
}
boolean cellExists (Address address)
{
return parent.cellExists (address);
}
Function getFunction (String text)
{
return parent.getFunction (this, text);
}
// --------------------------------------------------------------------------------//
// Value interface methods
// --------------------------------------------------------------------------------//
@Override
public void calculate ()
{
@ -259,18 +202,18 @@ class Cell implements Value, Comparable<Cell>
return cellType == CellType.VALUE ? value.isValid () : true;
}
@Override
public ValueResult getValueResult ()
{
return cellType == CellType.VALUE ? value.getValueResult () : ValueResult.VALID;
}
@Override
public ValueType getValueType ()
{
return cellType == CellType.VALUE ? value.getValueType () : ValueType.NUMBER;
}
@Override
public ValueResult getValueResult ()
{
return cellType == CellType.VALUE ? value.getValueResult () : ValueResult.VALID;
}
@Override
public double getDouble ()
{
@ -284,15 +227,9 @@ class Cell implements Value, Comparable<Cell>
}
@Override
public int size ()
public String getText ()
{
return cellType == CellType.VALUE ? value.size () : 0;
}
@Override
public Iterator<Value> iterator ()
{
return cellType == CellType.VALUE ? value.iterator () : null;
return cellType == CellType.VALUE ? value.getText () : "???";
}
@Override
@ -316,22 +253,76 @@ class Cell implements Value, Comparable<Cell>
@Override
public String getType ()
{
return "Cell " + getAddressText ();
return "Cell " + address.getText ();
}
@Override
public String getText ()
public int size ()
{
// cell points to another cell which is ERROR or NA
assert cellType == CellType.VALUE;
// assert !value.isValid ();
return value.getText ();
return cellType == CellType.VALUE ? value.size () : 0;
}
Value getValue ()
@Override
public Iterator<Value> iterator ()
{
return value;
return cellType == CellType.VALUE ? value.iterator () : null;
}
// --------------------------------------------------------------------------------//
// end of Value interface methods
// --------------------------------------------------------------------------------//
private void setTestData (int choice)
{
// FUTURE.VC
if (choice == 1)
{
System.out.println ("****** Hardcoded values ******");
if (address.getRowKey () == 67)
fullText = "1000";
else if (address.getRowKey () == 131)
fullText = "10.5";
else if (address.getRowKey () == 195)
fullText = "12";
else if (address.getRowKey () == 259)
fullText = "8";
}
// IRA.VC
if (choice == 2)
{
System.out.println ("****** Hardcoded values ******");
if (address.getRowKey () == 66)
fullText = "10";
else if (address.getRowKey () == 130)
fullText = "30";
else if (address.getRowKey () == 194)
fullText = "65";
else if (address.getRowKey () == 258)
fullText = "1000";
else if (address.getRowKey () == 386)
fullText = "15";
}
// CARLOAN.VC
if (choice == 3)
{
System.out.println ("****** Hardcoded values ******");
if (address.getRowKey () == 67)
fullText = "9375";
else if (address.getRowKey () == 131)
fullText = "4500";
else if (address.getRowKey () == 195)
fullText = "24";
else if (address.getRowKey () == 259)
fullText = "11.9";
}
}
@Override
public int compareTo (Cell o)
{
return address.compareTo (o.address);
}
@Override
@ -341,6 +332,7 @@ class Cell implements Value, Comparable<Cell>
String contents2 = "";
String valueText = "";
String line2 = "";
String rest = "";
switch (cellType)
{
@ -356,22 +348,18 @@ class Cell implements Value, Comparable<Cell>
case VALUE:
contents = fullText;
valueText = ": " + value.getValueType ();
rest = value.toString ();
break;
}
if (contents.length () > 49)
if (contents.length () > 50)
{
contents2 = contents.substring (49);
contents = contents.substring (0, 49);
line2 = String.format ("| %-69.69s|%n", contents2);
contents2 = contents.substring (50);
contents = contents.substring (0, 50);
line2 = String.format ("| %-70.70s|%n", contents2);
}
return String.format ("%s%n| %-9.9s : %-49.49s %-18.18s |%n%s", AbstractValue.LINE,
address.getText (), contents, cellType + valueText, line2);
}
@Override
public int compareTo (Cell o)
{
return address.compareTo (o.address);
return String.format ("%s%n| %-9.9s : %-50.50s %-18.18s |%n%s%s", AbstractValue.LINE,
address.getText (), contents, cellType + valueText, line2, rest);
}
}

25
src/com/bytezone/diskbrowser/visicalc/Expression.java
View File

@ -3,31 +3,8 @@ package com.bytezone.diskbrowser.visicalc;
import java.util.ArrayList;
import java.util.List;
class Expression extends AbstractValue //implements Iterable<Value>
class Expression extends AbstractValue
{
// Expressions:
// number
// cell address
// function
// expression [+-*/^] expression
// [+-] expression
// ( expression )
// From the reference card:
// Expressions are evaluated strictly from left to right except as modified by
// parentheses. You must start an expression with a +, a digit (0-9), or one of
// the symbols @-(. or #
// [@IF(@ISERROR(BK24),0,BK24)]
// [@IF(D4=0,0,1)]
// [@IF(D4=0,0,B32+1)]
// [@IF(D4=0,0,1+(D3/100/D4)^D4-1*100)]
// [@SUM(C4...F4)]
// [+C4-@SUM(C5...C12)]
// [+D5/100/12]
// [.3*(B4+B7+B8+B9)]
// [+N12+(P12*(.2*K12+K9-O12))]
private final List<String> operators = new ArrayList<String> ();
private final List<String> signs = new ArrayList<String> ();

7
src/com/bytezone/diskbrowser/visicalc/Sheet.java
View File

@ -160,7 +160,7 @@ public class Sheet
assert !line.isEmpty ();
lines.add (line);
System.out.println (line);
// System.out.println (line);
if (line.startsWith ("/"))
doFormat (line);
@ -474,16 +474,13 @@ public class Sheet
last = cell.getAddress ().getColumn ();
}
// text.append (AbstractValue.LINE + "\n");
text.append (cell);
if (cell.isCellType (CellType.VALUE))
text.append (cell.getValue ());
text.append (AbstractValue.LINE);
text.append ("\n\n");
}
text.append ("\n");
text.append ("File contents:\n\n");
for (String line : lines)
{
text.append (line);

4
src/com/bytezone/diskbrowser/visicalc/Value.java
View File

@ -22,10 +22,10 @@ interface Value extends Iterable<Value>
public double getDouble (); // if ValueType == NUMBER
public String getText (); // if ValueType == ERROR / NA / BOOLEAN
public boolean getBoolean (); // if ValueType == BOOLEAN
public String getText (); // if ValueType == ERROR / NA / BOOLEAN
public String getFullText (); // original text
public String getType (); // FUNCTION, CONDITION, EXPRESSION