From 60da97b2798d589361a0659ffff37cea043dc3b3 Mon Sep 17 00:00:00 2001 From: nsingh Date: Mon, 30 Oct 2017 18:13:37 -0700 Subject: [PATCH] Move conditional to commons --- .../ConditionalsLiveHoverProvider.java | 14 +--------- .../boot/app/cli/RunningAppConditional.java | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RunningAppConditional.java diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java index bd09eea96..8993b46e8 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java @@ -31,6 +31,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.springframework.ide.vscode.boot.java.handlers.HoverProvider; import org.springframework.ide.vscode.boot.java.utils.HoverContentUtils; +import org.springframework.ide.vscode.commons.boot.app.cli.RunningAppConditional; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; import org.springframework.ide.vscode.commons.util.BadLocationException; import org.springframework.ide.vscode.commons.util.Log; @@ -229,17 +230,4 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { return Optional.empty(); } } - - public static class RunningAppConditional { - - public final String condition; - public final String message; - public final SpringBootApp app; - - public RunningAppConditional(SpringBootApp app, String condition, String message) { - this.condition = condition; - this.message = message; - this.app = app; - } - } } diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RunningAppConditional.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RunningAppConditional.java new file mode 100644 index 000000000..4454e4cdc --- /dev/null +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RunningAppConditional.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2017 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.commons.boot.app.cli; + +import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; + +public class RunningAppConditional { + + public final String condition; + public final String message; + public final SpringBootApp app; + + public RunningAppConditional(SpringBootApp app, String condition, String message) { + this.condition = condition; + this.message = message; + this.app = app; + } +} \ No newline at end of file