Changed package name

src/es/mesacarlos/webconsole/util/DateTimeUtils.java

@@ -0,0 +1,10 @@
+package es.mesacarlos.webconsole.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateTimeUtils {
+	public static String getDateAsString() {
+		return new SimpleDateFormat("dd-MM-yyyy HH:mm:ss").format(new Date());
+	}
+}

src/es/mesacarlos/webconsole/util/Internationalization.java

@@ -0,0 +1,52 @@
+package es.mesacarlos.webconsole.util;
+
+import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class Internationalization {
+	private static ResourceBundle messages = ResourceBundle.getBundle("phrases", new Locale("en"));
+	
+	/**
+	 * Changes locale of this application
+	 * @param locale String representing language 
+	 */
+	public static void setCurrentLocale(String locale) {
+		messages = ResourceBundle.getBundle("phrases", new Locale(locale));
+	}
+	
+	/**
+	 * Get current locale
+	 * @return Current locale
+	 */
+	public static Locale getCurrentLocale() {
+		return messages.getLocale();
+	}
+
+	/**
+	 * Gets translated message
+	 * @return The desired message in user's language
+	 */
+	public static String getPhrase(String phrase, Object... params) {
+		String msg = messages.getString(phrase);
+		msg = MessageFormat.format(msg, params);
+		msg = correctEncoding(msg);
+		return msg;
+	}
+	
+	/**
+	 * Java i18n uses ISO-8859-1 internally, so we need to correct all characters to UTF-8
+	 * @param msg Message to correct
+	 * @return Message corrected
+	 */
+	private static String correctEncoding(String msg) {
+		try {
+			msg = new String(msg.getBytes("ISO-8859-1"), "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return msg;
+	}
+	
+}

src/es/mesacarlos/webconsole/util/LogFilter.java

@@ -0,0 +1,138 @@
+package es.mesacarlos.webconsole.util;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.message.Message;
+
+import es.mesacarlos.webconsole.websocket.WSServer;
+
+public class LogFilter implements Filter{
+	private WSServer wsServer;
+
+	public LogFilter(WSServer wsServer) {
+		this.wsServer = wsServer;
+	}
+
+	@Override
+	public State getState() {
+		return null;
+	}
+
+	@Override
+	public void initialize() {
+		
+	}
+
+	@Override
+	public void start() {
+		
+	}
+
+	@Override
+	public void stop() {
+		
+	}
+
+	@Override
+	public boolean isStarted() {
+		return false;
+	}
+
+	@Override
+	public boolean isStopped() {
+		return false;
+	}
+
+	@Override
+	public Result getOnMismatch() {
+		return null;
+	}
+
+	@Override
+	public Result getOnMatch() {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String msg, Object... params) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+			Object p3) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+			Object p3, Object p4) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+			Object p3, Object p4, Object p5) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+			Object p3, Object p4, Object p5, Object p6) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+			Object p3, Object p4, Object p5, Object p6, Object p7) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+			Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2,
+			Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) {
+		return null;
+	}
+
+	@Override
+	public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) {
+		return null;
+	}
+
+	@Override
+	public Result filter(LogEvent event) {
+		String message = event.getMessage().getFormattedMessage().replaceAll("\u001b"," ");
+        wsServer.onNewConsoleLinePrinted(message);
+        return null;
+	}
+
+}

src/es/mesacarlos/webconsole/util/LoginManager.java

@@ -0,0 +1,33 @@
+package es.mesacarlos.webconsole.util;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+
+public class LoginManager {
+	private ArrayList<InetSocketAddress> loggedInUsers = new ArrayList<InetSocketAddress>();
+	private static LoginManager instance;
+	
+	private LoginManager() {}
+	
+	public static LoginManager getInstance() {
+		if(instance == null)
+			instance = new LoginManager();
+		return instance;
+	}
+	
+	public void logIn(InetSocketAddress address) {
+		loggedInUsers.add(address);
+	}
+	
+	public void logOut(InetSocketAddress address) {
+		loggedInUsers.remove(address);
+	}
+	
+	public boolean isLoggedIn(InetSocketAddress address) {
+		return loggedInUsers.contains(address);
+	}
+	
+	public ArrayList<InetSocketAddress> getLoggedInUsers() {
+		return loggedInUsers;
+	}
+}