Move ApplicationLogConsole to cf plugin

spring-attic · Feb 4, 2020 · d400b36 · d400b36
1 parent 04e882e
commit d400b36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...oundry/console/ApplicationLogConsole.java → ...ash/cf/console/ApplicationLogConsole.java b/...oundry/console/ApplicationLogConsole.java → ...ash/cf/console/ApplicationLogConsole.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cloudfoundry.console;
+package org.springframework.ide.eclipse.boot.dash.cf.console;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,11 +26,13 @@
 import org.eclipse.ui.console.IOConsoleOutputStream;
 import org.eclipse.ui.console.MessageConsole;
 import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
-import org.springframework.ide.eclipse.boot.util.Log;
+import org.springframework.ide.eclipse.boot.dash.cloudfoundry.console.CfLogType;
+import org.springframework.ide.eclipse.boot.dash.cloudfoundry.console.IApplicationLogConsole;
+import org.springframework.ide.eclipse.boot.dash.cloudfoundry.console.LogType;
+import org.springsource.ide.eclipse.commons.livexp.util.Log;
 
 import reactor.core.Disposable;
 
-@SuppressWarnings("restriction")
 public class ApplicationLogConsole extends MessageConsole implements IPropertyChangeListener, IApplicationLogConsole {
 
 	private Map<LogType, IOConsoleOutputStream> activeStreams = new HashMap<>();
@@ -77,7 +79,7 @@ public synchronized boolean writeApplicationLog(String message, LogType type) {
 					return true;
 				}
 			} catch (IOException e) {
-				BootDashActivator.log(e);
+				Log.log(e);
 			}
 		}
 		return false;

diff --git a/....dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/console/CloudAppLogManager.java b/....dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/console/CloudAppLogManager.java
@@ -19,7 +19,6 @@
 import org.springframework.ide.eclipse.boot.dash.cf.runtarget.CloudFoundryRunTarget;
 import org.springframework.ide.eclipse.boot.dash.cloudfoundry.CloudFoundryTargetProperties;
 import org.springframework.ide.eclipse.boot.dash.cloudfoundry.client.ClientRequests;
-import org.springframework.ide.eclipse.boot.dash.cloudfoundry.console.ApplicationLogConsole;
 import org.springframework.ide.eclipse.boot.dash.cloudfoundry.console.LogType;
 import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
 import org.springframework.ide.eclipse.boot.dash.model.runtargettypes.TargetProperties;