jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trivial code cleanup

Browse source
This commit is contained in:
Vhati 2017-11-26 11:48:38 -05:00
parent d934740377
commit 0621f680f8
12 changed files with 158 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/vhati/modmanager/ui/table/ChecklistTableModel.java
View file

@ -49,7 +49,7 @@ public class ChecklistTableModel<T> extends AbstractTableModel implements Reorde
@SuppressWarnings("unchecked")
public T getItem( int row ) {
return (T)rowsList.get(row).get(DATA_PAYLOAD);
return (T)rowsList.get(row).get( DATA_PAYLOAD );
}
@Override
@ -63,13 +63,13 @@ public class ChecklistTableModel<T> extends AbstractTableModel implements Reorde
}
public void setSelected( int row, boolean b ) {
rowsList.get(row).set( DATA_CHECK, new Boolean(b) );
rowsList.get(row).set( DATA_CHECK, new Boolean( b ) );
fireTableRowsUpdated( row, row );
}
@SuppressWarnings("unchecked")
public boolean isSelected( int row ) {
return ((Boolean)rowsList.get(row).get(DATA_CHECK)).booleanValue();
return ((Boolean)rowsList.get( row ).get( DATA_CHECK )).booleanValue();
}
@Override
@ -85,10 +85,10 @@ public class ChecklistTableModel<T> extends AbstractTableModel implements Reorde
@Override
public Object getValueAt( int row, int column ) {
if ( column == COLUMN_CHECK ) {
return rowsList.get(row).get(DATA_CHECK);
return rowsList.get( row ).get( DATA_CHECK );
}
else if ( column == COLUMN_PAYLOAD ) {
Object o = rowsList.get(row).get(DATA_PAYLOAD);
Object o = rowsList.get( row ).get( DATA_PAYLOAD );
return o.toString();
}
throw new ArrayIndexOutOfBoundsException();

22
src/main/java/net/vhati/modmanager/ui/table/ChecklistTablePanel.java
View file

@ -32,14 +32,14 @@ public class ChecklistTablePanel<T> extends JPanel {
table.setFillsViewportHeight( true );
table.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
table.setTableHeader( null );
table.getColumnModel().getColumn(0).setMinWidth(30);
table.getColumnModel().getColumn(0).setMaxWidth(30);
table.getColumnModel().getColumn(0).setPreferredWidth(30);
table.getColumnModel().getColumn( 0 ).setMinWidth( 30 );
table.getColumnModel().getColumn( 0 ).setMaxWidth( 30 );
table.getColumnModel().getColumn( 0 ).setPreferredWidth( 30 );
JScrollPane scrollPane = new JScrollPane( null, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
scrollPane.setViewportView( table );
//scrollPane.setColumnHeaderView( null ); // Counterpart to setTableHeader().
scrollPane.setPreferredSize( new Dimension(Integer.MIN_VALUE, Integer.MIN_VALUE) );
scrollPane.setPreferredSize( new Dimension( Integer.MIN_VALUE, Integer.MIN_VALUE ) );
this.add( scrollPane, BorderLayout.CENTER );
@ -55,18 +55,20 @@ public class ChecklistTablePanel<T> extends JPanel {
// Reset on first click and when no longer on that row.
if ( e.getClickCount() == 1 ) prevRow = -1;
if ( thisRow != prevRow || thisRow == -1 ) {
streak = 1;
prevRow = thisRow;
return;
} else {
}
else {
streak++;
}
if ( streak % 2 != 0 ) return; // Respond only to click pairs.
// Don't further toggle a multi-clicked checkbox.
int viewCol = table.columnAtPoint( e.getPoint() );
int modelCol = table.getColumnModel().getColumn(viewCol).getModelIndex();
int modelCol = table.getColumnModel().getColumn( viewCol ).getModelIndex();
if ( modelCol == 0 ) return;
int selRow = table.getSelectedRow();
@ -92,7 +94,7 @@ public class ChecklistTablePanel<T> extends JPanel {
List<T> results = new ArrayList<T>();
for ( int i=0; i < tableModel.getRowCount(); i++ ) {
results.add( tableModel.getItem(i) );
results.add( tableModel.getItem( i ) );
}
return results;
@ -102,8 +104,8 @@ public class ChecklistTablePanel<T> extends JPanel {
List<T> results = new ArrayList<T>();
for ( int i=0; i < tableModel.getRowCount(); i++ ) {
if ( tableModel.isSelected(i) ) {
results.add( tableModel.getItem(i) );
if ( tableModel.isSelected( i ) ) {
results.add( tableModel.getItem( i ) );
}
}
@ -114,7 +116,7 @@ public class ChecklistTablePanel<T> extends JPanel {
public void toggleAllItemSelection() {
int selectedCount = 0;
for ( int i = tableModel.getRowCount()-1; i >= 0; i-- ) {
if ( tableModel.isSelected(i) ) selectedCount++;
if ( tableModel.isSelected( i ) ) selectedCount++;
}
boolean b = ( selectedCount != tableModel.getRowCount() );

14
src/main/java/net/vhati/modmanager/ui/table/TableRowTransferHandler.java
View file

@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
*/
public class TableRowTransferHandler extends TransferHandler {
private static final Logger log = LogManager.getLogger(TableRowTransferHandler.class);
private static final Logger log = LogManager.getLogger( TableRowTransferHandler.class );
private DataFlavor localIntegerFlavor = null;
@ -47,12 +47,12 @@ public class TableRowTransferHandler extends TransferHandler {
protected Transferable createTransferable( JComponent c ) {
assert ( c == table );
int row = table.getSelectedRow();
return new IntegerTransferrable( new Integer(row) );
return new IntegerTransferrable( new Integer( row ) );
}
@Override
public boolean canImport( TransferHandler.TransferSupport ts ) {
boolean b = ( ts.getComponent() == table && ts.isDrop() && ts.isDataFlavorSupported(localIntegerFlavor) );
boolean b = ( ts.getComponent() == table && ts.isDrop() && ts.isDataFlavorSupported( localIntegerFlavor ) );
table.setCursor( b ? DragSource.DefaultMoveDrop : DragSource.DefaultMoveNoDrop );
return b;
}
@ -65,7 +65,7 @@ public class TableRowTransferHandler extends TransferHandler {
@Override
@SuppressWarnings("Unchecked")
public boolean importData( TransferHandler.TransferSupport ts ) {
if ( !canImport(ts) ) return false;
if ( !canImport( ts ) ) return false;
JTable target = (JTable)ts.getComponent();
JTable.DropLocation dl = (JTable.DropLocation)ts.getDropLocation();
@ -73,9 +73,9 @@ public class TableRowTransferHandler extends TransferHandler {
int rowCount = table.getModel().getRowCount();
if ( dropRow < 0 || dropRow > rowCount ) dropRow = rowCount;
target.setCursor( Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR) );
target.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) );
try {
Integer draggedRow = (Integer)ts.getTransferable().getTransferData(localIntegerFlavor);
Integer draggedRow = (Integer)ts.getTransferable().getTransferData( localIntegerFlavor );
if ( draggedRow != -1 && draggedRow != dropRow ) {
((Reorderable)table.getModel()).reorder( draggedRow, dropRow );
if ( dropRow > draggedRow ) dropRow--;
@ -92,7 +92,7 @@ public class TableRowTransferHandler extends TransferHandler {
@Override
protected void exportDone( JComponent source, Transferable data, int action ) {
if ( action == TransferHandler.MOVE || action == TransferHandler.NONE ) {
table.setCursor( Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR) );
table.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) );
}
}