CRNT-25760 Refactor/Clean up MB Facade

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@58379 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 7 insertions, 10 deletions

diff --git a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java
index d73a489..27a465d 100644
--- a/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java
+++ b/model/org.eclipse.stardust.model.xpdl.builder/src/main/java/org/eclipse/stardust/model/xpdl/builder/utils/MBFacade.java
@@ -69,10 +69,15 @@ import org.eclipse.stardust.modeling.repository.common.descriptors.ReplaceModelE
 

 public class MBFacade

 {

-   private static MBFacade mbFacade;

+   private final static MBFacade mbFacade;

 

    private ModelManagementStrategy modelManagementStrategy;

 

+   static

+   {

+      mbFacade = new MBFacade();

+   }

+

    private MBFacade()

    {

 

@@ -80,20 +85,12 @@ public class MBFacade
 

    public static MBFacade getInstance()

    {

-      if (mbFacade == null)

-      {

-         mbFacade = new MBFacade();

-      }

       return mbFacade;

    }

 

    public static MBFacade getInstance(ModelManagementStrategy modelManagementStrategy)

    {

-      if (mbFacade == null)

-      {

-         mbFacade = new MBFacade();

-         mbFacade.modelManagementStrategy = modelManagementStrategy;

-      }

+      mbFacade.modelManagementStrategy = modelManagementStrategy;

       return mbFacade;

    }