Refactored (moved) class to simplify dependencies
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/AutomaticExperimentManager.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/AutomaticExperimentManager.java
index 9dd034a..5647cae 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/AutomaticExperimentManager.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/AutomaticExperimentManager.java
@@ -18,7 +18,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.stem.analysis.LogInitializationException;
+import org.eclipse.stem.core.common.util.LogInitializationException;
public class AutomaticExperimentManager {
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/ErrorAnalysisAlgorithm.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/ErrorAnalysisAlgorithm.java
index 56f4e0f..1aea3ee 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/ErrorAnalysisAlgorithm.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/ErrorAnalysisAlgorithm.java
@@ -17,7 +17,7 @@
import java.util.List;
import org.eclipse.stem.analysis.ErrorFunction;
-import org.eclipse.stem.analysis.LogInitializationException;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.scenario.Scenario;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java
index 6b395c6..2e07006 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java
@@ -29,10 +29,10 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.stem.analysis.ErrorFunction;
import org.eclipse.stem.analysis.ErrorResult;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
import org.eclipse.stem.core.Utility;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.model.Decorator;
import org.eclipse.stem.core.model.IntegrationDecorator;
import org.eclipse.stem.core.scenario.Scenario;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/executable/AutomaticExperimentExecutableAdapterFactory.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/executable/AutomaticExperimentExecutableAdapterFactory.java
index 1324e34..26041cb 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/executable/AutomaticExperimentExecutableAdapterFactory.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/executable/AutomaticExperimentExecutableAdapterFactory.java
@@ -14,13 +14,13 @@
*******************************************************************************/
import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.automaticexperiment.AutomaticExperiment;
import org.eclipse.stem.analysis.automaticexperiment.AutomaticExperimentManager;
import org.eclipse.stem.analysis.automaticexperiment.ErrorAnalysisAlgorithm;
import org.eclipse.stem.analysis.automaticexperiment.OptimizerAlgorithm;
import org.eclipse.stem.analysis.automaticexperiment.util.AutomaticexperimentAdapterFactory;
import org.eclipse.stem.core.Utility;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.jobs.adapters.executable.emf.ExecutableAdapter;
import org.eclipse.stem.jobs.adapters.executable.emf.ExecutableAdapterFactory;
import org.eclipse.stem.jobs.execution.IExecutable;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVScenarioStreamer.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVScenarioStreamer.java
index 4cd5ce3..b8e9451 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVScenarioStreamer.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVScenarioStreamer.java
@@ -16,7 +16,7 @@
import java.util.TreeMap;
import org.eclipse.stem.analysis.Activator;
-import org.eclipse.stem.analysis.LogInitializationException;
+import org.eclipse.stem.core.common.util.LogInitializationException;
/*******************************************************************************
* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVscenarioLoader.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVscenarioLoader.java
index 6d72bd1..edab9fc 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVscenarioLoader.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/util/CSVscenarioLoader.java
@@ -35,11 +35,11 @@
import org.eclipse.stem.analysis.Activator;
import org.eclipse.stem.analysis.AnalysisFactory;
import org.eclipse.stem.analysis.DiseaseType;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.impl.AnalysisFactoryImpl;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl.ReferenceScenarioDataInstance;
import org.eclipse.stem.core.Utility;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.model.Decorator;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/DataProcessor.java b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/DataProcessor.java
index 2f8839b..76f5fd8 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/DataProcessor.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/DataProcessor.java
@@ -30,7 +30,7 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.eclipse.stem.analysis.LogInitializationException;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.definitions.Activator;
/**
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioAnalysisSuite.java b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioAnalysisSuite.java
index 04dee47..716f0cb 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioAnalysisSuite.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioAnalysisSuite.java
@@ -24,10 +24,10 @@
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.stem.analysis.ErrorFunction;
import org.eclipse.stem.analysis.ErrorResult;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl.ReferenceScenarioDataInstance;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.scenario.Scenario;
import org.eclipse.stem.util.analysis.views.AnalysisControl;
import org.eclipse.stem.util.analysis.views.EstimatorControl;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/EpidemicControl.java b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/EpidemicControl.java
index 1b642b7..8156749 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/EpidemicControl.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/EpidemicControl.java
@@ -24,11 +24,11 @@
import org.eclipse.birt.chart.model.attribute.ColorDefinition;
import org.eclipse.birt.chart.model.attribute.impl.ColorDefinitionImpl;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl.ReferenceScenarioDataInstance;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
import org.eclipse.stem.core.common.Identifiable;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.util.analysis.Activator;
import org.eclipse.stem.util.analysis.AggregateDataWriter;
import org.eclipse.stem.util.analysis.ScenarioAnalysisSuite;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/LyapunovControl.java b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/LyapunovControl.java
index 13e6f62..054f502 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/LyapunovControl.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/LyapunovControl.java
@@ -22,7 +22,7 @@
import org.eclipse.birt.chart.model.attribute.impl.ColorDefinitionImpl;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.stem.analysis.LogInitializationException;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.util.analysis.Activator;
import org.eclipse.stem.util.analysis.CSVAnalysisWriter;
import org.eclipse.stem.util.analysis.PhaseSpaceCoordinate;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ProcessorControl.java b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ProcessorControl.java
index 6196bd3..3dcd768 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ProcessorControl.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ProcessorControl.java
@@ -23,7 +23,7 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.eclipse.stem.analysis.LogInitializationException;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.util.analysis.DataProcessor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ScenarioComparisonControl.java b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ScenarioComparisonControl.java
index 4fb6bbb..4781c15 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ScenarioComparisonControl.java
+++ b/org.eclipse.stem/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/views/ScenarioComparisonControl.java
@@ -28,7 +28,7 @@
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.stem.analysis.ErrorFunction;
import org.eclipse.stem.analysis.ErrorResult;
-import org.eclipse.stem.analysis.LogInitializationException;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.util.analysis.Activator;
import org.eclipse.stem.util.analysis.CSVAnalysisWriter;
import org.eclipse.stem.util.analysis.ScenarioAnalysisSuite;
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/LogInitializationException.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/util/LogInitializationException.java
similarity index 95%
rename from org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/LogInitializationException.java
rename to org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/util/LogInitializationException.java
index 4c921f7..6afa51d 100644
--- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/LogInitializationException.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/util/LogInitializationException.java
@@ -1,4 +1,4 @@
-package org.eclipse.stem.analysis;
+package org.eclipse.stem.core.common.util;
/*******************************************************************************
* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
* IBM Corporation, BfR, and others.
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelImpl.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelImpl.java
index 7cc0dc4..b1aa4e9 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelImpl.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelImpl.java
@@ -12,12 +12,12 @@
*******************************************************************************/
package org.eclipse.stem.core.graph.impl;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.stem.core.graph.GraphPackage;
-import org.eclipse.stem.core.graph.IntegrationLabel;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.stem.core.graph.GraphPackage;
+import org.eclipse.stem.core.graph.IntegrationLabel;
import org.eclipse.stem.core.graph.IntegrationLabelValue;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java
index a6c7550..b3131a8 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/impl/IntegrationLabelValueImpl.java
@@ -12,11 +12,11 @@
*******************************************************************************/
package org.eclipse.stem.core.graph.impl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.stem.core.graph.Exchange;
-import org.eclipse.stem.core.graph.GraphPackage;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.stem.core.graph.Exchange;
+import org.eclipse.stem.core.graph.GraphPackage;
import org.eclipse.stem.core.graph.IntegrationLabelValue;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelItemProvider.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelItemProvider.java
index 44b125b..a0d0aa8 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelItemProvider.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelItemProvider.java
@@ -13,22 +13,22 @@
package org.eclipse.stem.core.graph.provider;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.stem.core.graph.GraphPackage;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.stem.core.graph.GraphPackage;
import org.eclipse.stem.core.graph.IntegrationLabel;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelValueItemProvider.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelValueItemProvider.java
index e5bc5f6..4a2f65d 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelValueItemProvider.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/graph/provider/IntegrationLabelValueItemProvider.java
@@ -13,18 +13,18 @@
package org.eclipse.stem.core.graph.provider;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.stem.core.graph.GraphPackage;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/impl/IntegrationDecoratorImpl.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/impl/IntegrationDecoratorImpl.java
index f70320e..11c3949 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/impl/IntegrationDecoratorImpl.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/impl/IntegrationDecoratorImpl.java
@@ -14,18 +14,18 @@
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.stem.core.graph.DynamicLabel;
-import org.eclipse.stem.core.graph.IntegrationLabel;
-import org.eclipse.stem.core.math.BinomialDistributionUtil;
-import org.eclipse.stem.core.model.IntegrationDecorator;
-import org.eclipse.stem.core.model.ModelPackage;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.stem.core.graph.DynamicLabel;
+import org.eclipse.stem.core.graph.IntegrationLabel;
+import org.eclipse.stem.core.math.BinomialDistributionUtil;
+import org.eclipse.stem.core.model.IntegrationDecorator;
+import org.eclipse.stem.core.model.ModelPackage;
import org.eclipse.stem.core.model.STEMTime;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/provider/IntegrationDecoratorItemProvider.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/provider/IntegrationDecoratorItemProvider.java
index 4c040cc..f73caf2 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/provider/IntegrationDecoratorItemProvider.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/model/provider/IntegrationDecoratorItemProvider.java
@@ -13,22 +13,22 @@
package org.eclipse.stem.core.model.provider;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.stem.core.model.IntegrationDecorator;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.stem.core.model.IntegrationDecorator;
import org.eclipse.stem.core.model.ModelPackage;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/TriggerList.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/TriggerList.java
index c2fa66d..ed66596 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/TriggerList.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/TriggerList.java
@@ -12,8 +12,8 @@
*******************************************************************************/
package org.eclipse.stem.core.trigger;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.stem.core.model.Decorator;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.stem.core.model.Decorator;
import org.eclipse.stem.core.predicate.Predicate;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/provider/TriggerListItemProvider.java b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/provider/TriggerListItemProvider.java
index 5c71466..9ee2519 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/provider/TriggerListItemProvider.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.core/src/org/eclipse/stem/core/trigger/provider/TriggerListItemProvider.java
@@ -13,28 +13,28 @@
package org.eclipse.stem.core.trigger.provider;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.stem.core.common.provider.CoreEditPlugin;
-import org.eclipse.stem.core.model.ModelFactory;
-import org.eclipse.stem.core.model.provider.DecoratorItemProvider;
-import org.eclipse.stem.core.modifier.ModifierFactory;
-import org.eclipse.stem.core.predicate.PredicateFactory;
-import org.eclipse.stem.core.trigger.TriggerFactory;
-import org.eclipse.stem.core.trigger.TriggerList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.stem.core.common.provider.CoreEditPlugin;
+import org.eclipse.stem.core.model.ModelFactory;
+import org.eclipse.stem.core.model.provider.DecoratorItemProvider;
+import org.eclipse.stem.core.modifier.ModifierFactory;
+import org.eclipse.stem.core.predicate.PredicateFactory;
+import org.eclipse.stem.core.trigger.TriggerFactory;
+import org.eclipse.stem.core.trigger.TriggerList;
import org.eclipse.stem.core.trigger.TriggerPackage;
/**
diff --git a/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessSimulationRunner.java b/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessSimulationRunner.java
index a0e6c12..0337575 100644
--- a/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessSimulationRunner.java
+++ b/org.eclipse.stem/core/org.eclipse.stem.ui.headless/src/org/eclipse/stem/ui/headless/HeadlessSimulationRunner.java
@@ -28,12 +28,12 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.automaticexperiment.AutomaticExperiment;
import org.eclipse.stem.analysis.automaticexperiment.AutomaticExperimentManager;
import org.eclipse.stem.analysis.automaticexperiment.ErrorAnalysisAlgorithm;
import org.eclipse.stem.core.Utility;
import org.eclipse.stem.core.common.impl.DublinCoreImpl;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.model.Decorator;
import org.eclipse.stem.core.model.IntegrationDecorator;
import org.eclipse.stem.core.scenario.Scenario;
diff --git a/org.eclipse.stem/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/impl/ExternalDataSourceDiseaseModelImpl.java b/org.eclipse.stem/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/impl/ExternalDataSourceDiseaseModelImpl.java
index 038bd30..0f76e58 100644
--- a/org.eclipse.stem/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/impl/ExternalDataSourceDiseaseModelImpl.java
+++ b/org.eclipse.stem/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/impl/ExternalDataSourceDiseaseModelImpl.java
@@ -31,11 +31,11 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.ui.provider.PropertySource;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.util.CSVScenarioStreamer;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
import org.eclipse.stem.core.Utility;
import org.eclipse.stem.core.common.Identifiable;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.graph.DynamicLabel;
import org.eclipse.stem.core.graph.Graph;
import org.eclipse.stem.core.graph.IntegrationLabel;
diff --git a/org.eclipse.stem/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewInfectorWizard.java b/org.eclipse.stem/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewInfectorWizard.java
index 6add819..317bafc 100644
--- a/org.eclipse.stem/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewInfectorWizard.java
+++ b/org.eclipse.stem/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewInfectorWizard.java
@@ -22,12 +22,12 @@
import org.eclipse.core.commands.IHandler;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl.ReferenceScenarioDataInstance;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
import org.eclipse.stem.core.STEMURI;
import org.eclipse.stem.core.common.Identifiable;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.model.NodeDecorator;
import org.eclipse.stem.diseasemodels.standard.InfectorInoculatorCollection;
import org.eclipse.stem.diseasemodels.standard.SIInfector;
diff --git a/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationInitializerImpl.java b/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationInitializerImpl.java
index 02e9eb9..6242e19 100644
--- a/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationInitializerImpl.java
+++ b/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationInitializerImpl.java
@@ -19,11 +19,11 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl.ReferenceScenarioDataInstance;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
import org.eclipse.stem.core.STEMURI;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.graph.Graph;
import org.eclipse.stem.core.graph.Node;
import org.eclipse.stem.core.graph.NodeLabel;
diff --git a/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationModelImpl.java b/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationModelImpl.java
index 90dae74..918876f 100644
--- a/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationModelImpl.java
+++ b/org.eclipse.stem/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/ExternalDataSourcePopulationModelImpl.java
@@ -28,11 +28,11 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.ui.provider.PropertySource;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.util.CSVScenarioStreamer;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
import org.eclipse.stem.core.Utility;
import org.eclipse.stem.core.common.Identifiable;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.graph.DynamicLabel;
import org.eclipse.stem.core.graph.ExchangePool;
import org.eclipse.stem.core.graph.Graph;
diff --git a/org.eclipse.stem/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java b/org.eclipse.stem/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java
index 75a8cc6..e24c66b 100644
--- a/org.eclipse.stem/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java
+++ b/org.eclipse.stem/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java
@@ -26,12 +26,12 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.automaticexperiment.AutomaticExperiment;
import org.eclipse.stem.analysis.automaticexperiment.ErrorAnalysisAlgorithm;
import org.eclipse.stem.analysis.automaticexperiment.ErrorAnalysisAlgorithmFactory;
import org.eclipse.stem.core.STEMXMIResourceFactoryImpl;
import org.eclipse.stem.core.common.tests.IdentifiableTest;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import junit.textui.TestRunner;
diff --git a/org.eclipse.stem/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java b/org.eclipse.stem/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java
index befe58a..82bfd6e 100644
--- a/org.eclipse.stem/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java
+++ b/org.eclipse.stem/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java
@@ -24,9 +24,9 @@
import junit.textui.TestRunner;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.stem.analysis.LogInitializationException;
import org.eclipse.stem.analysis.impl.ReferenceScenarioDataMapImpl;
import org.eclipse.stem.analysis.util.CSVscenarioLoader;
+import org.eclipse.stem.core.common.util.LogInitializationException;
import org.eclipse.stem.core.graph.GraphFactory;
import org.eclipse.stem.core.model.Decorator;
import org.eclipse.stem.core.model.IntegrationDecorator;
