• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision73 (tree)
Time2015-08-21 01:14:41
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/framework/fwBatch/src/batch/status/JobState.java (revision 72)
+++ trunk/framework/fwBatch/src/batch/status/JobState.java (revision 73)
@@ -1,6 +1,8 @@
11 package batch.status;
22
33 import java.util.EnumSet;
4+import java.util.Optional;
5+import java.util.stream.Stream;
46
57
68 /**
@@ -54,15 +56,6 @@
5456 }
5557
5658 /**
57- * 同一確認
58- * @param val 値
59- * @return 同一の場合 true を返す。
60- */
61- public boolean equals(final int val) {
62- return this.value == val;
63- }
64-
65- /**
6659 * 実行中状態
6760 * @return 実行中状態
6861 */
@@ -84,12 +77,7 @@
8477 * @return リクエスト状態の場合 true を返す。
8578 */
8679 public static boolean isRequest(final int val) {
87- for (final JobState js : requested()) {
88- if (js.equals(val)) {
89- return true;
90- }
91- }
92- return false;
80+ return requested().stream().anyMatch(js -> js.value() == val);
9381 }
9482
9583 /**
@@ -98,12 +86,7 @@
9886 * @return 実行中状態の場合 true を返す。
9987 */
10088 public static boolean isRunning(final int val) {
101- for (final JobState js : running()) {
102- if (js.equals(val)) {
103- return true;
104- }
105- }
106- return false;
89+ return running().stream().anyMatch(js -> js.value() == val);
10790 }
10891
10992 /**
@@ -112,7 +95,8 @@
11295 * @return 終了状態の場合 true を返す。
11396 */
11497 public static boolean isEnd(final int val) {
115- return ID_B_NEND.equals(val) || ID_B_NODATA.equals(val) || ID_B_WARNING.equals(val);
98+ return EnumSet.of(ID_B_NEND, ID_B_NODATA, ID_B_WARNING).
99+ stream().anyMatch(js -> js.value() == val);
116100 }
117101
118102 /**
@@ -121,7 +105,7 @@
121105 * @return キャンセル状態の場合 true を返す。
122106 */
123107 public static boolean isCancel(final int val) {
124- return ID_B_CANCEL.equals(val) || ID_B_IRAI_CAN.equals(val);
108+ return ID_B_CANCEL.value() == val || ID_B_IRAI_CAN.value() == val;
125109 }
126110
127111 /**
@@ -130,7 +114,7 @@
130114 * @return エラー状態の場合 true を返す。
131115 */
132116 public static boolean isError(final int val) {
133- return ID_B_INVALID.equals(val);
117+ return ID_B_INVALID.value() == val;
134118 }
135119
136120 /**
@@ -154,10 +138,10 @@
154138 * @return オブジェクト
155139 */
156140 public static JobState valueOf(final int val) {
157- for (final JobState js : JobState.values()) {
158- if (js.value() == val) {
159- return js;
160- }
141+ Optional<JobState> opt = Stream.of(JobState.values()).
142+ filter(js -> js.value() == val).findFirst();
143+ if (opt.isPresent()) {
144+ return opt.get();
161145 }
162146
163147 throw new IllegalArgumentException(String.valueOf(val));
--- trunk/framework/fwBatch/src/batch/base/BatchStatus.java (revision 72)
+++ trunk/framework/fwBatch/src/batch/base/BatchStatus.java (revision 73)
@@ -235,7 +235,7 @@
235235
236236 if (JobState.isCancel(job.getJobSts())) {
237237 ret = Batch.RET_CANCELED;
238- } else if (!JobState.ID_B_SH_START.equals(job.getJobSts())) {
238+ } else if (JobState.ID_B_SH_START.value() != job.getJobSts()) {
239239 ret = Batch.RET_ENV_ERROR;
240240 } else {
241241 // ジョブ管理状態確認・更新
@@ -428,14 +428,14 @@
428428 } else if (JobState.isCancel(jdsts)) {
429429 ret = Batch.RET_CANCELED;
430430 job.setJobSts(JobState.ID_B_CANCEL.value());
431- } else if (JobState.ID_B_NODATA.equals(jdsts) && ret == -1) {
431+ } else if (JobState.ID_B_NODATA.value() == jdsts && ret == -1) {
432432 ret = Batch.RET_NODATA;
433433 job.setJobSts(JobState.ID_B_NODATA.value());
434- } else if (JobState.ID_B_NEND.equals(jdsts)
434+ } else if (JobState.ID_B_NEND.value() == jdsts
435435 && (ret == -1 || ret == Batch.RET_NODATA)) {
436436 ret = Batch.RET_SUCCESS;
437437 job.setJobSts(JobState.ID_B_NEND.value());
438- } else if (JobState.ID_B_WARNING.equals(jdsts)
438+ } else if (JobState.ID_B_WARNING.value() == jdsts
439439 && (ret == -1 || ret == Batch.RET_NODATA || ret == Batch.RET_SUCCESS)) {
440440 ret = Batch.RET_WARNING;
441441 job.setJobSts(JobState.ID_B_WARNING.value());
@@ -466,7 +466,7 @@
466466 }
467467
468468 // ジョブ詳細管理が処理中のとき
469- if (JobState.ID_B_EDIT.equals(dtlsts)) {
469+ if (JobState.ID_B_EDIT.value() == dtlsts) {
470470 JobDetail jd = dtllst.get(0);
471471 if (JobState.isCancel(jobsts)) {
472472 jds.updateJobDetail(conn, this.jobSeq, dtlno,
--- trunk/framework/fwBatch/src/batch/base/BatchParameterImpl.java (revision 72)
+++ trunk/framework/fwBatch/src/batch/base/BatchParameterImpl.java (revision 73)
@@ -100,7 +100,7 @@
100100 setOnlineParams(job.getExecParam());
101101
102102 // 中止依頼
103- if (!JobState.ID_B_EDIT.equals(job.getJobSts())) {
103+ if (JobState.ID_B_EDIT.value() != job.getJobSts()) {
104104 return false;
105105 }
106106