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

Compare commits

merge into: socrates:#12_pdf_generation
Branches Tags
socrates:master socrates:gh-pages socrates:#15_opensource_license socrates:#9_Readme socrates:#10_javadoc socrates:#14_datamodell socrates:#13_exception-handling socrates:#12_pdf_generation socrates:issue#2 socrates:issue#5
socrates:v1.2 socrates:v1.1 socrates:v1.0
...
pull from: socrates:#14_datamodell
Branches Tags
socrates:gh-pages socrates:#15_opensource_license socrates:master socrates:#9_Readme socrates:#10_javadoc socrates:#14_datamodell socrates:#13_exception-handling socrates:#12_pdf_generation socrates:issue#2 socrates:issue#5
socrates:v1.2 socrates:v1.1 socrates:v1.0

4 Commits
#12_pdf_ge ... #14_datamo

Author SHA1 Message Date
Servicepoint
4c94643638 #14 - Überflüssige Funktionen entfernt. 2015-01-06 17:28:45 +01:00
Servicepoint
c5638e697f Solved issue #14 - Datenmodell wurde nun komplett überarbeitet. 
Theoretisch müssten nun sämtliche Operationen auf Datenstrukturen direkt
auf den Datenmodellen geschehen, während die Tabellen- und Listenmodelle
lediglich in den Tabellen und Listen eingebunden werden und für damit
verbundene Aufgaben zuständig sind.
 2015-01-06 17:24:13 +01:00
Servicepoint
401d68cf47 #14: Erste Arbeiten am vereinheitlichten DataModel. 2014-12-17 17:38:55 +01:00
Servicepoint
ecb496f35b #13 solved: Exceptions, die nicht direkt behandelt werden können, 
werden, bis auf wenige Ausnahmen, an die Main-Klasse weitergereicht, um
dort aufgefangen zu werden.
Die Software hat jetzt einen eigenen Logger und Util-Funktionen, für das
einfache Werfen von Fehlermeldungen.
 2014-12-16 17:29:50 +01:00
46 changed files with 862 additions and 595 deletions
Expand all files Collapse all files

174
kBorrow.ucls
View File

@@ -10,8 +10,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<interface id="2" language="java" name="de.katho.kBorrow.db.DbConnector" project="kBorrow"
file="/kBorrow/src/de/katho/kBorrow/db/DbConnector.java" binary="false" corner="BOTTOM_RIGHT">
<interface id="2" language="java" name="de.katho.kBorrow.interfaces.DbConnector" project="kBorrow"
file="/kBorrow/src/de/katho/kBorrow/interfaces/DbConnector.java" binary="false" corner="BOTTOM_RIGHT">
<position height="225" width="217" x="1048" y="1066"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
@@ -19,8 +19,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</interface>
<class id="3" language="java" name="de.katho.kBorrow.data.KUser" project="kBorrow"
file="/kBorrow/src/de/katho/kBorrow/data/KUser.java" binary="false" corner="BOTTOM_RIGHT">
<class id="3" language="java" name="de.katho.kBorrow.data.objects.KUser" project="kBorrow"
file="/kBorrow/src/de/katho/kBorrow/data/objects/KUser.java" binary="false" corner="BOTTOM_RIGHT">
<position height="225" width="143" x="724" y="1066"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
@@ -163,8 +163,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="19" language="java" name="de.katho.kBorrow.data.KArticle" project="kBorrow"
file="/kBorrow/src/de/katho/kBorrow/data/KArticle.java" binary="false" corner="BOTTOM_RIGHT">
<class id="19" language="java" name="de.katho.kBorrow.data.objects.KArticle" project="kBorrow"
file="/kBorrow/src/de/katho/kBorrow/data/objects/KArticle.java" binary="false" corner="BOTTOM_RIGHT">
<position height="225" width="154" x="2701" y="1066"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
@@ -181,126 +181,114 @@
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<association id="21">
<end type="SOURCE" refId="17" navigable="false">
<attribute id="22" name="set">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="23" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="1" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="24">
<bendpoint x="1017" y="639"/>
<end type="SOURCE" refId="4" navigable="false">
<attribute id="25" name="dbCon">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="26" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="27">
<bendpoint x="2798" y="639"/>
<end type="SOURCE" refId="10" navigable="false">
<attribute id="28" name="dbCon">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="29" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="30">
<end type="SOURCE" refId="13"/>
<end type="TARGET" refId="12"/>
</generalization>
<realization id="31">
<end type="SOURCE" refId="18"/>
<end type="TARGET" refId="2"/>
</realization>
<realization id="32">
<realization id="21">
<end type="SOURCE" refId="9"/>
<end type="TARGET" refId="2"/>
</realization>
<association id="33">
<end type="SOURCE" refId="5" navigable="false">
<attribute id="34" name="data">
<generalization id="22">
<end type="SOURCE" refId="6"/>
<end type="TARGET" refId="12"/>
</generalization>
<association id="23">
<bendpoint x="2798" y="639"/>
<end type="SOURCE" refId="10" navigable="false">
<attribute id="24" name="dbCon">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="35" minimum="0" maximum="2147483647">
<multiplicity id="25" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<realization id="26">
<end type="SOURCE" refId="18"/>
<end type="TARGET" refId="2"/>
</realization>
<association id="27">
<end type="SOURCE" refId="5" navigable="false">
<attribute id="28" name="data">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="29" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="19" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="36">
<end type="SOURCE" refId="6"/>
<end type="TARGET" refId="12"/>
</generalization>
<association id="37">
<end type="SOURCE" refId="14" navigable="false">
<attribute id="38" name="dbCon">
<association id="30">
<bendpoint x="1017" y="639"/>
<end type="SOURCE" refId="4" navigable="false">
<attribute id="31" name="dbCon">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="39" minimum="0" maximum="1">
<multiplicity id="32" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="40">
<end type="SOURCE" refId="14" navigable="false">
<attribute id="41" name="data">
<generalization id="33">
<end type="SOURCE" refId="13"/>
<end type="TARGET" refId="12"/>
</generalization>
<generalization id="34">
<end type="SOURCE" refId="8"/>
<end type="TARGET" refId="12"/>
</generalization>
<association id="35">
<end type="SOURCE" refId="5" navigable="false">
<attribute id="36" name="dbCon">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="42" minimum="0" maximum="2147483647">
<multiplicity id="37" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="38">
<end type="SOURCE" refId="7"/>
<end type="TARGET" refId="12"/>
</generalization>
<association id="39">
<end type="SOURCE" refId="17" navigable="false">
<attribute id="40" name="set">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="41" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="1" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="42">
<end type="SOURCE" refId="14" navigable="false">
<attribute id="43" name="data">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="44" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="43">
<end type="SOURCE" refId="7"/>
<end type="TARGET" refId="12"/>
</generalization>
<association id="44">
<end type="SOURCE" refId="5" navigable="false">
<attribute id="45" name="dbCon">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="46" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="47">
<generalization id="45">
<end type="SOURCE" refId="16"/>
<end type="TARGET" refId="12"/>
</generalization>
<generalization id="48">
<end type="SOURCE" refId="8"/>
<end type="TARGET" refId="12"/>
</generalization>
<association id="49">
<association id="46">
<end type="SOURCE" refId="17" navigable="false">
<attribute id="50" name="dbCon">
<attribute id="47" name="dbCon">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="51" minimum="0" maximum="1">
<multiplicity id="48" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>

49
src/de/katho/kBorrow/KLogger.java Normal file
View File

@@ -0,0 +1,49 @@
package de.katho.kBorrow;
import java.io.File;
import java.io.IOException;
import java.util.logging.FileHandler;
import java.util.logging.Formatter;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.SimpleFormatter;
public class KLogger {
private static Logger logger;
private Handler fileHandler;
private Formatter plainText;
private KLogger() throws IOException {
logger = Logger.getLogger(Util.class.getName());
String fDir = System.getProperty("user.home")+"/kBorrow";
String fName = "kBorrow.log";
File dir = new File(fDir);
File file = new File(fDir+"/"+fName);
if(!dir.isDirectory()) dir.mkdir();
if(!file.isFile()) file.createNewFile();
fileHandler = new FileHandler(fDir+"/"+fName, true);
plainText = new SimpleFormatter();
fileHandler.setFormatter(plainText);
logger.addHandler(fileHandler);
}
private static Logger getLogger(){
if(logger == null){
try{
new KLogger();
} catch(IOException e){
Util.showError(e);
}
}
return logger;
}
public static void log(Level pLevel, String pMsg, Exception e){
getLogger().log(pLevel, pMsg, e);
System.out.println(pMsg);
}
}

59
src/de/katho/kBorrow/Settings.java
View File

