diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF index 8ce1db20c..e958ea456 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF @@ -20,9 +20,7 @@ Require-Bundle: org.eclipse.ui, org.springsource.ide.eclipse.commons.core;bundle-version="3.9.2", io.projectreactor.reactor-core;bundle-version="3.0.7", org.reactivestreams.reactive-streams;bundle-version="1.0.0", - org.springframework.ide.eclipse.boot.dash, org.springsource.ide.eclipse.commons.frameworks.core, - org.springframework.ide.eclipse.boot, org.eclipse.ui.workbench, org.eclipse.ui.ide, org.eclipse.ui.editors diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target.png new file mode 100644 index 000000000..c6aeae4d4 Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target.png differ diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target@2x.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target@2x.png new file mode 100644 index 000000000..e70d3b87c Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target@2x.png differ diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target_disabled.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target_disabled.png new file mode 100644 index 000000000..d3b175212 Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target_disabled.png differ diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target_disabled@2x.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target_disabled@2x.png new file mode 100644 index 000000000..269321c8a Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/add_target_disabled@2x.png differ diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/refresh.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/refresh.png new file mode 100644 index 000000000..3de2d8a11 Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/refresh.png differ diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/refresh@2x.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/refresh@2x.png new file mode 100644 index 000000000..b8ea425fe Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/icons/refresh@2x.png differ diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java index 1754221ab..8a706102d 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.springframework.tooling.ls.eclipse.gotosymbol; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -32,4 +33,16 @@ public class GotoSymbolPlugin extends AbstractUIPlugin { return instance; } + /** + * Returns an image descriptor for the image file at the given plug-in + * relative path + * + * @param path + * the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(ID, path); + } + } diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SelectionTracker.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SelectionTracker.java index f1991efff..3960de65e 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SelectionTracker.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SelectionTracker.java @@ -32,7 +32,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.DocumentProviderRegistry; import org.eclipse.ui.texteditor.IDocumentProvider; -import org.springframework.ide.eclipse.boot.dash.model.AbstractDisposable; +import org.springsource.ide.eclipse.commons.livexp.core.AbstractDisposable; import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression; import org.springsource.ide.eclipse.commons.livexp.core.LiveVariable; import org.springsource.ide.eclipse.commons.livexp.ui.Disposable; diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsView.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsView.java index 8fab79584..490b22306 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsView.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsView.java @@ -26,8 +26,7 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; -import org.springframework.ide.eclipse.boot.dash.BootDashActivator; -import org.springframework.ide.eclipse.boot.dash.views.sections.ViewPartWithSections; +import org.springframework.tooling.ls.eclipse.gotosymbol.GotoSymbolPlugin; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.GotoSymbolDialogModel; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.GotoSymbolSection; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.InFileSymbolsProvider; @@ -37,6 +36,7 @@ import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.SelectionTracke import org.springsource.ide.eclipse.commons.livexp.ui.ChooseOneSectionCombo; import org.springsource.ide.eclipse.commons.livexp.ui.IPageSection; import org.springsource.ide.eclipse.commons.livexp.ui.SimpleLabelProvider; +import org.springsource.ide.eclipse.commons.livexp.ui.ViewPartWithSections; import org.springsource.ide.eclipse.commons.livexp.util.Log; import com.google.common.collect.ImmutableList; @@ -53,7 +53,7 @@ public class SpringSymbolsView extends ViewPartWithSections { private SpringSymbolsViewModel model; - Action newViewAction = new Action("New View", BootDashActivator.getImageDescriptor("icons/add_target.png")) { + Action newViewAction = new Action("New View", GotoSymbolPlugin.getImageDescriptor("icons/add_target.png")) { @Override public void run() { try { @@ -67,7 +67,7 @@ public class SpringSymbolsView extends ViewPartWithSections { } }; - Action refreshAction = new Action("Refresh", BootDashActivator.getImageDescriptor("icons/refresh.png")) { + Action refreshAction = new Action("Refresh", GotoSymbolPlugin.getImageDescriptor("icons/refresh.png")) { @Override public void run() { model.refreshButton.increment(); diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsViewModel.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsViewModel.java index d8ec21508..c086cf31e 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsViewModel.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/view/SpringSymbolsViewModel.java @@ -13,13 +13,13 @@ package org.springframework.tooling.ls.eclipse.gotosymbol.view; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.ui.IWorkbenchWindow; -import org.springframework.ide.eclipse.boot.dash.livexp.LiveCounter; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.GotoSymbolDialogModel; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.InFileSymbolsProvider; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.InProjectSymbolsProvider; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.InWorkspaceSymbolsProvider; import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.SelectionTracker; import org.springframework.tooling.ls.eclipse.gotosymbol.favourites.FavouritesPreference; +import org.springsource.ide.eclipse.commons.livexp.core.LiveCounter; import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression; public class SpringSymbolsViewModel {