Skip to content

Commit 156a223

Browse files
author
Guilherme Viteri
committed
speciesList directly in the StateManager
1 parent e5b42f4 commit 156a223

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

src/main/java/org/reactome/web/pwp/client/manager/state/State.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public interface StateLoadedHandler {
3030
}
3131

3232
private Species species;
33-
private List<Species> speciesList;
3433

3534
/**
3635
* event can either be a Pathway or a ReactionLikeEvent (these are linkable as default parameters)
@@ -132,13 +131,8 @@ public State(State state) {
132131
this.analysisStatus = state.analysisStatus;
133132
this.flag = state.flag;
134133
this.flagIncludeInteractors = state.flagIncludeInteractors;
135-
this.speciesList = state.speciesList;
136134
}
137135

138-
public void setSpeciesList(List<Species> speciesList) { this.speciesList = speciesList;}
139-
140-
public List<Species> getSpeciesList() { return this.speciesList;}
141-
142136
void doConsistencyCheck(final StateLoadedHandler handler) {
143137
if (event != null) {
144138
if ((event instanceof Pathway) && ((Pathway) event).getHasDiagram()) {

src/main/java/org/reactome/web/pwp/client/manager/state/StateManager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public class StateManager implements BrowserModule.Manager, ValueChangeHandler<S
3838

3939
private State currentState;
4040

41+
private List<Species> speciesList;
42+
4143
public StateManager(EventBus eventBus) {
4244
this.eventBus = eventBus;
4345
new TitleManager(eventBus);
@@ -99,8 +101,7 @@ public void onAnalysisReset() {
99101

100102
@Override
101103
public void onSpeciesListRetrieved(SpeciesListRetrievedEvent event) {
102-
State state = new State(this.currentState);
103-
state.setSpeciesList(event.getSpeciesList());
104+
this.speciesList = event.getSpeciesList();
104105
}
105106

106107
@Override
@@ -135,7 +136,7 @@ public void onDatabaseObjectSelected(DatabaseObjectSelectedEvent event) {
135136
currentState.setEvent(e);
136137
currentState.setPath(path);
137138
}
138-
if (species != null && !species.equals(currentState.getSpecies()) && currentState.getSpeciesList().contains(species)) {
139+
if (species != null && !species.equals(currentState.getSpecies()) && speciesList.contains(species)) {
139140
eventBus.fireEventFromSource(new SpeciesSelectedEvent(species), this);
140141
return;
141142
}

0 commit comments

Comments
 (0)