Revize d1c461a4

Update and refactor models for DB access.

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/Register.java

@@ -42 +42 @@
 			errors.put("email", "Please enter e-mail address.");
 		} else if (!isEmailAddressValid(email)) {
 			errors.put("email", "Please enter valid e-mail address.");
-		} else if (user.existsEmail(email)) {
+		} else if (user.isEmailExists(email)) {
 			errors.put("email", "E-mail already exists.");
 		}
 
 		if (Strings.isNullOrEmpty(username)) {
 			errors.put("username", "Please enter username.");
-		} else if (user.existsNick(username)) {
+		} else if (user.isNickExists(username)) {
 			errors.put("username", "Nickname already exists.");
 		}
     	

sources/src/main/java/cz/zcu/kiv/offscreen/user/DB.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.user;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 
 
 import javax.servlet.ServletContext;
 
 /**
- * Class Db is useful for comunication with mysql database.
+ * Class Db is useful for communication with mysql database.
  * 
  * @author Daniel Bureš
  *
@@ -21 +17 @@
 	
 	/**
 	 * Constructor opens connection do database. Access data must be save in ServletContext as InitParameter( DbUrl, DbName, DbUser, DbPsw ).
-	 * 
-	 * 
 	 */
 	public DB(ServletContext context){	
 		    
 			try {
 				Class.forName("com.mysql.jdbc.Driver");
-				
-				conn = (Connection) DriverManager.getConnection(context.getInitParameter("DbUrl") + context.getInitParameter("DbName")+"?user="+ context.getInitParameter("DbUser") +"&password="+ context.getInitParameter("DbPsw") + "&useUnicode=true&characterEncoding=UTF-8");				
-				open();
-			} catch (ClassNotFoundException e) {
-				System.out.println("classnotfound exception");
-				e.printStackTrace();
-			} catch (SQLException e) {
-				
-				System.out.println("sql exception");
+
+				String dbUrl = context.getInitParameter("DbUrl");
+				String dbName = context.getInitParameter("DbName");
+				String dbUser = context.getInitParameter("DbUser");
+				String dbPsw = context.getInitParameter("DbPsw");
+
+				conn = DriverManager.getConnection(dbUrl + dbName + "?user=" + dbUser + "&password=" + dbPsw + "&useUnicode=true&characterEncoding=UTF-8");
+				conn.setAutoCommit(true);
+			} catch (ClassNotFoundException | SQLException e) {
 				e.printStackTrace();
 			}
 	}
-	
+
 	/**
-	 * Method creates sql tables in database. And insert users: admin, user1, user2, user3
+	 * Method return prepared statement for inserting of values
+
+	 * @param query query with ? on values.
+	 * @param returnGeneratedKeys true - RETURN_GENERATED_KEYS flag is set, false - no flag is set
 	 */
