#34867 レビュー後修正（コメント追加・ソース整理）

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DatabaseVersions.java

 package jp.agentec.abook.abv.bl.data;
 package jp.agentec.abook.abv.bl.data;
 
 
-// バージョンが上がるごとに+10すること
+// バージョンが上がるごとに+10すること(途中でバージョン追加になる恐れがあるため)
 public class DatabaseVersions {
 public class DatabaseVersions {
 	public static final int Ver1_0_0 = 1;
 	public static final int Ver1_0_0 = 1;
 	public static final int Ver1_1_0 = 11;
 	public static final int Ver1_1_0 = 11;

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java

@@ -215,7 +215,7 @@ public class OperationDao extends AbstractDao {
     /**
     /**
      * 作業閲覧日付
      * 作業閲覧日付
      * @param operationId
      * @param operationId
-     * @return
+     * @return 正常:true 異常:false
      */
      */
     public boolean updateReadingDate(Long operationId) {
     public boolean updateReadingDate(Long operationId) {
         return update("update t_operation set operation_open_date=? WHERE operation_id=?", new Object[]{DateTimeUtil.getCurrentTimestamp(), operationId}) > 0;
         return update("update t_operation set operation_open_date=? WHERE operation_id=?", new Object[]{DateTimeUtil.getCurrentTimestamp(), operationId}) > 0;
@@ -263,8 +263,9 @@ public class OperationDao extends AbstractDao {
 
 
     /**
     /**
      * カテゴリの作業一覧検索用
      * カテゴリの作業一覧検索用
-     * @param operationGroupMasterId
-     * @return
+     * @param operationGroupMasterId カテゴリID
+     * @param operationSortingType ソートタイプ
+     * @return カテゴリに紐づく作業リスト
      */
      */
     public List<OperationDto> getOperationsByGroupMasterId(Integer operationGroupMasterId, OperationSortingType operationSortingType) {
     public List<OperationDto> getOperationsByGroupMasterId(Integer operationGroupMasterId, OperationSortingType operationSortingType) {
         String sql = generateGetOperationQuery(null, null, null, operationSortingType, operationGroupMasterId);
         String sql = generateGetOperationQuery(null, null, null, operationSortingType, operationGroupMasterId);
@@ -367,7 +368,7 @@ public class OperationDao extends AbstractDao {
                     sql.append("  ORDER BY top.operation_open_date DESC ");
                     sql.append("  ORDER BY top.operation_open_date DESC ");
                     break;
                     break;
                 default:
                 default:
-                    sql.append("  ORDER BY top.operation_name DESC ");
+                    sql.append("  ORDER BY top.operation_name ASC ");
                     break;
                     break;
             }
             }
         } else {
         } else {

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

@@ -142,7 +142,7 @@ public class OperationGroupMasterLogic extends AbstractLogic {
 
 
     /**
     /**
      * 親の階層パスをリストでセット
      * 親の階層パスをリストでセット
-     * @param operationGroupMasterId
+     * @param operationGroupMasterId カテゴリID
      * @return
      * @return
      */
      */
     public List<OperationGroupMasterDto> getParentOperationGroupMasterForPath (Integer operationGroupMasterId) {
     public List<OperationGroupMasterDto> getParentOperationGroupMasterForPath (Integer operationGroupMasterId) {
@@ -163,7 +163,8 @@ public class OperationGroupMasterLogic extends AbstractLogic {
 
 
     /**
     /**
      * 作業種別IDで関連する作業リストを取得
      * 作業種別IDで関連する作業リストを取得
-     * @param operationGroupMasterId
+     * @param operationGroupMasterId カテゴリID
+     * @param operationSortingType ソートタイプ
      * @return
      * @return
      */
      */
     public List<OperationDto> getOperationByOperationGroupMasterId(Integer operationGroupMasterId, OperationSortingType operationSortingType) {
     public List<OperationDto> getOperationByOperationGroupMasterId(Integer operationGroupMasterId, OperationSortingType operationSortingType) {

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

@@ -1069,12 +1069,13 @@ public class OperationLogic extends AbstractLogic {
     }
     }
 
 
     /**
     /**
-     * プロジェクト一覧取得
+     * 作業一覧取得
      *
      *
-     * @param searchWord
-     * @param searchStartDateStr
-     * @param searchEndDateStr
-     * @return
+     * @param searchWord            検索条件：作業名
+     * @param searchStartDateStr　検索条件：作業日範囲（開始）
+     * @param searchEndDateStr　　検索条件：作業日範囲（終了）
+     * @param operationSortingType　ソート順
+     * @return 作業リスト
      */
      */
     public List<OperationDto> getRefreshOperation(String searchWord, String searchStartDateStr, String searchEndDateStr, OperationSortingType operationSortingType) {
     public List<OperationDto> getRefreshOperation(String searchWord, String searchStartDateStr, String searchEndDateStr, OperationSortingType operationSortingType) {
         List<OperationDto> operationDtoList;
         List<OperationDto> operationDtoList;
@@ -1089,9 +1090,9 @@ public class OperationLogic extends AbstractLogic {
     }
     }
 
 
     /**
     /**
-     * プロジェクト関連資料または共通資料一覧取得
+     * 作業関連資料または共通資料一覧取得
      *
      *
-     * @return
+     * @return ジャンル毎の共通資料
      */
      */
     public List<CategoryContentDto> getOperationRelatedContent() {
     public List<CategoryContentDto> getOperationRelatedContent() {
         List<ContentDto> contentDtoList;
         List<ContentDto> contentDtoList;

ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/ABVUIDataCache.java

@@ -115,7 +115,7 @@ public class ABVUIDataCache {
 
 
 	/**
 	/**
 	 * ソート条件をセット
 	 * ソート条件をセット
-	 * @param sortCondition
+	 * @param sortCondition ソートタイプ
 	 */
 	 */
 	public void setSortCondition(int sortCondition) {
 	public void setSortCondition(int sortCondition) {
 		/* ロケーションタイプ毎にソート条件を保存する */
 		/* ロケーションタイプ毎にソート条件を保存する */
@@ -124,7 +124,7 @@ public class ABVUIDataCache {
 
 
 	/**
 	/**
 	 * ソート条件を取得
 	 * ソート条件を取得
-	 * @return
+	 * @return ソートタイプ（デフォルト : 0）
 	 */
 	 */
 	public int getSortCondition() {
 	public int getSortCondition() {
 		return PreferenceUtil.getUserPref(context, UserPrefKey.OPERATION_SORT_CONDITION, 0);
 		return PreferenceUtil.getUserPref(context, UserPrefKey.OPERATION_SORT_CONDITION, 0);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java

@@ -2331,6 +2331,12 @@ public class OperationListActivity extends ABVUIActivity {
     }
     }
 
 
     // 並び替えの表示するソートリスト
     // 並び替えの表示するソートリスト
+
+    /**
+     * 並び替えの表示するソートリスト
+     * @param listView
+     * @return ArrayAdapter ソート名をセットしたアダプタ
+     */
     private ArrayAdapter<String> setSortListView(ListView listView) {
     private ArrayAdapter<String> setSortListView(ListView listView) {
         final List<String> sortMembers =  Arrays.asList(getRStringArray(R.array.sort_names));
         final List<String> sortMembers =  Arrays.asList(getRStringArray(R.array.sort_names));
         listView.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
         listView.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/HierarchyOperationListHelper.java → ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/CategoryOperationListHelper.java

@@ -24,7 +24,7 @@ import static jp.agentec.abook.abv.cl.util.PreferenceUtil.getUserPref;
  * @author jang
  * @author jang
  *
  *
  */
  */
-public abstract class HierarchyOperationListHelper<StackObject> extends OperationListHelper implements OnClickListener {
+public abstract class CategoryOperationListHelper<StackObject> extends OperationListHelper implements OnClickListener {
 	private final int MP = LayoutParams.MATCH_PARENT;
 	private final int MP = LayoutParams.MATCH_PARENT;
 	private final int WP = LayoutParams.WRAP_CONTENT;
 	private final int WP = LayoutParams.WRAP_CONTENT;
 	protected Stack<StackObject> stack;
 	protected Stack<StackObject> stack;
@@ -39,7 +39,7 @@ public abstract class HierarchyOperationListHelper<StackObject> extends Operatio
 	 * 階層構造を持つ親クラス
 	 * 階層構造を持つ親クラス
 	 * @param appActivity
 	 * @param appActivity
 	 */
 	 */
-	public HierarchyOperationListHelper(OperationListActivity appActivity) {
+	public CategoryOperationListHelper(OperationListActivity appActivity) {
 		super(appActivity);
 		super(appActivity);
 
 
 		mHierarchyContentLayout = new LinearLayout(appActivity);
 		mHierarchyContentLayout = new LinearLayout(appActivity);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java

@@ -18,7 +18,7 @@ import jp.agentec.adf.util.CollectionUtil;
 
 
 import static jp.agentec.abook.abv.cl.util.PreferenceUtil.getUserPref;
 import static jp.agentec.abook.abv.cl.util.PreferenceUtil.getUserPref;
 
 
-public class OperationGroupMasterListHelper extends HierarchyOperationListHelper<OperationGroupMasterDto> {
+public class OperationGroupMasterListHelper extends CategoryOperationListHelper<OperationGroupMasterDto> {
 
 
     private static final String TAG = "OperationGroupMasterListHelper";
     private static final String TAG = "OperationGroupMasterListHelper";
     private OperationGroupMasterDao mOperationGroupMasterDao = AbstractDao.getDao(OperationGroupMasterDao.class);
     private OperationGroupMasterDao mOperationGroupMasterDao = AbstractDao.getDao(OperationGroupMasterDao.class);