commit | f35a317675d420654d9d1996035ee11a65b71e0c | [log] [tgz] |
---|---|---|
author | Matthew Davis <matt.davis@au1.ibm.com> | Mon Jan 26 10:01:46 2015 +1100 |
committer | Matthew Davis <matt.davis@au1.ibm.com> | Mon Jan 26 10:01:46 2015 +1100 |
tree | d7b62ac9b4acf3fe6fed5340862b73c3370a194a | |
parent | 2001f9f098f1c7c332c9dfd875142c17d12084e0 [diff] |
Fixes issue with migration edges to allow multi-population identifiers to be used
diff --git a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/PopulationModelImpl.java b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/PopulationModelImpl.java index 173305f..7bf2330 100644 --- a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/PopulationModelImpl.java +++ b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/PopulationModelImpl.java
@@ -663,7 +663,7 @@ Edge e = edges.get(i); if(e instanceof MigrationEdge) { MigrationEdge me = (MigrationEdge)e; - if(!me.getPopulationIdentifier().equals(this.getPopulationIdentifier())) continue; + if(!me.getPopulationIdentifier().equals(((PopulationModelLabel)label).getPopulationIdentifier())) continue; // Migration is FROM A TO B Node source = me.getA();