diff --git a/.classpath b/.classpath index a6ea1d0..15d295c 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,6 @@ - + diff --git a/kBorrow.ucls b/kBorrow.ucls index 4bb436f..9eb5338 100644 --- a/kBorrow.ucls +++ b/kBorrow.ucls @@ -37,8 +37,8 @@ - + @@ -118,8 +118,8 @@ - + @@ -182,153 +182,141 @@ - - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + pModels){ dbCon = pDbCon; - articleModel = (ArticleModel)pModels.get("articlemodel"); - freeArticleModel = (FreeArticleModel)pModels.get("freearticlemodel"); + articleTableModel = (ArticleTableModel)pModels.get("articlemodel"); + freeArticleTableModel = (FreeArticleTableModel)pModels.get("freearticlemodel"); } /** @@ -29,8 +29,8 @@ public class ArticleController { public int createArticle(String pName, String pDesc) { int status = dbCon.createArticle(pName, pDesc); - articleModel.updateModel(); - freeArticleModel.updateModel(); + articleTableModel.updateModel(); + freeArticleTableModel.updateModel(); return status; } @@ -49,8 +49,8 @@ public class ArticleController { int status = this.dbCon.editArticle(pId, pName, pDesc); if(status == 0){ - articleModel.updateModel(); - freeArticleModel.updateModel(); + articleTableModel.updateModel(); + freeArticleTableModel.updateModel(); } return status; @@ -64,8 +64,8 @@ public class ArticleController { */ public boolean deleteArticle(int id) { if(this.dbCon.deleteArticle(id)){ - articleModel.updateModel(); - freeArticleModel.updateModel(); + articleTableModel.updateModel(); + freeArticleTableModel.updateModel(); return true; } diff --git a/src/de/katho/kBorrow/controller/UserController.java b/src/de/katho/kBorrow/controller/UserController.java index c8f21a3..41c0083 100644 --- a/src/de/katho/kBorrow/controller/UserController.java +++ b/src/de/katho/kBorrow/controller/UserController.java @@ -3,25 +3,25 @@ package de.katho.kBorrow.controller; import java.util.HashMap; import de.katho.kBorrow.db.DbConnector; -import de.katho.kBorrow.models.UserModel; +import de.katho.kBorrow.models.UserTableModel; import de.katho.kBorrow.models.UserListModel; public class UserController { private DbConnector dbCon; - private UserModel userModel; + private UserTableModel userTableModel; private UserListModel userListModel; public UserController(DbConnector pDbCon, HashMap pModels) { dbCon = pDbCon; - userModel = (UserModel)pModels.get("usermodel"); + userTableModel = (UserTableModel)pModels.get("usermodel"); userListModel = (UserListModel)pModels.get("userlistmodel"); } public int createUser(String pName, String pSurname){ int status = dbCon.createUser(pName, pSurname); - userModel.updateModel(); + userTableModel.updateModel(); userListModel.updateModel(); return status; @@ -31,7 +31,7 @@ public class UserController { int status = dbCon.editUser(pId, pName, pSurname); if(status == 0){ - userModel.updateModel(); + userTableModel.updateModel(); userListModel.updateModel(); } @@ -40,7 +40,7 @@ public class UserController { public boolean deleteUser(int id){ if(dbCon.deleteUser(id)){ - userModel.updateModel(); + userTableModel.updateModel(); userListModel.updateModel(); return true; diff --git a/src/de/katho/kBorrow/data/KLender.java b/src/de/katho/kBorrow/data/KLender.java new file mode 100644 index 0000000..d8a2769 --- /dev/null +++ b/src/de/katho/kBorrow/data/KLender.java @@ -0,0 +1,31 @@ +package de.katho.kBorrow.data; + +public class KLender { + private String name; + private String surname; + private int studentnumber; + private int id; + + public KLender(int pId, String pName, String pSurname, int pStudentnumber){ + id = pId; + name = pName; + surname = pSurname; + studentnumber = pStudentnumber; + } + + public String getName(){ + return name; + } + + public String getSurname(){ + return surname; + } + + public int getStudentnumber(){ + return studentnumber; + } + + public int getId(){ + return id; + } +} diff --git a/src/de/katho/kBorrow/db/DbConnector.java b/src/de/katho/kBorrow/db/DbConnector.java index 7856ea5..11018db 100644 --- a/src/de/katho/kBorrow/db/DbConnector.java +++ b/src/de/katho/kBorrow/db/DbConnector.java @@ -3,6 +3,7 @@ package de.katho.kBorrow.db; import java.util.ArrayList; import de.katho.kBorrow.data.KArticle; +import de.katho.kBorrow.data.KLender; import de.katho.kBorrow.data.KUser; public interface DbConnector { @@ -16,5 +17,6 @@ public interface DbConnector { public boolean deleteArticle(int id); public int editArticle(int pId, String pName, String pDesc); public ArrayList getFreeArticleList(); + public ArrayList getLenderList(); } diff --git a/src/de/katho/kBorrow/db/SqlConnector.java b/src/de/katho/kBorrow/db/SqlConnector.java index 5aab9b7..7830d85 100644 --- a/src/de/katho/kBorrow/db/SqlConnector.java +++ b/src/de/katho/kBorrow/db/SqlConnector.java @@ -3,6 +3,7 @@ package de.katho.kBorrow.db; import java.util.ArrayList; import de.katho.kBorrow.data.KArticle; +import de.katho.kBorrow.data.KLender; import de.katho.kBorrow.data.KUser; public class SqlConnector implements DbConnector{ @@ -65,5 +66,11 @@ public class SqlConnector implements DbConnector{ // TODO Auto-generated method stub return null; } + + @Override + public ArrayList getLenderList() { + // TODO Auto-generated method stub + return null; + } } diff --git a/src/de/katho/kBorrow/db/SqliteConnector.java b/src/de/katho/kBorrow/db/SqliteConnector.java index 4f952d2..ce71548 100644 --- a/src/de/katho/kBorrow/db/SqliteConnector.java +++ b/src/de/katho/kBorrow/db/SqliteConnector.java @@ -13,6 +13,7 @@ import java.util.Hashtable; import java.util.Map.Entry; import de.katho.kBorrow.data.KArticle; +import de.katho.kBorrow.data.KLender; import de.katho.kBorrow.data.KUser; /** @@ -242,6 +243,26 @@ public class SqliteConnector implements DbConnector { } } + public ArrayList getLenderList() { + ArrayList lendArr = new ArrayList(); + + try{ + Statement st = connection.createStatement(); + String query = "SELECT id, name, surname, studentnumber FROM lender"; + ResultSet rs = st.executeQuery(query); + + while (rs.next()){ + lendArr.add(new KLender(rs.getInt("id"), rs.getString("name"), rs.getString("surname"), rs.getInt("studentnumber"))); + } + + return lendArr; + } + catch(SQLException ex){ + ex.printStackTrace(); + return null; + } + } + /** * * @return 0: Benutzer erfolgreich erzeugt diff --git a/src/de/katho/kBorrow/gui/ArticlePanel.java b/src/de/katho/kBorrow/gui/ArticlePanel.java index ef9d5ae..156551c 100644 --- a/src/de/katho/kBorrow/gui/ArticlePanel.java +++ b/src/de/katho/kBorrow/gui/ArticlePanel.java @@ -27,7 +27,7 @@ import de.katho.kBorrow.controller.ArticleController; import de.katho.kBorrow.db.DbConnector; import de.katho.kBorrow.listener.ArticleDeleteTableButton; import de.katho.kBorrow.listener.ArticleEditTableButton; -import de.katho.kBorrow.models.ArticleModel; +import de.katho.kBorrow.models.ArticleTableModel; public class ArticlePanel extends JPanel implements ActionListener, KeyListener { @@ -40,7 +40,7 @@ public class ArticlePanel extends JPanel implements ActionListener, KeyListener private JLabel lblArticleStatus; private boolean articleModeEdit; private int articleEditId; - private ArticleModel articleModel; + private ArticleTableModel articleTableModel; /** * Create the panel. @@ -49,7 +49,7 @@ public class ArticlePanel extends JPanel implements ActionListener, KeyListener public ArticlePanel(final DbConnector dbCon, HashMap pModels) throws IOException { super(); this.setLayout(null); - articleModel = (ArticleModel)pModels.get("articlemodel"); + articleTableModel = (ArticleTableModel)pModels.get("articlemodel"); articleController = new ArticleController(dbCon, pModels); @@ -57,7 +57,7 @@ public class ArticlePanel extends JPanel implements ActionListener, KeyListener * Tabelle und drumherum */ - JTable articleTable = new JTable(articleModel); + JTable articleTable = new JTable(articleTableModel); articleTable.setRowHeight(30); ArticleDeleteTableButton articleDeleteTableButton = new ArticleDeleteTableButton("Löschen", articleTable, this, articleController); ArticleEditTableButton articleEditTableButton = new ArticleEditTableButton("Bearbeiten", articleTable, this); diff --git a/src/de/katho/kBorrow/gui/MainWindow.java b/src/de/katho/kBorrow/gui/MainWindow.java index e4a8367..0bc87c3 100644 --- a/src/de/katho/kBorrow/gui/MainWindow.java +++ b/src/de/katho/kBorrow/gui/MainWindow.java @@ -15,9 +15,9 @@ import de.katho.kBorrow.Settings; import de.katho.kBorrow.db.DbConnector; import de.katho.kBorrow.db.SqlConnector; import de.katho.kBorrow.db.SqliteConnector; -import de.katho.kBorrow.models.ArticleModel; -import de.katho.kBorrow.models.FreeArticleModel; -import de.katho.kBorrow.models.UserModel; +import de.katho.kBorrow.models.ArticleTableModel; +import de.katho.kBorrow.models.FreeArticleTableModel; +import de.katho.kBorrow.models.UserTableModel; import de.katho.kBorrow.models.UserListModel; @@ -58,10 +58,10 @@ public class MainWindow { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); models = new HashMap(); - models.put("usermodel", new UserModel(dbCon)); + models.put("usermodel", new UserTableModel(dbCon)); models.put("userlistmodel", new UserListModel(dbCon)); - models.put("articlemodel", new ArticleModel(dbCon)); - models.put("freearticlemodel", new FreeArticleModel(dbCon)); + models.put("articlemodel", new ArticleTableModel(dbCon)); + models.put("freearticlemodel", new FreeArticleTableModel(dbCon)); this.tabbedPane = new JTabbedPane(JTabbedPane.TOP); this.frame.getContentPane().add(this.tabbedPane, BorderLayout.CENTER); diff --git a/src/de/katho/kBorrow/gui/NewLendingPanel.java b/src/de/katho/kBorrow/gui/NewLendingPanel.java index 4f329d6..6352b5b 100644 --- a/src/de/katho/kBorrow/gui/NewLendingPanel.java +++ b/src/de/katho/kBorrow/gui/NewLendingPanel.java @@ -1,40 +1,37 @@ package de.katho.kBorrow.gui; +import java.awt.BorderLayout; +import java.awt.Color; +import java.io.IOException; +import java.util.Date; +import java.util.HashMap; + +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.UIManager; +import javax.swing.border.TitledBorder; + +import org.jdesktop.swingx.JXDatePicker; import de.katho.kBorrow.Util; import de.katho.kBorrow.db.DbConnector; import de.katho.kBorrow.listener.NewLendingTableButton; -import de.katho.kBorrow.models.FreeArticleModel; +import de.katho.kBorrow.models.FreeArticleTableModel; import de.katho.kBorrow.models.UserListModel; -import org.jdatepicker.*; - -import javax.swing.border.TitledBorder; -import javax.swing.JScrollPane; -import javax.swing.JTable; - -import java.awt.BorderLayout; -import java.io.IOException; -import java.util.HashMap; - -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JComboBox; -import javax.swing.JSeparator; -import javax.swing.JButton; -import javax.swing.JTextField; -import javax.swing.UIManager; - -import java.awt.Color; - public class NewLendingPanel extends JPanel { /** * */ private static final long serialVersionUID = -7346953418572781322L; - private FreeArticleModel freeArticleModel; + private FreeArticleTableModel freeArticleTableModel; private JTextField tfName; private JTextField tfSurname; private JTextField tfStudentNumber; @@ -52,10 +49,10 @@ public class NewLendingPanel extends JPanel { setLayout(null); // FreeArticleTable - freeArticleModel = (FreeArticleModel)pModel.get("freearticlemodel"); + freeArticleTableModel = (FreeArticleTableModel)pModel.get("freearticlemodel"); userListModel = (UserListModel)pModel.get("userlistmodel"); - JTable freeArticleTable = new JTable(freeArticleModel); + JTable freeArticleTable = new JTable(freeArticleTableModel); freeArticleTable.setRowHeight(30); NewLendingTableButton newLendingTableButton = new NewLendingTableButton("Artikel ausleihen", freeArticleTable, this); @@ -109,13 +106,10 @@ public class NewLendingPanel extends JPanel { lblNewLabel.setBounds(10, 60, 90, 20); panelNewLending.add(lblNewLabel); - JDatePicker picker = new JDateComponentFactory().createJDatePicker(); - picker.setTextEditable(true); - JPanel pickerPanel = new JPanel(); - pickerPanel.setBounds(106, 60, 205, 28); - pickerPanel.add((JComponent)picker); - panelNewLending.add(pickerPanel); - + JXDatePicker xpicker = new JXDatePicker(new Date()); + xpicker.setBounds(110, 60, 200, 20); + panelNewLending.add(xpicker); + JLabel lblBenutzer = new JLabel("Benutzer:"); lblBenutzer.setBounds(350, 20, 70, 20); diff --git a/src/de/katho/kBorrow/gui/UserPanel.java b/src/de/katho/kBorrow/gui/UserPanel.java index 753d928..c4b34fb 100644 --- a/src/de/katho/kBorrow/gui/UserPanel.java +++ b/src/de/katho/kBorrow/gui/UserPanel.java @@ -23,7 +23,7 @@ import de.katho.kBorrow.controller.UserController; import de.katho.kBorrow.db.DbConnector; import de.katho.kBorrow.listener.UserDeleteTableButton; import de.katho.kBorrow.listener.UserEditTableButton; -import de.katho.kBorrow.models.UserModel; +import de.katho.kBorrow.models.UserTableModel; public class UserPanel extends JPanel implements ActionListener, KeyListener { @@ -35,17 +35,17 @@ public class UserPanel extends JPanel implements ActionListener, KeyListener { private JButton btnUserCancel; private boolean userModeEdit; private int userEditId; - private UserModel userModel; + private UserTableModel userTableModel; private UserController userController; public UserPanel(final DbConnector dbCon, HashMap pModels) throws IOException{ super(); setLayout(null); - userModel = (UserModel)pModels.get("usermodel"); + userTableModel = (UserTableModel)pModels.get("usermodel"); userController = new UserController(dbCon, pModels); //Tabelle und drumherum - JTable userTable = new JTable(userModel); + JTable userTable = new JTable(userTableModel); userTable.setRowHeight(30); UserDeleteTableButton userDeleteTableButton = new UserDeleteTableButton("Löschen", userTable, this, userController); UserEditTableButton userEditTableButton = new UserEditTableButton("Bearbeiten", userTable, this); diff --git a/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java b/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java index 54d47bf..bf48ea3 100644 --- a/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java +++ b/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java @@ -11,7 +11,7 @@ import javax.swing.JTable; import de.katho.kBorrow.controller.ArticleController; import de.katho.kBorrow.gui.ArticlePanel; -import de.katho.kBorrow.models.ArticleModel; +import de.katho.kBorrow.models.ArticleTableModel; public class ArticleDeleteTableButton extends TableButton { @@ -31,7 +31,7 @@ public class ArticleDeleteTableButton extends TableButton { public void actionPerformed(ActionEvent e){ fireEditingStopped(); - ArticleModel model = (ArticleModel) pTable.getModel(); + ArticleTableModel model = (ArticleTableModel) pTable.getModel(); int row = pTable.getSelectedRow(); int id = model.getArticleId(row); diff --git a/src/de/katho/kBorrow/listener/ArticleEditTableButton.java b/src/de/katho/kBorrow/listener/ArticleEditTableButton.java index 0fb6433..0ecb2d8 100644 --- a/src/de/katho/kBorrow/listener/ArticleEditTableButton.java +++ b/src/de/katho/kBorrow/listener/ArticleEditTableButton.java @@ -10,7 +10,7 @@ import javax.swing.ImageIcon; import javax.swing.JTable; import de.katho.kBorrow.gui.ArticlePanel; -import de.katho.kBorrow.models.ArticleModel; +import de.katho.kBorrow.models.ArticleTableModel; public class ArticleEditTableButton extends TableButton { @@ -30,7 +30,7 @@ public class ArticleEditTableButton extends TableButton { public void actionPerformed(ActionEvent e){ fireEditingStopped(); - ArticleModel model = (ArticleModel) pTable.getModel(); + ArticleTableModel model = (ArticleTableModel) pTable.getModel(); int row = pTable.getSelectedRow(); articleTab.setModeEditArticle(model.getArticleId(row), model.getArticleName(row), model.getArticleDescription(row)); diff --git a/src/de/katho/kBorrow/listener/NewLendingTableButton.java b/src/de/katho/kBorrow/listener/NewLendingTableButton.java index 8577c9d..b4392a4 100644 --- a/src/de/katho/kBorrow/listener/NewLendingTableButton.java +++ b/src/de/katho/kBorrow/listener/NewLendingTableButton.java @@ -10,7 +10,7 @@ import javax.swing.ImageIcon; import javax.swing.JTable; import de.katho.kBorrow.gui.NewLendingPanel; -import de.katho.kBorrow.models.FreeArticleModel; +import de.katho.kBorrow.models.FreeArticleTableModel; public class NewLendingTableButton extends TableButton { @@ -30,7 +30,7 @@ public class NewLendingTableButton extends TableButton { public void actionPerformed(ActionEvent e){ fireEditingStopped(); - FreeArticleModel model = (FreeArticleModel) pTable.getModel(); + FreeArticleTableModel model = (FreeArticleTableModel) pTable.getModel(); int row = pTable.getSelectedRow(); pPanel.setModeNewLending(model.getArticleId(row), model.getArticleName(row)); diff --git a/src/de/katho/kBorrow/listener/UserDeleteTableButton.java b/src/de/katho/kBorrow/listener/UserDeleteTableButton.java index b897a2e..843e1f2 100644 --- a/src/de/katho/kBorrow/listener/UserDeleteTableButton.java +++ b/src/de/katho/kBorrow/listener/UserDeleteTableButton.java @@ -11,7 +11,7 @@ import javax.swing.JTable; import de.katho.kBorrow.controller.UserController; import de.katho.kBorrow.gui.UserPanel; -import de.katho.kBorrow.models.UserModel; +import de.katho.kBorrow.models.UserTableModel; public class UserDeleteTableButton extends TableButton { @@ -28,7 +28,7 @@ public class UserDeleteTableButton extends TableButton { public void actionPerformed(ActionEvent e){ fireEditingStopped(); - UserModel model = (UserModel) pTable.getModel(); + UserTableModel model = (UserTableModel) pTable.getModel(); int row = pTable.getSelectedRow(); int id = model.getUserId(row); diff --git a/src/de/katho/kBorrow/listener/UserEditTableButton.java b/src/de/katho/kBorrow/listener/UserEditTableButton.java index 542a2c9..2f38c7f 100644 --- a/src/de/katho/kBorrow/listener/UserEditTableButton.java +++ b/src/de/katho/kBorrow/listener/UserEditTableButton.java @@ -10,7 +10,7 @@ import javax.swing.ImageIcon; import javax.swing.JTable; import de.katho.kBorrow.gui.UserPanel; -import de.katho.kBorrow.models.UserModel; +import de.katho.kBorrow.models.UserTableModel; public class UserEditTableButton extends TableButton { @@ -30,7 +30,7 @@ public class UserEditTableButton extends TableButton { public void actionPerformed(ActionEvent e){ fireEditingStopped(); - UserModel model = (UserModel) pTable.getModel(); + UserTableModel model = (UserTableModel) pTable.getModel(); int row = pTable.getSelectedRow(); pPanel.setModeEditUser(model.getUserId(row), model.getUserName(row), model.getUserSurname(row)); diff --git a/src/de/katho/kBorrow/models/ArticleModel.java b/src/de/katho/kBorrow/models/ArticleTableModel.java similarity index 92% rename from src/de/katho/kBorrow/models/ArticleModel.java rename to src/de/katho/kBorrow/models/ArticleTableModel.java index 978622c..bb1c563 100644 --- a/src/de/katho/kBorrow/models/ArticleModel.java +++ b/src/de/katho/kBorrow/models/ArticleTableModel.java @@ -7,7 +7,7 @@ import javax.swing.table.AbstractTableModel; import de.katho.kBorrow.data.KArticle; import de.katho.kBorrow.db.DbConnector; -public class ArticleModel extends AbstractTableModel { +public class ArticleTableModel extends AbstractTableModel { /** * @@ -17,7 +17,7 @@ public class ArticleModel extends AbstractTableModel { protected DbConnector dbCon; protected ArrayList data = new ArrayList(); - public ArticleModel(DbConnector pDbCon){ + public ArticleTableModel(DbConnector pDbCon){ header = new String [] {"ID", "Artikelname", "Artikelbeschreibung", "", ""}; this.dbCon = pDbCon; this.updateModel(); diff --git a/src/de/katho/kBorrow/models/FreeArticleModel.java b/src/de/katho/kBorrow/models/FreeArticleTableModel.java similarity index 76% rename from src/de/katho/kBorrow/models/FreeArticleModel.java rename to src/de/katho/kBorrow/models/FreeArticleTableModel.java index 00b8a3d..aa41789 100644 --- a/src/de/katho/kBorrow/models/FreeArticleModel.java +++ b/src/de/katho/kBorrow/models/FreeArticleTableModel.java @@ -2,7 +2,7 @@ package de.katho.kBorrow.models; import de.katho.kBorrow.db.DbConnector; -public class FreeArticleModel extends ArticleModel { +public class FreeArticleTableModel extends ArticleTableModel { /** * @@ -10,7 +10,7 @@ public class FreeArticleModel extends ArticleModel { private static final long serialVersionUID = 1908669541941834593L; private String[] header; - public FreeArticleModel(DbConnector pDbCon) { + public FreeArticleTableModel(DbConnector pDbCon) { super(pDbCon); this.header = new String[] {"ID", "Artikelname", "Artikelbeschreibung", ""}; diff --git a/src/de/katho/kBorrow/models/LenderModel.java b/src/de/katho/kBorrow/models/LenderModel.java new file mode 100644 index 0000000..3d9ca0b --- /dev/null +++ b/src/de/katho/kBorrow/models/LenderModel.java @@ -0,0 +1,20 @@ +package de.katho.kBorrow.models; + +import java.util.ArrayList; + +import de.katho.kBorrow.data.KLender; +import de.katho.kBorrow.db.DbConnector; + +public class LenderModel { + private ArrayList data; + private DbConnector dbCon; + + public LenderModel(DbConnector pDbCon){ + dbCon = pDbCon; + updateModel(); + } + + public void updateModel(){ + data = dbCon.getLenderList(); + } +} diff --git a/src/de/katho/kBorrow/models/UserModel.java b/src/de/katho/kBorrow/models/UserTableModel.java similarity index 90% rename from src/de/katho/kBorrow/models/UserModel.java rename to src/de/katho/kBorrow/models/UserTableModel.java index 33f03b6..ce1b153 100644 --- a/src/de/katho/kBorrow/models/UserModel.java +++ b/src/de/katho/kBorrow/models/UserTableModel.java @@ -7,7 +7,7 @@ import javax.swing.table.AbstractTableModel; import de.katho.kBorrow.data.KUser; import de.katho.kBorrow.db.DbConnector; -public class UserModel extends AbstractTableModel { +public class UserTableModel extends AbstractTableModel { /** * @@ -17,7 +17,7 @@ public class UserModel extends AbstractTableModel { private String[] header = {"ID", "Vorname", "Nachname", "", ""}; private ArrayList data = new ArrayList(); - public UserModel(DbConnector pDbCon){ + public UserTableModel(DbConnector pDbCon){ dbCon = pDbCon; updateModel(); }