Util Klasse hinzugefügt und kleinere Änderungen an NewLending

durchgeführt.

src/de/katho/kBorrow/Util.java

@@ -0,0 +1,14 @@
+package de.katho.kBorrow;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+public class Util {
+	public static String getCurrentDate(){
+		DateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
+		Date date = new Date();
+		
+		return dateFormat.format(date);
+	}
+}

src/de/katho/kBorrow/gui/NewLendingPanel.java

@@ -2,11 +2,14 @@ package de.katho.kBorrow.gui;
 
 import javax.swing.JPanel;
 
+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.UserListModel;
 
+import org.jdatepicker.*;
+
 import javax.swing.border.TitledBorder;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -15,6 +18,7 @@ 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;
@@ -35,6 +39,9 @@ public class NewLendingPanel extends JPanel {
 	private JTextField tfSurname;
 	private JTextField tfStudentNumber;
 	private UserListModel userListModel;
+	private JLabel lblStartDate;
+	private JLabel lblArticleName;
+	private int articleId = -1;
 	
 	/**
 	 * Create the panel.
@@ -86,22 +93,30 @@ public class NewLendingPanel extends JPanel {
 		lblArtikelname.setBounds(10, 20, 90, 20);
 		panelNewLending.add(lblArtikelname);
 		
-		JLabel lblArticleName = new JLabel("");
-		lblArticleName.setBounds(110, 20, 100, 20);
+		lblArticleName = new JLabel("");
+		lblArticleName.setBounds(110, 20, 205, 20);
 		panelNewLending.add(lblArticleName);
 		
 		JLabel lblAusgeliehenAm = new JLabel("Ausgeliehen am:");
 		lblAusgeliehenAm.setBounds(10, 40, 90, 20);
 		panelNewLending.add(lblAusgeliehenAm);
 		
-		JLabel lblStartDate = new JLabel("");
-		lblStartDate.setBounds(110, 40, 100, 20);
+		lblStartDate = new JLabel("");
+		lblStartDate.setBounds(110, 40, 205, 20);
 		panelNewLending.add(lblStartDate);
 		
 		JLabel lblNewLabel = new JLabel("Vor. R<>ckgabe:");
 		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);	
+		
+		
 		JLabel lblBenutzer = new JLabel("Benutzer:");
 		lblBenutzer.setBounds(350, 20, 70, 20);
 		panelNewLending.add(lblBenutzer);
@@ -151,9 +166,11 @@ public class NewLendingPanel extends JPanel {
 
 	}
 
-	public void setModeNewLending(int articleId, String articleName,
-			String articleDescription) {
-		// TODO Auto-generated method stub
+	public void setModeNewLending(int pArticleId, String articleName) {
+		
+		lblStartDate.setText(Util.getCurrentDate());
+		lblArticleName.setText(articleName);
+		articleId = pArticleId;
 		
 	}
 }

src/de/katho/kBorrow/listener/NewLendingTableButton.java

@@ -33,7 +33,7 @@ public class NewLendingTableButton extends TableButton {
 				FreeArticleModel model = (FreeArticleModel) pTable.getModel();
 				int row = pTable.getSelectedRow();
 				
-				pPanel.setModeNewLending(model.getArticleId(row), model.getArticleName(row), model.getArticleDescription(row));
+				pPanel.setModeNewLending(model.getArticleId(row), model.getArticleName(row));
 			}
 		});
 	}

src/de/katho/kBorrow/models/UserListModel.java

@@ -16,7 +16,7 @@ public class UserListModel extends AbstractListModel<String> implements ComboBox
 	private static final long serialVersionUID = -8653066929273274524L;
 	private DbConnector dbCon;
 	private ArrayList<KUser> data;
-	private KUser selectedItem = null;
+	private String selectedItem = null;
 	
 	public UserListModel(DbConnector pDbCon){		
 		super();
@@ -28,22 +28,23 @@ public class UserListModel extends AbstractListModel<String> implements ComboBox
 	public void updateModel() {
 		data = dbCon.getUserList();
 		
-		if(data.size() > 0) setSelectedItem(data.get(0));
+		if(data.size() > 0) setSelectedItem(data.get(0).getName()+" "+data.get(0).getSurname());
 		
 		fireIntervalAdded(this, 0, data.size()-1);
 	}
 	
 	public void setSelectedItem(Object object) {
+		System.out.println(object);
 		if(selectedItem == null && object == null) return;
 		if(selectedItem != null && selectedItem.equals(object)) return;
-		if(object!= null && data.indexOf((KUser)object) == -1) return;
+		if(object!= null && !dataContains((String)object)) return;
 		
-		selectedItem = (KUser)object;
+		selectedItem = (String)object;
 		fireContentsChanged(this, -1, -1);
 	}
 	
 	public String getSelectedItem(){
-		if(selectedItem != null ) return selectedItem.getName()+" "+selectedItem.getSurname();
+		if(selectedItem != null ) return selectedItem;
 		return "";
 	}
 	
@@ -57,5 +58,12 @@ public class UserListModel extends AbstractListModel<String> implements ComboBox
 	public int getSize() {
 		return data.size();
 	}
+	
+	private boolean dataContains(String pName){
+		for(KUser elem : data){
+			if(pName.equals(elem.getName()+" "+elem.getSurname())) return true;
+		}
+		return false;
+	}
 }