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;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Ftechtype%2Fadapters%2FTechTypeEditorAdapter.java;h=fcd6a7e259075f81894f1613ee4d9699071e97b5;hb=85f9ed92b6332c3e539d9736d1536d5714444d69;hp=6ab176ede84979537a7b1dc303cbcfcf8984afd7;hpb=3424ba8b4dd8e368badce8515bca96a99be518f4;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 6ab176ed..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,10 +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); - - TechTypeTableView.table.getDisplay().asyncExec(() -> { - TechTypeTableView.table.setComponentType(componentType); - }); + 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) {