haraldwolff
/
java-org.hwo.ui
forked from LupusNobilis/java-org.hwo.ui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIP161104

thobaben_diagram
Harald Wolff 2016-11-04 14:11:55 +01:00
parent b563f61a1c
commit a14c4bcc45
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/hwo/models/TableMapper/TableMapper.java
View File

@ -27,12 +27,9 @@ import javax.swing.JFrame;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
<<<<<<< Updated upstream
import javax.swing.table.TableRowSorter; import javax.swing.table.TableRowSorter;
=======
import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
>>>>>>> Stashed changes
import org.hwo.csv.CSV; import org.hwo.csv.CSV;
import org.hwo.csv.CSVRecord; import org.hwo.csv.CSVRecord;
@ -325,14 +322,9 @@ public class TableMapper extends AbstractTableModel
table.setModel(this); table.setModel(this);
table.setColumnModel(new TableMapperColumnModel(this)); table.setColumnModel(new TableMapperColumnModel(this));
<<<<<<< Updated upstream
table.setAutoCreateRowSorter(false); table.setAutoCreateRowSorter(false);
setSortingEnabled(true); setSortingEnabled(true);
=======
table.setAutoCreateRowSorter(true);
table.setDefaultRenderer(Object.class, new TableCellRenderer()); table.setDefaultRenderer(Object.class, new TableCellRenderer());
>>>>>>> Stashed changes
mouseAdapter = new MouseAdapter() { mouseAdapter = new MouseAdapter() {
@ -387,7 +379,6 @@ public class TableMapper extends AbstractTableModel
} }
<<<<<<< Updated upstream
private void initializeJTable(){ private void initializeJTable(){
if (sortingEnabled){ if (sortingEnabled){
this.jTable.setRowSorter(new TableRowSorter<TableMapper>(this)); this.jTable.setRowSorter(new TableRowSorter<TableMapper>(this));
@ -403,13 +394,13 @@ public class TableMapper extends AbstractTableModel
public void setSortingEnabled(boolean sortingEnabled) { public void setSortingEnabled(boolean sortingEnabled) {
this.sortingEnabled = sortingEnabled; this.sortingEnabled = sortingEnabled;
initializeJTable(); initializeJTable();
======= }
public TableMapperColorSourceInterface getColorSourceInterface() { public TableMapperColorSourceInterface getColorSourceInterface() {
return colorSourceInterface; return colorSourceInterface;
} }
public void setColorSourceInterface(TableMapperColorSourceInterface colorSourceInterface) { public void setColorSourceInterface(TableMapperColorSourceInterface colorSourceInterface) {
this.colorSourceInterface = colorSourceInterface; this.colorSourceInterface = colorSourceInterface;
>>>>>>> Stashed changes
} }
public void addListSelectionListener(ListSelectionListener listener) public void addListSelectionListener(ListSelectionListener listener)