354845: [Model Explorer] really slow with a big model

https://bugs.eclipse.org/bugs/show_bug.cgi?id=354845

Integrate contribution from L. Wouters.
Clean up code & fix small mistakes

Conflicts:
	Cherry picked from ba4827 in master. One of the plug-ins doesn't exist
in Kepler. The files have been excluded from the cherry pick.

2 files changed, 15 insertions, 9 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java
index 35221d2ab62..c7eb315ff2c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/GetContainedTextEditors.java
@@ -37,15 +37,18 @@ public class GetContainedTextEditors extends AbstractEditorContainerQuery implem
 	 * {@inheritDoc}
 	 */
 	public Collection<TextEditorModel> evaluate(final EObject context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		List<TextEditorModel> result = new ArrayList<TextEditorModel>(3);
+		List<TextEditorModel> result = new ArrayList<TextEditorModel>();
 		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(context);
-		if (roots == null)
+		if(roots == null) {
 			return result;
-		while (roots.hasNext()) {
+		}
+
+		while(roots.hasNext()) {
 			EObject root = roots.next();
-			if (root instanceof TextEditorModel) {
-				if (EcoreUtil.equals(((TextEditorModel)root).getEditedObject(), context))
+			if(root instanceof TextEditorModel) {
+				if(EcoreUtil.equals(((TextEditorModel)root).getEditedObject(), context)) {
 					result.add((TextEditorModel)root);
+				}
 			}
 		}
 		return result;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
index 07a423e048f..8aaf591760b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
@@ -34,13 +34,16 @@ public class IsTextEditorContainer extends AbstractEditorContainerQuery implemen
 	 */
 	public Boolean evaluate(final EObject context, ParameterValueList parameterValues) throws ModelQueryExecutionException {
 		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(context);
-		if (roots == null)
+		if(roots == null) {
 			return false;
-		while (roots.hasNext()) {
+		}
+
+		while(roots.hasNext()) {
 			EObject root = roots.next();
-			if (root instanceof TextEditorModel) {
-				if (EcoreUtil.equals(((TextEditorModel)root).getEditedObject(), context))
+			if(root instanceof TextEditorModel) {
+				if(EcoreUtil.equals(((TextEditorModel)root).getEditedObject(), context)) {
 					return true;
+				}
 			}
 		}
 		return false;