From a14c4bcc45d3876acd3ad276f4d99ec3772ae2d2 Mon Sep 17 00:00:00 2001 From: Harald Wolff Date: Fri, 4 Nov 2016 14:11:55 +0100 Subject: [PATCH] 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)