X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Ftechtype%2Fadapters%2FTechTypeEditorAdapter.java;h=fcd6a7e259075f81894f1613ee4d9699071e97b5;hb=c92ee2daa8341dd4ab5e08879f52daa15a90fb31;hp=5ebe6ed479060d086b9c30783c0b3ef71ef17e53;hpb=96d2122ccc3a7d3503d0bf2ab121eb8fd2186323;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/adapters/TechTypeEditorAdapter.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/adapters/TechTypeEditorAdapter.java
index 5ebe6ed4..fcd6a7e2 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/adapters/TechTypeEditorAdapter.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/adapters/TechTypeEditorAdapter.java
@@ -64,12 +64,18 @@ public class TechTypeEditorAdapter extends AbstractResourceEditorAdapter impleme
 				public void run(ReadGraph graph) throws DatabaseException {
 					DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
 					Resource componentType = graph.getPossibleObject(table, DN.TechType_TechTypeTable_HasComponentType);
-					String data = graph.getPossibleRelatedValue2(table, DN.TechType_TechTypeTable_HasData);
-
-					TechTypeTableView.table.getDisplay().asyncExec(() -> {
-						TechTypeTableView.table.setComponentType(componentType);
-						TechTypeTableView.table.setTechTypeData(data);
-					});
+					if (componentType != null) {
+						TechTypeTableView.table.getDisplay().asyncExec(() -> {
+							TechTypeTableView.table.setComponentType(componentType);
+						});
+					} else {
+						String data = graph.getRelatedValue2(table, DN.TechType_TechTypeTable_HasData);
+						int[] enabled = graph.getPossibleRelatedValue2(table, DN.TechType_TechTypeTable_HasEnabledItems);
+						TechTypeTableView.table.getDisplay().asyncExec(() -> {
+							TechTypeTableView.table.setComponentType(null);
+							TechTypeTableView.table.setTechTypeData(data, enabled);
+						});
+					}
 				}
 			});
 		} catch (DatabaseException e) {