From a14c4bcc45d3876acd3ad276f4d99ec3772ae2d2 Mon Sep 17 00:00:00 2001 From: Harald Wolff Date: Fri, 4 Nov 2016 14:11:55 +0100 Subject: [PATCH 1/3] WIP161104 --- src/org/hwo/models/TableMapper/TableMapper.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/org/hwo/models/TableMapper/TableMapper.java b/src/org/hwo/models/TableMapper/TableMapper.java index e00c4ec..a21a6ff 100644 --- a/src/org/hwo/models/TableMapper/TableMapper.java +++ b/src/org/hwo/models/TableMapper/TableMapper.java @@ -27,12 +27,9 @@ import javax.swing.JFrame; import javax.swing.JTable; import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; -<<<<<<< Updated upstream import javax.swing.table.TableRowSorter; -======= import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; ->>>>>>> Stashed changes import org.hwo.csv.CSV; import org.hwo.csv.CSVRecord; @@ -325,14 +322,9 @@ public class TableMapper extends AbstractTableModel table.setModel(this); table.setColumnModel(new TableMapperColumnModel(this)); -<<<<<<< Updated upstream table.setAutoCreateRowSorter(false); setSortingEnabled(true); -======= - table.setAutoCreateRowSorter(true); - table.setDefaultRenderer(Object.class, new TableCellRenderer()); ->>>>>>> Stashed changes mouseAdapter = new MouseAdapter() { @@ -387,7 +379,6 @@ public class TableMapper extends AbstractTableModel } -<<<<<<< Updated upstream private void initializeJTable(){ if (sortingEnabled){ this.jTable.setRowSorter(new TableRowSorter(this)); @@ -403,13 +394,13 @@ public class TableMapper extends AbstractTableModel public void setSortingEnabled(boolean sortingEnabled) { this.sortingEnabled = sortingEnabled; initializeJTable(); -======= + } + public TableMapperColorSourceInterface getColorSourceInterface() { return colorSourceInterface; } public void setColorSourceInterface(TableMapperColorSourceInterface colorSourceInterface) { this.colorSourceInterface = colorSourceInterface; ->>>>>>> Stashed changes } public void addListSelectionListener(ListSelectionListener listener) From 85c05155bdf4a31c9d87028d0205fec7d8320326 Mon Sep 17 00:00:00 2001 From: Harald Wolff Date: Fri, 25 Nov 2016 08:28:43 +0100 Subject: [PATCH 2/3] SerialPortChooser.execute(...) added parent Component parameter --- src/org/hwo/ui/dialog/SerialPortChooser.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/org/hwo/ui/dialog/SerialPortChooser.java b/src/org/hwo/ui/dialog/SerialPortChooser.java index 24e4b2a..bb7883c 100644 --- a/src/org/hwo/ui/dialog/SerialPortChooser.java +++ b/src/org/hwo/ui/dialog/SerialPortChooser.java @@ -1,6 +1,7 @@ package org.hwo.ui.dialog; import java.awt.BorderLayout; +import java.awt.Component; import java.awt.FlowLayout; import javax.swing.JButton; @@ -33,12 +34,19 @@ public class SerialPortChooser extends JDialog { return execute(null); } public static NewSerialPort execute(String selectedPortName) + { + return execute(null, selectedPortName); + } + public static NewSerialPort execute(Component parent,String selectedPortName) { SerialPortChooser spc = new SerialPortChooser(); if (selectedPortName != null) spc.setSelectedSerialPort(selectedPortName); + if (parent != null) + spc.setLocationRelativeTo(parent); + spc.setVisible(true); return spc.getSelectedSerialPort(); From 5be543ff0598cb23b6ecbfd9b14de4ccc9c918c1 Mon Sep 17 00:00:00 2001 From: Harald Wolff Date: Fri, 25 Nov 2016 08:38:11 +0100 Subject: [PATCH 3/3] Korrekturen letzter Merge --- src/org/hwo/ui/diagram/SimplePlotLabeler.java | 2 +- src/org/hwo/ui/dialog/SerialPortChooser.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/org/hwo/ui/diagram/SimplePlotLabeler.java b/src/org/hwo/ui/diagram/SimplePlotLabeler.java index cb20e93..e759c79 100644 --- a/src/org/hwo/ui/diagram/SimplePlotLabeler.java +++ b/src/org/hwo/ui/diagram/SimplePlotLabeler.java @@ -43,7 +43,7 @@ public class SimplePlotLabeler implements PlotLabeler { ); } else if (digits == 0){ return String.format("%1.2f",value); - } else if (digits > 0){ + } else { return String.format( String.format("%%%d.2f",digits), value diff --git a/src/org/hwo/ui/dialog/SerialPortChooser.java b/src/org/hwo/ui/dialog/SerialPortChooser.java index 4a21a6a..d246420 100644 --- a/src/org/hwo/ui/dialog/SerialPortChooser.java +++ b/src/org/hwo/ui/dialog/SerialPortChooser.java @@ -33,10 +33,7 @@ public class SerialPortChooser extends JDialog { { return execute(null); } - public static NewSerialPort execute(Component parent,String selectedPortName) - { - return execute(null, selectedPortName); - } + public static NewSerialPort execute(Component parent,String selectedPortName) { SerialPortChooser spc = new SerialPortChooser();