X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Factions%2Fstyle%2FMetricsEditor.java;fp=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Factions%2Fstyle%2FMetricsEditor.java;h=ca9ca5fe140bad1b3efbd1c3b3fa5453a8814497;hp=57aeac3129b7ef740c575f570fa14dc3da06f548;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hpb=24e2b34260f219f0d1644ca7a138894980e25b14

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/style/MetricsEditor.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/style/MetricsEditor.java
index 57aeac312..ca9ca5fe1 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/style/MetricsEditor.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/style/MetricsEditor.java
@@ -1,354 +1,354 @@
-package org.simantics.modeling.ui.actions.style;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.TableModel;
-
-import org.simantics.utils.strings.format.MetricsFormat;
-import org.simantics.utils.strings.format.MetricsFormatList;
-import org.simantics.utils.strings.format.MetricsFormatListListener;
-
-public class MetricsEditor extends JPanel {
-
-    private static final long serialVersionUID = 3781280603509654789L;
-    private JTextField valueTestField;
-    private JTextField valuePresentationField;
-    private JTextField formatNameField;
-    private JTextField formatPatternField;
-    //		private JTextField formatScaleField;
-
-    private MetricsFormat format;
-    private MetricsFormatList formatList;
-    private double formatValue;
-
-    private JTable formatTable;
-    private MetricsTableModel tableModel;
-
-    public MetricsEditor() {
-        super();
-        setLayout(new BorderLayout());
-
-        JPanel panel = new JPanel();
-        panel.setLayout(new BorderLayout());
-
-        valueTestField = new JTextField();
-        valuePresentationField = new JTextField();
-        formatNameField = new JTextField();
-        formatPatternField = new JTextField();
-        //			formatScaleField = new JTextField();
-
-        JPanel labelPanel = new JPanel(new GridLayout(0,1));
-        JPanel fieldPanel = new JPanel(new GridLayout(0,1));
-        panel.add(labelPanel,BorderLayout.WEST);
-        panel.add(fieldPanel,BorderLayout.CENTER);
-
-
-        labelPanel.add(new JLabel("Value test:"));
-        fieldPanel.add(valueTestField);
-        labelPanel.add(new JLabel("Value presentation:"));
-        fieldPanel.add(valuePresentationField);
-        labelPanel.add(new JLabel("Format name:"));
-        fieldPanel.add(formatNameField);
-        labelPanel.add(new JLabel("Format pattern:"));
-        fieldPanel.add(formatPatternField);
-
-        add(panel,BorderLayout.NORTH);
-        //			add(new JLabel("Format scale:"));
-        //			add(formatScaleField);
-
-        JPanel listPanel = new JPanel();
-        add(listPanel,BorderLayout.CENTER);
-        JTable table = createFormatTable();
-        JScrollPane scrollPane = new JScrollPane(table);
-        table.setFillsViewportHeight(true);
-
-        listPanel.add(scrollPane);
-
-        JPanel controlPanel = new JPanel();
-        add(controlPanel,BorderLayout.SOUTH);
-        controlPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
-
-        JButton addTemplateButton = new JButton("Add Format Template");
-        addTemplateButton.setToolTipText("Add current format to templates");
-        controlPanel.add(addTemplateButton);
-        addTemplateButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent arg0) {
-                addTemplate();
-            }
-        });
-
-        JButton removeTemplateButton = new JButton("Remove Template");
-        removeTemplateButton.setToolTipText("Remove selected template");
-        controlPanel.add(removeTemplateButton);
-        removeTemplateButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent arg0) {
-                removeTemplate();
-            }
-        });
-
-        JButton updateTemplateButton = new JButton("Update Template");
-        updateTemplateButton.setToolTipText("Update selected template using current format");
-        controlPanel.add(updateTemplateButton);
-        updateTemplateButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent arg0) {
-                updateTemplate();
-            }
-        });
-
-        JButton newFormatButton = new JButton("New Format");
-        newFormatButton.setToolTipText("Create a new Format");
-        controlPanel.add(newFormatButton);
-        newFormatButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent arg0) {
-                newFormat();
-            }
-        });
-
-
-        valuePresentationField.setEditable(false);
-
-        ActionListener l = new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                updateValues();
-
-            }
-        };
-
-        valueTestField.addActionListener(l);
-        formatPatternField.addActionListener(l);
-
-        valueTestField.setText("123456.789");
-        formatPatternField.setText("%s");
-
-        updateValues();
-    }
-
-    private void addTemplate() {
-        MetricsFormat format = createMetricsFormatFromFields();
-
-        try {
-            formatList.addFormat(format);
-        } catch (Exception e) {
-            // TODO : show error
-        }
-    }
-
-    private void updateTemplate() {
-        int index = formatTable.getSelectedRow();
-        if (index == -1)
-            return; // TODO : show error, or even better, disable the button
-        MetricsFormat format = createMetricsFormatFromFields();
-        try {
-            formatList.replaceFormatWith(formatList.getFormats()[index], format);
-        } catch (Exception e) {
-            // TODO : show error
-        }
-    }
-
-    private void removeTemplate() {
-        int index = formatTable.getSelectedRow();
-        if (index == -1)
-            return; // TODO : show error, or even better, disable the button
-        try {
-            formatList.removeFormat(formatList.getFormats()[index]);
-        } catch (Exception e) {
-            // TODO : show error
-        }
-    }
-
-    public MetricsFormat getFormat() {
-        return format;
-    }
-
-    private void newFormat() {
-        format = null;
-        formatNameField.setText("New format");
-        formatPatternField.setText("%s");
-        updateValues();
-    }
-
-    private JTable createFormatTable() {
-        formatList = MetricsFormatList.getList();
-        tableModel = new MetricsTableModel(formatList);
-
-        formatTable = new JTable(tableModel);
-        formatTable.doLayout();
-
-        formatTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
-        formatTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-
-            @Override
-            public void valueChanged(ListSelectionEvent e) {
-                if (e.getValueIsAdjusting())
-                    return;
-                int index = formatTable.getSelectionModel().getMinSelectionIndex();
-                if (index == -1)
-                    return;
-                setMetricsFormat(formatList.getFormats()[index]);
-
-            }
-        });
-        return formatTable;
-    }
-
-    private void updateValues() {
-        String value = valueTestField.getText();
-        if (value == null || value.length() == 0)
-            return;
-        Double d = null;
-        try {
-            d = Double.parseDouble(value);
-        } catch (NumberFormatException e) {
-            valuePresentationField.setText("Value test is not a number");
-            return;
-        }
-        formatValue = d;
-
-        MetricsFormat format = null;
-        try {
-            format = createMetricsFormatFromFields();
-        } catch (Exception e) {
-            valuePresentationField.setText("Format pattern is not correct " + e.getMessage());
-        }
-        if (format == null)
-            return; // TODO : show error
-        setMetricsFormat(format);
-        tableModel.setFormatValue(formatValue);
-    }
-
-    private MetricsFormat createMetricsFormatFromFields() {
-        if (formatPatternField.getText().length() == 0)
-            return null;
-        return new MetricsFormat(formatPatternField.getText(),1.0,formatNameField.getText());
-    }
-
-    public void setMetricsFormat(MetricsFormat format) {
-        this.format = format;
-        try {
-            valuePresentationField.setText(format.formatValue(formatValue));
-        } catch (Exception e) {
-            valuePresentationField.setText("Format error: "  + e.getMessage());
-        }
-        formatNameField.setText(format.getName());
-        formatPatternField.setText(format.getPattern());
-    }
-
-    public void dispose() {
-        tableModel.dispose();
-    }
-
-    private class MetricsTableModel implements TableModel, MetricsFormatListListener {
-
-        private String[] columnNames = {"Name","Format","Value"};
-        private MetricsFormatList formatList;
-        private double formatValue = 0;
-
-        public MetricsTableModel(MetricsFormatList formatList) {
-            this.formatList = formatList;
-            this.formatList.addListener(this);
-        }
-
-        public void setFormatValue(double value) {
-            this.formatValue = value;
-            fireChanged();
-        }
-
-        @Override
-        public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-            // do nothing
-        }
-
-        @Override
-        public boolean isCellEditable(int rowIndex, int columnIndex) {
-            return false;
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            MetricsFormat format = formatList.getFormats()[rowIndex];
-            if (columnIndex == 0) {
-                return format.getName();
-            } else if (columnIndex == 1) {
-                return format.getPattern();
-            } else if (columnIndex == 2) {
-                return format.formatValue(formatValue);
-            }
-            throw new IndexOutOfBoundsException("There is no column " + columnIndex);
-        }
-
-        @Override
-        public int getRowCount() {
-            return formatList.getFormats().length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return columnNames[columnIndex];
-        }
-
-        @Override
-        public int getColumnCount() {
-            return columnNames.length;
-        }
-
-        @Override
-        public Class<?> getColumnClass(int columnIndex) {
-            return String.class;
-        }
-
-        private List<TableModelListener> listeners = new ArrayList<TableModelListener>();
-
-        @Override
-        public void addTableModelListener(TableModelListener l) {
-            listeners.add(l);
-        }
-
-        @Override
-        public void removeTableModelListener(TableModelListener l) {
-            listeners.remove(l);
-        }
-
-        @Override
-        public void onListChanged(MetricsFormatList sender) {
-            fireChanged();
-        }
-
-        private void fireChanged() {
-            for (TableModelListener l : listeners) {
-                l.tableChanged(new TableModelEvent(this));
-            }
-        }
-
-        public void dispose() {
-            formatList.removeListener(this);
-        }
-    }
-}
+package org.simantics.modeling.ui.actions.style;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
+
+import org.simantics.utils.strings.format.MetricsFormat;
+import org.simantics.utils.strings.format.MetricsFormatList;
+import org.simantics.utils.strings.format.MetricsFormatListListener;
+
+public class MetricsEditor extends JPanel {
+
+    private static final long serialVersionUID = 3781280603509654789L;
+    private JTextField valueTestField;
+    private JTextField valuePresentationField;
+    private JTextField formatNameField;
+    private JTextField formatPatternField;
+    //		private JTextField formatScaleField;
+
+    private MetricsFormat format;
+    private MetricsFormatList formatList;
+    private double formatValue;
+
+    private JTable formatTable;
+    private MetricsTableModel tableModel;
+
+    public MetricsEditor() {
+        super();
+        setLayout(new BorderLayout());
+
+        JPanel panel = new JPanel();
+        panel.setLayout(new BorderLayout());
+
+        valueTestField = new JTextField();
+        valuePresentationField = new JTextField();
+        formatNameField = new JTextField();
+        formatPatternField = new JTextField();
+        //			formatScaleField = new JTextField();
+
+        JPanel labelPanel = new JPanel(new GridLayout(0,1));
+        JPanel fieldPanel = new JPanel(new GridLayout(0,1));
+        panel.add(labelPanel,BorderLayout.WEST);
+        panel.add(fieldPanel,BorderLayout.CENTER);
+
+
+        labelPanel.add(new JLabel("Value test:"));
+        fieldPanel.add(valueTestField);
+        labelPanel.add(new JLabel("Value presentation:"));
+        fieldPanel.add(valuePresentationField);
+        labelPanel.add(new JLabel("Format name:"));
+        fieldPanel.add(formatNameField);
+        labelPanel.add(new JLabel("Format pattern:"));
+        fieldPanel.add(formatPatternField);
+
+        add(panel,BorderLayout.NORTH);
+        //			add(new JLabel("Format scale:"));
+        //			add(formatScaleField);
+
+        JPanel listPanel = new JPanel();
+        add(listPanel,BorderLayout.CENTER);
+        JTable table = createFormatTable();
+        JScrollPane scrollPane = new JScrollPane(table);
+        table.setFillsViewportHeight(true);
+
+        listPanel.add(scrollPane);
+
+        JPanel controlPanel = new JPanel();
+        add(controlPanel,BorderLayout.SOUTH);
+        controlPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
+
+        JButton addTemplateButton = new JButton("Add Format Template");
+        addTemplateButton.setToolTipText("Add current format to templates");
+        controlPanel.add(addTemplateButton);
+        addTemplateButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                addTemplate();
+            }
+        });
+
+        JButton removeTemplateButton = new JButton("Remove Template");
+        removeTemplateButton.setToolTipText("Remove selected template");
+        controlPanel.add(removeTemplateButton);
+        removeTemplateButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                removeTemplate();
+            }
+        });
+
+        JButton updateTemplateButton = new JButton("Update Template");
+        updateTemplateButton.setToolTipText("Update selected template using current format");
+        controlPanel.add(updateTemplateButton);
+        updateTemplateButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                updateTemplate();
+            }
+        });
+
+        JButton newFormatButton = new JButton("New Format");
+        newFormatButton.setToolTipText("Create a new Format");
+        controlPanel.add(newFormatButton);
+        newFormatButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                newFormat();
+            }
+        });
+
+
+        valuePresentationField.setEditable(false);
+
+        ActionListener l = new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                updateValues();
+
+            }
+        };
+
+        valueTestField.addActionListener(l);
+        formatPatternField.addActionListener(l);
+
+        valueTestField.setText("123456.789");
+        formatPatternField.setText("%s");
+
+        updateValues();
+    }
+
+    private void addTemplate() {
+        MetricsFormat format = createMetricsFormatFromFields();
+
+        try {
+            formatList.addFormat(format);
+        } catch (Exception e) {
+            // TODO : show error
+        }
+    }
+
+    private void updateTemplate() {
+        int index = formatTable.getSelectedRow();
+        if (index == -1)
+            return; // TODO : show error, or even better, disable the button
+        MetricsFormat format = createMetricsFormatFromFields();
+        try {
+            formatList.replaceFormatWith(formatList.getFormats()[index], format);
+        } catch (Exception e) {
+            // TODO : show error
+        }
+    }
+
+    private void removeTemplate() {
+        int index = formatTable.getSelectedRow();
+        if (index == -1)
+            return; // TODO : show error, or even better, disable the button
+        try {
+            formatList.removeFormat(formatList.getFormats()[index]);
+        } catch (Exception e) {
+            // TODO : show error
+        }
+    }
+
+    public MetricsFormat getFormat() {
+        return format;
+    }
+
+    private void newFormat() {
+        format = null;
+        formatNameField.setText("New format");
+        formatPatternField.setText("%s");
+        updateValues();
+    }
+
+    private JTable createFormatTable() {
+        formatList = MetricsFormatList.getList();
+        tableModel = new MetricsTableModel(formatList);
+
+        formatTable = new JTable(tableModel);
+        formatTable.doLayout();
+
+        formatTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+        formatTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                if (e.getValueIsAdjusting())
+                    return;
+                int index = formatTable.getSelectionModel().getMinSelectionIndex();
+                if (index == -1)
+                    return;
+                setMetricsFormat(formatList.getFormats()[index]);
+
+            }
+        });
+        return formatTable;
+    }
+
+    private void updateValues() {
+        String value = valueTestField.getText();
+        if (value == null || value.length() == 0)
+            return;
+        Double d = null;
+        try {
+            d = Double.parseDouble(value);
+        } catch (NumberFormatException e) {
+            valuePresentationField.setText("Value test is not a number");
+            return;
+        }
+        formatValue = d;
+
+        MetricsFormat format = null;
+        try {
+            format = createMetricsFormatFromFields();
+        } catch (Exception e) {
+            valuePresentationField.setText("Format pattern is not correct " + e.getMessage());
+        }
+        if (format == null)
+            return; // TODO : show error
+        setMetricsFormat(format);
+        tableModel.setFormatValue(formatValue);
+    }
+
+    private MetricsFormat createMetricsFormatFromFields() {
+        if (formatPatternField.getText().length() == 0)
+            return null;
+        return new MetricsFormat(formatPatternField.getText(),1.0,formatNameField.getText());
+    }
+
+    public void setMetricsFormat(MetricsFormat format) {
+        this.format = format;
+        try {
+            valuePresentationField.setText(format.formatValue(formatValue));
+        } catch (Exception e) {
+            valuePresentationField.setText("Format error: "  + e.getMessage());
+        }
+        formatNameField.setText(format.getName());
+        formatPatternField.setText(format.getPattern());
+    }
+
+    public void dispose() {
+        tableModel.dispose();
+    }
+
+    private class MetricsTableModel implements TableModel, MetricsFormatListListener {
+
+        private String[] columnNames = {"Name","Format","Value"};
+        private MetricsFormatList formatList;
+        private double formatValue = 0;
+
+        public MetricsTableModel(MetricsFormatList formatList) {
+            this.formatList = formatList;
+            this.formatList.addListener(this);
+        }
+
+        public void setFormatValue(double value) {
+            this.formatValue = value;
+            fireChanged();
+        }
+
+        @Override
+        public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+            // do nothing
+        }
+
+        @Override
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            return false;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            MetricsFormat format = formatList.getFormats()[rowIndex];
+            if (columnIndex == 0) {
+                return format.getName();
+            } else if (columnIndex == 1) {
+                return format.getPattern();
+            } else if (columnIndex == 2) {
+                return format.formatValue(formatValue);
+            }
+            throw new IndexOutOfBoundsException("There is no column " + columnIndex);
+        }
+
+        @Override
+        public int getRowCount() {
+            return formatList.getFormats().length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return columnNames[columnIndex];
+        }
+
+        @Override
+        public int getColumnCount() {
+            return columnNames.length;
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            return String.class;
+        }
+
+        private List<TableModelListener> listeners = new ArrayList<TableModelListener>();
+
+        @Override
+        public void addTableModelListener(TableModelListener l) {
+            listeners.add(l);
+        }
+
+        @Override
+        public void removeTableModelListener(TableModelListener l) {
+            listeners.remove(l);
+        }
+
+        @Override
+        public void onListChanged(MetricsFormatList sender) {
+            fireChanged();
+        }
+
+        private void fireChanged() {
+            for (TableModelListener l : listeners) {
+                l.tableChanged(new TableModelEvent(this));
+            }
+        }
+
+        public void dispose() {
+            formatList.removeListener(this);
+        }
+    }
+}