Skip to content

Commit

Permalink
10.4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Wisser committed May 29, 2021
1 parent bc60017 commit 5c93598
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/main/engine/net/sf/jailer/JailerVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class JailerVersion {
/**
* The Jailer version.
*/
public static final String VERSION = "10.4.8.5";
public static final String VERSION = "10.4.9";

/**
* The Jailer working tables version.
Expand Down
34 changes: 17 additions & 17 deletions src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ public BrowserContentPane(final DataModel dataModel, final Table table, String c
// ignore
}

// conditionEditorButton.setVisible(false); // TODO
conditionEditorButton.setVisible(false); // TODO

// TODO show tooltip of "where-clause" combobox formatted

Expand Down Expand Up @@ -1144,22 +1144,22 @@ public void paint(Graphics graphics) {
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setStroke(new BasicStroke(1));

if (currentSearchButtonColumnIndex >= 0 && currentSearchButtonIcon != null && currentSearchButtonLocation != null) {
Point loc = SwingUtilities.convertPoint(rowsTable.getTableHeader(), rowsTable.getTableHeader().getLocation(), jLayeredPane2);
g2d.drawImage(currentSearchButtonIcon.getImage(), currentSearchButtonLocation.x + loc.x, currentSearchButtonLocation.y + loc.y, null, null);
}
for (int i = 0; i < rowsTable.getColumnCount(); ++i) {
if (BrowserContentPane.this.table != null) {
if (BrowserContentPane.this.table.getColumns().get(i).name.toLowerCase().contains("e")) { // TODO
int vi = rowsTable.convertColumnIndexToView(i);
if (vi >= 0 && vi != currentSearchButtonColumnIndex) {
Point location = calcSearchColumnPosition(vi);
Point loc = SwingUtilities.convertPoint(rowsTable.getTableHeader(), rowsTable.getTableHeader().getLocation(), jLayeredPane2);
g2d.drawImage(half.getImage(), location.x + loc.x, location.y + loc.y, null, null);
}
}
}
}
// if (currentSearchButtonColumnIndex >= 0 && currentSearchButtonIcon != null && currentSearchButtonLocation != null) {
// Point loc = SwingUtilities.convertPoint(rowsTable.getTableHeader(), rowsTable.getTableHeader().getLocation(), jLayeredPane2);
// g2d.drawImage(currentSearchButtonIcon.getImage(), currentSearchButtonLocation.x + loc.x, currentSearchButtonLocation.y + loc.y, null, null);
// }
// for (int i = 0; i < rowsTable.getColumnCount(); ++i) {
// if (BrowserContentPane.this.table != null) {
// if (BrowserContentPane.this.table.getColumns().get(i).name.toLowerCase().contains("e")) { // TODO
// int vi = rowsTable.convertColumnIndexToView(i);
// if (vi >= 0 && vi != currentSearchButtonColumnIndex) {
// Point location = calcSearchColumnPosition(vi);
// Point loc = SwingUtilities.convertPoint(rowsTable.getTableHeader(), rowsTable.getTableHeader().getLocation(), jLayeredPane2);
// g2d.drawImage(half.getImage(), location.x + loc.x, location.y + loc.y, null, null);
// }
// }
// }
// }
}
};
rowsTableScrollPane.setWheelScrollingEnabled(false);
Expand Down

0 comments on commit 5c93598

Please sign in to comment.