diff --git a/domino-mvp-api-client/src/main/java/org/dominokit/domino/api/client/mvp/presenter/AbstractPresenter.java b/domino-mvp-api-client/src/main/java/org/dominokit/domino/api/client/mvp/presenter/AbstractPresenter.java index bd257f78..c9e772d3 100644 --- a/domino-mvp-api-client/src/main/java/org/dominokit/domino/api/client/mvp/presenter/AbstractPresenter.java +++ b/domino-mvp-api-client/src/main/java/org/dominokit/domino/api/client/mvp/presenter/AbstractPresenter.java @@ -33,6 +33,7 @@ import org.dominokit.domino.api.shared.extension.GlobalDominoEventListener; import org.dominokit.domino.history.AppHistory; import org.dominokit.domino.history.DominoHistory; +import org.dominokit.domino.history.StateToken; import org.dominokit.domino.history.TokenParameter; public abstract class AbstractPresenter extends DominoPresenter implements Presentable { @@ -164,23 +165,23 @@ public final void onSkippedRouting() { protected void publishState(String token, String title, String data) { routingTask.disable(); - history().fireState(token, title, data); + history().fireState(StateToken.of(token).title(title).data(data)); } protected void publishState( String token, String title, String data, TokenParameter... parameters) { routingTask.disable(); - history().fireState(token, title, data, parameters); + history().fireState(StateToken.of(token).title(title).data(data), parameters); } protected void publishState(String token) { routingTask.disable(); - history().fireState(token); + history().fireState(StateToken.of(token)); } protected void publishState(String token, TokenParameter... parameters) { routingTask.disable(); - history().fireState(token, parameters); + history().fireState(StateToken.of(token), parameters); } protected boolean isAutoActivate() { diff --git a/domino-mvp-desktop/src/main/java/org/dominokit/domino/desktop/client/DesktopStateHistory.java b/domino-mvp-desktop/src/main/java/org/dominokit/domino/desktop/client/DesktopStateHistory.java index 639223aa..c7351902 100644 --- a/domino-mvp-desktop/src/main/java/org/dominokit/domino/desktop/client/DesktopStateHistory.java +++ b/domino-mvp-desktop/src/main/java/org/dominokit/domino/desktop/client/DesktopStateHistory.java @@ -116,39 +116,6 @@ public void forward() { // not implemented for desktop } - @Override - public void pushState(String token, String title, String data) { - // not implemented for desktop - } - - @Override - public void pushState(String token) { - // not implemented for desktop - } - - @Override - public void replaceState(String token, String title, String data) { - // not implemented for desktop - } - - @Override - public void fireState(String token, String title, String data) {} - - @Override - public void fireState(String token) {} - - @Override - public void pushState(String token, String title, String data, TokenParameter... parameters) {} - - @Override - public void pushState(String token, TokenParameter... parameters) {} - - @Override - public void fireState(String token, String title, String data, TokenParameter... parameters) {} - - @Override - public void fireState(String token, TokenParameter... parameters) {} - @Override public void fireCurrentStateHistory(String title) {} @@ -158,45 +125,19 @@ public int getHistoryEntriesCount() { } @Override - public void pushState(String token, String title) {} - - @Override - public void fireState(String token, String title) {} - - @Override - public void pushState(HistoryToken token, String title, String data) {} - - @Override - public void pushState(HistoryToken token, String title) {} - - @Override - public void pushState( - HistoryToken token, String title, String data, TokenParameter... parameters) {} - - @Override - public void pushState(HistoryToken token) {} - - @Override - public void pushState(HistoryToken token, TokenParameter... parameters) {} + public void pushState(StateToken stateToken) {} @Override - public void fireState(HistoryToken token, String title, String data) {} + public void pushState(StateToken stateToken, TokenParameter... parameters) {} @Override - public void fireState(HistoryToken token, String title) {} + public void fireState(StateToken stateToken) {} @Override - public void fireState( - HistoryToken token, String title, String data, TokenParameter... parameters) {} + public void fireState(StateToken stateToken, TokenParameter... parameters) {} @Override - public void fireState(HistoryToken token) {} - - @Override - public void fireState(HistoryToken token, TokenParameter... parameters) {} - - @Override - public void replaceState(HistoryToken token, String title, String data) {} + public void replaceState(StateToken stateToken) {} @Override public HistoryToken currentToken() { @@ -208,6 +149,12 @@ public String getRootPath() { return this.rootPath; } + @Override + public void addInterceptor(HistoryInterceptor interceptor) {} + + @Override + public void removeInterceptor(HistoryInterceptor interceptor) {} + private class HistoryListener { private final StateListener listener; diff --git a/pom.xml b/pom.xml index beff182f..2cbb61dd 100644 --- a/pom.xml +++ b/pom.xml @@ -93,15 +93,15 @@ 3.0.0-M1 1.0.0 - 2.9.0 + 2.10.0 1.0.0-RC1 3.9.0 1.1.0 - 1.0.0-RC6 + 1.0.0-RC8 1.0.0-RC6 1.0.2 1.0.2 - 1.0.0-RC4 + 1.0.0-RC5 1.0.3 2.0-SNAPSHOT