From ee297a834747ac995c1f04a4b8902ff1eb901999 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 18 Oct 2014 23:42:40 +0200 Subject: [PATCH] order by "nachname" code for test and for real database --- src/de/mpg/molgen/buczek/portifix/Gui.java | 9 ++++++++- src/de/mpg/molgen/buczek/portifix/TableModel.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/de/mpg/molgen/buczek/portifix/Gui.java b/src/de/mpg/molgen/buczek/portifix/Gui.java index 378e528..47fbb1b 100644 --- a/src/de/mpg/molgen/buczek/portifix/Gui.java +++ b/src/de/mpg/molgen/buczek/portifix/Gui.java @@ -42,10 +42,17 @@ public class Gui extends javax.swing.JFrame { Connection connection; TableModel tableModel; + private static final boolean useTestDatabase=true; + private static final String connectString= + useTestDatabase + ? "jdbc:firebirdsql://portier-db//project/portier/firebird/data/x.fdb?encoding=UTF8" + : "jdbc:firebirdsql://portier-db/portiervision.fdb?encoding=UTF8"; + + private void filltable() { try { if (connection == null) { - connection = DriverManager.getConnection("jdbc:firebirdsql://portier-db//project/portier/firebird/data/x.fdb?encoding=UTF8", "sysdba", "***REMOVED***"); + connection = DriverManager.getConnection(connectString, "sysdba", "***REMOVED***"); tableModel.setConnection(connection); } tableModel.populate(); diff --git a/src/de/mpg/molgen/buczek/portifix/TableModel.java b/src/de/mpg/molgen/buczek/portifix/TableModel.java index 6167513..20ed1aa 100644 --- a/src/de/mpg/molgen/buczek/portifix/TableModel.java +++ b/src/de/mpg/molgen/buczek/portifix/TableModel.java @@ -77,7 +77,7 @@ public class TableModel extends AbstractTableModel { + " from AUSGABE,PERSONAL,EXEMPLAR" + " where AUSGABE.PERSONAL_ID=PERSONAL.PERSONAL_ID" + " and AUSGABE.EXEMPLAR_ID=EXEMPLAR.EXEMPLAR_ID" - + " order by NAME_2"; + + " order by NAME_1"; protected ArrayList row = new ArrayList(100);