From 1f2a40b668c8f75992713262d64ae5ab8a659337 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 10 Sep 2019 19:10:04 +0300 Subject: [PATCH] Necessary reverts and changes to build against release/1.35.2 platform gitlab #60 --- .../OpenDiagramFromConfigurationAdapter.java | 2 +- .../styles/DistrictNetworkHoverInfoStyle.java | 2 +- .../DistrictNetworkStaticInfoStyle.java | 2 +- .../ui/styles/ElevationRectangleStyle.java | 19 +------------------ 4 files changed, 4 insertions(+), 21 deletions(-) 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