Merge branch 'contract/sato/1.0.300_dev' into contract/sato/1.0.300_hida

# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/LockReportJSON.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/AcmsJSONParser.java

@@ -6,11 +6,15 @@ import jp.agentec.abook.abv.bl.common.exception.AcmsException;
 import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.adf.core.CloneableObject;
+import jp.agentec.adf.util.DateTimeFormat;
+import jp.agentec.adf.util.DateTimeUtil;
 import jp.agentec.adf.util.StringUtil;
 
 import org.json.adf.JSONException;
 import org.json.adf.JSONObject;
 
+import java.util.Date;
+
 public abstract class AcmsJSONParser extends CloneableObject {
 	/**
 	 * {@link AcmsJSONParser} クラスのインスタンスを初期化します。
@@ -129,4 +133,27 @@ public abstract class AcmsJSONParser extends CloneableObject {
 		}
 	}
 
+	protected int getIntOrDef(JSONObject json, String key, int def) {
+		if (json.has(key)) {
+			return json.getInt(key);
+		} else {
+			return def;
+		}
+	}
+
+	protected String getStringOrNull(JSONObject json, String key) {
+		if (json.has(key)) {
+			return json.getString(key);
+		} else {
+			return null;
+		}
+	}
+
+	protected Date getDateOrNull(JSONObject json, String key) {
+		if (json.has(key)) {
+			return DateTimeUtil.toDate(json.getString(key), "UTC", DateTimeFormat.yyyyMMdd_hyphen);
+		} else {
+			return null;
+		}
+	}
 }

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/LockReportJSON.java

@@ -5,14 +5,13 @@ import org.json.adf.JSONObject;
 import java.util.Date;
 
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
-import jp.agentec.adf.util.DateTimeFormat;
-import jp.agentec.adf.util.DateTimeUtil;
 
 /**
  * checkapi/lockReport/のレスポンスを変換するクラス
  */
 public class LockReportJSON extends AcmsCommonJSON {
 
+    public static final int BAD_STATE = 999;
     private Date presentTimeUTC;
     private int reportStatus;
     private String reportLockUserId;
@@ -25,63 +24,45 @@ public class LockReportJSON extends AcmsCommonJSON {
 
     @Override
     protected void parse(JSONObject json) {
-        httpStatus = intOrDef(json, "httpStatus", 999);
-        presentTimeUTC = dateOrNull(json, "presentTimeUTC");
-        reportStatus = intOrDef(json, "reportStatus", 999);
-        reportLockUserId = stringOrNull(json, "reportLockUserId");
-        reportLockUserName = stringOrNull(json, "reportLockUserName");
-        reportLockTime = dateOrNull(json, "reportLockTime");
+        presentTimeUTC = getDateOrNull(json, "presentTimeUTC");
+        reportStatus = getIntOrDef(json, "reportStatus", BAD_STATE);
+        reportLockUserId = getStringOrNull(json, "reportLockUserId");
+        reportLockUserName = getStringOrNull(json, "reportLockUserName");
+        reportLockTime = getDateOrNull(json, "reportLockTime");
     }
 
+    @SuppressWarnings("unused")
     int getHttpStatus() {
         return httpStatus;
     }
 
+    @SuppressWarnings("unused")
     Date getPresentTime() {
         return presentTime;
     }
 
+    @SuppressWarnings("unused")
     public Date getPresentTimeUTC() {
         return presentTimeUTC;
     }
 
+    @SuppressWarnings("unused")
     public int getReportStatus() {
         return reportStatus;
     }
 
+    @SuppressWarnings("unused")
     public String getReportLockUserId() {
         return reportLockUserId;
     }
 
+    @SuppressWarnings("unused")
     public String getReportLockUserName() {
         return reportLockUserName;
     }
 
+    @SuppressWarnings("unused")
     public Date getReportLockTime() {
         return reportLockTime;
     }
-
-    private int intOrDef(JSONObject json, String key, int def) {
-        if (json.has(key)) {
-            return json.getInt(key);
-        } else {
-            return def;
-        }
-    }
-
-    private String stringOrNull(JSONObject json, String key) {
-        if (json.has(key)) {
-            return json.getString(key);
-        } else {
-            return null;
-        }
-    }
-
-    private Date dateOrNull(JSONObject json, String key) {
-        if (json.has(key)) {
-            return DateTimeUtil.toDate(json.getString(key), "UTC", DateTimeFormat.yyyyMMdd_hyphen);
-        } else {
-            return null;
-        }
-    }
 }

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationDataJSON.java

@@ -45,6 +45,8 @@ public class OperationDataJSON extends AcmsCommonJSON {
     public static final String SendBackUserName = "sendBackUserName";     // 差し戻しユーザ名	差し戻された場合のみ
     public static final String SendBackComment = "sendBackComment";       // 確認コメント	差し戻された場合のみ
 
+    public static final String ReportStatus = "reportStatus";
+
     public List<TaskDto> taskDtoList;
     public Date lastEditDate;
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/UnlockReportJSON.java

@@ -5,10 +5,10 @@ import org.json.adf.JSONObject;
 import java.util.Date;
 
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
-import jp.agentec.adf.util.DateTimeFormat;
-import jp.agentec.adf.util.DateTimeUtil;
+
 
 public class UnlockReportJSON extends AcmsCommonJSON {
+    public static final int BAD_STATE = 999;
     private Date presentTimeUTC;
     private int reportStatus;
 
@@ -18,37 +18,25 @@ public class UnlockReportJSON extends AcmsCommonJSON {
 
     @Override
     protected void parse(JSONObject json) {
-        presentTimeUTC = dateOrNull(json, "presentTimeUTC");
-        reportStatus = intOrDef(json, "", 999);
+        presentTimeUTC = getDateOrNull(json, "presentTimeUTC");
+        reportStatus = getIntOrDef(json, "", BAD_STATE);
     }
 
+    @SuppressWarnings("unused")
     public int getHttpStatus() {
         return httpStatus;
     }
 
+    @SuppressWarnings("unused")
     public Date getPresentTime() {
         return presentTime;
     }
 
+    @SuppressWarnings("unused")
     public Date getPresentTimeUTC() {
         return presentTimeUTC;
     }
 
+    @SuppressWarnings("unused")
     public int getReportStatus() {return reportStatus; }
-
-    private int intOrDef(JSONObject json, String key, int def) {
-        if (json.has(key)) {
-            return json.getInt(key);
-        } else {
-            return def;
-        }
-    }
-
-    private Date dateOrNull(JSONObject json, String key) {
-        if (json.has(key)) {
-            return DateTimeUtil.toDate(json.getString(key), "UTC", DateTimeFormat.yyyyMMdd_hyphen);
-        } else {
-            return null;
-        }
-    }
 }

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java

@@ -14,6 +14,13 @@ import jp.agentec.adf.util.DateTimeFormat;
 import jp.agentec.adf.util.DateTimeUtil;
 
 import static java.net.HttpURLConnection.HTTP_OK;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportLockTime;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportLockUserId;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportLockUserName;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId;
+import static jp.agentec.abook.abv.bl.common.constant.ABookKeys.TASK_KEY;
 
 public class LockReportLogic extends AbstractLogic {
 
@@ -78,6 +85,7 @@ public class LockReportLogic extends AbstractLogic {
 
     // コールバック用のパラメータ
     public static class Result {
+        public static final int BAD_STATUS = 999;
         int result;
         String message;
         ExtParam extParam;
@@ -101,7 +109,6 @@ public class LockReportLogic extends AbstractLogic {
         @SuppressWarnings("magic_number")
         static Result failure(Throwable e, Long taskReportId, Date reportStartDate) {
             // 例外がでたとき
-            final int BAD_STATUS = 999;
             Result result = new Result();
             result.result = 1;
             result.message = e.getLocalizedMessage();
@@ -192,16 +199,16 @@ public class LockReportLogic extends AbstractLogic {
         @SuppressWarnings("unused")
         public String json() {
             JSONObject extParam = new JSONObject();
-            extParam.put("reportStatus", String.valueOf(reportStatus));
-            extParam.put("reportLockUserId", reportLockUserId);
-            extParam.put("reportLockUserName", reportLockUserName);
-            extParam.put("reportLockTime", reportLockTime);
+            extParam.put(ReportStatus, String.valueOf(reportStatus));
+            extParam.put(ReportLockUserId, reportLockUserId);
+            extParam.put(ReportLockUserName, reportLockUserName);
+            extParam.put(ReportLockTime, DateTimeUtil.formatDate(reportLockTime, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen));
 
             if (taskReportId != null && taskReportId != 0) {
-                extParam.put("taskReportId", taskReportId);
+                extParam.put(TaskReportId, taskReportId);
             }
             if (reportStartDate != null) {
-                extParam.put("reportStartDate", DateTimeUtil.toString(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen));
+                extParam.put(ReportStartDate, DateTimeUtil.formatDate(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen));
             }
             return extParam.toString();
         }

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java

@@ -15,6 +15,10 @@ import jp.agentec.adf.util.DateTimeFormat;
 import jp.agentec.adf.util.DateTimeUtil;
 
 import static java.net.HttpURLConnection.HTTP_OK;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskKey;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId;
 
 public class UnlockReportLogic extends AbstractLogic {
 
@@ -79,6 +83,7 @@ public class UnlockReportLogic extends AbstractLogic {
 
     // コールバック用のパラメータ
     public static class Result {
+        public static final int BAD_STATUS = 999;
         int result;
         String message;
         ExtParam extParam;
@@ -94,7 +99,6 @@ public class UnlockReportLogic extends AbstractLogic {
 
         static Result failure(Throwable e, Long taskReportId, Date reportStartDate) {
             // 例外がでたとき
-            final int BAD_STATUS = 999;
             Result result = new Result();
             result.result = 1;
             result.message = e.getLocalizedMessage();
@@ -141,12 +145,12 @@ public class UnlockReportLogic extends AbstractLogic {
 
         public String json() {
             JSONObject extParam = new JSONObject();
-            extParam.put("reportStatus", String.valueOf(reportStatus));
+            extParam.put(ReportStatus, String.valueOf(reportStatus));
             if (taskReportId != null && taskReportId != 0) {
-                extParam.put("taskReportId", taskReportId);
+                extParam.put(TaskReportId, taskReportId);
             }
             if (reportStartDate != null) {
-                extParam.put("reportStartDate", DateTimeUtil.formatDate(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen));
+                extParam.put(ReportStartDate, DateTimeUtil.formatDate(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen));
             }
             return extParam.toString();
         }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -87,6 +87,8 @@ import jp.agentec.adf.util.DateTimeUtil;
 import jp.agentec.adf.util.FileUtil;
 import jp.agentec.adf.util.StringUtil;
 
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate;
+
 
 public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 	private static final String TAG ="ABVContentViewActivity";