Add files via upload

usermanagement171/bin/messages.properties

@@ -0,0 +1,17 @@
+AddPanel.cancel=\u041E\u0442\u043C\u0435\u043D\u0430
+AddPanel.date_of_birth=\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F
+AddPanel.first_name=\u0418\u043C\u044F
+AddPanel.last_name=\u0424\u0430\u043C\u0438\u043B\u0438\u044F
+AddPanel.ok=Ok
+BrowsePanel.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
+BrowsePanel.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
+BrowsePanel.details=\u0414\u0435\u0442\u0430\u043B\u0438
+BrowsePanel.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+MainFrame.user_management=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F\u043C\u0438
+DetailsPanel.cancel=\u041E\u0442\u043C\u0435\u043D\u0430
+DetailsPanel.first_name=\u0418\u043C\u044F
+DetailsPanel.last_name=\u0424\u0430\u043C\u0438\u043B\u0438\u044F
+DetailsPanel.date_of_birth=\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F
+UserTableModel.id=ID
+UserTableModel.first_name=\u0418\u043C\u044F
+UserTableModel.last_name=\u0424\u0430\u043C\u0438\u043B\u0438\u044F

usermanagement171/bin/usersDataSet.xml

@@ -3,7 +3,13 @@
 		<column>id</column> 
 		<column>FirstName</column> 
 		<column>LastName</column> 
-		<column>DateOfBirth</column> 
+		<column>DateOfBirth</column>
+		 <row> 
+			<value>3</value> 
+			<value>TestFind</value> 
+			<value>User</value> 
+			<value>2019-05-11</value> 
+		</row>  
 		<row> 
 			<value>1000</value> 
 			<value>Bill</value> 

usermanagement171/db/usermanagement171.properties

@@ -0,0 +1,17 @@
+#HSQL Database Engine
+#Mon Dec 16 03:42:51 EET 2019
+hsqldb.script_format=0
+runtime.gc_interval=0
+sql.enforce_strict_size=false
+hsqldb.cache_size_scale=8
+readonly=false
+hsqldb.nio_data_file=true
+hsqldb.cache_scale=14
+version=1.8.0
+hsqldb.default_table_type=memory
+hsqldb.cache_file_scale=1
+hsqldb.log_size=200
+modified=yes
+hsqldb.cache_version=1.7.0
+hsqldb.original_version=1.8.0
+hsqldb.compatible_version=1.8.0

usermanagement171/db/usermanagement171.script

@@ -0,0 +1,4 @@
+CREATE SCHEMA PUBLIC AUTHORIZATION DBA
+CREATE USER SA PASSWORD ""
+GRANT DBA TO SA
+SET WRITE_DELAY 20

usermanagement171/db/usermanegement171.properties

@@ -1,5 +1,5 @@
 #HSQL Database Engine
-#Tue Dec 10 14:39:34 EET 2019
+#Mon Dec 16 13:53:20 EET 2019
 hsqldb.script_format=0
 runtime.gc_interval=0
 sql.enforce_strict_size=false

usermanagement171/src/main/java/messages.properties

@@ -0,0 +1,10 @@
+AddPanel.cancel=\u041E\u0442\u043C\u0435\u043D\u0430
+AddPanel.date_of_birth=\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F
+AddPanel.first_name=\u0418\u043C\u044F
+AddPanel.last_name=\u0424\u0430\u043C\u0438\u043B\u0438\u044F
+AddPanel.ok=Ok
+BrowsePanel.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
+BrowsePanel.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
+BrowsePanel.details=\u0414\u0435\u0442\u0430\u043B\u0438
+BrowsePanel.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+MainFrame.user_management=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F\u043C\u0438

usermanagement171/src/main/java/ua/nure/kravets/usermanagement171/User.java

@@ -1,12 +1,18 @@
 package ua.nure.kravets.usermanagement171;
 
+import java.io.Serializable;
 import java.util.Calendar;
 import java.util.Date;
