From 32c8042b75f0f6de96d464d58182b14585018853 Mon Sep 17 00:00:00 2001 From: Servicepoint Date: Wed, 26 Nov 2014 17:56:25 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Erste=20Ans=C3=A4tze,=20ein=20Artikel-Inspe?= =?UTF-8?q?ct-Frame=20zu=20implementieren.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kBorrow/gui/ArticleInspectFrame.java | 53 +++++++++++++++++++ src/de/katho/kBorrow/gui/ArticlePanel.java | 8 +-- .../listener/ArticleInspectTableButton.java | 40 ++++++++++++++ .../kBorrow/models/ArticleTableModel.java | 2 +- 4 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 src/de/katho/kBorrow/gui/ArticleInspectFrame.java create mode 100644 src/de/katho/kBorrow/listener/ArticleInspectTableButton.java diff --git a/src/de/katho/kBorrow/gui/ArticleInspectFrame.java b/src/de/katho/kBorrow/gui/ArticleInspectFrame.java new file mode 100644 index 0000000..eb643cc --- /dev/null +++ b/src/de/katho/kBorrow/gui/ArticleInspectFrame.java @@ -0,0 +1,53 @@ +package de.katho.kBorrow.gui; + +import java.awt.BorderLayout; +import java.util.HashMap; + +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.border.EmptyBorder; +import javax.swing.JScrollPane; +import javax.swing.JLabel; +import javax.swing.JTable; +import java.awt.GridLayout; + +public class ArticleInspectFrame extends JFrame { + + /** + * + */ + private static final long serialVersionUID = -8993341404926674307L; + private JPanel contentPane; + private JTable table; + + /** + * Create the frame. + */ + public ArticleInspectFrame(int pArtId, HashMap pModels) { + setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setBounds(100, 100, 660, 541); + contentPane = new JPanel(); + contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); + contentPane.setLayout(new BorderLayout(0, 0)); + setContentPane(contentPane); + + JPanel panel = new JPanel(); + contentPane.add(panel, BorderLayout.CENTER); + panel.setLayout(null); + + JLabel lblNewLabel_1 = new JLabel("Artikelname"); + lblNewLabel_1.setBounds(0, 0, 100, 30); + panel.add(lblNewLabel_1); + + JLabel lblNewLabel = new JLabel("New label"); + lblNewLabel.setBounds(0, 45, 634, 45); + panel.add(lblNewLabel); + table = new JTable(); + + JScrollPane scrollPane = new JScrollPane(table); + contentPane.add(scrollPane, BorderLayout.SOUTH); + + setVisible(true); + } + +} diff --git a/src/de/katho/kBorrow/gui/ArticlePanel.java b/src/de/katho/kBorrow/gui/ArticlePanel.java index ddcab1f..a45a257 100644 --- a/src/de/katho/kBorrow/gui/ArticlePanel.java +++ b/src/de/katho/kBorrow/gui/ArticlePanel.java @@ -28,6 +28,7 @@ import de.katho.kBorrow.data.KArticle; import de.katho.kBorrow.db.DbConnector; import de.katho.kBorrow.listener.ArticleDeleteTableButton; import de.katho.kBorrow.listener.ArticleEditTableButton; +import de.katho.kBorrow.listener.ArticleInspectTableButton; import de.katho.kBorrow.models.ArticleTableModel; public class ArticlePanel extends JPanel implements ActionListener, KeyListener { @@ -61,10 +62,11 @@ public class ArticlePanel extends JPanel implements ActionListener, KeyListener articleTable.setRowHeight(30); ArticleDeleteTableButton articleDeleteTableButton = new ArticleDeleteTableButton("Löschen", articleTable, this, articleController); ArticleEditTableButton articleEditTableButton = new ArticleEditTableButton("Bearbeiten", articleTable, this); + ArticleInspectTableButton articleInspectTableButton = new ArticleInspectTableButton("Details", articleTable, pModels); - for (int i = 3; i <= 4; i++){ - articleTable.getColumnModel().getColumn(i).setCellEditor(i == 3 ? articleEditTableButton : articleDeleteTableButton); - articleTable.getColumnModel().getColumn(i).setCellRenderer(i == 3 ? articleEditTableButton : articleDeleteTableButton); + for (int i = 3; i <= 5; i++){ + articleTable.getColumnModel().getColumn(i).setCellEditor(i == 3 ? articleInspectTableButton : i == 4 ? articleEditTableButton : articleDeleteTableButton); + articleTable.getColumnModel().getColumn(i).setCellRenderer(i == 3 ? articleInspectTableButton : i == 4 ? articleEditTableButton : articleDeleteTableButton); articleTable.getColumnModel().getColumn(i).setMinWidth(30); articleTable.getColumnModel().getColumn(i).setMaxWidth(30); diff --git a/src/de/katho/kBorrow/listener/ArticleInspectTableButton.java b/src/de/katho/kBorrow/listener/ArticleInspectTableButton.java new file mode 100644 index 0000000..4e954d1 --- /dev/null +++ b/src/de/katho/kBorrow/listener/ArticleInspectTableButton.java @@ -0,0 +1,40 @@ +package de.katho.kBorrow.listener; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; + +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import javax.swing.JTable; + +import de.katho.kBorrow.gui.ArticleInspectFrame; + +public class ArticleInspectTableButton extends TableButton { + + /** + * + */ + private static final long serialVersionUID = -2591133864537097893L; + + public ArticleInspectTableButton(String pLabel, final JTable pTable, final HashMap pModels) throws IOException { + super(pLabel); + ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/system-search.png"))); + + buttonE.setIcon(icon); + buttonR.setIcon(icon); + + buttonE.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent e){ + fireEditingStopped(); + + int row = pTable.getSelectedRow(); + + new ArticleInspectFrame(row, pModels); + } + }); + } + +} diff --git a/src/de/katho/kBorrow/models/ArticleTableModel.java b/src/de/katho/kBorrow/models/ArticleTableModel.java index 8ca6b76..b63726a 100644 --- a/src/de/katho/kBorrow/models/ArticleTableModel.java +++ b/src/de/katho/kBorrow/models/ArticleTableModel.java @@ -18,7 +18,7 @@ public class ArticleTableModel extends AbstractTableModel { protected ArrayList data = new ArrayList(); public ArticleTableModel(DbConnector pDbCon){ - header = new String [] {"ID", "Artikelname", "Artikelbeschreibung", "", ""}; + header = new String [] {"ID", "Artikelname", "Artikelbeschreibung", "", "", ""}; this.dbCon = pDbCon; this.updateModel(); } From 4f71db4fa09f20161922e55237f036631fff7326 Mon Sep 17 00:00:00 2001 From: Servicepoint Date: Tue, 2 Dec 2014 17:24:39 +0100 Subject: [PATCH 2/3] ArticleInspect-Fenster ist grundlegend implementiert und zeigt alle Ausleihen zu einem Artikel an. --- src/de/katho/kBorrow/Util.java | 3 - src/de/katho/kBorrow/db/DbConnector.java | 1 + src/de/katho/kBorrow/db/SqlConnector.java | 6 ++ src/de/katho/kBorrow/db/SqliteConnector.java | 21 +++++ .../kBorrow/gui/ArticleInspectFrame.java | 52 ++++++++--- src/de/katho/kBorrow/gui/ArticlePanel.java | 2 +- .../listener/ArticleInspectTableButton.java | 12 +-- .../models/ArticleInspectTableModel.java | 89 +++++++++++++++++++ 8 files changed, 166 insertions(+), 20 deletions(-) create mode 100644 src/de/katho/kBorrow/models/ArticleInspectTableModel.java diff --git a/src/de/katho/kBorrow/Util.java b/src/de/katho/kBorrow/Util.java index 5579ceb..6ea291c 100644 --- a/src/de/katho/kBorrow/Util.java +++ b/src/de/katho/kBorrow/Util.java @@ -3,9 +3,6 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import de.katho.kBorrow.db.DbConnector; - - public class Util { public static String getCurrentDate(){ DateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy"); diff --git a/src/de/katho/kBorrow/db/DbConnector.java b/src/de/katho/kBorrow/db/DbConnector.java index 312e863..e71acdc 100644 --- a/src/de/katho/kBorrow/db/DbConnector.java +++ b/src/de/katho/kBorrow/db/DbConnector.java @@ -23,4 +23,5 @@ public interface DbConnector { public int createNewLender(String pLName, String pLSurname, String pLSN); public ArrayList getActiveLendingList(); public int returnLending(int lendingId, int artId, String string); + public ArrayList getLendingListForArticle(int pArtId); } diff --git a/src/de/katho/kBorrow/db/SqlConnector.java b/src/de/katho/kBorrow/db/SqlConnector.java index a1dec79..399a2b4 100644 --- a/src/de/katho/kBorrow/db/SqlConnector.java +++ b/src/de/katho/kBorrow/db/SqlConnector.java @@ -98,5 +98,11 @@ public class SqlConnector implements DbConnector{ // TODO Auto-generated method stub return 0; } + + @Override + public ArrayList getLendingListForArticle(int pArtId) { + // 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 9efb242..80c270b 100644 --- a/src/de/katho/kBorrow/db/SqliteConnector.java +++ b/src/de/katho/kBorrow/db/SqliteConnector.java @@ -286,6 +286,27 @@ public class SqliteConnector implements DbConnector { return lendingArr; } } + + public ArrayList getLendingListForArticle(int pArtId){ + ArrayList lendingArr = new ArrayList(); + + try{ + Statement st = connection.createStatement(); + String query = "SELECT id, user_id, lender_id, start_date, expected_end_date, end_date FROM lending WHERE article_id = '"+pArtId+"' ORDER BY id DESC"; + + ResultSet rs = st.executeQuery(query); + + while(rs.next()){ + lendingArr.add(new KLending(rs.getInt("id"), rs.getInt("user_id"), rs.getInt("lender_id"), pArtId, rs.getString("start_date"), rs.getString("expected_end_date"), rs.getString("end_date"))); + } + + return lendingArr; + } + catch(SQLException e){ + e.printStackTrace(); + return lendingArr; + } + } /** * diff --git a/src/de/katho/kBorrow/gui/ArticleInspectFrame.java b/src/de/katho/kBorrow/gui/ArticleInspectFrame.java index eb643cc..9de23fb 100644 --- a/src/de/katho/kBorrow/gui/ArticleInspectFrame.java +++ b/src/de/katho/kBorrow/gui/ArticleInspectFrame.java @@ -9,7 +9,11 @@ import javax.swing.border.EmptyBorder; import javax.swing.JScrollPane; import javax.swing.JLabel; import javax.swing.JTable; -import java.awt.GridLayout; + +import de.katho.kBorrow.data.KArticle; +import de.katho.kBorrow.db.DbConnector; +import de.katho.kBorrow.models.ArticleInspectTableModel; +import de.katho.kBorrow.models.ArticleTableModel; public class ArticleInspectFrame extends JFrame { @@ -19,32 +23,58 @@ public class ArticleInspectFrame extends JFrame { private static final long serialVersionUID = -8993341404926674307L; private JPanel contentPane; private JTable table; + private ArticleInspectTableModel artInsModel; + private ArticleTableModel articleModel; + private KArticle article; /** * Create the frame. */ - public ArticleInspectFrame(int pArtId, HashMap pModels) { + public ArticleInspectFrame(int pRow, final DbConnector dbCon, HashMap pModels) { + articleModel = (ArticleTableModel)pModels.get("articletablemodel"); + article = articleModel.getArticleByRow(pRow); + setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); setBounds(100, 100, 660, 541); + setTitle("Details: "+article.getName()); + + // Table + artInsModel = new ArticleInspectTableModel(pRow, dbCon, pModels); + table = new JTable(artInsModel); + table.setFillsViewportHeight(true); + table.setRowHeight(30); + table.getColumnModel().getColumn(0).setMinWidth(30); + table.getColumnModel().getColumn(0).setMaxWidth(30); + table.getColumnModel().getColumn(0).setPreferredWidth(30); + JScrollPane scrollPane = new JScrollPane(table); + contentPane = new JPanel(); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); contentPane.setLayout(new BorderLayout(0, 0)); - setContentPane(contentPane); + JPanel panel = new JPanel(); - contentPane.add(panel, BorderLayout.CENTER); + panel.setLayout(null); - JLabel lblNewLabel_1 = new JLabel("Artikelname"); + JLabel lblNewLabel_1 = new JLabel("Artikelname:"); + JLabel lblArticleName = new JLabel(article.getName()); + JLabel lblNewLabel_2 = new JLabel ("Artikelbeschreibung:"); + JLabel lblArticleDesc = new JLabel(article.getDescription()); + lblNewLabel_1.setBounds(0, 0, 100, 30); + lblNewLabel_2.setBounds(0, 20, 100, 30); + lblArticleName.setBounds(120, 0, 100, 30); + lblArticleDesc.setBounds(120, 20, 200, 60); + + panel.add(lblNewLabel_1); + panel.add(lblNewLabel_2); + panel.add(lblArticleName); + panel.add(lblArticleDesc); - JLabel lblNewLabel = new JLabel("New label"); - lblNewLabel.setBounds(0, 45, 634, 45); - panel.add(lblNewLabel); - table = new JTable(); - - JScrollPane scrollPane = new JScrollPane(table); + setContentPane(contentPane); + contentPane.add(panel, BorderLayout.CENTER); contentPane.add(scrollPane, BorderLayout.SOUTH); setVisible(true); diff --git a/src/de/katho/kBorrow/gui/ArticlePanel.java b/src/de/katho/kBorrow/gui/ArticlePanel.java index a45a257..1ee9e07 100644 --- a/src/de/katho/kBorrow/gui/ArticlePanel.java +++ b/src/de/katho/kBorrow/gui/ArticlePanel.java @@ -62,7 +62,7 @@ public class ArticlePanel extends JPanel implements ActionListener, KeyListener articleTable.setRowHeight(30); ArticleDeleteTableButton articleDeleteTableButton = new ArticleDeleteTableButton("Löschen", articleTable, this, articleController); ArticleEditTableButton articleEditTableButton = new ArticleEditTableButton("Bearbeiten", articleTable, this); - ArticleInspectTableButton articleInspectTableButton = new ArticleInspectTableButton("Details", articleTable, pModels); + ArticleInspectTableButton articleInspectTableButton = new ArticleInspectTableButton("Details", articleTable, dbCon, pModels); for (int i = 3; i <= 5; i++){ articleTable.getColumnModel().getColumn(i).setCellEditor(i == 3 ? articleInspectTableButton : i == 4 ? articleEditTableButton : articleDeleteTableButton); diff --git a/src/de/katho/kBorrow/listener/ArticleInspectTableButton.java b/src/de/katho/kBorrow/listener/ArticleInspectTableButton.java index 4e954d1..aea1e5f 100644 --- a/src/de/katho/kBorrow/listener/ArticleInspectTableButton.java +++ b/src/de/katho/kBorrow/listener/ArticleInspectTableButton.java @@ -2,14 +2,15 @@ package de.katho.kBorrow.listener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.HashMap; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JTable; +import sun.tools.jar.Main; +import de.katho.kBorrow.db.DbConnector; import de.katho.kBorrow.gui.ArticleInspectFrame; public class ArticleInspectTableButton extends TableButton { @@ -19,9 +20,10 @@ public class ArticleInspectTableButton extends TableButton { */ private static final long serialVersionUID = -2591133864537097893L; - public ArticleInspectTableButton(String pLabel, final JTable pTable, final HashMap pModels) throws IOException { + public ArticleInspectTableButton(String pLabel, final JTable pTable, final DbConnector dbCon, final HashMap pModels) throws IOException { super(pLabel); - ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/system-search.png"))); + URL url = Main.class.getResource("/icons/system-search.png"); + ImageIcon icon = new ImageIcon(url); buttonE.setIcon(icon); buttonR.setIcon(icon); @@ -32,7 +34,7 @@ public class ArticleInspectTableButton extends TableButton { int row = pTable.getSelectedRow(); - new ArticleInspectFrame(row, pModels); + new ArticleInspectFrame(row, dbCon, pModels); } }); } diff --git a/src/de/katho/kBorrow/models/ArticleInspectTableModel.java b/src/de/katho/kBorrow/models/ArticleInspectTableModel.java new file mode 100644 index 0000000..aa9c7e2 --- /dev/null +++ b/src/de/katho/kBorrow/models/ArticleInspectTableModel.java @@ -0,0 +1,89 @@ +package de.katho.kBorrow.models; + +import java.util.ArrayList; +import java.util.HashMap; + +import javax.swing.table.AbstractTableModel; + +import de.katho.kBorrow.data.KArticle; +import de.katho.kBorrow.data.KLender; +import de.katho.kBorrow.data.KLending; +import de.katho.kBorrow.data.KUser; +import de.katho.kBorrow.db.DbConnector; + +public class ArticleInspectTableModel extends AbstractTableModel { + + /** + * + */ + private static final long serialVersionUID = 2293157709447086998L; + private String[] header; + private ArrayList data; + private DbConnector dbCon; + private KArticle article; + private ArticleTableModel articleModel; + private UserTableModel userModel; + private LenderModel lenderModel; + + + public ArticleInspectTableModel(int pRow, DbConnector pDbCon, HashMap pModels){ + header = new String[] {"ID", "Verliehen von:", "Ausgeliehen an:", "Ausleihdatum", "Vor. Rückgabe", "Rückgabe"}; + dbCon = pDbCon; + articleModel = (ArticleTableModel)pModels.get("articletablemodel"); + userModel = (UserTableModel)pModels.get("usertablemodel"); + lenderModel = (LenderModel)pModels.get("lendermodel"); + + article = articleModel.getArticleByRow(pRow); + + updateModel(); + } + + public void updateModel() { + data = dbCon.getLendingListForArticle(article.getId()); + fireTableDataChanged(); + } + + public int getColumnCount() { + return header.length; + } + + public String getColumnName(int col){ + return header[col]; + } + + public int getRowCount() { + return data.size(); + } + + public Object getValueAt(int row, int col) { + switch(col){ + case 0: + return data.get(row).getId(); + + case 1: + int uid = data.get(row).getUserId(); + KUser user = userModel.getUserById(uid); + + return user.getName()+" "+user.getSurname(); + + case 2: + int lid = data.get(row).getLenderId(); + KLender lender = lenderModel.getLenderById(lid); + + return lender.getName()+" "+lender.getSurname()+" ("+lender.getStudentnumber()+")"; + + case 3: + return data.get(row).getStartDate(); + + case 4: + return data.get(row).getExpectedEndDate(); + + case 5: + return data.get(row).getEndDate(); + + default: + return null; + } + } + +} From c32b6c7ab98d2e440224b70b753f91d26e215a41 Mon Sep 17 00:00:00 2001 From: Servicepoint Date: Wed, 3 Dec 2014 16:03:35 +0100 Subject: [PATCH 3/3] =?UTF-8?q?issue=20#7:=20Kleinere=20Design=C3=A4nderun?= =?UTF-8?q?gen=20am=20Inspect-Frame=20und=20dem=20Datenmodell.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kBorrow/gui/ArticleInspectFrame.java | 70 +++++++++++-------- .../models/ArticleInspectTableModel.java | 4 ++ 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/src/de/katho/kBorrow/gui/ArticleInspectFrame.java b/src/de/katho/kBorrow/gui/ArticleInspectFrame.java index 9de23fb..2b1fc7e 100644 --- a/src/de/katho/kBorrow/gui/ArticleInspectFrame.java +++ b/src/de/katho/kBorrow/gui/ArticleInspectFrame.java @@ -1,14 +1,15 @@ package de.katho.kBorrow.gui; -import java.awt.BorderLayout; import java.util.HashMap; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; +import javax.swing.BorderFactory; import javax.swing.JScrollPane; import javax.swing.JLabel; import javax.swing.JTable; +import javax.swing.JTextArea; import de.katho.kBorrow.data.KArticle; import de.katho.kBorrow.db.DbConnector; @@ -35,9 +36,40 @@ public class ArticleInspectFrame extends JFrame { article = articleModel.getArticleByRow(pRow); setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - setBounds(100, 100, 660, 541); + setBounds(150, 150, 660, 541); setTitle("Details: "+article.getName()); + // ContentPane + contentPane = new JPanel(); + contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); + setContentPane(contentPane); + contentPane.setLayout(null); + + // Panel Info + JPanel panelInfo = new JPanel(); + panelInfo.setBounds(0, 0, 644, 134); + panelInfo.setBorder(BorderFactory.createTitledBorder("Artikeldetails")); + + panelInfo.setLayout(null); + + JLabel lblNewLabel_1 = new JLabel("Artikelname:"); + JLabel lblArticleName = new JLabel(article.getName()); + JLabel lblNewLabel_2 = new JLabel ("Artikelbeschreibung:"); + JTextArea taArticleDesc = new JTextArea(article.getDescription()); + taArticleDesc.setRows(5); + taArticleDesc.setBorder(BorderFactory.createEtchedBorder()); + + lblNewLabel_1.setBounds(10, 21, 100, 20); + lblNewLabel_2.setBounds(10, 47, 100, 20); + lblArticleName.setBounds(120, 21, 100, 20); + taArticleDesc.setBounds(120, 45, 250, 78); + taArticleDesc.setEditable(false); + + panelInfo.add(lblNewLabel_1); + panelInfo.add(lblNewLabel_2); + panelInfo.add(lblArticleName); + panelInfo.add(taArticleDesc); + // Table artInsModel = new ArticleInspectTableModel(pRow, dbCon, pModels); table = new JTable(artInsModel); @@ -46,36 +78,14 @@ public class ArticleInspectFrame extends JFrame { table.getColumnModel().getColumn(0).setMinWidth(30); table.getColumnModel().getColumn(0).setMaxWidth(30); table.getColumnModel().getColumn(0).setPreferredWidth(30); + JScrollPane scrollPane = new JScrollPane(table); + scrollPane.setBounds(0, 131, 644, 371); + scrollPane.setBorder(BorderFactory.createTitledBorder("Alle Ausleihen des Artikels \""+article.getName()+"\"")); - contentPane = new JPanel(); - contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); - contentPane.setLayout(new BorderLayout(0, 0)); - - - JPanel panel = new JPanel(); - - panel.setLayout(null); - - JLabel lblNewLabel_1 = new JLabel("Artikelname:"); - JLabel lblArticleName = new JLabel(article.getName()); - JLabel lblNewLabel_2 = new JLabel ("Artikelbeschreibung:"); - JLabel lblArticleDesc = new JLabel(article.getDescription()); - - lblNewLabel_1.setBounds(0, 0, 100, 30); - lblNewLabel_2.setBounds(0, 20, 100, 30); - lblArticleName.setBounds(120, 0, 100, 30); - lblArticleDesc.setBounds(120, 20, 200, 60); - - - panel.add(lblNewLabel_1); - panel.add(lblNewLabel_2); - panel.add(lblArticleName); - panel.add(lblArticleDesc); - - setContentPane(contentPane); - contentPane.add(panel, BorderLayout.CENTER); - contentPane.add(scrollPane, BorderLayout.SOUTH); + // Add components to ContentPane + contentPane.add(panelInfo); + contentPane.add(scrollPane); setVisible(true); } diff --git a/src/de/katho/kBorrow/models/ArticleInspectTableModel.java b/src/de/katho/kBorrow/models/ArticleInspectTableModel.java index aa9c7e2..1f7a173 100644 --- a/src/de/katho/kBorrow/models/ArticleInspectTableModel.java +++ b/src/de/katho/kBorrow/models/ArticleInspectTableModel.java @@ -55,6 +55,10 @@ public class ArticleInspectTableModel extends AbstractTableModel { return data.size(); } + public boolean isCellEditable(int pRow, int pCol){ + return false; + } + public Object getValueAt(int row, int col) { switch(col){ case 0: