Incorporated review feedback

eclipse · Aug 13, 2019 · f4156f7 · f4156f7
1 parent c630d2f
commit f4156f7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/...xtext.builder.tests/src/org/eclipse/xtext/builder/impl/SimpleProjectsIntegrationTest.java b/...xtext.builder.tests/src/org/eclipse/xtext/builder/impl/SimpleProjectsIntegrationTest.java
@@ -349,8 +349,6 @@ public void testReexportedSource() throws Exception {
 		assertEquals(BuilderTestLanguagePackage.Literals.ELEMENT__REFERENCES,next.getEReference());
 	}
 
-	// TODO fix https://github.com/eclipse/xtext-eclipse/issues/400
-//	@Ignore("TODO fix https://github.com/eclipse/xtext-eclipse/issues/400")
 	@Test
 	public void testNewlyAddedReexportedSource() throws Exception {
 		IJavaProject foo = createJavaProject("foo");
@@ -373,8 +371,6 @@ public void testNewlyAddedReexportedSource() throws Exception {
 		assertEquals(0,countMarkers(bazFile));
 	}
 
-	// TODO fix https://github.com/eclipse/xtext-eclipse/issues/400
-//	@Ignore("TODO fix https://github.com/eclipse/xtext-eclipse/issues/400")
 	@Test
 	public void testReexportedJarRemoved() throws Exception {
 		IJavaProject foo = createJavaProject("foo");

diff --git a/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/impl/ToBeBuiltComputer.java b/org.eclipse.xtext.builder/src/org/eclipse/xtext/builder/impl/ToBeBuiltComputer.java
@@ -7,7 +7,9 @@
  *******************************************************************************/
 package org.eclipse.xtext.builder.impl;
 
+import java.util.Arrays;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
@@ -370,7 +372,7 @@ protected boolean isValid(URI uri, IStorage storage) {
 	}
 
 	protected Set<IProject> getInterestingProjects(IProject project) throws CoreException {
-		Set<IProject> result = Sets.newHashSet(project.getReferencedProjects());
+		Set<IProject> result = new LinkedHashSet<>(Arrays.asList(project.getReferencedProjects()));
 		contribution.addInterestingProjects(project, result);
 		return result;
 	}

diff --git a/...uilder/src/org/eclipse/xtext/builder/impl/javasupport/ProjectClasspathChangeListener.java b/...uilder/src/org/eclipse/xtext/builder/impl/javasupport/ProjectClasspathChangeListener.java
@@ -66,7 +66,7 @@ public void elementChanged(ElementChangedEvent event) {
 								.filter(Predicates.notNull())
 								.transform(IJavaProject::getProject).toSet();
 						dirtyStateManager.notifyListeners(new CoarseGrainedChangeEvent());
-						Set<IProject> mutableProjects = Sets.newHashSet(projects);
+						Set<IProject> mutableProjects = Sets.newLinkedHashSet(projects);
 						for(IProject project: projects) {
 							mutableProjects.addAll(projectDependencyGraph.getDependentXtextProjects(project));
 						}

diff --git a/....builder/src/org/eclipse/xtext/builder/impl/javasupport/SimpleProjectDependencyGraph.java b/....builder/src/org/eclipse/xtext/builder/impl/javasupport/SimpleProjectDependencyGraph.java
@@ -31,7 +31,7 @@ public void putDependency(IProject project, Set<IProject> dependsOn) {
 	}
 
 	public Set<IProject> getDependentXtextProjects(IProject project) {
-		Set<IProject> result = Sets.newHashSet();
+		Set<IProject> result = Sets.newLinkedHashSet();
 		for(Map.Entry<IProject, Set<IProject>> entry: dependencies.entrySet()) {
 			if (entry.getValue().contains(project)) {
 				result.add(entry.getKey());