From 1e615d6b7dbe09d2dc81b5e1e368fd7f9095b971 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Tue, 16 Nov 2010 11:32:32 +0000
Subject: [330235] Backup/Restore Functionality
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=330235

---
 .../emf/cdo/internal/workspace/CDOWorkspaceImpl.java    | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'plugins/org.eclipse.emf.cdo.workspace')

diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
index 6513665f80..f946714e14 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
@@ -38,7 +38,6 @@ import org.eclipse.emf.cdo.session.CDOSessionConfigurationFactory;
 import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
 import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
 import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
@@ -165,7 +164,7 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
         localRepository.setRootResourceID(session.getRepositoryInfo().getRootResourceID());
 
         InternalCDOPackageUnit[] packageUnits = session.getPackageRegistry().getPackageUnits(false);
-        registerPackageUnits(packageUnits);
+        localRepository.getPackageRegistry(false).putPackageUnits(packageUnits, CDOPackageUnit.State.LOADED);
         context[0] = accessor.rawStore(packageUnits, context[0], monitor);
 
         CDORevisionHandler handler = new CDORevisionHandler()
@@ -203,16 +202,6 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
     }
   }
 
-  private void registerPackageUnits(InternalCDOPackageUnit[] packageUnits)
-  {
-    InternalCDOPackageRegistry repositoryPackageRegistry = localRepository.getPackageRegistry(false);
-    for (InternalCDOPackageUnit packageUnit : packageUnits)
-    {
-      packageUnit.setState(CDOPackageUnit.State.LOADED);
-      repositoryPackageRegistry.putPackageUnit(packageUnit);
-    }
-  }
-
   public String getBranchPath()
   {
     return branchPath;
@@ -468,14 +457,14 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
     Repository repository = new Repository.Default()
     {
       @Override
-      protected void initMainBranch(InternalCDOBranchManager branchManager, long lastCommitTimeStamp)
+      public void initMainBranch(InternalCDOBranchManager branchManager, long lastCommitTimeStamp)
       {
         // Mark the main branch local so that new objects get local IDs
         branchManager.initMainBranch(true, lastCommitTimeStamp);
       }
 
       @Override
-      protected void initRootResource()
+      public void initRootResource()
       {
         // Don't create the root resource as it will be checked out
         setState(State.INITIAL);
-- 
cgit v1.2.3