Merge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1

Conflicts:
	org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java

Change-Id: I2780355701d80fc5dc992442209f614136e3c9db

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java b/org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java
index 8d229b78c325ea49fb0d0f8500c25726b1c8cf81..fff235ac638133c53a43c072fc285a77b048d0f7 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java
@@ -67,12 +67,12 @@ public class DistrictNodeGroup implements Group {
     }
 
     @Override
-    public void trackItems(RequestProcessor processor, final Resource runtimeDiagram, final SetListener<Resource> listener) throws DatabaseException {
+    public void trackItems(RequestProcessor processor, final Resource runtimeDiagram, final SetListener<Resource> listener) {
         if (types.isEmpty()) {
             System.out.println("DistrictNodeGroup has no types!");
             return;
         }
-        processor.syncRequest(new TernaryRead<Resource, Collection<Resource>, Set<String>, Collection<Resource>>(runtimeDiagram, types, mappedComponentTypeNames) {
+        processor.asyncRequest(new TernaryRead<Resource, Collection<Resource>, Set<String>, Collection<Resource>>(runtimeDiagram, types, mappedComponentTypeNames) {
             @Override
             public Collection<Resource> perform(ReadGraph graph) throws DatabaseException {
                 return graph.syncRequest(new ElementsMappedToComponentTypes(parameter, parameter2, parameter3));

diff --git a/pom.xml b/pom.xml
index 7834a65a0f048f86f7e4303fe5882d723ba573a7..720e49f4011fd83e48041701c6728f7f52b1d13c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
        <!-- common settings for all modules -->
        <properties>
-               <branch-spec>master</branch-spec>
+               <branch-spec>release/1.35.1</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
                <tycho-version>1.0.0</tycho-version>
        </properties>