REmove boot/dash deps from gotosymbol dialog

This commit is contained in:
Kris De Volder
2020-09-23 16:16:20 -07:00
parent b7c0707c1d
commit 7fa09894cb
11 changed files with 19 additions and 8 deletions

View File

@@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 484 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 322 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 421 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -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);
}
}

View File

@@ -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;

View File

@@ -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();

View File

@@ -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 {