OSDN Git Service

T29264
authorYuji Konishi <yuji.k64613@gmail.com>
Thu, 16 Aug 2012 02:45:20 +0000 (11:45 +0900)
committerYuji Konishi <yuji.k64613@gmail.com>
Thu, 16 Aug 2012 02:45:20 +0000 (11:45 +0900)
source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java

index a19cb3d..27e3328 100644 (file)
@@ -226,7 +226,7 @@ public class EverFolderActivity extends BaseActivity {
                                node = dao.searchById(id);
                        }
 
-                       if (isDirNode(target, node, false)) {
+                       if (isDirNode(target, node, false) || isFileNode(node)) {
                                cutButtonFlag = true;
                        }
                        if (isDirNode(target, node, true) && isCut()) {
@@ -261,6 +261,13 @@ public class EverFolderActivity extends BaseActivity {
                return ret;
        }
 
+       private boolean isFileNode(Node node) {
+               if (node == null || !(node instanceof FileNode)) {
+                       return false;
+               }
+               return true;
+       }
+
        private boolean isDirNode(LabelIconView target, Node node,
                        boolean containRoot) {
                if (target == null) {
@@ -814,7 +821,7 @@ public class EverFolderActivity extends BaseActivity {
                                // deleteButtonFlag = false;
                                // }
                                layout.setElabledTouchEvent(true);
-                               
+
                                leftButton.setEnabled(leftButtonFlag);
                                rightButton.setEnabled(rightButtonFlag);
                                // addButton.setEnabled(addButtonFlag);
@@ -824,7 +831,7 @@ public class EverFolderActivity extends BaseActivity {
                                msgEditText.setVisibility(View.VISIBLE);
                                msgButtonLayout.setVisibility(View.VISIBLE);
                                msgEditText.setText("");
-                               
+
                                layout.setElabledTouchEvent(false);
 
                                leftButton.setEnabled(false);