Merge pull request #91 from protegeproject/142-changes-to-the-web-api

refactored LinearizationDefinition
protegeproject · Jan 6, 2025 · 1ff1222 · 1ff1222
2 parents c269668 + 20bfc7b
commit 1ff1222
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/...ava/edu/stanford/bmir/protege/web/client/linearization/LinearizationPortletPresenter.java b/...ava/edu/stanford/bmir/protege/web/client/linearization/LinearizationPortletPresenter.java
@@ -69,7 +69,7 @@ public void startPortlet(PortletUi portletUi, WebProtegeEventBus eventBus) {
 
         dispatch.execute(GetLinearizationDefinitionsAction.create(), result -> {
             for (LinearizationDefinition definition : result.getDefinitionList()) {
-                this.definitionMap.put(definition.getWhoficEntityIri(), definition);
+                this.definitionMap.put(definition.getLinearizationUri(), definition);
             }
             view.setLinearizationDefinitonMap(this.definitionMap);
             handleSetEntity(getSelectedEntity());

diff --git a/...java/edu/stanford/bmir/protege/web/client/linearization/LinearizationPortletViewImpl.java b/...java/edu/stanford/bmir/protege/web/client/linearization/LinearizationPortletViewImpl.java
@@ -85,7 +85,7 @@ public class LinearizationPortletViewImpl extends Composite implements Lineariza
     private final TableRefresh tableRefresh = (linearizationTableRow) -> {
         flexTable.removeAllRows();
         this.tableRowList = this.tableRowList.stream().map(row -> {
-            if (row.getLinearizationDefinition().getWhoficEntityIri().equalsIgnoreCase(linearizationTableRow.getLinearizationDefinition().getWhoficEntityIri())) {
+            if (row.getLinearizationDefinition().getLinearizationUri().equalsIgnoreCase(linearizationTableRow.getLinearizationDefinition().getLinearizationUri())) {
                 return linearizationTableRow;
             }
             return row;

diff --git a/...c/main/java/edu/stanford/bmir/protege/web/client/linearization/LinearizationTableRow.java b/...c/main/java/edu/stanford/bmir/protege/web/client/linearization/LinearizationTableRow.java
@@ -124,7 +124,7 @@ private void populateEditableLinearizationParent() {
     public void populateDerivedLinearizationParents(List<LinearizationTableRow> rows) {
         if (isDerived()) {
             LinearizationTableRow mainRow = rows.stream()
-                    .filter(linearizationRow -> linearizationRow.linearizationDefinition.getId().equalsIgnoreCase(this.linearizationDefinition.getCoreLinId()))
+                    .filter(linearizationRow -> linearizationRow.linearizationDefinition.getLinearizationId().equalsIgnoreCase(this.linearizationDefinition.getCoreLinId()))
                     .findFirst()
                     .orElseThrow(() -> {
                         logger.info("Couldn't find parent with id " + linearizationDefinition.getCoreLinId());
@@ -183,7 +183,7 @@ public LinearizationSpecification asLinearizationSpecification() {
                 this.isPartOfCheckbox.getValue().getValue(),
                 this.parentIri,
                 this.linearizationDefinition.getSortingCode(),
-                this.linearizationDefinition.getWhoficEntityIri(),
+                this.linearizationDefinition.getLinearizationUri(),
                 this.commentsWidget.getText()
         );
         return response;

diff --git a/...u/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletPresenter.java b/...u/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletPresenter.java
@@ -142,7 +142,7 @@ remove the orElseGet() and add back the orElseThrow() when we have proper labels
             dispatch.execute(GetLinearizationDefinitionsAction.create(), definitionsResult -> {
                 Map<String, LinearizationDefinition> definitionMap = new HashMap<>();
                 for (LinearizationDefinition definition : definitionsResult.getDefinitionList()) {
-                    definitionMap.put(definition.getWhoficEntityIri(), definition);
+                    definitionMap.put(definition.getLinearizationUri(), definition);
                 }
                 view.setLinearizationDefinitonMap(definitionMap);
                 view.initializeTable();

diff --git a/...du/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletViewImpl.java b/...du/stanford/bmir/protege/web/client/postcoordination/PostCoordinationPortletViewImpl.java
@@ -111,7 +111,7 @@ private Optional<WhoficEntityPostCoordinationSpecification> createEditedSpec() {
         WhoficEntityPostCoordinationSpecification specification = new WhoficEntityPostCoordinationSpecification(entityIri, "ICD", new ArrayList<>());
         boolean somethingChanged = false;
         for (PostCoordinationTableRow tableRow : this.tableRows) {
-            PostCoordinationSpecification postCoordinationSpecification = new PostCoordinationSpecification(tableRow.getLinearizationDefinition().getWhoficEntityIri(),
+            PostCoordinationSpecification postCoordinationSpecification = new PostCoordinationSpecification(tableRow.getLinearizationDefinition().getLinearizationUri(),
                     new ArrayList<>(),
                     new ArrayList<>(),
                     new ArrayList<>(),
@@ -260,7 +260,7 @@ private void bindCellsToParentCells(){
         for(PostCoordinationTableRow row : this.tableRows) {
             if(!row.isDerived()) {
                 for(PostCoordinationTableRow childRow : this.tableRows) {
-                    if(childRow.isDerived() && childRow.getLinearizationDefinition().getCoreLinId().equalsIgnoreCase(row.getLinearizationDefinition().getId())) {
+                    if(childRow.isDerived() && childRow.getLinearizationDefinition().getCoreLinId().equalsIgnoreCase(row.getLinearizationDefinition().getLinearizationId())) {
                         for(PostCoordinationTableCell parentCell: row.getCellList()) {
                             for(PostCoordinationTableCell childCell: childRow.getCellList()) {
                                 if(parentCell.getAxisLabel().getPostCoordinationAxis().equalsIgnoreCase(childCell.getAxisLabel().getPostCoordinationAxis())) {
@@ -340,7 +340,7 @@ public void setTableData(WhoficEntityPostCoordinationSpecification whoficSpecifi
                 for (PostCoordinationTableCell cell : row.getCellList()) {
                     PostCoordinationSpecification specification = whoficSpecification.getPostCoordinationSpecifications().stream()
                             .filter(spec -> spec.getLinearizationView()
-                                    .equalsIgnoreCase(cell.getLinearizationDefinition().getWhoficEntityIri()))
+                                    .equalsIgnoreCase(cell.getLinearizationDefinition().getLinearizationUri()))
                             .findFirst()
                             .orElse(null);
 

diff --git a/...main/java/edu/stanford/bmir/protege/web/shared/linearization/LinearizationDefinition.java b/...main/java/edu/stanford/bmir/protege/web/shared/linearization/LinearizationDefinition.java
@@ -10,9 +10,9 @@
 
 @GwtCompatible(serializable = true)
 public class LinearizationDefinition implements IsSerializable, Serializable {
-    private String id;
+    private String linearizationId;
 
-    private String whoficEntityIri;
+    private String linearizationUri;
 
     private String linearizationMode;
 
@@ -30,28 +30,28 @@ private LinearizationDefinition() {
     }
 
     @JsonCreator
-    public LinearizationDefinition(@JsonProperty("Id") String id,
-                                   @JsonProperty("whoficEntityIri") String whoficEntityIri,
+    public LinearizationDefinition(@JsonProperty("linearizationId") String linearizationId,
+                                   @JsonProperty("linearizationUri") String linearizationUri,
                                    @JsonProperty("linearizationMode") String linearizationMode,
                                    @JsonProperty("rootId") String rootId,
-                                   @JsonProperty("DisplayLabel") String displayLabel,
+                                   @JsonProperty("displayLabel") String displayLabel,
                                    @JsonProperty("coreLinId") String coreLinId,
                                    @JsonProperty("sortingCode") String sortingCode) {
-        this.id = id;
-        this.whoficEntityIri = whoficEntityIri;
+        this.linearizationId = linearizationId;
+        this.linearizationUri = linearizationUri;
         this.linearizationMode = linearizationMode;
         this.rootId = rootId;
         this.coreLinId = coreLinId;
         this.sortingCode = sortingCode;
         this.displayLabel = displayLabel;
     }
 
-    public String getId() {
-        return id;
+    public String getLinearizationId() {
+        return linearizationId;
     }
 
-    public String getWhoficEntityIri() {
-        return whoficEntityIri;
+    public String getLinearizationUri() {
+        return linearizationUri;
     }
 
     public String getLinearizationMode() {
@@ -77,8 +77,8 @@ public String getDisplayLabel() {
     @Override
     public String toString() {
         return "LinearizationDefinition{" +
-                "id='" + id + '\'' +
-                ", whoficEntityIri='" + whoficEntityIri + '\'' +
+                "linearizationId='" + linearizationId + '\'' +
+                ", linearizationUri='" + linearizationUri + '\'' +
                 ", linearizationMode='" + linearizationMode + '\'' +
                 ", rootId='" + rootId + '\'' +
                 ", coreLinId='" + coreLinId + '\'' +