RESOLVED - bug 480105: Occasional ConcurrentModificationException when
re-launching Sphinx on previously used workspace
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480105

Updated copyright headers
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/ITreeViewerState.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/ITreeViewerState.java
index e51fea1..9f430c5 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/ITreeViewerState.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/ITreeViewerState.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
@@ -18,6 +19,9 @@
 
 import org.eclipse.sphinx.emf.workspace.ui.viewers.state.providers.ITreeElementStateProvider;
 
+// TODO Move this class and all model-independent related classes to org.eclipse.sphinx.platform.ui.viewers.state.
+// Split TreeElementStateProviderFactory into BasicTreeElementStateProviderFactory and BasicModelTreeElementStateProviderFactory
+// and enable appropriate factory to be set on TreeViewerStateRecorder when instantiating the latter.
 public interface ITreeViewerState {
 
 	List<ITreeElementStateProvider> getExpandedElements();
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerState.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerState.java
index 7126ff8..4375d4d 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerState.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerState.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerStateRecorder.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerStateRecorder.java
index 8aa663e..188eda3 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerStateRecorder.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/TreeViewerStateRecorder.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
  *     itemis - Initial API and implementation
  *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *     itemis - [480147] Massive performance problem and SWTError upon startup or viewer refresh when Model Explorer has expanded model content
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/AbstractTreeElementStateProvider.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/AbstractTreeElementStateProvider.java
index f8e38cb..07efd01 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/AbstractTreeElementStateProvider.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/AbstractTreeElementStateProvider.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/EObjectElementStateProvider.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/EObjectElementStateProvider.java
index b45e966..db53975 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/EObjectElementStateProvider.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/EObjectElementStateProvider.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FileElementStateProvider.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FileElementStateProvider.java
index 5739895..d8c78a2 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FileElementStateProvider.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FileElementStateProvider.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FolderElementStateProvider.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FolderElementStateProvider.java
index 102d60c..b568320 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FolderElementStateProvider.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/FolderElementStateProvider.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/ProjectElementStateProvider.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/ProjectElementStateProvider.java
index f9fd9b3..66dbc21 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/ProjectElementStateProvider.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/ProjectElementStateProvider.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */
diff --git a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/TransientElementStateProvider.java b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/TransientElementStateProvider.java
index daf2772..c1c72c9 100644
--- a/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/TransientElementStateProvider.java
+++ b/plugins/org.eclipse.sphinx.emf.workspace.ui/src/org/eclipse/sphinx/emf/workspace/ui/viewers/state/providers/TransientElementStateProvider.java
@@ -1,7 +1,7 @@
 /**
  * <copyright>
  *
- * Copyright (c) 2015 itemis and others.
+ * Copyright (c) 2015-2016 itemis and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     itemis - Initial API and implementation
+ *     itemis - [480105] Occasional ConcurrentModificationException when re-launching Sphinx on previously used workspace
  *
  * </copyright>
  */