-public class User {
-private Long id;
-private String firstName;
-private String lastName;
-private Date dateOfBirth;
+import java.util.Objects;
+
+
+
+public class User implements Serializable {
+	private static final long serialVersionUID = -3760492779402022862L;	
+	private Long id;
+	private String firstName;
+	private String lastName;
+	private Date dateOfBirth;
 
  public User() {
     }
@@ -17,6 +23,12 @@ public User(Long id, String firstName, String lastName, Date dateOfBirth) {
         this.lastName = lastName;
         this.dateOfBirth = dateOfBirth;
     }
+public User(String firstName, String lastName, Date date) {
+    this.firstName = firstName;
+    this.lastName = lastName;
+    this.dateOfBirth = date;
+
+}
 public Long getId() {
 	return id;
 }

usermanagement171/src/main/java/ua/nure/kravets/usermanagement171/db/ConnectionFactory.java

@@ -3,7 +3,5 @@
 import java.sql.Connection;
 
 public interface ConnectionFactory {
-
 	Connection createConnection() throws DatabaseException;
-
 }

usermanagement171/src/main/java/ua/nure/kravets/usermanagement171/db/ConnectionFactoryImpl.java

@@ -6,7 +6,6 @@
 import java.util.Properties;
 
 public class ConnectionFactoryImpl implements ConnectionFactory {
-
 	private String driver;
 	private String url;
 	private String user;

usermanagement171/src/main/java/ua/nure/kravets/usermanagement171/db/DaoFactory.java

@@ -3,45 +3,52 @@
 import java.io.IOException;
 import java.util.Properties;
 
+import ua.nure.kravets.usermanagement171.User;
+
 public abstract  class DaoFactory {
 
 	protected static final String USER_DAO = "dao.knure.ctde.usermanagement171.db.UserDao";
 	private static final String DAO_FACTORY ="dao.factory";
-	protected static Properties properties;
+protected static Properties properties;
+
 	private static DaoFactory instance;
 
-	static { 
+	static {
 		properties = new Properties();
-	try {
-		properties.load(DaoFactory.class.getClassLoader().getResourceAsStream("settings.properties"));
-	} catch (IOException e) {
-		throw new RuntimeException();
+		try {
+			properties.load(DaoFactory.class.getClassLoader()
+					.getResourceAsStream("settings.properties"));
+		} catch (IOException e) {
+			throw new RuntimeException("incorrect or missing settings");
+		}
 	}
-}
+
+
+	protected DaoFactory() {
+
+	}
+
 	public static synchronized DaoFactory getInstance() {
 		if (instance == null) {
-		Class factoryClass;
-		try {
-			factoryClass = Class.forName(properties.getProperty(DAO_FACTORY));
-			instance = (DaoFactory) factoryClass.newInstance();
-		} catch (Exception e) {
-			throw new RuntimeException(e);
+			Class<?> factoryClass;
+			try {
+				factoryClass = Class.forName(properties.getProperty(DAO_FACTORY));
+				instance = (DaoFactory) factoryClass.newInstance();
+			} catch (Exception e) {
+				throw new RuntimeException();
+			}
 		}
-	}
 		return instance;
 	}
 
-	protected DaoFactory() {
-
-
+	public static void init (Properties p) {
+		properties =  p;
+		instance = null;
 	}
-	protected ConnectionFactory getConnectionFactory(){
+
+	protected ConnectionFactory getConnectionFactory() {
 		return new ConnectionFactoryImpl(properties);
 	}
-	public  abstract UserDao getUserDao(); 
-
-public static void init (Properties prop) {
-	properties = prop;
-	instance = null;
-}
+
+	public abstract UserDao<User> getUserDao();
 }

usermanagement171/src/main/java/ua/nure/kravets/usermanagement171/db/DaoFactoryImpl.java

@@ -1,20 +1,19 @@
 package ua.nure.kravets.usermanagement171.db;
 
+import ua.nure.kravets.usermanagement171.User;
+
 public class DaoFactoryImpl extends DaoFactory {
 
-	@Override
-	public UserDao getUserDao() {
-		{
-			UserDao result = null;
+		public UserDao<User> getUserDao() {
+			UserDao<User> result;
 			try {
-				Class clazz = Class.forName(properties.getProperty(USER_DAO));
-				result = (UserDao) clazz.newInstance();
+				Class<?> clazz = Class.forName(properties.getProperty(USER_DAO));
+				result = (UserDao<User>) clazz.newInstance();
 				result.setConnectionFactory(getConnectionFactory());
 			} catch (Exception e) {
-				throw new RuntimeException (e);
-				}
+				throw new RuntimeException(e);
+			}
 			return result;
 		}
-	}
 
 }

usermanagement171/src/main/java/ua/nure/kravets/usermanagement171/db/DatabaseException.java

@@ -1,29 +1,17 @@
 package ua.nure.kravets.usermanagement171.db;
 
-public class DatabaseException extends Exception {
-
-	public DatabaseException() {
-		// TODO Auto-generated constructor stub
-	}
+import java.sql.SQLException;
 
-	public DatabaseException(String arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
+public class DatabaseException extends Exception {
 
-	public DatabaseException(Throwable arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
+	private static final long serialVersionUID = 1L;
 
-	public DatabaseException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-		// TODO Auto-generated constructor stub
+	public DatabaseException(SQLException e) {
+		super(e);
 	}
 
-	public DatabaseException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
-		super(arg0, arg1, arg2, arg3);
-		// TODO Auto-generated constructor stub
+	public DatabaseException(String string) {
+		super(string);
 	}
 
 }