autumncleaning #4

Merged
pns11 merged 19 commits from autumncleaning into main 2022-12-25 16:52:22 +01:00
21 changed files with 226 additions and 272 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
target/
.idea/
*.swp

View File

@ -174,10 +174,7 @@ public class SSAccountPlanFrame extends SSDefaultTableFrame {
try {
iImporter.doImport();
} catch (IOException ex) {
SSErrorDialog.showDialog(getMainFrame(), "",
ex.getLocalizedMessage());
} catch (SSImportException ex) {
} catch (IOException | SSImportException ex) {
SSErrorDialog.showDialog(getMainFrame(), "",
ex.getLocalizedMessage());
}
@ -194,6 +191,7 @@ public class SSAccountPlanFrame extends SSDefaultTableFrame {
new ActionListener() {
public void actionPerformed(ActionEvent e) {
SSAccountPlan iSelected = getSelected();
assert iSelected != null;
String iName = iSelected.getName();
iSelected = getAccountPlan(iSelected);
@ -215,10 +213,7 @@ public class SSAccountPlanFrame extends SSDefaultTableFrame {
try {
iExporter.doExport(iSelected);
} catch (IOException ex) {
SSErrorDialog.showDialog(getMainFrame(), "",
ex.getLocalizedMessage());
} catch (SSExportException ex) {
} catch (IOException | SSExportException ex) {
SSErrorDialog.showDialog(getMainFrame(), "",
ex.getLocalizedMessage());
}
@ -425,13 +420,11 @@ public class SSAccountPlanFrame extends SSDefaultTableFrame {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.accountplans.SSAccountPlanFrame");
sb.append("{iModel=").append(iModel);
sb.append(", iTable=").append(iTable);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.accountplans.SSAccountPlanFrame" +
"{iModel=" + iModel +
", iTable=" + iTable +
'}';
}
}

View File

@ -122,17 +122,14 @@ public class SSImportAccountplanDialog extends SSDialog {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(
"se.swedsoft.bookkeeping.gui.accountplans.dialog.SSImportAccountplanDialog");
sb.append("{iAccountPlan=").append(iAccountPlan);
sb.append(", iButtonPanel=").append(iButtonPanel);
sb.append(", iCheckREC=").append(iCheckREC);
sb.append(", iCheckSRU=").append(iCheckSRU);
sb.append(", iCheckVAT=").append(iCheckVAT);
sb.append(", iPanel=").append(iPanel);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.accountplans.dialog.SSImportAccountplanDialog" +
"{iAccountPlan=" + iAccountPlan +
", iButtonPanel=" + iButtonPanel +
", iCheckREC=" + iCheckREC +
", iCheckSRU=" + iCheckSRU +
", iCheckVAT=" + iCheckVAT +
", iPanel=" + iPanel +
'}';
}
}

View File

@ -343,23 +343,21 @@ public class SSAccountPlanPanel {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.accountplans.panel.SSAccountPlanPanel");
sb.append("{iAccountPlan=").append(iAccountPlan);
sb.append(", iAssessementYear=").append(iAssessementYear);
sb.append(", iBase=").append(iBase);
sb.append(", iBaseLabel=").append(iBaseLabel);
sb.append(", iButtonPanel=").append(iButtonPanel);
sb.append(", iDeleteRowButton=").append(iDeleteRowButton);
sb.append(", iImportFields=").append(iImportFields);
sb.append(", iInputVerifier=").append(iInputVerifier);
sb.append(", iModel=").append(iModel);
sb.append(", iName=").append(iName);
sb.append(", iPanel=").append(iPanel);
sb.append(", iTable=").append(iTable);
sb.append(", iType=").append(iType);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.accountplans.panel.SSAccountPlanPanel" +
"{iAccountPlan=" + iAccountPlan +
", iAssessementYear=" + iAssessementYear +
", iBase=" + iBase +
", iBaseLabel=" + iBaseLabel +
", iButtonPanel=" + iButtonPanel +
", iDeleteRowButton=" + iDeleteRowButton +
", iImportFields=" + iImportFields +
", iInputVerifier=" + iInputVerifier +
", iModel=" + iModel +
", iName=" + iName +
", iPanel=" + iPanel +
", iTable=" + iTable +
", iType=" + iType +
'}';
}
}

View File

@ -441,13 +441,11 @@ public class SSCompanyFrame extends SSDefaultTableFrame {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.company.SSCompanyFrame");
sb.append("{iModel=").append(iModel);
sb.append(", iShowAtStartup=").append(iShowAtStartup);
sb.append(", iTable=").append(iTable);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.company.SSCompanyFrame" +
"{iModel=" + iModel +
", iShowAtStartup=" + iShowAtStartup +
", iTable=" + iTable +
'}';
}
}

View File

@ -369,13 +369,11 @@ public class SSCreditInvoiceFrame extends SSDefaultTableFrame {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.creditinvoice.SSCreditInvoiceFrame");
sb.append("{iModel=").append(iModel);
sb.append(", iSearchPanel=").append(iSearchPanel);
sb.append(", iTable=").append(iTable);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.creditinvoice.SSCreditInvoiceFrame" +
"{iModel=" + iModel +
", iSearchPanel=" + iSearchPanel +
", iTable=" + iTable +
'}';
}
}

