Refactoring continues: UserService is created instead of UserDirectory. Database...

[tools/siman.git] / Workspace / Siman-Common / src / org / splat / service / technical / ProjectSettingsServiceImpl.java

diff --git a/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java
index 687b8f5f48a7de456f3f66c5ff2ae2748498c8a9..b11341b33c0af8bad60f834e99c78ab9d1c23365 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java
@@ -127,7 +127,7 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService {
                if (!steps.isEmpty())
                        return; // Project already configured
 
-               Database base = getDatabase().getMe();
+               Database base = getDatabase().getCheckedDB();
                File config = new File(filename);
                if (config.exists()) {
                        loadCustomization(config);
@@ -356,7 +356,7 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService {
                        }
                        concycles.add(new ProjectSettingsValidationCycle()); // Adds the built-in validation cycle
 
-                       if (getDatabase().getMe().isInitialized())
+                       if (getDatabase().getCheckedDB().isInitialized())
                                return; // No need to load object type definitions as they are already stored
 
                        // Documents tag
@@ -470,7 +470,7 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService {
 
                                tprop.disableCheck();
                                tdoc = getDocumentTypeService().createType(tprop); // Creation of Document Types
-                               tdoc.approve();
+                               getDocumentTypeService().approve(tdoc);
                                maptype.put(type, tdoc);
                        }
                } catch (Exception error) {
@@ -483,12 +483,12 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService {
                try {
                        KnowledgeElementType ktype = getKnowledgeElementTypeService()
                                        .createType("usecase"); // Internal reserved knowledge element type
-                       ktype.reserve();
+                       getKnowledgeElementTypeService().reserve(ktype);
                        for (Iterator<String> i = kname.iterator(); i.hasNext();) {
                                String type = i.next();
 
                                ktype = getKnowledgeElementTypeService().createType(type); // Knowledge Elements Types defined in the configuration
-                               ktype.approve();
+                               getKnowledgeElementTypeService().approve(ktype);
                        }
                } catch (Exception error) {
                        logger.warn("Error creating knowledge types, reason:", error); // Should not happen
@@ -523,7 +523,7 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService {
                                }
                                tctex = getSimulationContextService().createType(type,
                                                mapstep.get(type)); // Creation of Simulation Context Types
-                               tctex.approve();
+                               getSimulationContextService().approve(tctex);
                        }
                } catch (Exception error) {
                        logger.warn("Error creating context types, reason:", error); // Should not happen