diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/bootstrap/DefaultIdeInitializationStrategy.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/bootstrap/DefaultIdeInitializationStrategy.java index 07895eed96..a8025e7dc0 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/bootstrap/DefaultIdeInitializationStrategy.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/bootstrap/DefaultIdeInitializationStrategy.java @@ -113,9 +113,6 @@ class DefaultIdeInitializationStrategy implements IdeInitializationStrategy { .then(showUI()) .then( arg -> { - WorkspaceImpl workspace = appContext.getWorkspace(); - browserAddress.setAddress(workspace.getNamespace(), workspace.getConfig().getName()); - eventBus.fireEvent(new BasicIDEInitializedEvent()); }); } diff --git a/ide/commons-gwt/src/main/java/org/eclipse/che/ide/QueryParameters.java b/ide/commons-gwt/src/main/java/org/eclipse/che/ide/QueryParameters.java index 9b33809b40..4dc298b79c 100644 --- a/ide/commons-gwt/src/main/java/org/eclipse/che/ide/QueryParameters.java +++ b/ide/commons-gwt/src/main/java/org/eclipse/che/ide/QueryParameters.java @@ -10,11 +10,11 @@ */ package org.eclipse.che.ide; -import com.google.gwt.user.client.Window.Location; +import static com.google.gwt.user.client.Window.Location.getParameter; +import static com.google.gwt.user.client.Window.Location.getParameterMap; + import java.util.HashMap; -import java.util.List; import java.util.Map; -import javax.inject.Inject; import javax.inject.Singleton; /** @@ -26,14 +26,6 @@ import javax.inject.Singleton; @Singleton public class QueryParameters { - private final Map> cachedParameters; - - @Inject - public QueryParameters() { - // cache the query parameters because IDE changes window's location - cachedParameters = Location.getParameterMap(); - } - /** * Returns the query parameter by the specified name or empty string if parameter was not found. * Note that if multiple parameters have been specified with the same name, the last one will be @@ -43,13 +35,9 @@ public class QueryParameters { * @return query parameter value */ public String getByName(String name) { - List paramsForName = cachedParameters.get(name); + String value = getParameter(name); - if (paramsForName == null) { - return ""; - } else { - return paramsForName.get(paramsForName.size() - 1); - } + return value == null ? "" : value; } /** @@ -63,9 +51,8 @@ public class QueryParameters { */ public Map getAll() { Map parameters = new HashMap<>(); - for (Map.Entry> parametersEntry : cachedParameters.entrySet()) { - parameters.put(parametersEntry.getKey(), parametersEntry.getValue().get(0)); - } + getParameterMap().forEach((key, value) -> parameters.put(key, value.get(0))); + return parameters; } }