From 92e67341b4fddfc27abe4042d37cb9109a3cd640 Mon Sep 17 00:00:00 2001 From: Marcin Michalek Date: Tue, 10 Jun 2014 08:23:12 +0200 Subject: [PATCH] format --- NFCServer.iml | 19 +------------------ .../controllers/UserController.java | 2 ++ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/NFCServer.iml b/NFCServer.iml index 8a19ba5..a17aed6 100644 --- a/NFCServer.iml +++ b/NFCServer.iml @@ -1,5 +1,5 @@ - + @@ -12,23 +12,6 @@ - - - - file://$MODULE_DIR$/src/main/java/application/Config.java - file://$MODULE_DIR$/src/main/resources/Spring-Module.xml - - - - - - - - - - - - diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index caf5fba..1dcbdad 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -60,9 +60,11 @@ public class UserController { //access codes JSONArray accessCodes = new JSONArray(); + // array of obejcts {role:role, code:code} //message JSONObject message = new JSONObject(); + // {role:role, message:message} loginResponse.put("accessCodes", accessCodes); loginResponse.put("message", message);