Skip to content

Show cost with 2 decimals #1677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oihanealbizuri wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Show cost with 2 decimals #1677

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8daa6fa
Show cost with 2 decimals.
oihanealbizuri Jul 12, 2019
e2041bf
Merge branch 'master' of github.com:bardsoftware/ganttproject into tk…
oihanealbizuri Nov 8, 2019
dcd2247
Decimals
oihanealbizuri Nov 8, 2019
b3f0503
DecimalFormatter using Locale
oihanealbizuri Dec 2, 2019
0de2d4f
fixing conflicts
oihanealbizuri Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ganttproject/src/net/sourceforge/ganttproject/GPTreeTableBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ of the License, or (at your option) any later version.
import javax.swing.event.TableColumnModelListener;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
Expand All @@ -70,6 +71,7 @@ of the License, or (at your option) any later version.
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand All @@ -96,6 +98,15 @@ public void applyComponentOrientation(ComponentOrientation o) {
}
};

class DecimalRenderer extends DefaultTableCellRenderer {
private final DecimalFormat myFormatter = new DecimalFormat("#0.00");
Copy link
Copy Markdown
Contributor

@dbarashev dbarashev Jul 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The format of representing currency values is locale-specific. You want to use NumberFormat::getCurrencyInstance and pass the currently selected locale. GanttLanguage is responsible for such things (and it stores the current locale)


public Component getTableCellRendererComponent (JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
value = myFormatter.format((Number)value);
Copy link
Copy Markdown
Contributor

@dbarashev dbarashev Jan 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cast is not necessary. format argument is Object.

return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
}
}

private GPAction myEditCellAction = new GPAction("tree.edit") {
@Override
public void actionPerformed(ActionEvent e) {
Expand Down Expand Up @@ -926,7 +937,11 @@ private TableCellRenderer createCellRenderer(Class<?> columnClass) {
// renderer = TableCellRenderers.getNewDefaultRenderer(columnClass);
//
// }
return getTreeTable().getDefaultRenderer(columnClass);
if (Double.class.equals(columnClass)){
Copy link
Copy Markdown
Contributor

@dbarashev dbarashev Jul 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This way all columns with Double type will be formatted with two decimal digits. It is okay for cost (which is essentially money) but it may not be okay for other columns, including user-defined (imagine e.g. weight measured in tons).

I think that the best way to achieve the goal is to override method newTablecolumnext in GanttTreeTable and check if we are creating exactly COST column. We already use similar approach in ResourceTreeTable.

Also, the same should be done with the editor, no? Otherwise the user will see values with 2 decimal digits, but once he starts editing, he will see something different.

return new DecimalRenderer();
} else {
return getTreeTable().getDefaultRenderer(columnClass);
}
}

private TableCellEditor createCellEditor(Class<?> columnClass) {
Expand Down