Skip to content

Commit 236088c

Browse files
IIA-2518 Display Semantic name with fallback (#618)
* Update version to start feature: IIA-2518-Semantic-display-names * Display Semantic names with fallback * Update version to finish feature: IIA-2518-Semantic-display-names * code reusability --------- Co-authored-by: Sreehari <bhsreehari@deloitte.com>
1 parent 696c6b2 commit 236088c

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

kview/src/main/java/dev/ikm/komet/kview/mvvm/view/navigation/PatternNavEntryController.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import dev.ikm.komet.kview.controls.KometIcon;
1313
import dev.ikm.komet.kview.events.genediting.MakeGenEditingWindowEvent;
1414
import dev.ikm.komet.kview.events.pattern.MakePatternWindowEvent;
15+
import dev.ikm.tinkar.coordinate.language.calculator.LanguageCalculator;
1516
import dev.ikm.tinkar.coordinate.view.calculator.ViewCalculator;
1617
import dev.ikm.tinkar.entity.EntityService;
1718
import dev.ikm.tinkar.entity.SemanticEntity;
@@ -179,17 +180,18 @@ private void setupListView() {
179180
});
180181

181182
ViewProperties viewProperties = instancesViewModel.getPropertyValue(VIEW_PROPERTIES);
182-
Function<Integer, String> fetchDescriptionByNid = (nid -> {
183+
Function<Integer, String> fetchDescriptionByNid = nid -> {
183184
// Reference Component in Pattern
184185
String descr = "";
185186
if (EntityService.get().getEntity(nid).get() instanceof SemanticEntity semanticEntity) {
186187
EntityFacade refComponent = EntityService.get().getEntity(semanticEntity.referencedComponentNid()).get();
187188
PatternFacade patternFacade = semanticEntity.pattern().toProxy();
188-
descr = viewProperties.calculator().languageCalculator().getDescriptionText(refComponent.nid()).get()+" ";
189-
descr += viewProperties.calculator().languageCalculator().getDescriptionTextOrNid(patternFacade.nid());
189+
LanguageCalculator languageCalculator = viewProperties.calculator().languageCalculator();
190+
descr = languageCalculator.getPreferredDescriptionTextWithFallbackOrNid(refComponent.nid())+" ";
191+
descr += languageCalculator.getPreferredDescriptionTextWithFallbackOrNid(patternFacade.nid());
190192
}
191193
return descr;
192-
});
194+
};
193195
Function<EntityFacade, String> fetchDescriptionByFacade = (facade -> viewProperties.calculator().getPreferredDescriptionTextWithFallbackOrNid(facade));
194196
// set the cell factory for each pattern's instances list
195197
patternInstancesListView.setCellFactory(_ -> new PatternSemanticListCell(fetchDescriptionByNid, fetchDescriptionByFacade, viewProperties));

0 commit comments

Comments
 (0)