From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 10 Sep 2019 16:10:04 +0000 (+0300)
Subject: Necessary reverts and changes to build against release/1.35.2 platform
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1f2a40b668c8f75992713262d64ae5ab8a659337;p=simantics%2Fdistrict.git

Necessary reverts and changes to build against release/1.35.2 platform

gitlab #60
---

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/OpenDiagramFromConfigurationAdapter.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/OpenDiagramFromConfigurationAdapter.java
index e4e97d59..e1161296 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/OpenDiagramFromConfigurationAdapter.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/OpenDiagramFromConfigurationAdapter.java
@@ -20,7 +20,7 @@ public class OpenDiagramFromConfigurationAdapter
     }
 
     @Override
-    protected String getEditorId(ReadGraph g, Resource composite) throws DatabaseException {
+    protected String getEditorId() {
         return DistrictDiagramEditor.ID;
     }
 }
diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkHoverInfoStyle.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkHoverInfoStyle.java
index 77be9c90..0694da06 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkHoverInfoStyle.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkHoverInfoStyle.java
@@ -69,7 +69,7 @@ public class DistrictNetworkHoverInfoStyle extends StyleBase<DistrictNetworkHove
 	}
 	
 	public DistrictNetworkHoverInfoStyle(Resource style) throws DatabaseException {
-		super(style);
+		super();
 	}
 	
 	String currentRowKey;
diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java
index 27c2fc84..75c5ad4e 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/DistrictNetworkStaticInfoStyle.java
@@ -60,7 +60,7 @@ public class DistrictNetworkStaticInfoStyle extends StyleBase<DistrictNetworkSta
 	}
 	
 	public DistrictNetworkStaticInfoStyle(Resource style) {
-		super(style);
+		super();
 	}
 	
 	@Override
diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ElevationRectangleStyle.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ElevationRectangleStyle.java
index 59506e75..4f7bc461 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ElevationRectangleStyle.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/styles/ElevationRectangleStyle.java
@@ -6,7 +6,6 @@ import java.util.Collections;
 
 import org.simantics.db.RequestProcessor;
 import org.simantics.db.Resource;
-import org.simantics.db.exception.DatabaseException;
 import org.simantics.district.network.ui.nodes.ElevationServerNode;
 import org.simantics.maps.elevation.server.SingletonTiffTileInterface;
 import org.simantics.scenegraph.g2d.IG2DNode;
@@ -19,10 +18,9 @@ import org.simantics.scenegraph.utils.NodeUtil;
 public class ElevationRectangleStyle implements Style {
 
     private ObserverGroupListener listener = null;
-    private double priority;
 
     @Override
-    public void activate(RequestProcessor backend, Resource runtimeDiagram, Resource entry, Group group, EvaluationContext observer) throws DatabaseException {
+    public void activate(RequestProcessor backend, Resource runtimeDiagram, Resource entry, Group group, EvaluationContext observer) {
         if (listener != null && !listener.isDisposed())
             return;
         listener = new ObserverGroupListener(this, group, observer);
@@ -40,11 +38,6 @@ public class ElevationRectangleStyle implements Style {
 
     @Override
     public void apply(Resource entry, Group group, EvaluationContext observer) {
-        apply2(entry, observer);
-    }
-
-    @Override
-    public void apply2(Object item, EvaluationContext observer) {
         setRectangles(observer, SingletonTiffTileInterface.getBoundingBoxes());
     }
 
@@ -54,15 +47,5 @@ public class ElevationRectangleStyle implements Style {
             ((ElevationServerNode) node).setRectangles(rectangles);
         }
     }
-    
-    @Override
-    public void setPriority(double priority) {
-        this.priority = priority;
-    }
-
-    @Override
-    public double getPriority() {
-        return priority;
-    }
 
 }