From 1d379ddf4b390bf0c376bffce88a67d70162f7aa Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 20 Feb 2007 15:18:16 +0000
Subject: [PATCH] Merged V2.0 to HEAD    svn merge
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5198
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5199 .       - WCM
 Tutorial bootstrap removal    svn merge
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5199
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5200 .       - AWC-1141:
 Clipboard missing item

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/bean/clipboard/ClipboardBean.java         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
index 63981c7f48..6180616987 100644
--- a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
@@ -152,15 +152,16 @@ public class ClipboardBean
          if (index == -1)
          {
             // paste all
-            for (int i=0; i<this.items.size(); i++)
+            List<ClipboardItem> toRemove = new ArrayList<ClipboardItem>();
+            for (ClipboardItem item : this.items)
             {
-               ClipboardItem item = this.items.get(i);
                if (performClipboardOperation(item, action) == true)
                {
                   // if cut operation then remove item from the clipboard
                   if (item.getMode() == ClipboardStatus.CUT)
                   {
-                     this.items.remove(i);
+                     // remember which items to remove.
+                     toRemove.add(item);
                   }
                }
             }
@@ -170,6 +171,14 @@ public class ClipboardBean
             {
                this.items.clear();
             }
+            else if (toRemove.size() > 0)
+            {
+               // remove the items that were cut above
+               for (ClipboardItem item : toRemove)
+               {
+                  this.items.remove(item);
+               }
+            }
          }
          else
          {