This commit is contained in:
saftan 2023-06-02 16:39:20 +02:00
parent 0d5adfc10f
commit cbfbf5a8d8
4 changed files with 17 additions and 23 deletions

View File

@ -158,10 +158,10 @@ public class SSAccountGroup implements Serializable {
return toString("");
}
public String toString(String Seperator) {
public String toString(String separator) {
StringBuilder sb = new StringBuilder();
sb.append(Seperator);
sb.append(separator);
sb.append(iId);
sb.append(": ");
sb.append(getTitle());
@ -173,7 +173,7 @@ public class SSAccountGroup implements Serializable {
if (iGroups != null) {
sb.append("{\n");
for (SSAccountGroup iGroup : iGroups) {
sb.append(iGroup.toString(Seperator + " "));
sb.append(iGroup.toString(separator + " "));
}
sb.append(" }\n");
}

View File

@ -27,6 +27,8 @@ public class SSAccountSchema implements Serializable {
private List<SSAccountGroup> iBalanceGroups;
private static Map<String, SSAccountSchema> iSchemaCache = new HashMap<String, SSAccountSchema>();
/**
*
*/
@ -69,7 +71,6 @@ public class SSAccountSchema implements Serializable {
return sb.toString();
}
private static Map<String, SSAccountSchema> iSchemaCache = new HashMap<String, SSAccountSchema>();
/**
*
@ -124,9 +125,7 @@ public class SSAccountSchema implements Serializable {
try {
iReader.parse(new InputSource(is));
} catch (SAXException ex) {
ex.printStackTrace();
} catch (IOException ex) {
} catch (SAXException | IOException ex) {
ex.printStackTrace();
}
return iSchema;
@ -239,15 +238,12 @@ public class SSAccountSchema implements Serializable {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(
"se.swedsoft.bookkeeping.calc.data.SSAccountSchema.AccountGroupLoader");
sb.append("{iLevelOne=").append(iLevelOne);
sb.append(", iLevelTwo=").append(iLevelTwo);
sb.append(", iSchema=").append(iSchema);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.calc.data.SSAccountSchema.AccountGroupLoader" +
"{iLevelOne=" + iLevelOne +
", iLevelTwo=" + iLevelTwo +
", iSchema=" + iSchema +
'}';
}
}
}

View File

@ -109,14 +109,15 @@ public class SSOwnReportAccountGroup {
}
public String toString() {
return toString("");
return iName;
//return toString("");
}
public String toString(String Seperator) {
public String toString(String separator) {
/* StringBuilder sb = new StringBuilder();
sb.append(Seperator);
sb.append(separator);
sb.append( iId );
sb.append(": ");
sb.append( getTitle() );
@ -128,7 +129,7 @@ public class SSOwnReportAccountGroup {
if(iGroups != null){
sb.append("{\n");
for(SSAccountGroup iGroup : iGroups ){
sb.append(iGroup.toString(Seperator + " ") );
sb.append(iGroup.toString(separator + " ") );
}
sb.append(" }\n");
}

View File

@ -1,12 +1,9 @@
package se.swedsoft.bookkeeping.data;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
public class SSOrderSet {
private List<SSOrder> iOrders;
private final List<SSOrder> iOrders;
public SSOrderSet(List<SSOrder> orderList) {
iOrders = orderList;