diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF index a82581956..78dfaae9f 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF @@ -29,7 +29,6 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", org.eclipse.jdt.annotation, org.eclipse.mylyn.wikitext.markdown, org.eclipse.mylyn.wikitext, - org.springframework.ide.eclipse.boot.dash;bundle-version="3.9.12", com.google.gson, org.eclipse.lsp4e.jdt;bundle-version="0.10.0", org.springsource.ide.eclipse.commons.boot.ls diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml index bb1ef7f78..830279f94 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml @@ -341,5 +341,11 @@ class="org.springframework.tooling.boot.ls.BootDashInjections"> + + + + diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootDashInjections.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootDashInjections.java index a19672e33..65d8f7bf2 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootDashInjections.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootDashInjections.java @@ -1,28 +1,25 @@ -/******************************************************************************* - * 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 - * https://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Pivotal, Inc. - initial API and implementation - *******************************************************************************/ -package org.springframework.tooling.boot.ls; - -import org.springframework.ide.eclipse.boot.dash.di.EclipseBeanLoader; -import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext; -import org.springframework.ide.eclipse.boot.dash.model.DefaultBootDashModelContext; -import org.springframework.ide.eclipse.boot.dash.remoteapps.RemoteBootAppsDataHolder; -import org.springframework.tooling.boot.ls.prefs.RemoteAppsFromPrefsDataContributor; - -/** - * Contributes bean definitions to {@link DefaultBootDashModelContext} - */ -public class BootDashInjections implements EclipseBeanLoader.Contribution { - - @Override - public void applyBeanDefinitions(SimpleDIContext context) throws Exception { - context.defInstance(RemoteBootAppsDataHolder.Contributor.class, RemoteAppsFromPrefsDataContributor.INSTANCE); - } -} +///******************************************************************************* +// * 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 +// * https://www.eclipse.org/legal/epl-v10.html +// * +// * Contributors: +// * Pivotal, Inc. - initial API and implementation +// *******************************************************************************/ +//package org.springframework.tooling.boot.ls; +// +//import org.springframework.tooling.boot.ls.prefs.RemoteAppsFromPrefsDataContributor; +//import org.springsource.ide.eclipse.commons.boot.ls.remoteapps.RemoteBootAppsDataHolder; +// OBSOLETE: replaced by eclipse extension in plugin xml +///** +// * Contributes bean definitions to {@link DefaultBootDashModelContext} +// */ +//public class BootDashInjections implements EclipseBeanLoader.Contribution { +// +// @Override +// public void applyBeanDefinitions(SimpleDIContext context) throws Exception { +// context.defInstance(RemoteBootAppsDataHolder.Contributor.class, RemoteAppsFromPrefsDataContributor.INSTANCE); +// } +//} diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPlugin.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPlugin.java index ce4a4635f..f72382ddd 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPlugin.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPlugin.java @@ -21,8 +21,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; -import org.springframework.ide.eclipse.boot.dash.remoteapps.RemoteBootAppsDataHolder; -import org.springsource.ide.eclipse.commons.livexp.core.LiveSetVariable; /** * Boot-Java LS extension plugin diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java index 554d4871b..665cc59e1 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java @@ -30,9 +30,9 @@ import org.eclipse.lsp4j.InitializeResult; import org.eclipse.lsp4j.jsonrpc.messages.Message; import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage; import org.eclipse.lsp4j.services.LanguageServer; -import org.springframework.ide.eclipse.boot.dash.remoteapps.RemoteBootAppsDataHolder; -import org.springframework.ide.eclipse.boot.dash.remoteapps.RemoteBootAppsDataHolder.RemoteAppData; import org.springframework.tooling.ls.eclipse.commons.LanguageServerCommonsActivator; +import org.springsource.ide.eclipse.commons.boot.ls.remoteapps.RemoteBootAppsDataHolder; +import org.springsource.ide.eclipse.commons.boot.ls.remoteapps.RemoteBootAppsDataHolder.RemoteAppData; import org.springsource.ide.eclipse.commons.livexp.core.ValueListener; import com.google.common.collect.ImmutableSet; diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsFromPrefsDataContributor.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsFromPrefsDataContributor.java index 83147063e..089731024 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsFromPrefsDataContributor.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsFromPrefsDataContributor.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.springframework.tooling.boot.ls.prefs; -import org.springframework.ide.eclipse.boot.dash.remoteapps.RemoteBootAppsDataHolder; -import org.springframework.ide.eclipse.boot.dash.remoteapps.RemoteBootAppsDataHolder.RemoteAppData; +import org.springsource.ide.eclipse.commons.boot.ls.remoteapps.RemoteBootAppsDataHolder; +import org.springsource.ide.eclipse.commons.boot.ls.remoteapps.RemoteBootAppsDataHolder.RemoteAppData; import org.springsource.ide.eclipse.commons.livexp.core.ObservableSet; import org.springsource.ide.eclipse.commons.livexp.ui.Disposable; @@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableSet; public class RemoteAppsFromPrefsDataContributor implements RemoteBootAppsDataHolder.Contributor { - public static final RemoteAppsFromPrefsDataContributor INSTANCE = new RemoteAppsFromPrefsDataContributor(); private RemoteAppsPrefs prefs = new RemoteAppsPrefs(); private RemoteAppsFromPrefsDataContributor() {} diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java index f056b00ee..f5a4333e4 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/RemoteAppsPrefs.java @@ -12,8 +12,8 @@ package org.springframework.tooling.boot.ls.prefs; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; -import org.springframework.ide.eclipse.boot.dash.remoteapps.RemoteBootAppsDataHolder.RemoteAppData; import org.springframework.tooling.boot.ls.BootLanguageServerPlugin; +import org.springsource.ide.eclipse.commons.boot.ls.remoteapps.RemoteBootAppsDataHolder.RemoteAppData; import org.springsource.ide.eclipse.commons.livexp.ui.Disposable; import org.springsource.ide.eclipse.commons.livexp.util.ExceptionUtil; import org.springsource.ide.eclipse.commons.livexp.util.Log;