Fix URL displayed in desktop GUI

neo4j · Apr 13, 2016 · 9ac888a · 9ac888a
1 parent 0fe98ae
commit 9ac888a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/DesktopModel.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/model/DesktopModel.java
@@ -33,10 +33,9 @@
 import org.neo4j.desktop.model.exceptions.UnsuitableDirectoryException;
 import org.neo4j.desktop.runtime.DesktopConfigurator;
 import org.neo4j.desktop.ui.DesktopModelListener;
-import org.neo4j.graphdb.config.Setting;
 import org.neo4j.helpers.HostnamePort;
-import org.neo4j.kernel.internal.Version;
 import org.neo4j.kernel.configuration.Config;
+import org.neo4j.kernel.internal.Version;
 
 import static java.lang.String.format;
 
@@ -69,7 +68,7 @@ public String getNeo4jVersion()
         return format( "%s", Version.getKernel().getReleaseVersion() );
     }
 
-    public Setting<HostnamePort> getServerAddress()
+    public HostnamePort getServerAddress()
     {
         return serverConfigurator.getServerAddress();
     }

diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/runtime/DesktopConfigurator.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/runtime/DesktopConfigurator.java
@@ -24,7 +24,6 @@
 
 import org.neo4j.dbms.DatabaseManagementSystemSettings;
 import org.neo4j.desktop.config.Installation;
-import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.HostnamePort;
 import org.neo4j.kernel.configuration.Config;
@@ -74,8 +73,8 @@ public String getDatabaseDirectory()
         return dbDir.getAbsolutePath();
     }
 
-    public Setting<HostnamePort> getServerAddress()
+    public HostnamePort getServerAddress()
     {
-        return ServerSettings.httpConnector( config, HttpConnector.Encryption.NONE ).get().address;
+        return ServerSettings.httpConnector( config, HttpConnector.Encryption.NONE ).get().address.from( config );
     }
 }