From c9fa478b80680ac5634a47d7de9f9d5cde9cda4c Mon Sep 17 00:00:00 2001
From: Martin <martin.weick@outlook.com>
Date: Fri, 4 May 2018 20:22:09 +0200
Subject: commit for merge
---
.../assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java
index 65933bd..8a596b3 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java
@@ -6,7 +6,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundExceptio
import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
import java.sql.PreparedStatement;
-
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
@@ -31,7 +30,10 @@ public class VehicleDBDAO implements VehicleDAO {
String name = "";
int id = -1;
try {
- p1 = jdbcConnectionManager.getConnection().prepareStatement(query1,PreparedStatement.RETURN_GENERATED_KEYS);
+ p1 =
+ jdbcConnectionManager
+ .getConnection()
+ .prepareStatement(query1, PreparedStatement.RETURN_GENERATED_KEYS);
p1.setString(1, name);
p1.setString(2, vehicle.constructionType().name());
if (vehicle.type() == VehicleType.KTW_B) {
@@ -41,7 +43,6 @@ public class VehicleDBDAO implements VehicleDAO {
}
p1.executeUpdate();
-
ResultSet keyResultSet = p1.getGeneratedKeys();
if (keyResultSet.next()) {
--
cgit v1.2.3-70-g09d2