From 395cdc9a52dd555ea85087854570956e5aa16e3a Mon Sep 17 00:00:00 2001 From: Tim Brunson Date: Tue, 1 Jun 2021 11:36:37 -0700 Subject: [PATCH 1/2] made panel protected --- .../java/org/reactome/web/diagram/client/ViewerContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/reactome/web/diagram/client/ViewerContainer.java b/src/main/java/org/reactome/web/diagram/client/ViewerContainer.java index 8290c97b..087e877c 100644 --- a/src/main/java/org/reactome/web/diagram/client/ViewerContainer.java +++ b/src/main/java/org/reactome/web/diagram/client/ViewerContainer.java @@ -79,6 +79,7 @@ public ViewerContainer(EventBus eventBus) { leftTopLauncher = new LeftTopLauncherPanel(eventBus); rightContainerPanel = new RightContainerPanel(); bottomContainerPanel = new BottomContainerPanel(); + rightTopLauncherPanel = new RightTopLauncherPanel(eventBus); initialise(); @@ -151,7 +152,7 @@ protected void initialise() { //Launcher panels this.add(leftTopLauncher); - this.add(new RightTopLauncherPanel(eventBus)); + this.add(rightTopLauncherPanel); //Settings panel rightContainerPanel.add(hideableContainerPanel = new HideableContainerPanel(eventBus)); From 73617ae21a4e68f080f879f212ea9a8970f9b32a Mon Sep 17 00:00:00 2001 From: Tim Brunson Date: Thu, 22 Jul 2021 11:14:52 -0700 Subject: [PATCH 2/2] idg specific changes not to be merged with master and updated readme for idg branch --- README.md | 3 +++ .../web/diagram/context/ContextInfoPanel.java | 12 ++++++------ .../web/diagram/client/images/watermark.png | Bin 8526 -> 23287 bytes 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e522ac73..e00ed6d2 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +# DO NOT MERGE THIS BRANCH WITH MASTER +This branch contains IDG specific changes. It removes the analysis tab from the details panel and removes the interactors tab from the context panel of a context selected entity. + [](https://reactome.org) Diagram Viewer diff --git a/src/main/java/org/reactome/web/diagram/context/ContextInfoPanel.java b/src/main/java/org/reactome/web/diagram/context/ContextInfoPanel.java index 59c819e0..9774870b 100755 --- a/src/main/java/org/reactome/web/diagram/context/ContextInfoPanel.java +++ b/src/main/java/org/reactome/web/diagram/context/ContextInfoPanel.java @@ -30,7 +30,7 @@ public class ContextInfoPanel extends Composite implements ClickHandler { private List