Refactoring and pruning before 1.1

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@17593 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
index 2ac9756a98c1d11cb5f9cbca6444ca3b8cb3be0b..daba9eb425e52c69e7aa7ea369762ff3dec83cef 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
@@ -23,7 +23,7 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.WriteRequest;\r
 import org.simantics.db.exception.CancelTransactionException;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.adapter.RemoverUtil;\r
+import org.simantics.db.layer0.util.RemoverUtil;\r
 import org.simantics.ui.SimanticsUI;\r
 import org.simantics.ui.utils.ResourceAdaptionUtils;\r
 import org.simantics.utils.ui.ExceptionUtils;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/DefaultRealizationVirtualGraph.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/DefaultRealizationVirtualGraph.java
index 4653cd15fe19c251c74deb46beb48a8b8591b78a..ba87681684ec93ab665c01a2b5f55e20ebc2c16b 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/DefaultRealizationVirtualGraph.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/DefaultRealizationVirtualGraph.java
@@ -5,8 +5,8 @@ import org.simantics.db.Session;
 import org.simantics.db.VirtualGraphContext;\r
 import org.simantics.db.WriteGraph;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.adapter.RealizationVirtualGraph;\r
-import org.simantics.db.layer0.adapter.ResourceData;\r
+import org.simantics.db.layer0.realization.RealizationVirtualGraph;\r
+import org.simantics.db.layer0.realization.ResourceData;\r
 import org.simantics.simulation.ontology.SimulationResource;\r
 import org.simantics.sysdyn.SysdynResource;\r
 \r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/HistoryRealizationVirtualGraph.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/HistoryRealizationVirtualGraph.java
index 92ae6e2555c65de9d1b7df6db9e03df69104700a..2634bad7cebf750b923c77ee3e714368d10a0c02 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/HistoryRealizationVirtualGraph.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/HistoryRealizationVirtualGraph.java
@@ -14,10 +14,10 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.common.procedure.single.SingleSetSyncListener;\r
 import org.simantics.db.common.request.WriteRequest;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.adapter.RealizationVirtualGraph;\r
-import org.simantics.db.layer0.adapter.RemoverUtil;\r
-import org.simantics.db.layer0.adapter.ResourceData;\r
 import org.simantics.db.layer0.adapter.RuntimeValuations;\r
+import org.simantics.db.layer0.realization.RealizationVirtualGraph;\r
+import org.simantics.db.layer0.realization.ResourceData;\r
+import org.simantics.db.layer0.util.RemoverUtil;\r
 import org.simantics.db.request.Read;\r
 import org.simantics.simulation.ontology.SimulationResource;\r
 import org.simantics.sysdyn.SysdynResource;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProjectLifeCycle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProjectLifeCycle.java
index 9790daeef201814d7a7815590a36a57803fffc4f..33148333b8e619e65bd47917c3282ea7da7f012b 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProjectLifeCycle.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProjectLifeCycle.java
@@ -18,9 +18,9 @@ import org.simantics.db.common.procedure.single.SingleSetListener;
 import org.simantics.db.common.request.ObjectsWithType;\r
 import org.simantics.db.common.request.WriteRequest;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.adapter.ActivationManager;\r
 import org.simantics.db.layer0.adapter.RuntimeValuations;\r
 import org.simantics.db.layer0.adapter.TrendVariable;\r
+import org.simantics.db.layer0.service.ActivationManager;\r
 import org.simantics.db.layer0.util.Simantics;\r
 import org.simantics.db.request.Read;\r
 import org.simantics.db.service.VirtualGraphSupport;\r