sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[incremental standalone builder] tests, proper IAllContainerStateAdapter, remove deleted resources

Browse source 
- Added tests for the incremental builder
- some refactorings to make the state less shared
- ‘FlatResourceSetBasedAllContainersState’ uses ResourceDescriptionsData if existent.
- some minor other things.

Signed-off-by: Sven Efftinge <sven.efftinge@itemis.de>
This commit is contained in:
Sven Efftinge 2015-05-05 20:00:16 +02:00
parent 754a5ef242
commit 11c2745905
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/FlatResourceSetBasedAllContainersState.java
View file

@ -12,12 +12,13 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.xtext.resource.XtextResourceSet;
import org.eclipse.xtext.resource.impl.ResourceDescriptionsData;
import com.google.common.collect.Lists;
/**
* This implementation of {@link IAllContainersState} puts all resources from a {@link ResourceSet} into one single
* container. Resource that are loaded after this class has been created are also considered.
* This implementation of {@link IAllContainersState} looks whether a {@link ResourceDescriptionsData} is installed on the wrapped {@link ResourceSet}
* and delegates to that. If no such adapter is installed it uses the contents of the {@link ResourceSet}. Resource that are loaded after this class has been created are also considered.
*
* @author Moritz Eysholdt - Initial contribution and API
* @since 2.3
@ -37,20 +38,16 @@ public class FlatResourceSetBasedAllContainersState extends AdapterImpl implemen
this.resourceSet = rs;
}
@Override
public boolean equals(Object arg0) {
if (arg0 == null || arg0.getClass() != getClass())
return false;
FlatResourceSetBasedAllContainersState other = (FlatResourceSetBasedAllContainersState) arg0;
return other.resourceSet == resourceSet;
}
@Override
public Collection<URI> getContainedURIs(String containerHandle) {
if (!HANDLE.equals(containerHandle))
return Collections.emptySet();
if (resourceSet instanceof XtextResourceSet) {
XtextResourceSet xtextResourceSet = (XtextResourceSet) resourceSet;
ResourceDescriptionsData descriptionsData = ResourceDescriptionsData.ResourceSetAdapter.findResourceDescriptionsData(resourceSet);
if (descriptionsData != null) {
return descriptionsData.getAllURIs();
}
return newArrayList(xtextResourceSet.getNormalizationMap().values());
}
List<URI> uris = Lists.newArrayListWithCapacity(resourceSet.getResources().size());
@ -74,11 +71,6 @@ public class FlatResourceSetBasedAllContainersState extends AdapterImpl implemen
return Collections.singletonList(HANDLE);
}
@Override
public int hashCode() {
return resourceSet == null ? 0 : resourceSet.hashCode();
}
@Override
public boolean isAdapterForType(Object type) {
return IAllContainersState.class == type || FlatResourceSetBasedAllContainersState.class == type;