Skip to content

fixed the bug by adding conditions for OtherEntity and GenomeEncodedEntity #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gsviteri merged 2 commits into from
May 5, 2020
Merged

fixed the bug by adding conditions for OtherEntity and GenomeEncodedEntity #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32c23e8
fixed the bug by adding conditions for OtherEntity and GenomeEncodedE…
yusra-haider Apr 30, 2020
73baf22
removed unneccessary code
yusra-haider Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...va/org/reactome/web/pwp/client/details/common/widgets/panels/DatabaseIdentifierPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,22 @@ public DatabaseIdentifierPanel(DetailsPanel parentPanel, PhysicalEntity pe) {
initialize();
break;
}
} else if (pe instanceof OtherEntity) {
for (DatabaseIdentifier identifier : pe.getCrossReference()) {
this.reference = identifier.getDatabaseName();
this.id = identifier.getIdentifier();
this.url = identifier.getUrl();
initialize();
break;
}
} else if (pe instanceof GenomeEncodedEntity) {
for (DatabaseIdentifier identifier : pe.getCrossReference()) {
this.reference = identifier.getDatabaseName();
this.id = identifier.getIdentifier();
this.url = identifier.getUrl();
initialize();
break;
}
} else {
initWidget(new Label("No reference entity"));
}
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/org/reactome/web/pwp/client/details/common/widgets/panels/PhysicalEntityPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@ public void onClick(ClickEvent event) {

Widget getCrossReferenceTree(){
TreeItem references = new TreeItem(SafeHtmlUtils.fromString("External cross-references"));

DatabaseIdentifierPanel dbIdPanel = new DatabaseIdentifierPanel(physicalEntity);
TreeItem reference = dbIdPanel.asTreeItem();
reference.setState(true, false);
references.addItem(reference);

//Links to the complex portal have been added as cross references for Complexes but they
//do not have reference entity. The first condition is a hack to accommodate this case
if(!(this.physicalEntity instanceof Complex) && !this.physicalEntity.getCrossReference().isEmpty()){
if(!(this.physicalEntity instanceof Complex) && !(this.physicalEntity instanceof GenomeEncodedEntity) &&
!(this.physicalEntity instanceof OtherEntity) && !this.physicalEntity.getCrossReference().isEmpty()){
Collections.sort(physicalEntity.getCrossReference());
for (DatabaseIdentifier databaseIdentifier : this.physicalEntity.getCrossReference()) {
dbIdPanel = new DatabaseIdentifierPanel(databaseIdentifier);
Expand Down