Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PT #164971098: Fix Inro URL constants. Properly create Location instance

Browse Source
This commit is contained in:
BoykoAlex
2019-03-28 17:27:17 -04:00
parent 46a936b324
commit 6b514c0831
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
View File

@@ -430,7 +430,9 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
if (element != null ) {
IJavaProject project = element.getJavaProject() == null ? ResourceUtils.getJavaProject(projectUri) : element.getJavaProject();
if (project != null) {
return new Location(Utils.eclipseIntroUri(project.getElementName(), params.getBindingKey()).toString(), null);
Location location = new Location();
location.setUri(Utils.eclipseIntroUri(project.getElementName(), params.getBindingKey()).toString());
return location;
}
}
} catch (Exception e) {

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/Utils.java
View File

@@ -31,7 +31,7 @@ import org.eclipse.ui.PlatformUI;
@SuppressWarnings("restriction")
public class Utils {
private static final String URL_PREFIX = "https://org.eclipse.ui.intro/execute?command=";
private static final String URL_PREFIX = "http://org.eclipse.ui.intro/execute?command=";
private static final String EQUALS = "=";
private static final String PARAMETERS_SEPARATOR = ",";
private static final String PARAMETERS_START = "(";

10
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseJavaElementLocationProvider.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Pivotal, Inc.
* Copyright (c) 2019 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,7 +21,13 @@ public class EclipseJavaElementLocationProvider implements JavaElementLocationPr
@Override
public Location findLocation(IJavaProject project, IMember member) {
URI uri = EclipseSourceLinks.eclipseIntroUri(project, member);
return uri == null ? null : new Location(uri.toString(), null);
if (uri == null) {
return null;
} else {
Location location = new Location();
location.setUri(uri.toString());
return location;
}
}
}

2
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseSourceLinks.java
View File

@@ -31,7 +31,7 @@ import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFin
*/
public class EclipseSourceLinks implements SourceLinks {
private static final String URL_PREFIX = "https://org.eclipse.ui.intro/execute?command=";
private static final String URL_PREFIX = "http://org.eclipse.ui.intro/execute?command=";
private static final String EQUALS = "=";
private static final String PARAMETERS_SEPARATOR = ",";
private static final String PARAMETERS_START = "(";