View File

@ -110,13 +110,11 @@ public class SSSelectInvoiceDialog extends SSDialog {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.creditinvoice.dialog.SSSelectInvoiceDialog");
sb.append("{iButtonPanel=").append(iButtonPanel);
sb.append(", iInvoice=").append(iInvoice);
sb.append(", iPanel=").append(iPanel);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.creditinvoice.dialog.SSSelectInvoiceDialog" +
"{iButtonPanel=" + iButtonPanel +
", iInvoice=" + iInvoice +
", iPanel=" + iPanel +
'}';
}
}

View File

@ -816,54 +816,52 @@ public class SSCreditInvoicePanel {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.creditinvoice.panel.SSCreditInvoicePanel");
sb.append("{iButtonPanel=").append(iButtonPanel);
sb.append(", iCrediting=").append(iCrediting);
sb.append(", iCreditInvoice=").append(iCreditInvoice);
sb.append(", iCurrency=").append(iCurrency);
sb.append(", iCurrencyRate=").append(iCurrencyRate);
sb.append(", iCustomer=").append(iCustomer);
sb.append(", iCustomerName=").append(iCustomerName);
sb.append(", iDate=").append(iDate);
sb.append(", iDefaultAccounts=").append(iDefaultAccounts);
sb.append(", iDelayInterest=").append(iDelayInterest);
sb.append(", iDeliveryAddress=").append(iDeliveryAddress);
sb.append(", iDeliveryTerm=").append(iDeliveryTerm);
sb.append(", iDeliveryWay=").append(iDeliveryWay);
sb.append(", iEntered=").append(iEntered);
sb.append(", iEuSaleCommodity=").append(iEuSaleCommodity);
sb.append(", iEuSaleYhirdPartCommodity=").append(iEuSaleYhirdPartCommodity);
sb.append(", iInputVerifier=").append(iInputVerifier);
sb.append(", iInvoiceAddress=").append(iInvoiceAddress);
sb.append(", iModel=").append(iModel);
sb.append(", iNetSum=").append(iNetSum);
sb.append(", iNumber=").append(iNumber);
sb.append(", iOurContactPerson=").append(iOurContactPerson);
sb.append(", iPanel=").append(iPanel);
sb.append(", iPaymentTerm=").append(iPaymentTerm);
sb.append(", iRefreshVoucher=").append(iRefreshVoucher);
sb.append(", iRoundingSum=").append(iRoundingSum);
sb.append(", iSavecustomerandproducts=").append(iSavecustomerandproducts);
sb.append(", isStockInfluencing=").append(isStockInfluencing);
sb.append(", iTable=").append(iTable);
sb.append(", iTaxFree=").append(iTaxFree);
sb.append(", iTaxLabel1=").append(iTaxLabel1);
sb.append(", iTaxLabel2=").append(iTaxLabel2);
sb.append(", iTaxLabel3=").append(iTaxLabel3);
sb.append(", iTaxRate1=").append(iTaxRate1);
sb.append(", iTaxRate2=").append(iTaxRate2);
sb.append(", iTaxRate3=").append(iTaxRate3);
sb.append(", iTaxSum1=").append(iTaxSum1);
sb.append(", iTaxSum2=").append(iTaxSum2);
sb.append(", iTaxSum3=").append(iTaxSum3);
sb.append(", iText=").append(iText);
sb.append(", iTotalSum=").append(iTotalSum);
sb.append(", iVoucherTable=").append(iVoucherTable);
sb.append(", iVoucherTableModel=").append(iVoucherTableModel);
sb.append(", iYourContactPerson=").append(iYourContactPerson);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.creditinvoice.panel.SSCreditInvoicePanel" +
"{iButtonPanel=" + iButtonPanel +
", iCrediting=" + iCrediting +
", iCreditInvoice=" + iCreditInvoice +
", iCurrency=" + iCurrency +
", iCurrencyRate=" + iCurrencyRate +
", iCustomer=" + iCustomer +
", iCustomerName=" + iCustomerName +
", iDate=" + iDate +
", iDefaultAccounts=" + iDefaultAccounts +
", iDelayInterest=" + iDelayInterest +
", iDeliveryAddress=" + iDeliveryAddress +
", iDeliveryTerm=" + iDeliveryTerm +
", iDeliveryWay=" + iDeliveryWay +
", iEntered=" + iEntered +
", iEuSaleCommodity=" + iEuSaleCommodity +
", iEuSaleYhirdPartCommodity=" + iEuSaleYhirdPartCommodity +
", iInputVerifier=" + iInputVerifier +
", iInvoiceAddress=" + iInvoiceAddress +
", iModel=" + iModel +
", iNetSum=" + iNetSum +
", iNumber=" + iNumber +
", iOurContactPerson=" + iOurContactPerson +
", iPanel=" + iPanel +
", iPaymentTerm=" + iPaymentTerm +
", iRefreshVoucher=" + iRefreshVoucher +
", iRoundingSum=" + iRoundingSum +
", iSavecustomerandproducts=" + iSavecustomerandproducts +
", isStockInfluencing=" + isStockInfluencing +
", iTable=" + iTable +
", iTaxFree=" + iTaxFree +
", iTaxLabel1=" + iTaxLabel1 +
", iTaxLabel2=" + iTaxLabel2 +
", iTaxLabel3=" + iTaxLabel3 +
", iTaxRate1=" + iTaxRate1 +
", iTaxRate2=" + iTaxRate2 +
", iTaxRate3=" + iTaxRate3 +
", iTaxSum1=" + iTaxSum1 +
", iTaxSum2=" + iTaxSum2 +
", iTaxSum3=" + iTaxSum3 +
", iText=" + iText +
", iTotalSum=" + iTotalSum +
", iVoucherTable=" + iVoucherTable +
", iVoucherTableModel=" + iVoucherTableModel +
", iYourContactPerson=" + iYourContactPerson +
'}';
}
}

