socrates/kBorrow
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

SwingX-ErrorPane eingeführt. Finale Änderungen an NewLendingPanel

Browse Source 
durchgeführt.
This commit is contained in:
Servicepoint
2014-11-25 14:59:16 +01:00
parent 0686840950
commit 932e18a725
2 changed files with 117 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/de/katho/kBorrow/gui/MainWindow.java
View File

@@ -1,11 +1,13 @@
package de.katho.kBorrow.gui; package de.katho.kBorrow.gui;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.JTabbedPane; import javax.swing.JTabbedPane;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException; import javax.swing.UnsupportedLookAndFeelException;
import org.jdesktop.swingx.JXErrorPane;
import org.jdesktop.swingx.error.ErrorInfo;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.io.IOException; import java.io.IOException;
import java.sql.SQLException; import java.sql.SQLException;
@@ -43,20 +45,21 @@ public class MainWindow {
* @throws IOException * @throws IOException
*/ */
public MainWindow() { public MainWindow() {
this.set = new Settings(); set = new Settings();
this.frame = new JFrame(); frame = new JFrame();
this.frame.setResizable(false); frame.setResizable(false);
this.frame.setBounds(100, 100, 600, 500); frame.setBounds(100, 100, 600, 500);
this.frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
try { try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
if(set.getProperty("dBType").equals("sqlite")){ if(set.getProperty("dBType").equals("sqlite")){
this.dbCon = new SqliteConnector(set.getProperty("sqlitePath")); dbCon = new SqliteConnector(set.getProperty("sqlitePath"));
} }
else if(set.getProperty("dBType").equals("mysql")) { else if(set.getProperty("dBType").equals("mysql")) {
this.dbCon = new SqlConnector(); dbCon = new SqlConnector();
} }
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
models = new HashMap<String, Object>(); models = new HashMap<String, Object>();
models.put("usermodel", new UserTableModel(dbCon)); models.put("usermodel", new UserTableModel(dbCon));
@@ -65,16 +68,17 @@ public class MainWindow {
models.put("freearticlemodel", new FreeArticleTableModel(dbCon)); models.put("freearticlemodel", new FreeArticleTableModel(dbCon));
models.put("lendermodel", new LenderModel(dbCon)); models.put("lendermodel", new LenderModel(dbCon));
this.tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane = new JTabbedPane(JTabbedPane.TOP);
this.frame.getContentPane().add(this.tabbedPane, BorderLayout.CENTER); frame.getContentPane().add(this.tabbedPane, BorderLayout.CENTER);
this.tabbedPane.addTab("Neue Ausleihe", new NewLendingPanel(this.dbCon, models)); tabbedPane.addTab("Neue Ausleihe", new NewLendingPanel(this.dbCon, models));
this.tabbedPane.addTab("Ausleihen verwalten", new ManageLendingsPanel(this.dbCon, models)); tabbedPane.addTab("Ausleihen verwalten", new ManageLendingsPanel(this.dbCon, models));
this.tabbedPane.addTab("Artikel verwalten", new ArticlePanel(this.dbCon, models)); tabbedPane.addTab("Artikel verwalten", new ArticlePanel(this.dbCon, models));
this.tabbedPane.addTab("Benutzer verwalten", new UserPanel(this.dbCon, models)); tabbedPane.addTab("Benutzer verwalten", new UserPanel(this.dbCon, models));
} }
catch(ClassNotFoundException | InstantiationException | IllegalAccessException | IOException | UnsupportedLookAndFeelException | SQLException e) { catch(ClassNotFoundException | InstantiationException | IllegalAccessException | IOException | UnsupportedLookAndFeelException | SQLException e) {
JOptionPane.showMessageDialog(this.frame, e.getStackTrace(), "Fatal error", JOptionPane.ERROR_MESSAGE); ErrorInfo info = new ErrorInfo("Exception", e.getMessage(), null, null, e, null, null);
JXErrorPane.showDialog(frame, info);
System.exit(1); System.exit(1);
} }

184
src/de/katho/kBorrow/gui/NewLendingPanel.java
View File

@@ -6,6 +6,8 @@ import java.awt.Component;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -40,7 +42,7 @@ import de.katho.kBorrow.models.UserListModel;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
public class NewLendingPanel extends JPanel implements ActionListener, FocusListener{ public class NewLendingPanel extends JPanel implements ActionListener, FocusListener, KeyListener {
/** /**
* *
@@ -89,8 +91,6 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
freeArticleTable.getColumnModel().getColumn(0).setMinWidth(30); freeArticleTable.getColumnModel().getColumn(0).setMinWidth(30);
freeArticleTable.getColumnModel().getColumn(0).setMaxWidth(30); freeArticleTable.getColumnModel().getColumn(0).setMaxWidth(30);
freeArticleTable.getColumnModel().getColumn(0).setPreferredWidth(30); freeArticleTable.getColumnModel().getColumn(0).setPreferredWidth(30);
freeArticleTable.setFillsViewportHeight(true); freeArticleTable.setFillsViewportHeight(true);
@@ -102,63 +102,41 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
panelFreeArticleList.add(new JScrollPane(freeArticleTable)); panelFreeArticleList.add(new JScrollPane(freeArticleTable));
// Panel: NewLending // Datepicker
JPanel panelNewLending = new JPanel();
panelNewLending.setBorder(new TitledBorder(null, "Neue Ausleihe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panelNewLending.setBounds(0, 252, 589, 205);
this.add(panelFreeArticleList);
this.add(panelNewLending);
panelNewLending.setLayout(null);
JLabel lblArtikelname = new JLabel("Artikelname:");
lblArtikelname.setBounds(10, 20, 90, 20);
panelNewLending.add(lblArtikelname);
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);
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);
dpEstEndDate = new JXDatePicker(new Date()); dpEstEndDate = new JXDatePicker(new Date());
dpEstEndDate.setBounds(110, 60, 200, 20); dpEstEndDate.setBounds(110, 60, 200, 20);
panelNewLending.add(dpEstEndDate);
JLabel lblBenutzer = new JLabel("Benutzer:"); // Userlist Combobox
lblBenutzer.setBounds(350, 20, 70, 20);
panelNewLending.add(lblBenutzer);
cbUserName = new JComboBox<String>(userListModel); cbUserName = new JComboBox<String>(userListModel);
cbUserName.setBounds(430, 20, 130, 20); cbUserName.setBounds(430, 20, 130, 20);
panelNewLending.add(cbUserName);
// Separator
JSeparator separator = new JSeparator(); JSeparator separator = new JSeparator();
separator.setBounds(10, 90, 569, 2); separator.setBounds(10, 90, 569, 2);
// Lender Labels // Lender Labels
lblArticleName = new JLabel("");
JLabel lblArtikelname = new JLabel("Artikelname:");
JLabel lblLenderName = new JLabel("Name:"); JLabel lblLenderName = new JLabel("Name:");
JLabel lblLenderSurname = new JLabel("Nachname:"); JLabel lblLenderSurname = new JLabel("Nachname:");
JLabel lblLenderStudentnumber = new JLabel("Matrikelnummer:"); JLabel lblLenderStudentnumber = new JLabel("Matrikelnummer:");
JLabel lblAusgeliehenAm = new JLabel("Ausgeliehen am:");
JLabel lblNewLabel = new JLabel("Vor. R<>ckgabe:");
JLabel lblBenutzer = new JLabel("Benutzer:");
lblStartDate = new JLabel("");
lblStatus = new JLabel(""); lblStatus = new JLabel("");
lblArticleName.setBounds(110, 20, 205, 20);
lblArtikelname.setBounds(10, 20, 90, 20);
lblAusgeliehenAm.setBounds(10, 40, 90, 20);
lblLenderName.setBounds(10, 100, 90, 20); lblLenderName.setBounds(10, 100, 90, 20);
lblStatus.setBounds(210, 100, 400, 20); lblStatus.setBounds(210, 100, 400, 20);
lblLenderSurname.setBounds(10, 130, 90, 20); lblLenderSurname.setBounds(10, 130, 90, 20);
lblLenderStudentnumber.setBounds(10, 160, 90, 20); lblLenderStudentnumber.setBounds(10, 160, 90, 20);
lblNewLabel.setBounds(10, 60, 90, 20);
lblBenutzer.setBounds(350, 20, 70, 20);
lblStartDate.setBounds(110, 40, 205, 20);
// Lender Textfields // Lender Textfields
tfName = new JTextField(); tfName = new JTextField();
@@ -173,6 +151,9 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
tfName.setBounds(110, 100, 90, 20); tfName.setBounds(110, 100, 90, 20);
tfSurname.setBounds(110, 130, 90, 20); tfSurname.setBounds(110, 130, 90, 20);
tfStudentNumber.setBounds(110, 160, 90, 20); tfStudentNumber.setBounds(110, 160, 90, 20);
tfName.addKeyListener(this);
tfSurname.addKeyListener(this);
tfStudentNumber.addKeyListener(this);
AutoCompleteDecorator.decorate(tfName, lenderModel.getList(), false, new LenderNameConverter() ); AutoCompleteDecorator.decorate(tfName, lenderModel.getList(), false, new LenderNameConverter() );
AutoCompleteDecorator.decorate(tfSurname, lenderModel.getList(), false, new LenderSurnameConverter()); AutoCompleteDecorator.decorate(tfSurname, lenderModel.getList(), false, new LenderSurnameConverter());
AutoCompleteDecorator.decorate(tfStudentNumber, lenderModel.getList(), false, new LenderStudentnumberConverter()); AutoCompleteDecorator.decorate(tfStudentNumber, lenderModel.getList(), false, new LenderStudentnumberConverter());
@@ -195,18 +176,75 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
MyFocusTraversalPolicy focusPolicy = new MyFocusTraversalPolicy(order); MyFocusTraversalPolicy focusPolicy = new MyFocusTraversalPolicy(order);
// New Lending Pane // New Lending Pane
JPanel panelNewLending = new JPanel();
panelNewLending.setBorder(new TitledBorder(null, "Neue Ausleihe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panelNewLending.setBounds(0, 252, 589, 205);
panelNewLending.setLayout(null);
panelNewLending.add(lblArtikelname);
panelNewLending.add(lblLenderStudentnumber); panelNewLending.add(lblLenderStudentnumber);
panelNewLending.add(lblLenderSurname); panelNewLending.add(lblLenderSurname);
panelNewLending.add(lblLenderName); panelNewLending.add(lblLenderName);
panelNewLending.add(lblStatus); panelNewLending.add(lblStatus);
panelNewLending.add(separator); panelNewLending.add(separator);
panelNewLending.add(btnSave); panelNewLending.add(btnSave);
panelNewLending.add(lblAusgeliehenAm);
panelNewLending.add(btnCancel); panelNewLending.add(btnCancel);
panelNewLending.add(tfName); panelNewLending.add(tfName);
panelNewLending.add(tfSurname); panelNewLending.add(tfSurname);
panelNewLending.add(tfStudentNumber); panelNewLending.add(tfStudentNumber);
panelNewLending.add(lblNewLabel);
panelNewLending.add(lblBenutzer);
panelNewLending.add(lblStartDate);
panelNewLending.add(dpEstEndDate);
panelNewLending.add(cbUserName);
panelNewLending.add(lblArticleName);
panelNewLending.setFocusTraversalPolicy(focusPolicy); panelNewLending.setFocusTraversalPolicy(focusPolicy);
panelNewLending.setFocusCycleRoot(true); panelNewLending.setFocusCycleRoot(true);
// this
add(panelFreeArticleList);
add(panelNewLending);
}
private void resetForm(){
lblStartDate.setText("");
lblArticleName.setText("");
articleId = -1;
tfName.setText("");
tfSurname.setText("");
tfStudentNumber.setText("");
}
private void saveButtonPressed(){
String pLName = tfName.getText();
String pLSurname = tfSurname.getText();
String startDate = lblStartDate.getText();
Date estEndDate = dpEstEndDate.getDate();
String pLSN = tfStudentNumber.getText();
String pUsername = userListModel.getSelectedItem();
int r = newLendingController.newLending(articleId, pLName, pLSurname, pLSN, startDate, estEndDate, pUsername);
switch (r) {
case 0:
lblStatus.setText("Art-ID "+articleId+" erfolgreich ausgeliehen.");
resetForm();
break;
case 1:
lblStatus.setText("Fehler bei Ausleihe, SQL-Fehler.");
break;
case 2:
lblStatus.setText("Notwendige Daten sind leer (Art-ID, Start-Date, Est. End-Date)");
break;
case 3:
lblStatus.setText("Das R<>ckgabedatum ist fr<66>her oder gleich dem Ausleihdatum");
break;
case 4:
lblStatus.setText("Die gegebene Kombination aus Lender-Name, -Surname und -Studentnumber" +
"existiert mehrmals in der Datenbank. Das darf nicht sein und wirft daher einen Fehler!");
break;
}
} }
public void setModeNewLending(int pArticleId, String articleName) { public void setModeNewLending(int pArticleId, String articleName) {
@@ -223,54 +261,14 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
} }
if(pEvent.getSource() == btnSave){ if(pEvent.getSource() == btnSave){
String pLName = tfName.getText(); saveButtonPressed();
String pLSurname = tfSurname.getText();
String startDate = lblStartDate.getText();
Date estEndDate = dpEstEndDate.getDate();
String pLSN = tfStudentNumber.getText();
String pUsername = userListModel.getSelectedItem();
System.out.println("Art-ID: "+articleId);
System.out.println("------------------");
System.out.println("Lender-Name: "+pLName);
System.out.println("Lender-Surname: "+pLSurname);
System.out.println("Lender-SN: "+pLSN);
System.out.println("------------------");
System.out.println("User-Name: "+pUsername);
System.out.println("Start-Date: "+startDate);
System.out.println("Est. End-Date: "+estEndDate);
int r = newLendingController.newLending(articleId, pLName, pLSurname, pLSN, startDate, estEndDate, pUsername);
System.out.println("Status: "+r);
switch (r) {
case 0:
lblStatus.setText("Art-ID "+articleId+" erfolgreich ausgeliehen.");
resetForm();
break;
case 1:
lblStatus.setText("Fehler bei Ausleihe, SQL-Fehler.");
break;
case 2:
lblStatus.setText("Notwendige Daten sind leer (Art-ID, Start-Date, Est. End-Date)");
break;
case 3:
lblStatus.setText("Das R<>ckgabedatum ist fr<66>her oder gleich dem Ausleihdatum");
break;
case 4:
lblStatus.setText("Die gegebene Kombination aus Lender-Name, -Surname und -Studentnumber" +
"existiert mehrmals in der Datenbank. Das darf nicht sein und wirft daher einen Fehler!");
break;
}
} }
} }
@Override @Override
public void focusGained(FocusEvent pEvent) { public void focusGained(FocusEvent pEvent) {
// TODO Auto-generated method stub
} }
public void focusLost(FocusEvent pEvent) { public void focusLost(FocusEvent pEvent) {
@@ -283,12 +281,20 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
} }
} }
private void resetForm(){ public void keyPressed(KeyEvent pKeyPress) {
lblStartDate.setText(""); if(pKeyPress.getKeyCode() == KeyEvent.VK_ENTER) saveButtonPressed();
lblArticleName.setText("");
articleId = -1; }
tfName.setText("");
tfSurname.setText(""); @Override
tfStudentNumber.setText(""); public void keyReleased(KeyEvent e) {
// TODO Auto-generated method stub
}
@Override
public void keyTyped(KeyEvent e) {
// TODO Auto-generated method stub
} }
} }