Set license/copyright information for district features

[simantics/district.git] / org.simantics.district.network / src / org / simantics / district / network / profile / ThrottledStyleBase.java

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java b/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java
index f820c9222a121537742df253be60889d7a3ee685..483f62eddccbb6241f184ef892156f586e4e6de9 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/ThrottledStyleBase.java
@@ -14,7 +14,6 @@ package org.simantics.district.network.profile;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.request.UnaryRead;
@@ -72,10 +71,12 @@ public abstract class ThrottledStyleBase<Result> extends StyleBase<Optional<Resu
 
     @Override
     public final void applyStyleForNode(EvaluationContext evaluationContext, INode node, Optional<Result> result) {
-        if (!result.equals(Optional.empty())) {
+        if (!Optional.empty().equals(result) && result != null) {
             applyThrottledStyleForNode(evaluationContext, node, result.get());
         } else {
             LOGGER.debug("Do not apply as results are unchanged for {} {} {}", evaluationContext, node, result);
+            // TODO: fix this duplicate method invocation with null
+            applyThrottledStyleForNode(evaluationContext, node, null);
         }
     }
 
@@ -93,7 +94,8 @@ public abstract class ThrottledStyleBase<Result> extends StyleBase<Optional<Resu
             DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
             Long interval = DEFAULT_INTERVAL;
             if (configuration != null) {
-                interval = graph.getPossibleRelatedValue(configuration, DN.Diagram_profileUpdateInterval, Bindings.LONG);
+                // TODO: take back to use when throttled profile is actually working
+                // interval = graph.getPossibleRelatedValue(configuration, DN.Diagram_profileUpdateInterval, Bindings.LONG);
             }
             return interval != null ? interval : DEFAULT_INTERVAL;
         }