View File

@ -71,14 +71,11 @@ public class SSCreditInvoiceSearchPanel extends JPanel {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(
"se.swedsoft.bookkeeping.gui.creditinvoice.panel.SSCreditInvoiceSearchPanel");
sb.append("{iModel=").append(iModel);
sb.append(", iPanel=").append(iPanel);
sb.append(", iTextField=").append(iTextField);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.creditinvoice.panel.SSCreditInvoiceSearchPanel" +
"{iModel=" + iModel +
", iPanel=" + iPanel +
", iTextField=" + iTextField +
'}';
}
}

View File

@ -299,10 +299,7 @@ public class SSCustomerFrame extends SSDefaultTableFrame {
try {
iExporter.export();
} catch (IOException ex) {
SSErrorDialog.showDialog(getMainFrame(), "",
ex.getLocalizedMessage());
} catch (SSExportException ex) {
} catch (IOException | SSExportException ex) {
SSErrorDialog.showDialog(getMainFrame(), "",
ex.getLocalizedMessage());
}
@ -655,13 +652,11 @@ public class SSCustomerFrame extends SSDefaultTableFrame {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.customer.SSCustomerFrame");
sb.append("{iModel=").append(iModel);
sb.append(", iSearchPanel=").append(iSearchPanel);
sb.append(", iTable=").append(iTable);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.customer.SSCustomerFrame" +
"{iModel=" + iModel +
", iSearchPanel=" + iSearchPanel +
", iTable=" + iTable +
'}';
}
}

View File

