[156127] CSS Outline with wrong Model when editing multiple files

bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java

diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
index 8fd73e3..2da3182 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
@@ -40,7 +40,7 @@
 
 	public void update() {
 		super.update();
-		treeViewer.getControl().setVisible(false);
+		treeViewer.getControl().setRedraw(false);
 		Object[] expandedElements = treeViewer.getExpandedElements();
 		if (isChecked()) {
 			treeViewer.setComparator(new ViewerComparator());
@@ -50,6 +50,6 @@
 		}
 		treeViewer.setInput(treeViewer.getInput());
 		treeViewer.setExpandedElements(expandedElements);
-		treeViewer.getControl().setVisible(true);
+		treeViewer.getControl().setRedraw(true);
 	}
 }
\ No newline at end of file

bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java

diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java
index f8120f4..0d08e3a 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java
@@ -41,9 +41,8 @@
 
 	public void update() {
 		super.update();
+		treeViewer.getControl().setRedraw(false);
 		setChecked(getPreferenceStore().getBoolean(getPreferenceKey()));
-		// treeViewer.getControl().setVisible(false);
-		// treeViewer.getControl().setRedraw(false);
 		Object[] expandedElements = treeViewer.getExpandedElements();
 		ISelection selection = treeViewer.getSelection();
 		contentProvider.setShowLogicalOrder(isChecked());
@@ -52,9 +51,7 @@
 		treeViewer.refresh(treeViewer.getInput());
 
 		treeViewer.setExpandedElements(expandedElements);
+		treeViewer.getControl().setRedraw(true);
 		treeViewer.setSelection(selection);
-		// treeViewer.getControl().setVisible(true);
-		// treeViewer.getControl().setRedraw(true);
-
 	}
 }

bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java

diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
index 1ab0382..bf89338 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
@@ -40,7 +40,6 @@
 	 */
 	public void update() {
 		super.update();
-		// treeViewer.getControl().setVisible(false);
 		treeViewer.getControl().setRedraw(false);
 		Object[] expandedElements = treeViewer.getExpandedElements();
 		if (isChecked()) {
@@ -51,7 +50,6 @@
 		}
 		treeViewer.setInput(treeViewer.getInput());
 		treeViewer.setExpandedElements(expandedElements);
-		// treeViewer.getControl().setVisible(true);
 		treeViewer.getControl().setRedraw(true);
 	}
 }