From c32b6c7ab98d2e440224b70b753f91d26e215a41 Mon Sep 17 00:00:00 2001
From: Servicepoint <Servicepoint@P-PC-BHDFS12>
Date: Wed, 3 Dec 2014 16:03:35 +0100
Subject: [PATCH] =?UTF-8?q?issue=20#7:=20Kleinere=20Design=C3=A4nderungen?=
 =?UTF-8?q?=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: