T29298

T29292
T29291

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index 72ec570..bd5c219 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -511,7 +511,7 @@ public class EverFolderActivity extends BaseActivity {
                        }
                        if (n instanceof DirNode){
                                DirNode d = (DirNode)n;
-                               if (!d.isSelected()){
+                               if (isNoteBook(d) && !d.isSelected()){
                                        continue;
                                }
                        }

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java b/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java
index 993a034..89380b5 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java
@@ -101,8 +101,10 @@ public class FolderUtil {
                        }
                        if (!isFound) {
                                if (CommonUtil.isNull(node.getChildrenString())) {
+                                       // 子が無い場合は削除
                                        nodeDao.deleteNT(node.getId());
                                } else {
+                                       // フォルダに変更
                                        nodeDao.updateGuidNT(node, null);
                                }
                        }