@@ -15,13 +15,13 @@ public class Settings {
private String filePath;
private String fileName;
public Settings() {
this.properties = new Properties();
this.filePath = System.getProperty("user.home")+"/kBorrow";
this.fileName = "Settings.cfg";
public Settings() throws Exception {
properties = new Properties();
filePath = System.getProperty("user.home")+"/kBorrow";
fileName = "Settings.cfg";
if(!this.filePathHasValidConfig()){
this.createDefaultConfig();
if(!filePathHasValidConfig()){
createDefaultConfig();
}
}
@@ -31,14 +31,14 @@ public class Settings {
*/
private boolean filePathHasValidConfig(){
try {
InputStream in = new FileInputStream(this.filePath+"/"+this.fileName);
this.properties = new Properties();
InputStream in = new FileInputStream(filePath+"/"+fileName);
properties = new Properties();
this.properties.load(in);
properties.load(in);
// Check if the properties file holds certain keys and values.
if( (this.properties.containsKey("dBType") && this.properties.containsValue("sqlite") && this.properties.containsKey("sqlitePath")) ||
(this.properties.contains("dbType") && this.properties.containsValue("mysql") && this.properties.containsKey("mysqlDB") && this.properties.containsKey("mysqlHost") && this.properties.containsKey("mysqlUser") && this.properties.containsKey("mysqlPass"))) {
if( (properties.containsKey("dBType") && properties.containsValue("sqlite") && properties.containsKey("sqlitePath")) ||
(properties.contains("dbType") && properties.containsValue("mysql") && properties.containsKey("mysqlDB") && properties.containsKey("mysqlHost") && properties.containsKey("mysqlUser") && properties.containsKey("mysqlPass"))) {
in.close();
return true;
@@ -49,21 +49,23 @@ public class Settings {
}
} catch (FileNotFoundException e) {
Util.showWarning(new Exception("Kann die Settingsdatei nicht finden. Versuche, eine neue zu erzeugen.", e));
return false;
} catch (IOException e){
e.printStackTrace();
Util.showWarning(e);
return false;
}
}
/**
* Writes a default config to the config file.
* @throws Exception
*
*/
private void createDefaultConfig() {
private void createDefaultConfig() throws Exception {
try {
File dir = new File(this.filePath);
File file = new File(this.filePath+"/"+this.fileName);
File dir = new File(filePath);
File file = new File(filePath+"/"+fileName);
if(!dir.isDirectory()) dir.mkdir();
if(!file.isFile()) file.createNewFile();
else {
@@ -73,39 +75,36 @@ public class Settings {
OutputStream os = new FileOutputStream(this.filePath+"/"+this.fileName);
this.properties.put("dBType", "sqlite");
this.properties.put("sqlitePath",System.getProperty("user.home").replace("\\", "/")+"/kBorrow/kBorrow.db" );
this.properties.store(os, null);
properties.put("dBType", "sqlite");
properties.put("sqlitePath",System.getProperty("user.home").replace("\\", "/")+"/kBorrow/kBorrow.db" );
properties.store(os, null);
os.close();
} catch (FileNotFoundException e) {
System.out.println("I couldn't find the specified properties file while trying to create a default config.");
e.printStackTrace();
throw new Exception("I couldn't find the specified properties file while trying to create a default config.", e);
} catch (IOException e) {
System.out.println("I had problems, writing to the properties file while trying to create a default config.");
e.printStackTrace();
throw new Exception("I had problems writing to the properties file while trying to create a default config.", e);
}
}
public String getProperty(String pKey){
return this.properties.getProperty(pKey);
if(properties.containsKey(pKey)) return properties.getProperty(pKey);
return "";
}
public void setProperty(String pKey, String pValue){
this.properties.put(pKey, pValue);
public void setProperty(String pKey, String pValue) throws IOException{
properties.put(pKey, pValue);
OutputStream os;
try {
os = new FileOutputStream(this.filePath+"/"+this.fileName);
this.properties.store(os, null);
properties.store(os, null);
os.close();
} catch (FileNotFoundException e) {
System.out.println("I couldn't find the specified properties file while trying to write the config.");
e.printStackTrace();
throw new FileNotFoundException("I couldn't find the specified properties file while trying to write the config.");
} catch (IOException e) {
System.out.println("I had problems, writing to the properties file while saving a setting.");
e.printStackTrace();
throw new IOException("I had problems, writing to the properties file while saving a setting.");
}
}

26
src/de/katho/kBorrow/Util.java
View File

@@ -4,8 +4,16 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
import java.util.logging.Level;
import javax.swing.JFrame;
import org.jdesktop.swingx.JXErrorPane;
import org.jdesktop.swingx.error.ErrorInfo;
public final class Util {
private static JFrame mainwindow;
public class Util {
public static String getCurrentDate(){
DateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
Date date = new Date();
@@ -25,4 +33,20 @@ public class Util {
return sb.toString();
}
public static void showWarning(Exception e){
KLogger.log(Level.WARNING, e.getMessage(), e);
ErrorInfo info = new ErrorInfo("Warnung", e.getMessage(), null, null, e, Level.WARNING, null);
JXErrorPane.showDialog(mainwindow, info);
}
public static void showError(Exception e){
KLogger.log(Level.SEVERE, e.getMessage(), e);
ErrorInfo info = new ErrorInfo("Fehler", e.getMessage(), null, null, e, Level.SEVERE, null);
JXErrorPane.showDialog(mainwindow, info);
}
public static void setMainWindow(JFrame p){
mainwindow = p;
}
}

33
src/de/katho/kBorrow/controller/ArticleController.java
View File

@@ -2,19 +2,18 @@ package de.katho.kBorrow.controller;
import java.util.HashMap;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.models.ArticleTableModel;
import de.katho.kBorrow.models.FreeArticleTableModel;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
public class ArticleController {
private DbConnector dbCon;
private ArticleTableModel articleTableModel;
private FreeArticleTableModel freeArticleTableModel;
private KArticleModel kArticleModel;
public ArticleController(DbConnector pDbCon, HashMap<String, Object> pModels){
public ArticleController(DbConnector pDbCon, HashMap<String, KDataModel> models){
dbCon = pDbCon;
articleTableModel = (ArticleTableModel)pModels.get("articletablemodel");
freeArticleTableModel = (FreeArticleTableModel)pModels.get("freearticletablemodel");
kArticleModel = (KArticleModel)models.get("karticlemodel");
}
/**
@@ -29,8 +28,7 @@ public class ArticleController {
public int createArticle(String pName, String pDesc) {
int status = dbCon.createArticle(pName, pDesc);
articleTableModel.updateModel();
freeArticleTableModel.updateModel();
kArticleModel.updateModel();
return status;
}
@@ -49,8 +47,7 @@ public class ArticleController {
int status = this.dbCon.editArticle(pId, pName, pDesc);
if(status == 0){
articleTableModel.updateModel();
freeArticleTableModel.updateModel();
kArticleModel.updateModel();
}
return status;
@@ -59,21 +56,19 @@ public class ArticleController {
/**
* L<>scht den Artikel mit der gegebenen ID in der Datenbank und aktualisiert die Tabelle.
*
* @param pRow Row des Artikels, der gel<65>scht werden soll.
* @param pId ID des Artikels, der gel<65>scht werden soll.
* @return 0: Artikel konnte erfolgreich gel<65>scht werden
* 1: Artikel konnte nicht gel<65>scht werden, unbekannter Fehler (SQL-Fehler)
* 2: Artikel konnte nicht gel<65>scht werden, weil er im Moment verliehen ist.
*/
public int deleteArticle(int pRow) {
public int deleteArticle(int pId) {
if(!articleTableModel.getArticleByRow(pRow).getIsFree()) return 2;
if(!((KArticle)kArticleModel.getElement(pId)).getIsFree()) return 2;
int id = articleTableModel.getArticleByRow(pRow).getId();
int returnCode = dbCon.deleteArticle(id);
int returnCode = dbCon.deleteArticle(pId);
if(returnCode == 0){
articleTableModel.updateModel();
freeArticleTableModel.updateModel();
kArticleModel.updateModel();
}
return returnCode;

34
src/de/katho/kBorrow/controller/ManageLendingsController.java
View File

@@ -3,38 +3,34 @@ package de.katho.kBorrow.controller;
import java.util.HashMap;
import de.katho.kBorrow.Util;
import de.katho.kBorrow.data.KLending;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.models.ArticleTableModel;
import de.katho.kBorrow.models.FreeArticleTableModel;
import de.katho.kBorrow.models.LendingTableModel;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.KLendingModel;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
public class ManageLendingsController {
private DbConnector dbCon;
private FreeArticleTableModel freeArticleTableModel;
private ArticleTableModel articleTableModel;
private LendingTableModel lendingTableModel;
private KArticleModel articleModel;
private KLendingModel lendingModel;
public ManageLendingsController(DbConnector pDbCon, HashMap<String, Object> pModels){
public ManageLendingsController(DbConnector pDbCon, HashMap<String, KDataModel> models){
dbCon = pDbCon;
freeArticleTableModel = (FreeArticleTableModel)pModels.get("freearticletablemodel");
articleTableModel = (ArticleTableModel)pModels.get("articletablemodel");
lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel");
articleModel = (KArticleModel)models.get("karticlemodel");
lendingModel = (KLendingModel)models.get("klendingmodel");
}
public void returnLending(int pRow) {
KLending lending = lendingTableModel.getLendingByRow(pRow);
public void returnLending(int pId) {
KLending lending = lendingModel.getElement(pId);
int artId = lending.getArticleId();
int lendingId = lending.getId();
dbCon.returnLending(lendingId, artId, Util.getCurrentDate());
dbCon.returnLending(pId, artId, Util.getCurrentDate());
freeArticleTableModel.updateModel();
articleTableModel.updateModel();
lendingTableModel.updateModel();
articleModel.updateModel();
lendingModel.updateModel();
}
}

66
src/de/katho/kBorrow/controller/NewLendingController.java
View File

@@ -19,33 +19,31 @@ import java.util.HashMap;
import de.katho.kBorrow.Settings;
import de.katho.kBorrow.Util;
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;
import de.katho.kBorrow.models.ArticleTableModel;
import de.katho.kBorrow.models.FreeArticleTableModel;
import de.katho.kBorrow.models.LenderModel;
import de.katho.kBorrow.models.LendingTableModel;
import de.katho.kBorrow.models.UserListModel;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.KLenderModel;
import de.katho.kBorrow.data.KLendingModel;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
public class NewLendingController {
private DbConnector dbCon;
private UserListModel userListModel;
private LenderModel lenderModel;
private FreeArticleTableModel freeArticleModel;
private LendingTableModel lendingTableModel;
private ArticleTableModel articleTableModel;
private KUserModel kUserModel;
private KLenderModel kLenderModel;
private KArticleModel kArticleModel;
private KLendingModel kLendingModel;
private Settings settings;
public NewLendingController(DbConnector pDbCon, HashMap<String, Object> pModels, final Settings pSettings){
public NewLendingController(DbConnector pDbCon, HashMap<String, KDataModel> models, final Settings pSettings){
dbCon = pDbCon;
userListModel = (UserListModel)pModels.get("userlistmodel");
lenderModel = (LenderModel)pModels.get("lendermodel");
freeArticleModel = (FreeArticleTableModel)pModels.get("freearticletablemodel");
articleTableModel = (ArticleTableModel)pModels.get("articletablemodel");
lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel");
kUserModel = (KUserModel)models.get("kusermodel");
kLenderModel = (KLenderModel)models.get("klendermodel");
kArticleModel = (KArticleModel)models.get("karticlemodel");
kLendingModel = (KLendingModel)models.get("klendingmodel");
settings = pSettings;
}
@@ -59,18 +57,19 @@ public class NewLendingController {
* 4: Die gegebene Kombination aus Lender-Name, -Surname und -Studentnumber
* existiert mehrmals in der Datenbank. Das darf nicht sein und wirft daher einen Fehler!
* 5: Matrikelnummer muss eine Zahl sein!
* @throws Exception
*/
public int newLending(int pArtId, String pLName, String pLSurname, String pLSN, String pStartDate, Date pEstEndDate, String pUsername){
public int newLending(int pArtId, String pLName, String pLSurname, String pLSN, String pStartDate, Date pEstEndDate, String pUsername) throws Exception{
if(pArtId == -1 || pStartDate.isEmpty() || pEstEndDate == null || pLName.isEmpty() || pLSurname.isEmpty() || pUsername.isEmpty()) return 2;
if(pEstEndDate.before(new Date())) return 3;
if(!pLSN.matches("[0-9]+")) return 5;
ArrayList<KLender> lenders = lenderModel.getLenders(pLName, pLSurname, pLSN);
ArrayList<KLender> lenders = kLenderModel.getLenders(pLName, pLSurname, pLSN);
if(lenders.size() == 0) {
int result = dbCon.createNewLender(pLName, pLSurname, pLSN);
if(result == 0){
lenderModel.updateModel();
kLenderModel.updateModel();
return newLending(pArtId, pLName, pLSurname, pLSN, pStartDate, pEstEndDate, pUsername);
}
@@ -78,15 +77,14 @@ public class NewLendingController {
}
else if(lenders.size() == 1){
KLender lender = lenders.get(0);
int uId = userListModel.getIdByFullname(pUsername);
int uId = kUserModel.getIdByFullname(pUsername);
DateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
int[] result = dbCon.createNewLending(pArtId, uId, lender.getId(), pStartDate, dateFormat.format(pEstEndDate));
if(result[0] == 0){
freeArticleModel.updateModel();
articleTableModel.updateModel();
lendingTableModel.updateModel();
kArticleModel.updateModel();
kLendingModel.updateModel();
createPdfFile(result[1]);
return result[0];
@@ -97,11 +95,11 @@ public class NewLendingController {
}
private void createPdfFile(int pLendingId){
KLending lending = lendingTableModel.getLendingById(pLendingId);
KArticle article = articleTableModel.getArticleById(lending.getArticleId());
KUser user = userListModel.getUserById(lending.getUserId());
KLender lender = lenderModel.getLenderById(lending.getLenderId());
private void createPdfFile(int pLendingId) throws Exception {
KLending lending = kLendingModel.getElement(pLendingId);
KArticle article = kArticleModel.getElement(lending.getArticleId());
KUser user = kUserModel.getElement(lending.getUserId());
KLender lender = kLenderModel.getElement(lending.getLenderId());
PDDocument doc = new PDDocument();
PDPage page = new PDPage(PDPage.PAGE_SIZE_A4);
@@ -174,7 +172,7 @@ public class NewLendingController {
}
}
} catch (IOException | COSVisitorException e) {
e.printStackTrace();
throw new Exception("Problem bei der Erstellung der PDF-Datei.", e);
}
}

2
src/de/katho/kBorrow/controller/RewriteToNewUserController.java
View File

@@ -1,6 +1,6 @@
package de.katho.kBorrow.controller;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.interfaces.DbConnector;
public class RewriteToNewUserController {

57
src/de/katho/kBorrow/controller/UserController.java
View File

@@ -2,33 +2,31 @@ package de.katho.kBorrow.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.logging.Level;
import de.katho.kBorrow.data.KLending;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.KLogger;
import de.katho.kBorrow.data.KLendingModel;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.gui.RewriteToNewUserDialog;
import de.katho.kBorrow.models.LendingTableModel;
import de.katho.kBorrow.models.UserTableModel;
import de.katho.kBorrow.models.UserListModel;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
public class UserController {
private DbConnector dbCon;
private UserTableModel userTableModel;
private UserListModel userListModel;
private LendingTableModel lendingTableModel;
private KDataModel userModel;
private KDataModel lendingModel;
public UserController(DbConnector pDbCon, HashMap<String, Object> pModels) {
public UserController(DbConnector pDbCon, HashMap<String, KDataModel> models) {
dbCon = pDbCon;
userTableModel = (UserTableModel)pModels.get("usertablemodel");
userListModel = (UserListModel)pModels.get("userlistmodel");
lendingTableModel = (LendingTableModel)pModels.get("lendingtablemodel");
userModel = models.get("kusermodel");
lendingModel = models.get("klendingmodel");
}
public int createUser(String pName, String pSurname){
int status = dbCon.createUser(pName, pSurname);
userTableModel.updateModel();
userListModel.updateModel();
userModel.updateModel();
return status;
}
@@ -37,42 +35,43 @@ public class UserController {
int status = dbCon.editUser(pId, pName, pSurname);
if(status == 0){
userTableModel.updateModel();
userListModel.updateModel();
userModel.updateModel();
}
return status;
}
public boolean deleteUser(int pRow) {
int id = userTableModel.getUserByRow(pRow).getId();
public boolean deleteUser(int pId) {
if(!(lendingModel instanceof KLendingModel)) {
KLogger.log(Level.SEVERE, "UserController: lendingModel type error!", new Exception("UserController: lendingModel type error!"));
return false;
}
boolean isOccupied = false;
ArrayList<KLending> lendingList = lendingTableModel.getLendingList();
ArrayList<KLending> lendingList = ((KLendingModel)lendingModel).getData();
for(KLending elem : lendingList){
if(elem.getUserId() == id){
if(elem.getUserId() == pId){
isOccupied = true;
break;
}
}
if(isOccupied){
RewriteToNewUserDialog dialog = new RewriteToNewUserDialog(id, dbCon);
RewriteToNewUserDialog dialog = new RewriteToNewUserDialog(pId, dbCon, userModel);
if(dialog.getResult() == 0){
lendingTableModel.updateModel();
userTableModel.updateModel();
userListModel.updateModel();
lendingModel.updateModel();
userModel.updateModel();
return deleteUser(pRow);
return deleteUser(pId);
}
else return false;
}
else {
if(dbCon.deleteUser(id)){
userTableModel.updateModel();
userListModel.updateModel();
lendingTableModel.updateModel();
if(dbCon.deleteUser(pId)){
userModel.updateModel();
lendingModel.updateModel();
return true;
}

2
src/de/katho/kBorrow/converter/LenderNameConverter.java
View File

@@ -2,7 +2,7 @@ package de.katho.kBorrow.converter;
import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
import de.katho.kBorrow.data.KLender;
import de.katho.kBorrow.data.objects.KLender;
public class LenderNameConverter extends ObjectToStringConverter {

2
src/de/katho/kBorrow/converter/LenderStudentnumberConverter.java
View File

@@ -2,7 +2,7 @@ package de.katho.kBorrow.converter;
import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
import de.katho.kBorrow.data.KLender;
import de.katho.kBorrow.data.objects.KLender;
public class LenderStudentnumberConverter extends ObjectToStringConverter {

2
src/de/katho/kBorrow/converter/LenderSurnameConverter.java
View File

@@ -2,7 +2,7 @@ package de.katho.kBorrow.converter;
import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
import de.katho.kBorrow.data.KLender;
import de.katho.kBorrow.data.objects.KLender;
public class LenderSurnameConverter extends ObjectToStringConverter {

47
src/de/katho/kBorrow/data/KArticleModel.java Normal file
View File

@@ -0,0 +1,47 @@
package de.katho.kBorrow.data;
import java.util.ArrayList;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class KArticleModel implements KDataModel {
private ArrayList<KGuiModel> models = new ArrayList<KGuiModel>();
private ArrayList<KArticle> data = new ArrayList<KArticle>();
private DbConnector dbCon;
public KArticleModel(DbConnector pDbCon) {
dbCon = pDbCon;
updateModel();
}
public void register(KGuiModel pModel) {
if(!models.contains(pModel)){
pModel.fetchData(this);
models.add(pModel);
}
}
public void updateModel() {
data = dbCon.getArticleList();
for(KGuiModel model : models){
model.fetchData(this);
}
}
public ArrayList<KArticle> getData() {
return data;
}
public KArticle getElement(int id) {
for (KArticle elem : data){
if(elem.getId() == id) return elem;
}
return null;
}
}

51
src/de/katho/kBorrow/models/LenderModel.java → src/de/katho/kBorrow/data/KLenderModel.java
View File

@@ -1,27 +1,50 @@
package de.katho.kBorrow.models;
package de.katho.kBorrow.data;
import java.util.ArrayList;
import de.katho.kBorrow.data.KLender;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class LenderModel {
private ArrayList<KLender> data;
public class KLenderModel implements KDataModel {
private ArrayList<KGuiModel> models = new ArrayList<KGuiModel>();
private ArrayList<KLender> data = new ArrayList<KLender>();
private DbConnector dbCon;
public LenderModel(DbConnector pDbCon){
public KLenderModel(DbConnector pDbCon) {
dbCon = pDbCon;
updateModel();
}
public void updateModel(){
data = dbCon.getLenderList();
public void register(KGuiModel pModel) {
if(!models.contains(pModel)){
pModel.fetchData(this);
models.add(pModel);
}
}
public ArrayList<KLender> getList(){
public void updateModel() {
data = dbCon.getLenderList();
for(KGuiModel model : models){
model.fetchData(this);
}
}
public ArrayList<KLender> getData() {
return data;
}
public KLender getElement(int id) {
for(KLender elem : data){
if(elem.getId() == id) return elem;
}
return null;
}
public ArrayList<KLender> getLenders(String pName, String pSurname, String pSN){
boolean nameEmpty = pName.isEmpty();
boolean surnameEmpty = pSurname.isEmpty();
@@ -105,14 +128,4 @@ public class LenderModel {
return elems;
}
public KLender getLenderById(int pId){
for(KLender elem : data){
if(elem.getId() == pId) return elem;
}
return null;
}
public KLender getLenderByRow(int pRow){
return data.get(pRow);
}
}

48
src/de/katho/kBorrow/data/KLendingModel.java Normal file
View File

@@ -0,0 +1,48 @@
package de.katho.kBorrow.data;
import java.util.ArrayList;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class KLendingModel implements KDataModel {
private ArrayList<KGuiModel> models = new ArrayList<KGuiModel>();
private ArrayList<KLending> data = new ArrayList<KLending>();
private DbConnector dbCon;
public KLendingModel(DbConnector pDbCon) {
dbCon = pDbCon;
updateModel();
}
public void register(KGuiModel pModel) {
if(!models.contains(pModel)){
pModel.fetchData(this);
models.add(pModel);
}
}
public void updateModel() {
data = dbCon.getLendingList();
for(KGuiModel model : models){
model.fetchData(this);
}
}
public ArrayList<KLending> getData() {
return data;
}
public KLending getElement(int id) {
for(KLending elem : data){
if(elem.getId() == id) return elem;
}
return null;
}
}

54
src/de/katho/kBorrow/data/KUserModel.java Normal file
View File

@@ -0,0 +1,54 @@
package de.katho.kBorrow.data;
import java.util.ArrayList;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class KUserModel implements KDataModel {
private ArrayList<KGuiModel> models = new ArrayList<KGuiModel>();
private ArrayList<KUser> data = new ArrayList<KUser>();
private DbConnector dbCon;
public KUserModel(DbConnector pDbCon){
dbCon = pDbCon;
updateModel();
}
public void updateModel(){
data = dbCon.getUserList();
for(KGuiModel model : models){
model.fetchData(this);
}
}
public void register(KGuiModel pModel) {
if(!models.contains(pModel)) {
pModel.fetchData(this);
models.add(pModel);
}
}
public ArrayList<KUser> getData() {
return data;
}
public KUser getElement(int id) {
for(KUser elem : data){
if(elem.getId() == id) return elem;
}
return null;
}
public int getIdByFullname(String pName){
for (KUser elem : data){
if(pName.equals(elem.getName()+" "+elem.getSurname())) return elem.getId();
}
return -1;
}
}

18
src/de/katho/kBorrow/data/KArticle.java → src/de/katho/kBorrow/data/objects/KArticle.java
View File

@@ -1,4 +1,4 @@
package de.katho.kBorrow.data;
package de.katho.kBorrow.data.objects;
public class KArticle {
private int id;
@@ -7,22 +7,22 @@ public class KArticle {
private boolean isFree;
public KArticle(int pId, String pName, boolean pFree, String pDesc) {
this.id = pId;
this.name = pName;
this.description = pDesc;
id = pId;
name = pName;
description = pDesc;
isFree = pFree;
}
public int getId() {
return this.id;
return id;
}
public String getName() {
return this.name;
return name;
}
public String getDescription() {
return this.description;
return description;
}
public boolean getIsFree(){
@@ -30,11 +30,11 @@ public class KArticle {
}
public void setName(String pName){
this.name = pName;
name = pName;
}
public void setDescription(String pDesc){
this.description = pDesc;
description = pDesc;
}
public void setIsFree(boolean pFree){

2
src/de/katho/kBorrow/data/KLender.java → src/de/katho/kBorrow/data/objects/KLender.java
View File

@@ -1,4 +1,4 @@
package de.katho.kBorrow.data;
package de.katho.kBorrow.data.objects;
public class KLender {
private String name;

2
src/de/katho/kBorrow/data/KLending.java → src/de/katho/kBorrow/data/objects/KLending.java
View File

@@ -1,4 +1,4 @@
package de.katho.kBorrow.data;
package de.katho.kBorrow.data.objects;
public class KLending {
private int id;

2
src/de/katho/kBorrow/data/KUser.java → src/de/katho/kBorrow/data/objects/KUser.java
View File

@@ -1,4 +1,4 @@
package de.katho.kBorrow.data;
package de.katho.kBorrow.data.objects;
public class KUser {
private String name;

15
src/de/katho/kBorrow/db/SqlConnector.java
View File

@@ -2,10 +2,11 @@ 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.KLending;
import de.katho.kBorrow.data.KUser;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.DbConnector;
public class SqlConnector implements DbConnector{
@@ -117,4 +118,10 @@ public class SqlConnector implements DbConnector{
return false;
}
@Override
public ArrayList<KLending> getLendingList() {
// TODO Auto-generated method stub
return null;
}
}

67
src/de/katho/kBorrow/db/SqliteConnector.java
View File

@@ -12,10 +12,12 @@ import java.util.ArrayList;
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.KLending;
import de.katho.kBorrow.data.KUser;
import de.katho.kBorrow.Util;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.DbConnector;
/**
* @class sqliteConnector
@@ -92,7 +94,7 @@ public class SqliteConnector implements DbConnector {
return true;
} catch (SQLException e) {
e.printStackTrace();
Util.showWarning(e);
return false;
}
}
@@ -108,7 +110,7 @@ public class SqliteConnector implements DbConnector {
return true;
}
catch (SQLException e){
e.printStackTrace();
Util.showWarning(e);
return false;
}
}
@@ -201,7 +203,7 @@ public class SqliteConnector implements DbConnector {
return userArr;
}
catch (SQLException e){
e.printStackTrace();
Util.showWarning(e);
return null;
}
}
@@ -221,7 +223,7 @@ public class SqliteConnector implements DbConnector {
return userArr;
}
catch (SQLException e){
e.printStackTrace();
Util.showWarning(e);
return null;
}
}
@@ -241,7 +243,7 @@ public class SqliteConnector implements DbConnector {
return artArr;
}
catch (SQLException ex){
ex.printStackTrace();
Util.showWarning(ex);
return null;
}
}
@@ -261,7 +263,7 @@ public class SqliteConnector implements DbConnector {
return artArr;
}
catch(SQLException ex){
ex.printStackTrace();
Util.showWarning(ex);
return null;
}
}
@@ -281,11 +283,30 @@ public class SqliteConnector implements DbConnector {
return lendArr;
}
catch(SQLException ex){
ex.printStackTrace();
Util.showWarning(ex);
return null;
}
}
public ArrayList<KLending> getLendingList(){
ArrayList<KLending> lendingArr = new ArrayList<KLending>();
try {
Statement st = connection.createStatement();
String query = "SELECT id, user_id, lender_id, article_id, start_date, expected_end_date, end_date FROM lending";
ResultSet rs = st.executeQuery(query);
while (rs.next()){
lendingArr.add(new KLending(rs.getInt("id"), rs.getInt("user_id"), rs.getInt("lender_id"), rs.getInt("article_id"), rs.getString("start_date"), rs.getString("expected_end_date"), rs.getString("end_date")));
}
}
catch(SQLException e){
Util.showWarning(e);
}
return lendingArr;
}
public ArrayList<KLending> getActiveLendingList() {
ArrayList<KLending> lendingArr = new ArrayList<KLending>();
@@ -302,7 +323,7 @@ public class SqliteConnector implements DbConnector {
return lendingArr;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return lendingArr;
}
}
@@ -323,7 +344,7 @@ public class SqliteConnector implements DbConnector {
return lendingArr;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return lendingArr;
}
}
@@ -345,7 +366,7 @@ public class SqliteConnector implements DbConnector {
return 0;
} catch (SQLException e) {
e.printStackTrace();
Util.showWarning(e);
return 1;
}
}
@@ -361,7 +382,7 @@ public class SqliteConnector implements DbConnector {
return 0;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return 1;
}
}
@@ -377,7 +398,7 @@ public class SqliteConnector implements DbConnector {
return true;
}
catch (SQLException e){
e.printStackTrace();
Util.showWarning(e);
return false;
}
}
@@ -393,7 +414,7 @@ public class SqliteConnector implements DbConnector {
return 0;
} catch (SQLException e) {
e.printStackTrace();
Util.showWarning(e);
return 1;
}
}
@@ -408,7 +429,7 @@ public class SqliteConnector implements DbConnector {
return 0;
}
catch (SQLException e){
e.printStackTrace();
Util.showWarning(e);
return 1;
}
}
@@ -424,7 +445,7 @@ public class SqliteConnector implements DbConnector {
return 0;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return 1;
}
}
@@ -462,7 +483,7 @@ public class SqliteConnector implements DbConnector {
return result;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return new int[]{1,0};
}
}
@@ -477,7 +498,7 @@ public class SqliteConnector implements DbConnector {
return true;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return false;
}
}
@@ -493,7 +514,7 @@ public class SqliteConnector implements DbConnector {
return 0;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return 1;
}
@@ -510,7 +531,7 @@ public class SqliteConnector implements DbConnector {
return 0;
}
catch(SQLException e){
e.printStackTrace();
Util.showWarning(e);
return 1;
}
}

18
src/de/katho/kBorrow/gui/ArticleInspectFrame.java
View File

@@ -11,10 +11,10 @@ import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.JTextArea;
import de.katho.kBorrow.data.KArticle;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.models.ArticleInspectTableModel;
import de.katho.kBorrow.models.ArticleTableModel;
public class ArticleInspectFrame extends JFrame {
@@ -24,16 +24,15 @@ public class ArticleInspectFrame extends JFrame {
private static final long serialVersionUID = -8993341404926674307L;
private JPanel contentPane;
private JTable table;
private ArticleInspectTableModel artInsModel;
private ArticleTableModel articleModel;
private KArticleModel articleModel;
private KArticle article;
/**
* Create the frame.
*/
public ArticleInspectFrame(int pRow, final DbConnector dbCon, HashMap<String, Object> pModels) {
articleModel = (ArticleTableModel)pModels.get("articletablemodel");
article = articleModel.getArticleByRow(pRow);
public ArticleInspectFrame(int pId, HashMap<String, KDataModel> models) {
articleModel = (KArticleModel)models.get("karticlemodel");
article = articleModel.getElement(pId);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
setBounds(150, 150, 660, 541);
@@ -71,8 +70,7 @@ public class ArticleInspectFrame extends JFrame {
panelInfo.add(taArticleDesc);
// Table
artInsModel = new ArticleInspectTableModel(pRow, dbCon, pModels);
table = new JTable(artInsModel);
table = new JTable(new ArticleInspectTableModel(pId, models));
table.setFillsViewportHeight(true);
table.setRowHeight(30);
table.getColumnModel().getColumn(0).setMinWidth(30);

22
src/de/katho/kBorrow/gui/ArticlePanel.java
View File

@@ -24,8 +24,10 @@ import javax.swing.UIManager;
import javax.swing.border.TitledBorder;
import de.katho.kBorrow.controller.ArticleController;
import de.katho.kBorrow.data.KArticle;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.listener.ArticleDeleteTableButton;
import de.katho.kBorrow.listener.ArticleEditTableButton;
import de.katho.kBorrow.listener.ArticleInspectTableButton;
@@ -42,27 +44,27 @@ public class ArticlePanel extends JPanel implements ActionListener, KeyListener
private JLabel lblArticleStatus;
private boolean articleModeEdit;
private int articleEditId;
private ArticleTableModel articleTableModel;
private KArticleModel articleModel;
/**
* Create the panel.
* @throws IOException
*/
public ArticlePanel(final DbConnector dbCon, HashMap<String, Object> pModels) throws IOException {
public ArticlePanel(final DbConnector dbCon, HashMap<String, KDataModel> models) throws IOException {
super();
this.setLayout(null);
articleTableModel = (ArticleTableModel)pModels.get("articletablemodel");
articleController = new ArticleController(dbCon, pModels);
articleModel = (KArticleModel)models.get("karticlemodel");
articleController = new ArticleController(dbCon, models);
/*
* Tabelle und drumherum
*/
JTable articleTable = new JTable(articleTableModel);
JTable articleTable = new JTable(new ArticleTableModel(articleModel));
articleTable.setRowHeight(30);
ArticleDeleteTableButton articleDeleteTableButton = new ArticleDeleteTableButton("L<EFBFBD>schen", articleTable, this, articleController);
ArticleEditTableButton articleEditTableButton = new ArticleEditTableButton("Bearbeiten", articleTable, this);
ArticleInspectTableButton articleInspectTableButton = new ArticleInspectTableButton("Details", articleTable, dbCon, pModels);
ArticleInspectTableButton articleInspectTableButton = new ArticleInspectTableButton("Details", articleTable, models);
for (int i = 3; i <= 5; i++){
articleTable.getColumnModel().getColumn(i).setCellEditor(i == 3 ? articleInspectTableButton : i == 4 ? articleEditTableButton : articleDeleteTableButton);
@@ -173,8 +175,8 @@ public class ArticlePanel extends JPanel implements ActionListener, KeyListener
this.textAreaArticleDescription.setText("");
}
public void setModeEditArticle(int pRow) {
KArticle art = articleTableModel.getArticleByRow(pRow);
public void setModeEditArticle(int pId) {
KArticle art = articleModel.getElement(pId);
this.articleModeEdit = true;
this.articleEditId = art.getId();

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

@@ -5,28 +5,21 @@ import javax.swing.JTabbedPane;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import org.jdesktop.swingx.JXErrorPane;
import org.jdesktop.swingx.error.ErrorInfo;
import java.awt.BorderLayout;
import java.io.File;
import java.io.IOException;
import java.sql.SQLException;
import java.util.HashMap;
import de.katho.kBorrow.Settings;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.Util;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.KLenderModel;
import de.katho.kBorrow.data.KLendingModel;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.db.SqlConnector;
import de.katho.kBorrow.db.SqliteConnector;
import de.katho.kBorrow.models.ArticleTableModel;
import de.katho.kBorrow.models.FreeArticleTableModel;
import de.katho.kBorrow.models.LenderModel;
import de.katho.kBorrow.models.LendingTableModel;
import de.katho.kBorrow.models.UserTableModel;
import de.katho.kBorrow.models.UserListModel;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
public class MainWindow {
@@ -38,7 +31,7 @@ public class MainWindow {
private Settings set;
private HashMap<String, Object> models;
private HashMap<String, KDataModel> models;
/**
* Create the application.
@@ -48,13 +41,7 @@ public class MainWindow {
* @throws ClassNotFoundException
* @throws IOException
*/
public MainWindow() throws IOException {
set = new Settings();
frame = new JFrame();
frame.setResizable(false);
frame.setBounds(100, 100, 600, 500);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
public MainWindow() {
// Delete all files in tmp-dir
Runtime.getRuntime().addShutdownHook(new Thread(){
public void run(){
@@ -66,6 +53,13 @@ public class MainWindow {
});
try {
frame = new JFrame();
frame.setResizable(false);
frame.setBounds(100, 100, 600, 500);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
Util.setMainWindow(frame);
set = new Settings();
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
if(set.getProperty("dBType").equals("sqlite")){
@@ -75,32 +69,29 @@ public class MainWindow {
dbCon = new SqlConnector();
}
models = new HashMap<String, Object>();
models.put("usertablemodel", new UserTableModel(dbCon));
models.put("userlistmodel", new UserListModel(dbCon));
models.put("articletablemodel", new ArticleTableModel(dbCon));
models.put("freearticletablemodel", new FreeArticleTableModel(dbCon));
models.put("lendermodel", new LenderModel(dbCon));
models.put("lendingtablemodel", new LendingTableModel(dbCon, models));
models = new HashMap<String, KDataModel>();
models.put("karticlemodel", new KArticleModel(dbCon));
models.put("klendermodel", new KLenderModel(dbCon));
models.put("klendingmodel", new KLendingModel(dbCon));
models.put("kusermodel", new KUserModel(dbCon));
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
frame.getContentPane().add(this.tabbedPane, BorderLayout.CENTER);
frame.getContentPane().add(tabbedPane, BorderLayout.CENTER);
tabbedPane.addTab("Neue Ausleihe", new NewLendingPanel(this.dbCon, models, set));
tabbedPane.addTab("Ausleihen verwalten", new ManageLendingsPanel(this.dbCon, models));
tabbedPane.addTab("Artikel verwalten", new ArticlePanel(this.dbCon, models));
tabbedPane.addTab("Benutzer verwalten", new UserPanel(this.dbCon, models));
}
catch(ClassNotFoundException | InstantiationException | IllegalAccessException | IOException | UnsupportedLookAndFeelException | SQLException e) {
ErrorInfo info = new ErrorInfo("Exception", e.getMessage(), null, null, e, null, null);
JXErrorPane.showDialog(frame, info);
catch(Exception e) {
Util.showError(e);
System.exit(1);
}
this.frame.setVisible(true);
frame.setVisible(true);
}
public static void main(String[] args) throws IOException{
public static void main(String[] args) {
new MainWindow();
}
}

11
src/de/katho/kBorrow/gui/ManageLendingsPanel.java
View File

@@ -4,10 +4,9 @@ import java.util.HashMap;
import javax.swing.JPanel;
import de.katho.kBorrow.controller.ManageLendingsController;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.listener.LendingReturnTableButton;
import de.katho.kBorrow.models.LendingTableModel;
@@ -26,16 +25,14 @@ public class ManageLendingsPanel extends JPanel {
*/
private static final long serialVersionUID = 925691137664223491L;
private LendingTableModel lendingTableModel;
private ManageLendingsController manageLendingsController;
public ManageLendingsPanel(DbConnector dbCon, HashMap<String, Object> models) throws IOException {
public ManageLendingsPanel(DbConnector dbCon, HashMap<String, KDataModel> models) throws IOException {
lendingTableModel = (LendingTableModel)models.get("lendingtablemodel");
manageLendingsController = new ManageLendingsController(dbCon, models);
// Lending-Table
JTable lendingTable = new JTable(lendingTableModel);
JTable lendingTable = new JTable(new LendingTableModel(models));
LendingReturnTableButton lrtb = new LendingReturnTableButton("Ausleihe beenden", lendingTable, manageLendingsController);
lendingTable.getColumnModel().getColumn(0).setMinWidth(30);
lendingTable.getColumnModel().getColumn(0).setMaxWidth(30);

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

@@ -34,12 +34,15 @@ import de.katho.kBorrow.controller.NewLendingController;
import de.katho.kBorrow.converter.LenderNameConverter;
import de.katho.kBorrow.converter.LenderStudentnumberConverter;
import de.katho.kBorrow.converter.LenderSurnameConverter;
import de.katho.kBorrow.data.KArticle;
import de.katho.kBorrow.data.KLender;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.KLenderModel;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.listener.NewLendingTableButton;
import de.katho.kBorrow.models.FreeArticleTableModel;
import de.katho.kBorrow.models.LenderModel;
import de.katho.kBorrow.models.UserListModel;
import java.awt.event.FocusEvent;
@@ -50,15 +53,12 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
*
*/
private static final long serialVersionUID = -7346953418572781322L;
private FreeArticleTableModel freeArticleTableModel;
private JTextField tfName;
private JTextField tfSurname;
private JTextField tfStudentNumber;
private UserListModel userListModel;
private JLabel lblStartDate;
private JLabel lblArticleName;
private int articleId;
private LenderModel lenderModel;
private JButton btnCancel;
private JButton btnSave;
private NewLendingController newLendingController;
@@ -66,20 +66,31 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
private JXDatePicker dpEstEndDate;
private JLabel lblStatus;
private KArticleModel kArticleModel;
private KUserModel kUserModel;
private KLenderModel kLenderModel;
private UserListModel userListModel;
private FreeArticleTableModel freeArticleTableModel;
/**
* Create the panel.
* @param dbCon
* @throws IOException
*/
public NewLendingPanel(final DbConnector dbCon, HashMap<String, Object> pModel, final Settings pSettings) throws IOException {
public NewLendingPanel(final DbConnector dbCon, HashMap<String, KDataModel> models, final Settings pSettings) throws IOException {
setLayout(null);
articleId = -1;
kArticleModel = (KArticleModel)models.get("karticlemodel");
kUserModel = (KUserModel)models.get("kusermodel");
kLenderModel = (KLenderModel)models.get("klendermodel");
userListModel = new UserListModel(kUserModel);
freeArticleTableModel = new FreeArticleTableModel(kArticleModel);
// FreeArticleTable
freeArticleTableModel = (FreeArticleTableModel)pModel.get("freearticletablemodel");
userListModel = (UserListModel)pModel.get("userlistmodel");
lenderModel = (LenderModel)pModel.get("lendermodel");
newLendingController = new NewLendingController(dbCon, pModel, pSettings);
newLendingController = new NewLendingController(dbCon, models, pSettings);
JTable freeArticleTable = new JTable(freeArticleTableModel);
freeArticleTable.setRowHeight(30);
@@ -156,9 +167,9 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
tfName.addKeyListener(this);
tfSurname.addKeyListener(this);
tfStudentNumber.addKeyListener(this);
AutoCompleteDecorator.decorate(tfName, lenderModel.getList(), false, new LenderNameConverter() );
AutoCompleteDecorator.decorate(tfSurname, lenderModel.getList(), false, new LenderSurnameConverter());
AutoCompleteDecorator.decorate(tfStudentNumber, lenderModel.getList(), false, new LenderStudentnumberConverter());
AutoCompleteDecorator.decorate(tfName, kLenderModel.getData(), false, new LenderNameConverter() );
AutoCompleteDecorator.decorate(tfSurname, kLenderModel.getData(), false, new LenderSurnameConverter());
AutoCompleteDecorator.decorate(tfStudentNumber, kLenderModel.getData(), false, new LenderStudentnumberConverter());
// Buttons
btnCancel = new JButton("Abbrechen");
@@ -218,7 +229,7 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
tfStudentNumber.setText("");
}
private void saveButtonPressed(){
private void saveButtonPressed() throws Exception {
String pLName = tfName.getText();
String pLSurname = tfSurname.getText();
String startDate = lblStartDate.getText();
@@ -252,8 +263,8 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
}
}
public void setModeNewLending(int pRow) {
KArticle art = freeArticleTableModel.getArticleByRow(pRow);
public void setModeNewLending(int id) {
KArticle art = kArticleModel.getElement(id);
lblStartDate.setText(Util.getCurrentDate());
lblArticleName.setText(art.getName());
@@ -267,7 +278,11 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
}
if(pEvent.getSource() == btnSave){
try {
saveButtonPressed();
} catch (Exception e) {
Util.showError(e);
}
}
}
@@ -278,7 +293,7 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
}
public void focusLost(FocusEvent pEvent) {
ArrayList<KLender> result = lenderModel.getLenders(tfName.getText(), tfSurname.getText(), tfStudentNumber.getText());
ArrayList<KLender> result = kLenderModel.getLenders(tfName.getText(), tfSurname.getText(), tfStudentNumber.getText());
if(result.size() == 1){
tfName.setText(result.get(0).getName());
@@ -288,7 +303,12 @@ public class NewLendingPanel extends JPanel implements ActionListener, FocusList
}
public void keyPressed(KeyEvent pKeyPress) {
if(pKeyPress.getKeyCode() == KeyEvent.VK_ENTER) saveButtonPressed();
if(pKeyPress.getKeyCode() == KeyEvent.VK_ENTER)
try {
saveButtonPressed();
} catch (Exception e) {
Util.showError(e);
}
}

8
src/de/katho/kBorrow/gui/RewriteToNewUserDialog.java
View File

@@ -10,11 +10,13 @@ import javax.swing.border.EmptyBorder;
import javax.swing.JComboBox;
import de.katho.kBorrow.controller.RewriteToNewUserController;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.models.RewriteUserModel;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JLabel;
public class RewriteToNewUserDialog extends JDialog implements ActionListener {
@@ -36,7 +38,7 @@ public class RewriteToNewUserDialog extends JDialog implements ActionListener {
/**
* Create the dialog.
*/
public RewriteToNewUserDialog(int pOldId, DbConnector pDbCon) {
public RewriteToNewUserDialog(int pOldId, DbConnector pDbCon, KDataModel userModel) {
setTitle("Ausleihe umschreiben");
setModal(true);
setModalityType(ModalityType.APPLICATION_MODAL);
@@ -47,7 +49,7 @@ public class RewriteToNewUserDialog extends JDialog implements ActionListener {
setContentPane(contentPane);
contentPane.setLayout(new BorderLayout());
oldId = pOldId;
rwusermodel = new RewriteUserModel(pDbCon, oldId);
rwusermodel = new RewriteUserModel(userModel, oldId);
rwcontroller = new RewriteToNewUserController(pDbCon);
// Content Panel

20
src/de/katho/kBorrow/gui/UserPanel.java
View File

@@ -20,8 +20,10 @@ import javax.swing.UIManager;
import javax.swing.border.TitledBorder;
import de.katho.kBorrow.controller.UserController;
import de.katho.kBorrow.data.KUser;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.listener.UserDeleteTableButton;
import de.katho.kBorrow.listener.UserEditTableButton;
import de.katho.kBorrow.models.UserTableModel;
@@ -36,17 +38,17 @@ public class UserPanel extends JPanel implements ActionListener, KeyListener {
private JButton btnUserCancel;
private boolean userModeEdit;
private int userEditId;
private UserTableModel userTableModel;
private KUserModel kUserModel;
private UserController userController;
public UserPanel(final DbConnector dbCon, HashMap<String, Object> pModels) throws IOException{
public UserPanel(final DbConnector dbCon, HashMap<String, KDataModel> models) throws IOException{
super();
setLayout(null);
userTableModel = (UserTableModel)pModels.get("usertablemodel");
userController = new UserController(dbCon, pModels);
kUserModel = (KUserModel)models.get("kusermodel");
userController = new UserController(dbCon, models);
//Tabelle und drumherum
JTable userTable = new JTable(userTableModel);
JTable userTable = new JTable(new UserTableModel(kUserModel));
userTable.setRowHeight(30);
UserDeleteTableButton userDeleteTableButton = new UserDeleteTableButton("L<EFBFBD>schen", userTable, this, userController);
UserEditTableButton userEditTableButton = new UserEditTableButton("Bearbeiten", userTable, this);
@@ -147,8 +149,8 @@ public class UserPanel extends JPanel implements ActionListener, KeyListener {
this.textFieldUserSurname.setText("");
}
public void setModeEditUser(int pRow){
KUser user = userTableModel.getUserByRow(pRow);
public void setModeEditUser(int pId){
KUser user = kUserModel.getElement(pId);
this.userModeEdit = true;
this.userEditId = user.getId();

11
src/de/katho/kBorrow/db/DbConnector.java → src/de/katho/kBorrow/interfaces/DbConnector.java
View File

@@ -1,11 +1,11 @@
package de.katho.kBorrow.db;
package de.katho.kBorrow.interfaces;
import java.util.ArrayList;
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.data.objects.KArticle;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.data.objects.KUser;
public interface DbConnector {
@@ -23,6 +23,7 @@ public interface DbConnector {
public int createNewLender(String pLName, String pLSurname, String pLSN);
public ArrayList<KLending> getActiveLendingList();
public int returnLending(int lendingId, int artId, String string);
public ArrayList<KLending> getLendingList();
public ArrayList<KLending> getLendingListForArticle(int pArtId);
public ArrayList<KUser> getRewriteUserList(int id);
public boolean rewriteToNewUser(int pOldId, int pNewId);

10
src/de/katho/kBorrow/interfaces/KDataModel.java Normal file
View File

@@ -0,0 +1,10 @@
package de.katho.kBorrow.interfaces;
import java.util.ArrayList;
public interface KDataModel {
public void register(KGuiModel pModel);
public void updateModel();
public ArrayList<?> getData();
public Object getElement(int id);
}

6
src/de/katho/kBorrow/interfaces/KGuiModel.java Normal file
View File

@@ -0,0 +1,6 @@
package de.katho.kBorrow.interfaces;
public interface KGuiModel {
public void fetchData(KDataModel pModel);
}

10
src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java
View File

@@ -11,6 +11,7 @@ import javax.swing.JTable;
import sun.tools.jar.Main;
import de.katho.kBorrow.controller.ArticleController;
import de.katho.kBorrow.gui.ArticlePanel;
import de.katho.kBorrow.models.ArticleTableModel;
public class ArticleDeleteTableButton extends TableButton {
@@ -24,16 +25,17 @@ public class ArticleDeleteTableButton extends TableButton {
URL url = Main.class.getResource("/icons/edit-delete.png");
ImageIcon icon = new ImageIcon(url);
this.buttonE.setIcon(icon);
this.buttonR.setIcon(icon);
buttonE.setIcon(icon);
buttonR.setIcon(icon);
this.buttonE.addActionListener(new ActionListener(){
buttonE.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e){
fireEditingStopped();
int row = pTable.getSelectedRow();
int id = ((ArticleTableModel)pTable.getModel()).getIdFromRow(row);
pPanel.setDeleteStatusLabel(pController.deleteArticle(row));
pPanel.setDeleteStatusLabel(pController.deleteArticle(id));
pPanel.resetModeEditArticle();
}
});

4
src/de/katho/kBorrow/listener/ArticleEditTableButton.java
View File

@@ -10,6 +10,7 @@ import javax.swing.JTable;
import sun.tools.jar.Main;
import de.katho.kBorrow.gui.ArticlePanel;
import de.katho.kBorrow.models.ArticleTableModel;
public class ArticleEditTableButton extends TableButton {
@@ -31,8 +32,9 @@ public class ArticleEditTableButton extends TableButton {
fireEditingStopped();
int row = pTable.getSelectedRow();
int id = ((ArticleTableModel)pTable.getModel()).getIdFromRow(row);
articleTab.setModeEditArticle(row);
articleTab.setModeEditArticle(id);
}
});
}

8
src/de/katho/kBorrow/listener/ArticleInspectTableButton.java
View File

@@ -10,8 +10,9 @@ 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;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.models.ArticleTableModel;
public class ArticleInspectTableButton extends TableButton {
@@ -20,7 +21,7 @@ public class ArticleInspectTableButton extends TableButton {
*/
private static final long serialVersionUID = -2591133864537097893L;
public ArticleInspectTableButton(String pLabel, final JTable pTable, final DbConnector dbCon, final HashMap<String, Object> pModels) throws IOException {
public ArticleInspectTableButton(String pLabel, final JTable pTable, final HashMap<String, KDataModel> models) throws IOException {
super(pLabel);
URL url = Main.class.getResource("/icons/system-search.png");
ImageIcon icon = new ImageIcon(url);
@@ -33,8 +34,9 @@ public class ArticleInspectTableButton extends TableButton {
fireEditingStopped();
int row = pTable.getSelectedRow();
int id = ((ArticleTableModel)pTable.getModel()).getIdFromRow(row);
new ArticleInspectFrame(row, dbCon, pModels);
new ArticleInspectFrame(id, models);
}
});
}

4
src/de/katho/kBorrow/listener/LendingReturnTableButton.java
View File

@@ -10,6 +10,7 @@ import javax.swing.JTable;
import sun.tools.jar.Main;
import de.katho.kBorrow.controller.ManageLendingsController;
import de.katho.kBorrow.models.LendingTableModel;
public class LendingReturnTableButton extends TableButton {
@@ -31,8 +32,9 @@ public class LendingReturnTableButton extends TableButton {
fireEditingStopped();
int row = pTable.getSelectedRow();
int id = ((LendingTableModel)pTable.getModel()).getIdFromRow(row);
pController.returnLending(row);
pController.returnLending(id);
}
});
}

4
src/de/katho/kBorrow/listener/NewLendingTableButton.java
View File

@@ -10,6 +10,7 @@ import javax.swing.JTable;
import sun.tools.jar.Main;
import de.katho.kBorrow.gui.NewLendingPanel;
import de.katho.kBorrow.models.FreeArticleTableModel;
public class NewLendingTableButton extends TableButton {
@@ -31,8 +32,9 @@ public class NewLendingTableButton extends TableButton {
fireEditingStopped();
int row = pTable.getSelectedRow();
int id = ((FreeArticleTableModel)pTable.getModel()).getIdFromRow(row);
pPanel.setModeNewLending(row);
pPanel.setModeNewLending(id);
}
});
}

4
src/de/katho/kBorrow/listener/UserDeleteTableButton.java
View File

@@ -11,6 +11,7 @@ import javax.swing.JTable;
import sun.tools.jar.Main;
import de.katho.kBorrow.controller.UserController;
import de.katho.kBorrow.gui.UserPanel;
import de.katho.kBorrow.models.UserTableModel;
public class UserDeleteTableButton extends TableButton {
@@ -29,8 +30,9 @@ public class UserDeleteTableButton extends TableButton {
fireEditingStopped();
int row = pTable.getSelectedRow();
int id = ((UserTableModel)pTable.getModel()).getIdFromRow(row);
if(pController.deleteUser(row)) pPanel.setStatusLabel("Benutzer erfolgreich gel<65>scht.");
if(pController.deleteUser(id)) pPanel.setStatusLabel("Benutzer erfolgreich gel<65>scht.");
else pPanel.setStatusLabel("Beuntzer konnte nicht gel<65>scht werden.");
pPanel.resetModeEditUser();

4
src/de/katho/kBorrow/listener/UserEditTableButton.java
View File

@@ -10,6 +10,7 @@ import javax.swing.JTable;
import sun.tools.jar.Main;
import de.katho.kBorrow.gui.UserPanel;
import de.katho.kBorrow.models.UserTableModel;
public class UserEditTableButton extends TableButton {
@@ -31,8 +32,9 @@ public class UserEditTableButton extends TableButton {
fireEditingStopped();
int row = pTable.getSelectedRow();
int id = ((UserTableModel)pTable.getModel()).getIdFromRow(row);
pPanel.setModeEditUser(row);
pPanel.setModeEditUser(id);
}
});

57
src/de/katho/kBorrow/models/ArticleInspectTableModel.java
View File

@@ -5,42 +5,35 @@ 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;
import de.katho.kBorrow.data.KLenderModel;
import de.katho.kBorrow.data.KLendingModel;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class ArticleInspectTableModel extends AbstractTableModel {
public class ArticleInspectTableModel extends AbstractTableModel implements KGuiModel {
/**
*
*/
private static final long serialVersionUID = 2293157709447086998L;
private String[] header;
private int articleId;
private ArrayList<KLending> data;
private DbConnector dbCon;
private KArticle article;
private ArticleTableModel articleModel;
private UserTableModel userModel;
private LenderModel lenderModel;
private KUserModel userModel;
private KLenderModel lenderModel;
public ArticleInspectTableModel(int pRow, DbConnector pDbCon, HashMap<String, Object> pModels){
public ArticleInspectTableModel(int pId, HashMap<String, KDataModel> models){
header = new String[] {"ID", "Verliehen von:", "Ausgeliehen an:", "Ausleihdatum", "Vor. R<>ckgabe", "R<EFBFBD>ckgabe"};
dbCon = pDbCon;
articleModel = (ArticleTableModel)pModels.get("articletablemodel");
userModel = (UserTableModel)pModels.get("usertablemodel");
lenderModel = (LenderModel)pModels.get("lendermodel");
articleId = pId;
userModel = (KUserModel)models.get("kusermodel");
lenderModel = (KLenderModel)models.get("klendermodel");
article = articleModel.getArticleByRow(pRow);
updateModel();
}
public void updateModel() {
data = dbCon.getLendingListForArticle(article.getId());
fireTableDataChanged();
fetchData(((KLendingModel)models.get("klendingmodel")));
}
public int getColumnCount() {
@@ -66,13 +59,13 @@ public class ArticleInspectTableModel extends AbstractTableModel {
case 1:
int uid = data.get(row).getUserId();
KUser user = userModel.getUserById(uid);
KUser user = userModel.getElement(uid);
return user.getName()+" "+user.getSurname();
case 2:
int lid = data.get(row).getLenderId();
KLender lender = lenderModel.getLenderById(lid);
KLender lender = lenderModel.getElement(lid);
return lender.getName()+" "+lender.getSurname()+" ("+lender.getStudentnumber()+")";
@@ -90,4 +83,16 @@ public class ArticleInspectTableModel extends AbstractTableModel {
}
}
public void fetchData(KDataModel pModel) {
if(pModel instanceof KLendingModel){
data = new ArrayList<KLending>();
for(KLending elem : ((KLendingModel)pModel).getData()){
if(elem.getArticleId() == articleId) data.add(elem);
}
fireTableDataChanged();
}
}
}

56
src/de/katho/kBorrow/models/ArticleTableModel.java
View File

@@ -4,10 +4,13 @@ import java.util.ArrayList;
import javax.swing.table.AbstractTableModel;
import de.katho.kBorrow.data.KArticle;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.interfaces.DbConnector;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class ArticleTableModel extends AbstractTableModel {
public class ArticleTableModel extends AbstractTableModel implements KGuiModel {
/**
*
@@ -17,21 +20,15 @@ public class ArticleTableModel extends AbstractTableModel {
protected DbConnector dbCon;
protected ArrayList<KArticle> data = new ArrayList<KArticle>();
public ArticleTableModel(DbConnector pDbCon){
public ArticleTableModel(KDataModel pModel){
header = new String [] {"ID", "Artikelname", "Artikelbeschreibung", "", "", ""};
this.dbCon = pDbCon;
this.updateModel();
pModel.register(this);
}
public String getColumnName(int index){
return header[index];
}
public void updateModel() {
this.data = this.dbCon.getArticleList();
this.fireTableDataChanged();
}
public int getColumnCount() {
return header.length;
}
@@ -63,40 +60,17 @@ public class ArticleTableModel extends AbstractTableModel {
return false;
}
/**
* Gibt die entsprechende Zeile in der Tabelle f<>r ein Objekt mit der gegebenen ID zur<75>ck.
*
* @param id ID, f<>r die die Tabellenzeile herausgesucht werden soll
* @return Zeile in der Tabelle. -1, wenn die ID nicht vorhanden ist.
*/
public int getRowFromId(int id) {
for (KArticle elem : this.data){
if(elem.getId() == id) return data.indexOf(elem);
}
return -1;
public int getIdFromRow(int pRow){
return data.get(pRow).getId();
}
/**
* Gibt das Article-Objekt der <20>bergebenen Zeile zur<75>ck.
*
* @param pRow Zeile, deren Article-Objekt zur<75>ckgegeben werden soll.
* @return KArticle-Objekt
*/
public KArticle getArticleByRow(int pRow){
return data.get(pRow);
public void fetchData(KDataModel pModel) {
if(pModel instanceof KArticleModel){
data = ((KArticleModel)pModel).getData();
fireTableDataChanged();
}
/**
* Gibt das Article-Objekt mit der entsprechendne ID zur<75>ck.
*
* @param pId Id, deren Objekt zur<75>ckgegeben werden soll.
* @return KArticle-Objekt
*/
public KArticle getArticleById(int pId){
for(KArticle elem : data){
if(elem.getId() == pId) return elem;
}
return null;
}
}

41
src/de/katho/kBorrow/models/FreeArticleTableModel.java
View File

@@ -1,8 +1,15 @@
package de.katho.kBorrow.models;
import de.katho.kBorrow.db.DbConnector;
import java.util.ArrayList;
import java.util.logging.Level;
public class FreeArticleTableModel extends ArticleTableModel {
import de.katho.kBorrow.KLogger;
import de.katho.kBorrow.data.KArticleModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class FreeArticleTableModel extends ArticleTableModel implements KGuiModel {
/**
*
@@ -10,19 +17,29 @@ public class FreeArticleTableModel extends ArticleTableModel {
private static final long serialVersionUID = 1908669541941834593L;
private String[] header;
public FreeArticleTableModel(DbConnector pDbCon) {
super(pDbCon);
this.header = new String[] {"ID", "Artikelname", "Artikelbeschreibung", ""};
updateModel();
}
public void updateModel(){
data = dbCon.getFreeArticleList();
fireTableDataChanged();
public FreeArticleTableModel(KDataModel pModel) {
super(pModel);
header = new String[] {"ID", "Artikelname", "Artikelbeschreibung", ""};
pModel.register(this);
}
public int getColumnCount(){
return header.length;
}
public void fetchData(KDataModel pModel) {
if(pModel instanceof KArticleModel){
data = new ArrayList<KArticle>();
for(KArticle elem : ((KArticleModel)pModel).getData()){
if (elem.getIsFree()) data.add(elem);
}
fireTableDataChanged();
}
else {
KLogger.log(Level.SEVERE, "FreeArticleModel: Typecast error!", new Exception("FreeArticleModel: Typecast error!"));
}
}
}

65
src/de/katho/kBorrow/models/LendingTableModel.java
View File

@@ -5,32 +5,34 @@ 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;
import de.katho.kBorrow.data.KLendingModel;
import de.katho.kBorrow.data.objects.KArticle;
import de.katho.kBorrow.data.objects.KLender;
import de.katho.kBorrow.data.objects.KLending;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class LendingTableModel extends AbstractTableModel {
public class LendingTableModel extends AbstractTableModel implements KGuiModel {
/**
*
*/
private static final long serialVersionUID = 1375465648631587292L;
private DbConnector dbCon;
private String[] header = {"ID", "Artikel", "Verliehen von:", "Ausgeliehen an:", "Ausleihdatum", "Vor. R<>ckgabe", ""};
private ArrayList<KLending> data = new ArrayList<KLending>();
private ArticleTableModel articleModel;
private LenderModel lenderModel;
private UserTableModel userTableModel;
private ArrayList<KLending> data;
private KDataModel articleModel;
private KDataModel lenderModel;
private KDataModel userModel;
private KDataModel lendingModel;
public LendingTableModel(DbConnector pDbCon, HashMap<String, Object> pModels ) {
dbCon = pDbCon;
articleModel = (ArticleTableModel)pModels.get("articletablemodel");
lenderModel = (LenderModel)pModels.get("lendermodel");
userTableModel = (UserTableModel)pModels.get("usertablemodel");
public LendingTableModel(HashMap<String, KDataModel> pModels ) {
articleModel = pModels.get("karticlemodel");
lenderModel = pModels.get("klendermodel");
userModel = pModels.get("kusermodel");
lendingModel = pModels.get("klendingmodel");
updateModel();
lendingModel.register(this);
}
public int getColumnCount() {
@@ -52,19 +54,19 @@ public class LendingTableModel extends AbstractTableModel {
case 1:
int artId = data.get(row).getArticleId();
KArticle art = articleModel.getArticleById(artId);
KArticle art = (KArticle) articleModel.getElement(artId);
return art.getName();
case 2:
int uId = data.get(row).getUserId();
KUser user = userTableModel.getUserById(uId);
KUser user = (KUser) userModel.getElement(uId);
return user.getName()+" "+user.getSurname();
case 3:
int lenderId = data.get(row).getLenderId();
KLender lender = lenderModel.getLenderById(lenderId);
KLender lender = (KLender) lenderModel.getElement(lenderId);
return lender.getName()+" "+lender.getSurname()+" ("+lender.getStudentnumber()+")";
@@ -84,24 +86,19 @@ public class LendingTableModel extends AbstractTableModel {
return false;
}
public void updateModel(){
data = dbCon.getActiveLendingList();
public void fetchData(KDataModel pModel) {
data = new ArrayList<KLending>();
if(pModel instanceof KLendingModel){
for(KLending elem : ((KLendingModel)pModel).getData()){
if(elem.getEndDate() == null || elem.getEndDate().equals("")) data.add(elem);
}
fireTableDataChanged();
}
public KLending getLendingByRow(int row) {
return data.get(row);
}
public KLending getLendingById(int id){
for(KLending elem : data){
if(elem.getId() == id) return elem;
}
return null;
}
public ArrayList<KLending> getLendingList(){
return data;
public int getIdFromRow(int pRow){
return data.get(pRow).getId();
}
}

35
src/de/katho/kBorrow/models/RewriteUserModel.java
View File

@@ -1,6 +1,12 @@
package de.katho.kBorrow.models;
import de.katho.kBorrow.db.DbConnector;
import java.util.ArrayList;
import java.util.logging.Level;
import de.katho.kBorrow.KLogger;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.KDataModel;
public class RewriteUserModel extends UserListModel {
@@ -10,18 +16,33 @@ public class RewriteUserModel extends UserListModel {
private static final long serialVersionUID = -78927566018961799L;
private int id;
public RewriteUserModel(DbConnector pDbCon, int pId) {
super(pDbCon);
public RewriteUserModel(KDataModel pModel, int pId) {
super(pModel);
id = pId;
updateModel();
pModel.register(this);
}
public void updateModel(){
data = dbCon.getRewriteUserList(id);
public int getIdByFullname(String pName){
for (KUser elem : data){
if(pName.equals(elem.getName()+" "+elem.getSurname())) return elem.getId();
}
return -1;
}
public void fetchData(KDataModel pModel){
if(pModel instanceof KUserModel){
data = new ArrayList<KUser>();
for(KUser elem : ((KUserModel)pModel).getData()){
if(elem.getId() != id) data.add(elem);
}
if(data.size() > 0) setSelectedItem(data.get(0).getName()+" "+data.get(0).getSurname());
fireIntervalAdded(this, 0, data.size()-1);
}
else {
KLogger.log(Level.SEVERE, "RewriteUserModel: Typecast error!", new Exception("RewriteUserModel: Typecast error!"));
}
}
}

39
src/de/katho/kBorrow/models/UserListModel.java
View File

@@ -5,32 +5,23 @@ import java.util.ArrayList;
import javax.swing.AbstractListModel;
import javax.swing.ComboBoxModel;
import de.katho.kBorrow.data.KUser;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class UserListModel extends AbstractListModel<String> implements ComboBoxModel<String> {
public class UserListModel extends AbstractListModel<String> implements ComboBoxModel<String>, KGuiModel {
/**
*
*/
private static final long serialVersionUID = -8653066929273274524L;
protected DbConnector dbCon;
protected ArrayList<KUser> data;
protected String selectedItem = null;
public UserListModel(DbConnector pDbCon){
public UserListModel(KDataModel pUserModel){
super();
dbCon = pDbCon;
updateModel();
}
public void updateModel() {
data = dbCon.getUserList();
if(data.size() > 0) setSelectedItem(data.get(0).getName()+" "+data.get(0).getSurname());
fireIntervalAdded(this, 0, data.size()-1);
pUserModel.register(this);
}
public void setSelectedItem(Object object) {
@@ -65,18 +56,14 @@ public class UserListModel extends AbstractListModel<String> implements ComboBox
return false;
}
public int getIdByFullname(String pName){
for (KUser elem : data){
if(pName.equals(elem.getName()+" "+elem.getSurname())) return elem.getId();
}
return -1;
public void fetchData(KDataModel pModel) {
if(pModel instanceof KUserModel){
data = ((KUserModel)pModel).getData();
}
public KUser getUserById(int pId){
for (KUser elem : data){
if(elem.getId() == pId) return elem;
}
return null;
if(data.size() > 0) setSelectedItem(data.get(0).getName()+" "+data.get(0).getSurname());
fireIntervalAdded(this, 0, data.size()-1);
}

49
src/de/katho/kBorrow/models/UserTableModel.java
View File

@@ -4,30 +4,30 @@ import java.util.ArrayList;
import javax.swing.table.AbstractTableModel;
import de.katho.kBorrow.data.KUser;
import de.katho.kBorrow.db.DbConnector;
import de.katho.kBorrow.data.KUserModel;
import de.katho.kBorrow.data.objects.KUser;
import de.katho.kBorrow.interfaces.KDataModel;
import de.katho.kBorrow.interfaces.KGuiModel;
public class UserTableModel extends AbstractTableModel {
public class UserTableModel extends AbstractTableModel implements KGuiModel {
/**
*
*/
private static final long serialVersionUID = 435829735305533728L;
private DbConnector dbCon;
private String[] header = {"ID", "Vorname", "Nachname", "", ""};
private ArrayList<KUser> data = new ArrayList<KUser>();
private ArrayList<KUser> data;
public UserTableModel(DbConnector pDbCon){
dbCon = pDbCon;
updateModel();
public UserTableModel(KDataModel pModel){
pModel.register(this);
}
public int getColumnCount() {
return this.header.length;
return header.length;
}
public int getRowCount() {
return this.data.size();
return data.size();
}
public String getValueAt(int row, int col) {
@@ -50,37 +50,22 @@ public class UserTableModel extends AbstractTableModel {
return header[index];
}
public void updateModel(){
data = dbCon.getUserList();
fireTableDataChanged();
}
// Die Funktion muss differenzierter werden
public boolean isCellEditable(int row, int col){
if (col > 2) return true;
return false;
}
/**
*
* @param pId
* @return Returns -1 if there is no row for the given id.
*/
public int getRowFromId(int pId){
for(KUser elem : this.data){
if(elem.getId() == pId) return data.indexOf(elem);
}
return -1;
public int getIdFromRow(int pRow){
return data.get(pRow).getId();
}
public KUser getUserByRow(int pRow){
return this.data.get(pRow);
public void fetchData(KDataModel pModel) {
if(pModel instanceof KUserModel){
data = ((KUserModel)pModel).getData();
fireTableDataChanged();
}
public KUser getUserById(int pId){
for(KUser elem : this.data){
if(elem.getId() == pId) return elem;
}
return null;
}
}