@ -130,7 +130,7 @@ public class SSCustomerPanel {
/**
*
* @return
* @return boolean
*/
public boolean isValid() {
return iInputVerifier.isValid();
@ -138,14 +138,14 @@ public class SSCustomerPanel {
/**
*
* @return
* @return JPanel
*/
public JPanel getPanel() {
return iPanel;
}
/**
* @return
* @return SSCustomer
*/
public SSCustomer getCustomer() {
// Kund nr:
@ -227,7 +227,7 @@ public class SSCustomerPanel {
}
/**
* @param iCustomer
* @param iCustomer SSCustomer
*/
public void setCustomer(SSCustomer iCustomer) {
// Kund nr:
@ -299,7 +299,7 @@ public class SSCustomerPanel {
/**
*
* @param pActionListener
* @param pActionListener ActionListener
*/
public void addOkAction(ActionListener pActionListener) {
@ -308,7 +308,7 @@ public class SSCustomerPanel {
/**
*
* @param pActionListener
* @param pActionListener ActionListener
*/
public void addCancelAction(ActionListener pActionListener) {
iButtonPanel.addCancelActionListener(pActionListener);
@ -650,41 +650,39 @@ public class SSCustomerPanel {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.customer.panel.SSCustomerPanel");
sb.append("{iBankAccountNumber=").append(iBankAccountNumber);
sb.append(", iButtonPanel=").append(iButtonPanel);
sb.append(", iComment=").append(iComment);
sb.append(", iCreditLimit=").append(iCreditLimit);
sb.append(", iCreditLimitCurrency=").append(iCreditLimitCurrency);
sb.append(", iCustomer=").append(iCustomer);
sb.append(", iCustomerNr=").append(iCustomerNr);
sb.append(", iDeliveryAddress=").append(iDeliveryAddress);
sb.append(", iDeliveryTerm=").append(iDeliveryTerm);
sb.append(", iDeliveryWay=").append(iDeliveryWay);
sb.append(", iDiscount=").append(iDiscount);
sb.append(", iEMail=").append(iEMail);
sb.append(", iEuSaleCommodity=").append(iEuSaleCommodity);
sb.append(", iEuSaleYhirdPartCommodity=").append(iEuSaleYhirdPartCommodity);
sb.append(", iHideUnitPrice=").append(iHideUnitPrice);
sb.append(", iInputVerifier=").append(iInputVerifier);
sb.append(", iInvoiceAddress=").append(iInvoiceAddress);
sb.append(", iInvoiceCurrency=").append(iInvoiceCurrency);
sb.append(", iName=").append(iName);
sb.append(", iOrginisationNumber=").append(iOrginisationNumber);
sb.append(", iOurContactPerson=").append(iOurContactPerson);
sb.append(", iPanel=").append(iPanel);
sb.append(", iPaymentTerm=").append(iPaymentTerm);
sb.append(", iPhone=").append(iPhone);
sb.append(", iPhone2=").append(iPhone2);
sb.append(", iPlusAccountNumber=").append(iPlusAccountNumber);
sb.append(", iTelefax=").append(iTelefax);
sb.append(", iUseInvoiceForDelivery=").append(iUseInvoiceForDelivery);
sb.append(", iVatFreeSale=").append(iVatFreeSale);
sb.append(", iVATNumber=").append(iVATNumber);
sb.append(", iYourContactPerson=").append(iYourContactPerson);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.customer.panel.SSCustomerPanel" +
"{iBankAccountNumber=" + iBankAccountNumber +
", iButtonPanel=" + iButtonPanel +
", iComment=" + iComment +
", iCreditLimit=" + iCreditLimit +
", iCreditLimitCurrency=" + iCreditLimitCurrency +
", iCustomer=" + iCustomer +
", iCustomerNr=" + iCustomerNr +
", iDeliveryAddress=" + iDeliveryAddress +
", iDeliveryTerm=" + iDeliveryTerm +
", iDeliveryWay=" + iDeliveryWay +
", iDiscount=" + iDiscount +
", iEMail=" + iEMail +
", iEuSaleCommodity=" + iEuSaleCommodity +
", iEuSaleYhirdPartCommodity=" + iEuSaleYhirdPartCommodity +
", iHideUnitPrice=" + iHideUnitPrice +
", iInputVerifier=" + iInputVerifier +
", iInvoiceAddress=" + iInvoiceAddress +
", iInvoiceCurrency=" + iInvoiceCurrency +
", iName=" + iName +
", iOrginisationNumber=" + iOrginisationNumber +
", iOurContactPerson=" + iOurContactPerson +
", iPanel=" + iPanel +
", iPaymentTerm=" + iPaymentTerm +
", iPhone=" + iPhone +
", iPhone2=" + iPhone2 +
", iPlusAccountNumber=" + iPlusAccountNumber +
", iTelefax=" + iTelefax +
", iUseInvoiceForDelivery=" + iUseInvoiceForDelivery +
", iVatFreeSale=" + iVatFreeSale +
", iVATNumber=" + iVATNumber +
", iYourContactPerson=" + iYourContactPerson +
'}';
}
}

View File

@ -66,13 +66,11 @@ public class SSCustomerSearchPanel extends JPanel {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.customer.panel.SSCustomerSearchPanel");
sb.append("{iModel=").append(iModel);
sb.append(", iPanel=").append(iPanel);
sb.append(", iTextField=").append(iTextField);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.customer.panel.SSCustomerSearchPanel" +
"{iModel=" + iModel +
", iPanel=" + iPanel +
", iTextField=" + iTextField +
'}';
}
}

View File

@ -27,7 +27,7 @@ public class SSHelpFrame extends JFrame {
/**
*
* @return
* @return SSHelpFrame
*/
public static SSHelpFrame getInstance() {
return cInstance;
@ -35,9 +35,9 @@ public class SSHelpFrame extends JFrame {
/**
*
* @param iMainFrame
* @param pWidth
* @param pHeight
* @param iMainFrame SSMainFrame
* @param pWidth int
* @param pHeight int
*/
public static void showFrame(SSMainFrame iMainFrame, int pWidth, int pHeight) {
if (cInstance == null) {
@ -48,10 +48,10 @@ public class SSHelpFrame extends JFrame {
/**
*
* @param iMainFrame
* @param pWidth
* @param pHeight
* @param iHelpClass
* @param iMainFrame SSMainFrame
* @param pWidth int
* @param pHeight int
* @param iHelpClass Class
*/
public static void showFrame(SSMainFrame iMainFrame, int pWidth, int pHeight, Class iHelpClass) {
if (cInstance == null) {
@ -206,7 +206,7 @@ public class SSHelpFrame extends JFrame {
/**
*
* @param pHelpClass
* @param pHelpClass Class
*/
private void setHelpClass(Class pHelpClass) {
// @todo Restructure help file to be able to connect a frame to a help topic.
@ -216,15 +216,13 @@ public class SSHelpFrame extends JFrame {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.help.SSHelpFrame");
sb.append("{iBackButton=").append(iBackButton);
sb.append(", iForwardButton=").append(iForwardButton);
sb.append(", iHelpSet=").append(iHelpSet);
sb.append(", iHistory=").append(iHistory);
sb.append(", iViewer=").append(iViewer);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.help.SSHelpFrame" +
"{iBackButton=" + iBackButton +
", iForwardButton=" + iForwardButton +
", iHelpSet=" + iHelpSet +
", iHistory=" + iHistory +
", iViewer=" + iViewer +
'}';
}
}

View File

@ -59,16 +59,14 @@ public class SSHelpPanel {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.help.panel.SSHelpPanel");
sb.append("{iHelpSet=").append(iHelpSet);
sb.append(", iPane11=").append(iPane11);
sb.append(", iPane12=").append(iPane12);
sb.append(", iPanel=").append(iPanel);
sb.append(", iPanel3=").append(iPanel3);
sb.append(", tabbedPane1=").append(tabbedPane1);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.help.panel.SSHelpPanel" +
"{iHelpSet=" + iHelpSet +
", iPane11=" + iPane11 +
", iPane12=" + iPane12 +
", iPanel=" + iPanel +
", iPanel3=" + iPanel3 +
", tabbedPane1=" + tabbedPane1 +
'}';
}
}

View File

@ -29,7 +29,7 @@ public class SSHelpHistory {
/**
*
* @param pViewer
* @param pViewer JHelpContentViewer
*/
public SSHelpHistory(JHelpContentViewer pViewer) {
iViewer = pViewer;
@ -47,7 +47,7 @@ public class SSHelpHistory {
/**
*
* @param iListener
* @param iListener ActionListener
*/
public void addHistoryListener(ActionListener iListener) {
iListeners.add(iListener);
@ -66,7 +66,7 @@ public class SSHelpHistory {
/**
*
* @param pEvent
* @param pEvent HelpModelEvent
*/
private void addHistoryEvent(HelpModelEvent pEvent) {
if (iUpdating) {
@ -84,7 +84,7 @@ public class SSHelpHistory {
/**
*
* @return
* @return boolean
*/
public boolean hasNext() {
return getNext() != null;
@ -92,7 +92,7 @@ public class SSHelpHistory {
/**
*
* @return
* @return boolean
*/
public boolean hasPrevious() {
return getPrevious() != null;
@ -140,7 +140,7 @@ public class SSHelpHistory {
/**
*
* @param pUpdating
* @param pUpdating boolean
*/
private void setUpdating(boolean pUpdating) {
iUpdating = pUpdating;
@ -148,7 +148,7 @@ public class SSHelpHistory {
/**
*
* @return
* @return HelpModelEvent|null
*/
private HelpModelEvent getCurrent() {
int theIndex = iIndex - 1;
@ -161,7 +161,7 @@ public class SSHelpHistory {
/**
*
* @return
* @return HelpModelEvent|null
*/
private HelpModelEvent getNext() {
int theIndex = iIndex;
@ -174,7 +174,7 @@ public class SSHelpHistory {
/**
*
* @return
* @return HelpModelEvent|null
*/
private HelpModelEvent getPrevious() {
int theIndex = iIndex - 2;

View File

@ -37,8 +37,8 @@ public class SSInvoiceDialog {
/**
*
* @param iMainFrame
* @param pModel
* @param iMainFrame SSMainFrame
* @param pModel SSInvoiceTableModel
*/
public static void newDialog(final SSMainFrame iMainFrame, final SSInvoiceTableModel pModel) {
final SSDialog iDialog = new SSDialog(iMainFrame,
@ -106,9 +106,9 @@ public class SSInvoiceDialog {
/**
*
* @param iMainFrame
* @param iInvoice
* @param pModel
* @param iMainFrame SSMainFrame
* @param iInvoice SSInvoice
* @param pModel SSInvoiceTableModel
*/
public static void editDialog(final SSMainFrame iMainFrame, SSInvoice iInvoice, final SSInvoiceTableModel pModel) {
final String lockString = "invoice" + iInvoice.getNumber()
@ -180,9 +180,9 @@ public class SSInvoiceDialog {
/**
*
* @param iMainFrame
* @param iInvoice
* @param pModel
* @param iMainFrame SSMainFrame
* @param iInvoice SSInvoice
* @param pModel SSInvoiceTableModel
*/
public static void copyDialog(final SSMainFrame iMainFrame, SSInvoice iInvoice, final SSInvoiceTableModel pModel) {
final String lockString = "invoice" + iInvoice.getNumber()
@ -265,10 +265,10 @@ public class SSInvoiceDialog {
/**
*
* @param iMainFrame
* @param iInvoice
* @param iOrders
* @param pModel
* @param iMainFrame SSMainFrame
* @param iInvoice SSInvoice
* @param iOrders List<SSOrder>
* @param pModel AbstractTableModel
*/
public static void newDialog(final SSMainFrame iMainFrame, SSInvoice iInvoice, final List<SSOrder> iOrders, final AbstractTableModel pModel) {
final String lockString = "ordertoinvoice"

View File

@ -52,9 +52,9 @@ public class SSInvoiceFrame extends SSDefaultTableFrame {
/**
*
* @param pMainFrame
* @param pWidth
* @param pHeight
* @param pMainFrame SSMainFrame
* @param pWidth int
* @param pHeight int
*/
public static void showFrame(SSMainFrame pMainFrame, int pWidth, int pHeight) {
if (cInstance == null || SSInvoiceFrame.cInstance.isClosed()) {
@ -419,8 +419,8 @@ public class SSInvoiceFrame extends SSDefaultTableFrame {
/**
*
* @param index
* @param iInvoices
* @param index int
* @param iInvoices List<SSInvoice>
*/
public void setFilterIndex(int index, List<SSInvoice> iInvoices) {
JPanel iPanel = (JPanel) iTabbedPane.getComponentAt(index);
@ -473,7 +473,7 @@ public class SSInvoiceFrame extends SSDefaultTableFrame {
/**
*
* @return
* @return SSInvoiceTableModel
*/
public SSInvoiceTableModel getModel() {
return iModel;
@ -515,7 +515,7 @@ public class SSInvoiceFrame extends SSDefaultTableFrame {
/**
*
* @param delete
* @param delete List<SSInvoice>
*/
private void deleteSelectedInvoice(List<SSInvoice> delete) {
if (delete.isEmpty()) {
@ -587,14 +587,12 @@ public class SSInvoiceFrame extends SSDefaultTableFrame {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.invoice.SSInvoiceFrame");
sb.append("{iModel=").append(iModel);
sb.append(", iSearchPanel=").append(iSearchPanel);
sb.append(", iTabbedPane=").append(iTabbedPane);
sb.append(", iTable=").append(iTable);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.invoice.SSInvoiceFrame" +
"{iModel=" + iModel +
", iSearchPanel=" + iSearchPanel +
", iTabbedPane=" + iTabbedPane +
", iTable=" + iTable +
'}';
}
}

View File

@ -74,13 +74,11 @@ public class SSInvoiceSearchPanel extends JPanel {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.invoice.panel.SSInvoiceSearchPanel");
sb.append("{iModel=").append(iModel);
sb.append(", iPanel=").append(iPanel);
sb.append(", iTextField=").append(iTextField);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.invoice.panel.SSInvoiceSearchPanel" +
"{iModel=" + iModel +
", iPanel=" + iPanel +
", iTextField=" + iTextField +
'}';
}
}

View File

@ -182,10 +182,8 @@ public class SSInterestInvoiceTableModel extends SSDefaultTableModel<SSInvoice>
public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
SSInvoice iInvoice = getObject(rowIndex);
switch (columnIndex) {
case 9:
if (columnIndex == 9) {
iActions.put(iInvoice, (InterestAction) aValue);
break;
}
fireTableDataChanged();
}
@ -195,8 +193,8 @@ public class SSInterestInvoiceTableModel extends SSDefaultTableModel<SSInvoice>
*
* Sets the "interest invoiced" flag on the invoices to true.
*
* @param iDescription
* @param iAccount
* @param iDescription String
* @param iAccount SSAccount
* @return the interest invoices
*/
public List<SSInvoice> getInterestInvoices(String iDescription, SSAccount iAccount) {
@ -285,7 +283,7 @@ public class SSInterestInvoiceTableModel extends SSDefaultTableModel<SSInvoice>
/**
*
* @param iTable
* @param iTable SSTable
*/
public static void setupTable(SSTable iTable) {
iTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
@ -327,7 +325,7 @@ public class SSInterestInvoiceTableModel extends SSDefaultTableModel<SSInvoice>
/**
*
* @param iBundleName
* @param iBundleName String
*/
InterestAction(String iBundleName) {
this.iBundleName = iBundleName;
@ -352,13 +350,10 @@ public class SSInterestInvoiceTableModel extends SSDefaultTableModel<SSInvoice>
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(
"se.swedsoft.bookkeeping.gui.invoice.util.SSInterestInvoiceTableModel.InterestAction");
sb.append("{iBundleName='").append(iBundleName).append('\'');
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.invoice.util.SSInterestInvoiceTableModel.InterestAction" +
"{iBundleName='" + iBundleName + '\'' +
'}';
}
}
@ -414,12 +409,10 @@ public class SSInterestInvoiceTableModel extends SSDefaultTableModel<SSInvoice>
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("se.swedsoft.bookkeeping.gui.invoice.util.SSInterestInvoiceTableModel");
sb.append("{iActions=").append(iActions);
sb.append('}');
return sb.toString();
return "se.swedsoft.bookkeeping.gui.invoice.util.SSInterestInvoiceTableModel" +
"{iActions=" + iActions +
'}';
}
}

View File

@ -24,7 +24,7 @@ public class SSInvoiceRowTableModel extends SSEditableTableModel<SSSaleRow> {
/**
*
* @return
* @return SSSaleRow
*/
@Override
public SSSaleRow newObject() {

View File

@ -32,7 +32,7 @@ public class SSInvoiceTableModel extends SSTableModel<SSInvoice> {
/**
* Default constructor.
* @param iInvoices
* @param iInvoices List<SSInvoice>
*/
public SSInvoiceTableModel(List<SSInvoice> iInvoices) {
super(iInvoices);
@ -50,7 +50,7 @@ public class SSInvoiceTableModel extends SSTableModel<SSInvoice> {
/**
*
* @return
* @return SSInvoiceTableModel
*/
public static SSInvoiceTableModel getDropDownModel() {
return getDropDownModel(SSDB.getInstance().getInvoices());
@ -58,8 +58,8 @@ public class SSInvoiceTableModel extends SSTableModel<SSInvoice> {
/**
*
* @param iInvoices
* @return
* @param iInvoices List<SSInvoice>
* @return SSInvoiceTableModel
*/
public static SSInvoiceTableModel getDropDownModel(List<SSInvoice> iInvoices) {
SSInvoiceTableModel iModel = new SSInvoiceTableModel(iInvoices);