[openrtm-commit:01726] r542 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: META-INF src/jp/go/aist/rtm/rtcbuilder/java

[openrtm ＠ openrtm.org]

Author: ga
Date: 2016-02-21 02:36:53 +0900 (Sun, 21 Feb 2016)
New Revision: 542

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/RtcBuilderJavaPlugin.java
Log:
Modified Logger #3211

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF	2016-02-20 17:36:36 UTC (rev 541)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF	2016-02-20 17:36:53 UTC (rev 542)
@@ -7,14 +7,17 @@
 Bundle-Version: 1.1.0.rc4v20130124
 Bundle-Activator: jp.go.aist.rtm.rtcbuilder.java.RtcBuilderJavaPlugin
 Bundle-Localization: plugin
-Require-Bundle: jp.go.aist.rtm.rtcbuilder,org.eclipse.ui,org.eclipse.c
- ore.runtime
+Require-Bundle: jp.go.aist.rtm.rtcbuilder,
+ org.eclipse.ui,
+ org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Export-Package: jp.go.aist.rtm.rtcbuilder.java,jp.go.aist.rtm.rtcbuild
- er.java.manager,jp.go.aist.rtm.rtcbuilder.java.template.cmake,jp.go.a
- ist.rtm.rtcbuilder.java.template.java,jp.go.aist.rtm.rtcbuilder.java.
- template.java_04,jp.go.aist.rtm.rtcbuilder.java.ui.Perspective
+Export-Package: jp.go.aist.rtm.rtcbuilder.java,
+ jp.go.aist.rtm.rtcbuilder.java.manager,
+ jp.go.aist.rtm.rtcbuilder.java.template.cmake,
+ jp.go.aist.rtm.rtcbuilder.java.template.java,
+ jp.go.aist.rtm.rtcbuilder.java.template.java_04,
+ jp.go.aist.rtm.rtcbuilder.java.ui.Perspective
 Eclipse-BuddyPolicy: registered
 Eclipse-RegisterBuddy: jp.go.aist.rtm.rtcbuilder
 Built-By: isao-_000

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/RtcBuilderJavaPlugin.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/RtcBuilderJavaPlugin.java	2016-02-20 17:36:36 UTC (rev 541)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/RtcBuilderJavaPlugin.java	2016-02-20 17:36:53 UTC (rev 542)
@@ -1,17 +1,20 @@
 package jp.go.aist.rtm.rtcbuilder.java;
 
-import java.util.logging.Logger;
+import jp.go.aist.rtm.toolscommon.profiles.util.LoggerUtil;
 
-import jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin;
-
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The activator class controls the plug-in life cycle
  */
 public class RtcBuilderJavaPlugin extends AbstractUIPlugin {
 
+	private static final Logger LOGGER = LoggerFactory
+			.getLogger(RtcBuilderJavaPlugin.class);
+
 	// The plug-in ID
 	public static final String PLUGIN_ID = "jp.go.aist.rtm.rtcbuilder.java";
 
@@ -22,8 +25,10 @@
 	 * The constructor
 	 */
 	public RtcBuilderJavaPlugin() {
+		LoggerUtil.setup();
+		LOGGER.trace("RtcBuilderJavaPlugin: START");
+
 		plugin = this;
-		getLogger();
 	}
 
 	/*
@@ -31,8 +36,6 @@
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
 	public void start(BundleContext context) throws Exception {
-		RtcBuilderPlugin.addLogger(getLogger());
-		//
 		super.start(context);
 	}
 
@@ -41,8 +44,6 @@
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
 	public void stop(BundleContext context) throws Exception {
-		RtcBuilderPlugin.removeLogger(getLogger());
-		//
 		plugin = null;
 		super.stop(context);
 	}
@@ -56,13 +57,4 @@
 		return plugin;
 	}
 
-	static Logger log;
-
-	public static Logger getLogger() {
-		if (log == null) {
-			log = Logger.getLogger(PLUGIN_ID);
-		}
-		return log;
-	}
-
 }