From 8b5eefbe21a55cd7515acd3c970aec6122372bdf Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 20 Oct 2020 09:56:39 -0400 Subject: [PATCH] Remove unnecessary dependency on boot --- .../META-INF/MANIFEST.MF | 1 - .../AbstractProblemSeverityPreferencesPage.java | 7 +------ .../preferences/ProblemSeverityPreferencesUtil.java | 2 +- .../eclipse/editor/support/yaml/path/YamlNavigable.java | 4 +--- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF index 6a7549603..4d9f3baf6 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF @@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.ui, org.springsource.ide.eclipse.commons.livexp;bundle-version="3.8.4", org.springsource.ide.eclipse.commons.frameworks.core, org.springsource.ide.eclipse.commons.core, - org.springframework.ide.eclipse.boot, io.projectreactor.reactor-core;bundle-version="[3.3.1,3.3.2)", org.reactivestreams.reactive-streams;bundle-version="1.0.0", org.apache.commons.lang3, diff --git a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/AbstractProblemSeverityPreferencesPage.java b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/AbstractProblemSeverityPreferencesPage.java index e64400600..8bb5ebbc5 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/AbstractProblemSeverityPreferencesPage.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/AbstractProblemSeverityPreferencesPage.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.springframework.ide.eclipse.editor.support.preferences; -import static org.springframework.ide.eclipse.editor.support.preferences.ProblemSeverityPreferencesUtil.*; - import java.util.Arrays; import java.util.Comparator; import java.util.List; @@ -19,13 +17,11 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.dialogs.ControlEnableState; import org.eclipse.jface.preference.ComboFieldEditor; -import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; @@ -35,15 +31,14 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.IWorkbenchPropertyPage; -import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.preferences.ScopedPreferenceStore; import org.osgi.service.prefs.BackingStoreException; -import org.springframework.ide.eclipse.boot.util.Log; import org.springframework.ide.eclipse.editor.support.reconcile.ProblemSeverity; import org.springframework.ide.eclipse.editor.support.reconcile.ProblemType; 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.core.UIValueListener; +import org.springsource.ide.eclipse.commons.livexp.util.Log; /** * Abstract superclass to easily implement a preference and/or project property page that allows diff --git a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/ProblemSeverityPreferencesUtil.java b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/ProblemSeverityPreferencesUtil.java index bad4f3b96..b22ec1e4e 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/ProblemSeverityPreferencesUtil.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/preferences/ProblemSeverityPreferencesUtil.java @@ -14,10 +14,10 @@ import java.io.IOException; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore; -import org.springframework.ide.eclipse.boot.util.Log; import org.springframework.ide.eclipse.editor.support.reconcile.ProblemSeverity; import org.springframework.ide.eclipse.editor.support.reconcile.ProblemType; import org.springsource.ide.eclipse.commons.core.util.StringUtil; +import org.springsource.ide.eclipse.commons.livexp.util.Log; /** * @author Kris De Volder diff --git a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/yaml/path/YamlNavigable.java b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/yaml/path/YamlNavigable.java index 19c761e3a..c064a55af 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/yaml/path/YamlNavigable.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/yaml/path/YamlNavigable.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.springframework.ide.eclipse.editor.support.yaml.path; -import java.util.Map; import java.util.stream.Stream; -import org.springframework.ide.eclipse.boot.util.Log; -import org.springframework.ide.eclipse.editor.support.yaml.ast.YamlFileAST; import org.springframework.ide.eclipse.editor.support.yaml.structure.YamlStructureParser.SNode; +import org.springsource.ide.eclipse.commons.livexp.util.Log; /** * Different types of things (e.g. {@link ApplicationYamlAssistContext}, {@link SNode} ...) can