Changeset 15098 for trunk/Jav_Wsp/src/com/scenari/m/bdp/item/fs/HWorkspaceFs.java

Timestamp:

03/14/10 09:12:55 (2 years ago)

Author:

sys

Message:

Copy / move by id.

File:

• trunk/Jav_Wsp/src/com/scenari/m/bdp/item/fs/HWorkspaceFs.java (modified) (7 diffs)

trunk/Jav_Wsp/src/com/scenari/m/bdp/item/fs/HWorkspaceFs.java

@@ -555 +555 @@
                                 fFireDiscoveredItems = vOld;
                         }
+                        break;
+
+                case space:
+                case wsp:
+                        //not implemented
+                        assert (false);
                 }
         }
@@ -641 +647 @@
                                 vResult = new XItemCache(this, vSrcNode);
                                 fItemsByUri.put(pUri, vResult);
-                                String vId = SrcFeatureIds.getSrcId(vSrcNode);
-                                if (vId != null) {
-                                        fItemsById.put(vId, vResult);
-                                }
                                 vResult.refresh(true);
                         }
@@ -657 +659 @@
          * L'itemCache a été rafraichit.
          * 
-         * Retourne null si l'uri n'est pas une uri d'item.
+         * Retourne null si l'id n'existe pas.
          */
         protected XItemCache xGetItemCacheById(String pSrcId, boolean pRefresh) throws Exception {
@@ -665 +667 @@
                         ISrcNode vSrcNode = SrcFeatureIds.findNodeById(fSubSrcNode, pSrcId);
                         if (vSrcNode != null) {
-                                vResult = new XItemCache(this, vSrcNode);
-                                fItemsByUri.put(vSrcNode.getSrcUri(), vResult);
-                                //Mutualisation des strings, on reprend la String de l'id de la source.
-                                String vId = SrcFeatureIds.getSrcId(vSrcNode);
-                                if (vId != null) {
-                                        fItemsById.put(vId, vResult);
-                                }
-                        }
-                }
-                if (pRefresh && vResult != null) vResult.refresh(true);
+                                String vSrcId = SrcFeatureIds.getSrcId(vSrcNode);
+                                if (vSrcId != null && vSrcId.equals(pSrcId)) {
+                                        vResult = new XItemCache(this, vSrcNode);
+                                        fItemsByUri.put(vSrcNode.getSrcUri(), vResult);
+                                        if (!pRefresh) vResult.setId(vSrcNode);
+                                } else if (vSrcId != null) {
+                                        //pSrcId était un alias vers le "bon id". 
+                                        return xGetItemCacheById(vSrcId, pRefresh);
+                                }
+                        }
+                }
+                if (pRefresh && vResult != null) {
+                        String vId = vResult.fId;
+                        vResult.refresh(true);
+                        if (vId != null && (vResult.fId == null || !vResult.fId.equals(vId))) {
+                                //L'id a été modifié au refresh...
+                                return xGetItemCacheById(pSrcId, pRefresh);
+                        }
+                }
                 return vResult;
         }
@@ -691 +702 @@
                         vResult = new XItemCache(this, pSubSrcNode);
                         fItemsByUri.put(pSubSrcNode.getSrcUri(), vResult);
-                        String vId = SrcFeatureIds.getSrcId(pSubSrcNode);
-                        if (vId != null) {
-                                fItemsById.put(vId, vResult);
-                        }
                 }
                 vResult.refresh(true);
@@ -713 +720 @@
                         vResult = new XItemCache(this, vSrcNode);
                         fItemsByUri.put(pUri, vResult);
-                        String vId = SrcFeatureIds.getSrcId(vSrcNode);
-                        if (vId != null) {
-                                fItemsById.put(vId, vResult);
-                        }
+                        if (!pRefresh) vResult.setId(vSrcNode);
                 }
                 if (pRefresh) vResult.refresh(true);
@@ -728 +732 @@
                 assert Thread.holdsLock(this);
                 fItemsByUri.remove(pItemCache.fUri);
-                XItemCacheData vDatas = pItemCache.getDatasIfExist();
-                if (vDatas != null) {
-                        ISrcNode vSrcNode = vDatas.getWspSrcNodeItem();
-                        try {
-                                String vId = SrcFeatureIds.getSrcId(vSrcNode);
-                                if (vId != null) {
-                                        fItemsById.remove(vId);
-                                }
-                        } catch (Exception e) {
-                                LogMgr.publishException(e);
-                        }
+                if (pItemCache.fId != null) {
+                        fItemsById.remove(pItemCache.fId);
                 }
         }