-	public void open() throws SQLException{
-		//conn = (Connection) DriverManager.getConnection(serverName +"?user="+ userName +"&password="+ password + "&useUnicode=true&characterEncoding=UTF-8");
-		conn.setAutoCommit(true);
-		Statement stat = conn.createStatement();
-						
+	PreparedStatement getPreparedStatement(String query, boolean returnGeneratedKeys) throws SQLException {
+		if(returnGeneratedKeys)
+			return conn.prepareStatement(query, PreparedStatement.RETURN_GENERATED_KEYS);
+		else
+			return conn.prepareStatement(query);
 	}
-	
+
 	/**
-	 * Method returns actual connection to database.
-	 * 
-	 * @return actual connection to database.
+	 * Method execute sql query like SELECT created with prepared statement and returns affected rows as resultSet or null.
+	 *
+	 * @param preparedStatement prepared statement with query and set all parameters.
+	 * @return ResultSet - data from database.
 	 */
-	public Connection getConn(){
-		return conn;		
+	ResultSet executeQuery(PreparedStatement preparedStatement){
+		try {
+			preparedStatement.execute();
+			return preparedStatement.getResultSet();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		return null;
 	}
-	
+
 	/**
-	 * Method execute sql query. Sql query can be INSERT, DELETE, UPDATE
-	 * @return count of affected rows
+	 * Method execute update or insert sql query created with prepared statement and return resultSet of generated keys or null.
+	 * @param preparedStatement prepared statement with query and set all parameters.
+	 * @return ResultSet - generated keys or null.
+	 */
+	ResultSet executeUpdate(PreparedStatement preparedStatement){
+		try {
+			preparedStatement.executeUpdate();
+			return preparedStatement.getGeneratedKeys();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * Method execute sql query like SELECT and returns affected rows as resultSet or null.
+	 * @param sql - completed sql query
+	 * @return ResultSet - data from database
+	 */
+	ResultSet executeQuery(String sql){
+		try{
+			Statement stat = conn.createStatement();
+			stat.execute(sql);
+			return stat.getResultSet();
+
+		}catch(SQLException | NullPointerException e){
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * Method execute prepared sql query. Sql query can be INSERT, DELETE, UPDATE
+	 *
+	 * @return count of affected rows or -1 on SQLException and -2 on NullPointerException
 	 * */
-	public int exStatement(String sql) {	
-		Statement stat;
-		
+	int executeStatement(PreparedStatement preparedStatement) {
+
 		try{
-			stat = conn.createStatement();
-			return stat.executeUpdate(sql);
+			return preparedStatement.executeUpdate();
 		}catch(SQLException e){
 			e.printStackTrace();
 			return -1;
 		}catch (NullPointerException e){
 			e.printStackTrace();
 			return -2;
-		}	
-		
+		}
 	}
-	
+
+
 	/**
-	 * Method execute sql query like SELECT and returns affected rows as resultSet or Null. 
-	 * 
-	 * @throws SQLException 
-	 * @return ResultSet - data from database 
-	 */
-	public ResultSet exQuery(String sql){
-		Statement stat;
-		
+	 * Method execute sql query. Sql query can be INSERT, DELETE, UPDATE
+	 *
+	 * @return count of affected rows or -1 on SQLException and -2 on NullPointerException
+	 * */
+	int executeStatement(String sql) {
+
 		try{
-			stat = conn.createStatement();
-			stat.execute(sql);
-			return stat.getResultSet();
+			Statement stat = conn.createStatement();
+			return stat.executeUpdate(sql);
 		}catch(SQLException e){
 			e.printStackTrace();
-			return null;
+			return -1;
 		}catch (NullPointerException e){
 			e.printStackTrace();
-			return null;
-		}			 
-		
-		
+			return -2;
+		}
 	}
 
 }

sources/src/main/java/cz/zcu/kiv/offscreen/user/Diagram.java

@@ -13 +13 @@
  */
 public class Diagram {
     private DB db = null;
-    private int id = -1;
+    private int id = 0;
 
 
     public Diagram(DB db) {
-        this(db, -1);
+        this(db, 0);
     }
 
     public Diagram(DB db, int id) {
@@ -34 +34 @@
         return this.id;
     }
 
+    /**
+     * Return id of user which is owner of diagram.
+     * @return user id
+     */
     public int getUserId(){
-        if(this.id < 0) return -1;
+        if(this.id == 0) return 0;
 
         String qy = "SELECT user_id FROM diagram WHERE id = '" + this.id + "'";
-        ResultSet rs = db.exQuery(qy);
+        ResultSet rs = db.executeQuery(qy);
 
         try{
             if (rs != null && rs.next()) {
@@ -50 +54 @@
         return -1;
     }
 
+    /**
+     * Returns if diagram is public or not
+     * @return true - diagram is public, false - diagram is not public
+     */
     public boolean isPublic(){
-        if(this.id < 0) return false;
+        if(this.id == 0) return false;
 
         String qy = "SELECT public FROM diagram WHERE id = '" + this.id + "'";
-        ResultSet rs = db.exQuery(qy);
+        ResultSet rs = db.executeQuery(qy);
 
         try{
             if (rs != null && rs.next()) {
@@ -66 +74 @@
         return false;
     }
 
+    /**
+     * Returns json of diagram. Json can be send straight to frontend.
+     */
     public String getJsonDiagram(){
-        if(this.id < 0) return "";
+        if(this.id == 0) return "";
 
         String qy = "SELECT graph_json FROM diagram WHERE id = '" + this.id + "'";
-        ResultSet rs = db.exQuery(qy);
+        ResultSet rs = db.executeQuery(qy);
 
         try{
             if (rs != null && rs.next()) {
@@ -88 +99 @@
      * @return created map.
      */
     public Map<String, String> getDiagram() {
-        if (this.id < 0) return Collections.emptyMap();
+        if (this.id == 0) return Collections.emptyMap();
 
         String qy = "SELECT * FROM diagram WHERE id = '" + this.id + "'";
 
         try {
 
-            ResultSet rs = db.exQuery(qy);
+            ResultSet rs = db.executeQuery(qy);
             if (rs != null && rs.next()) {
                 return createMap(rs);
             }
@@ -113 +124 @@
      */
     public void update(Map<String, String> param) {
         try {
-            if (this.id < 0) {
+            if (this.id == 0) {
                 // crating new diagram
 
                 String name = param.get("name");
@@ -125 +136 @@
                 String qy = "INSERT INTO diagram (name, created, last_update, user_id, public, graph_json ) " +
                         "VALUES (?, NOW(), NOW(), ?, ?, ?) ";
 
-                PreparedStatement pst = db.getConn().prepareStatement(qy);
+                PreparedStatement pst = db.getPreparedStatement(qy, true);
                 pst.setString(1, name);
                 pst.setString(2, userId);
                 pst.setString(3, isPublic);
                 pst.setString(4, graphJson);
-                pst.executeUpdate();
 
-                ResultSet rs = pst.getGeneratedKeys();
+                ResultSet rs = db.executeUpdate(pst);
 
-                if (rs.next()) {
+                if (rs != null && rs.next()) {
                     this.id = rs.getInt(1);
                 }
             } else {
@@ -144 +154 @@
 
                 String qy = "UPDATE diagram SET name = ?, public = ?, graph_json = ?, last_update = NOW() WHERE id= ?";
 
-                PreparedStatement pst = db.getConn().prepareStatement(qy);
+                PreparedStatement pst = db.getPreparedStatement(qy, false);
                 pst.setString(1, name);
                 pst.setString(2, isPublic);
                 pst.setString(3, graphJson);
                 pst.setInt(4, this.id);
-                pst.executeUpdate();
+
+                db.executeStatement(pst);
             }
         } catch (SQLException e) {
             e.printStackTrace();
@@ -160 +171 @@
      * Method deletes diagram from database.
      */
     public void delete() {
-        if (id < 0) return;
+        if (id == 0) return;
 
         String qy = "DELETE FROM diagram WHERE id = '" + this.id + "' LIMIT 1";
-        db.exStatement(qy);
+        db.executeStatement(qy);
     }
 
     /**
@@ -173 +184 @@
      * @return number of affected rows in database
      */
     public int updateGraphJson(String graphJson){
-        if(this.id < 0) return 0;
+        if(this.id == 0) return 0;
 
         String qy = "UPDATE diagram SET graph_json = ? WHERE id = ?";
 
         try {
-            PreparedStatement pst = db.getConn().prepareStatement(qy);
+            PreparedStatement pst = db.getPreparedStatement(qy, false);
             pst.setString(1, graphJson);
             pst.setInt(2, this.id);
-            pst.executeUpdate();
-            return pst.getUpdateCount();
+            return db.executeStatement(pst);
 
         } catch (SQLException e) {
             e.printStackTrace();
@@ -199 +209 @@
     public ArrayList<Map<String, String>> getDiagramListByUserId(int user_id) {
         String qy = "SELECT * FROM diagram WHERE user_id = '" + user_id + "' ORDER BY created DESC ";
 
-        return createListOfMap(db.exQuery(qy));
+        return createListOfMap(db.executeQuery(qy));
     }
 
 
@@ -212 +222 @@
 
         String qy = "SELECT * FROM diagram WHERE public = 1 ORDER BY name ASC ";
 
-        return createListOfMap(db.exQuery(qy));
+        return createListOfMap(db.executeQuery(qy));
     }
 
     /**
@@ -242 +252 @@
      *
      * @param rs not null result set
      * @return map of all parameters.
-     * @throws SQLException
      */
     private Map<String,String> createMap(ResultSet rs) throws SQLException {
         HashMap<String, String> item_map = new HashMap<>();

sources/src/main/java/cz/zcu/kiv/offscreen/user/User.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.user;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
 /**
- * Class CUser is used for creating, updating or loading user from database.
+ * Class User is used for creating, updating or loading user from database.
  *
  * @author Daniel Bureš
  *
@@ -16 +15 @@
 public class User {
 	private DB db = null;
 	private int id = 0;
-	private ResultSet rs;
-	private Map<String,String> paramStr = new HashMap<String,String>(10);
-
 
 	/**
 	 * Constructs object, where is saved db connection.
@@ -33 +29 @@
 	public User(DB db, int id){
 		this.db = db;
 		this.id = id;
-
-		if(id > 0){
-			load();
-		}
-
-	}
-
-	/**
-	 * Method loads user from database. User is loaded by his id, which must be saved in object of this class.
-	 */
-	public void load(){
-		String qy = "SELECT * FROM user WHERE id = '"+this.id+"' ";
-		try {
-			rs = db.exQuery(qy);
-			if ( rs != null && rs.next() ) {
-				this.id = rs.getInt("id");
-
-
-				paramStr.put("nick", rs.getString("nick")  );
-
-			}else{
-				this.id = 0;
-			}
-
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-
-	/**
-	 * Method sets session for current user and save session to database.
-	 *
-	 * @param session
-	 */
-	public void setSession(String session){
-		if(id > 0){
-			String qy = "UPDATE user SET session='"+session+"' WHERE id='"+ this.id +"'";
-			db.exStatement(qy);
-		}
 	}
 
 	/**
 	 * Method try to login user by his nick name and password. If login is OK then returns true else  returns false;
 	 *
-	 * @param nick
-	 * @param psw
+	 * @param nick users login name
+	 * @param psw users password
 	 * @return true - login ok
 	 * 		   false - login failed
 	 */
 	public boolean login(String nick, String psw){
-		String qy = "SELECT * FROM user WHERE nick LIKE '"+nick+"' AND psw LIKE '"+Util.MD5(psw)+"' AND active = '1' LIMIT 1";
-		try {
-			rs = db.exQuery(qy);
-			if ( rs.next() ) {
+		String qy = "SELECT * FROM user WHERE nick LIKE ? AND psw LIKE ? AND active = '1' LIMIT 1";
+
+		try{
+			PreparedStatement pst = db.getPreparedStatement(qy, false);
+			pst.setString(1, nick);
+			pst.setString(2, Util.MD5(psw));
+			ResultSet rs = db.executeQuery(pst);
+
+			if ( rs != null && rs.next() ) {
 				if(rs.getInt("id") > 0){
 					this.id = rs.getInt("id");
-					load();
 					return true;
 				}
 			}
@@ -99 +58 @@
 			e.printStackTrace();
 		}
 
-
 		return false;
 	}
 
-
-
-	public void register(Map<String, String> param){
-		try {
-				if ( this.id  == 0 ) {
-
-					String qy = "INSERT INTO user (id,created,active, nick,name, psw,session,email) " +
-										"VALUES (	'0', " +
-										"			NOW(), " +
-										"			'1', " +
-										"			'" + param.get("nick") + "',"+
-										"			'" + param.get("name") + "',"+
-										"			'" + Util.MD5(param.get("password")) + "'," +
-										" 			'" + param.get("session") + "',"+
-										" 			'" + param.get("email") + "' ) ";
-					Statement st = db.getConn().createStatement();
-					st.executeUpdate(qy, Statement.RETURN_GENERATED_KEYS);
-					ResultSet rs = st.getGeneratedKeys();
-
-					if(rs.next()){
-						this.id = rs.getInt(1);
-					}
-				}
-
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
-
-	}
-
 	/**
-	 * Method saves parameters into database. if is not loaded user then is created new User.
+	 * Method register new user to database. Id of user (variable id) must not be set.
+	 * When register is success variable id is set.
 	 *
-	 * @param param - parameters to save
-	 * @param cx
+	 * @param param Parameters which describing user. Keys must be: nick, name, password, session, email.
 	 */
-	public void update(Map<String, String> param,ServletContext cx){
+	public void register(Map<String, String> param){
 		try {
 			if ( this.id  == 0 ) {
 
-					String qy = "INSERT INTO user (id,created,active) " +
-										"VALUES ('0', NOW(), '1' ) ";
-					Statement st = db.getConn().createStatement();
-					st.executeUpdate(qy, Statement.RETURN_GENERATED_KEYS);
-					ResultSet rs = st.getGeneratedKeys();
+				String qy = "INSERT INTO user (id, created, active, nick, name, psw, session, email) " +
+						"VALUES ( ?, NOW(), ?, ?, ?, ?, ?, ?)";
 
-					if(rs.next()){
-						this.id = rs.getInt(1);
-					}
+				PreparedStatement pst = db.getPreparedStatement(qy, true);
+				pst.setInt(1, 0);
+				pst.setInt(2, 1);
+				pst.setString(3, param.get("nick"));
+				pst.setString(4, param.get("name"));
+				pst.setString(5, Util.MD5(param.get("password")));
+				pst.setString(6, param.get("session"));
+				pst.setString(7, param.get("email"));
 
+				ResultSet rs = db.executeUpdate(pst);
 
+				if(rs != null && rs.next()){
+					this.id = rs.getInt(1);
+				}
 			}
 
-			String tmp_info = param.get("info");
-			tmp_info = tmp_info.replaceAll("\\<","&lt;");
-			tmp_info = tmp_info.replaceAll("\\>","&gt;");
-			tmp_info = tmp_info.replaceAll("\\n","<br \\/>");
-			param.put("info",tmp_info);
-
-
-			db.exStatement(	"UPDATE user " +
-							"SET  email = '"+param.get("email")+"',"+
-								  "nick = '"+param.get("nick")+"',"+
-								  (param.get("noSavePsw")!=null?"":",psw = '"+param.get("psw")+"' " )+
-								  (param.get("active")!= null && Integer.valueOf(param.get("active")) >= 0 ? ",active = '" + param.get("active") + "'": "" )+
-								  " WHERE id = '" + this.id +"'");
-
-
-
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
 
+	/**
+	 * Return all information about user from database stored in map. Keys of map are: id, nick, name, psw, session,
+	 * active, created, email.
+	 *
+	 * @return created map or empty map.
+	 */
+	public Map<String, String> getUser(){
+		String qy = "SELECT * FROM user WHERE id = '" + this.id + "'";
+		try {
+			ResultSet rs = db.executeQuery(qy);
 
+			if ( rs != null && rs.next() ) {
+				Map<String, String> params = new HashMap<>(8);
+				params.put("id", rs.getString("id"));
+				params.put("nick", rs.getString("nick"));
+				params.put("name", rs.getString("name"));
+				params.put("psw", rs.getString("psw"));
+				params.put("session", rs.getString("session"));
+				params.put("active", rs.getString("active"));
+				params.put("created", rs.getString("created"));
+				params.put("email", rs.getString("email"));
+
+				return params;
+
+			} else {
+				this.id = 0;
+			}
 		} catch (SQLException e) {
-			cx.setAttribute("DEBUG", "e " + e.getMessage() + " state: "+e.getSQLState() + " sqlerrcode" + e.getErrorCode());
-
 			e.printStackTrace();
 		}
 
+		return Collections.emptyMap();
 	}
 
-
 	/**
-	 * Returns id of loaded user.
+	 * Returns id of user. Value 0 indicates not existing user.
 	 *
-	 * @return int
+	 * @return int with user id or 0.
 	 */
 	public int getId(){
 		return id;
 	}
 
 	/**
-	 * Returns loaded parameters, which are saved in Map<String,String>.
-	 * @return Map<String,String> loaded parameters, which are saved in Map<String,String>.
+	 * Method sets session for current user and save session to database.
 	 */
-	public Map<String,String> getParam(){
-		return paramStr;
+	public void setSession(String session){
+		if(id > 0){
+			String qy = "UPDATE user SET session= ? WHERE id='" + this.id + "'";
+
+			try {
+
+				PreparedStatement pst = db.getPreparedStatement(qy, false);
+				pst.setString(1, session);
+				db.executeStatement(pst);
+
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+		}
 	}
 
 	/**
-	 * Method returns nick of loaded user.
-	 * @return
+	 * Method saves parameters into database. Method can change only email, nick and active parameters.
+	 * @param param - parameters to save
 	 */
-	public String getNick(){
-		return paramStr.get("nick");
+	public void update(Map<String, String> param) {
+		if ( this.id  != 0 ) {
+			try {
+				String qy = "UPDATE user SET  email = ?, nick = ?, active = ? WHERE id = ?";
+
+				PreparedStatement pst = db.getPreparedStatement(qy, false);
+				pst.setString(1, param.get("email"));
+				pst.setString(2, param.get("nick"));
+				pst.setString(3, param.get("active"));
+				pst.setInt(4, this.id);
+
+				db.executeStatement(pst);
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+		}
 	}
 
 	/**
-	 * Method checks if exists user with nick.
-	 * @param testNick
-	 * @return
+	 * Returns nick of user or empty string when no user is loaded.
 	 */
-	public boolean existsNick(String testNick){
-		boolean exists = false;
-
-		String qy = "SELECT * FROM user WHERE LOWER(nick) LIKE '"+testNick.toLowerCase()+"' LIMIT 1";
-		try {
-			rs = db.exQuery(qy);
+	public String getNick(){
+		if (this.id != 0) {
+			String qy = "SELECT nick FROM user WHERE id = '" + this.id + "'";
+			ResultSet rs = db.executeQuery(qy);
 
-			if ( rs.next() ) {
-				if(rs.getInt("id") > 0){
-					return true;
+			try{
+				if (rs != null && rs.next()) {
+					return rs.getString("nick");
 				}
+			}  catch (SQLException e){
+				e.printStackTrace();
 			}
-
-		} catch (SQLException e) {
-			e.printStackTrace();
 		}
 
-		return exists;
+		return "";
+	}
 
+	/**
+	 * Method checks if exists user with input nick.
+	 *
+	 * @return true - nick already exists, false - otherwise
+	 */
+	public boolean isNickExists(String testNick){
+		return isExists("nick", testNick);
 	}
 
+	/**
+	 * Method checks if exists user with input e-mail.
+	 *
+	 * @return true - e-mail already exists, false otherwise
+	 */
+	public boolean isEmailExists(String testEmail){
+		return isExists("email", testEmail);
+	}
 
 	/**
-	 * Method checks if user exists by him e-mail.
+	 * Method checks if exists user whose attribute given by name exists with given value
 	 *
-	 * @param testEmail
-	 * @return
+	 * @return true - minimal one user exists, false - otherwise
 	 */
-	public boolean existsEmail(String testEmail){
-		boolean exists = false;
+	private boolean isExists(String name, String value){
+		String qy = "SELECT * FROM user WHERE LOWER(" + name + ") LIKE ? LIMIT 1";
 
-		String qy = "SELECT * FROM user WHERE LOWER(email) LIKE '"+testEmail.toLowerCase()+"' LIMIT 1";
 		try {
-			rs = db.exQuery(qy);
+			PreparedStatement pst = db.getPreparedStatement(qy, false);
+			pst.setString(1, value.toLowerCase());
+			ResultSet rs = db.executeQuery(pst);
 
-			if ( rs.next() ) {
-				if ( rs.getInt("id") > 0 ) {
-					return true;
-				}
+			if ( rs != null && rs.next() && rs.getInt("id") > 0) {
+				return true;
 			}
-
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}
 
-		return exists;
-
+		return false;
 	}
-
-
-
 }

sources/src/main/java/cz/zcu/kiv/offscreen/user/Util.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.user;
 
-import net.sf.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class Util {
-	
-	
-	
+class Util {
+
 	/**
 	 *	Method do a hash code from string.
 	 *
 	 * @param md5 - String to hash
 	 * @return String - hashcode 
 	 */
-	public static String MD5(String md5) {
+	static String MD5(String md5) {
 		   try {
 		        java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5");
 		        byte[] array = md.digest(md5.getBytes());
@@ -31 +24 @@
 		    }
 		    return null;
 	}
-	
-	
-	public static String formatDate(String date){	
+
+	static String formatDate(String date){
 		String pattern = "(\\d{4})-(\\d{2})-(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2}).*";
 		Pattern pat = Pattern.compile(pattern);
 		Matcher matches = pat.matcher(date);
@@ -45 +37 @@
 		
 		return formatedDate;
 	}
-
-	
-	
-	
-	
 }