[openrtm-commit:01729] r545 - in trunk/rtmtools/jp.go.aist.rtm.toolscommon: . META-INF src/jp/go/aist/rtm/toolscommon src/jp/go/aist/rtm/toolscommon/corba src/jp/go/aist/rtm/toolscommon/model/component/impl src/jp/go/aist/rtm/toolscommon/model/manager/impl src/jp/go/aist/rtm/toolscommon/synchronizationframework src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview src/jp/go/aist/rtm/toolscommon/util
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 2月 21日 (日) 02:38:11 JST
Author: ga
Date: 2016-02-21 02:38:11 +0900 (Sun, 21 Feb 2016)
New Revision: 545
Modified:
trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.properties
trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ToolsCommonPlugin.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationManager.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
Log:
Modified Logger #3211
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF 2016-02-20 17:38:11 UTC (rev 545)
@@ -27,12 +27,16 @@
uilder,org.apache.commons.lang.enums,org.apache.commons.lang.exceptio
n,org.apache.commons.lang.math,org.apache.commons.lang.mutable,org.ap
ache.commons.lang.text,org.apache.commons.lang.time
-Require-Bundle: org.eclipse.core.runtime,org.eclipse.emf.ecore;visibil
- ity:=reexport,org.eclipse.emf.ecore.xmi;visibility:=reexport,org.ecli
- pse.ui;visibility:=reexport,org.eclipse.ui.views,org.eclipse.core.run
- time;visibility:=reexport,org.eclipse.ui.editors;visibility:=reexport
- ,org.eclipse.core.resources;visibility:=reexport,org.eclipse.ui.ide;v
- isibility:=reexport,jp.go.aist.rtm.toolscommon.profiles
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.ui;visibility:=reexport,
+ org.eclipse.ui.views,
+ org.eclipse.core.runtime;visibility:=reexport,
+ org.eclipse.ui.editors;visibility:=reexport,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ jp.go.aist.rtm.toolscommon.profiles;visibility:=reexport
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: registered
Bundle-Activator: jp.go.aist.rtm.toolscommon.ToolsCommonPlugin
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.properties
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.properties 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.properties 2016-02-20 17:38:11 UTC (rev 545)
@@ -8,7 +8,6 @@
META-INF/,\
plugin.xml,\
plugin.properties,\
- lib/,\
icons/,\
schema/
jars.compile.order = .
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml 2016-02-20 17:38:11 UTC (rev 545)
@@ -77,7 +77,7 @@
<exec executable="n2a.bat">
<arg line="${source}\RTM\*.java"/>
</exec>
-
+
</target>
<target name="clean" description="ビルドで生成されたファイルを削除します">
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ToolsCommonPlugin.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ToolsCommonPlugin.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ToolsCommonPlugin.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -1,18 +1,22 @@
package jp.go.aist.rtm.toolscommon;
-import java.util.logging.Logger;
+import jp.go.aist.rtm.toolscommon.profiles.util.LoggerUtil;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
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 ToolsCommonPlugin extends AbstractUIPlugin {
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(ToolsCommonPlugin.class);
+
// The plug-in ID
public static final String PLUGIN_ID = "jp.go.aist.rtm.toolscommon";
@@ -23,8 +27,10 @@
* The constructor
*/
public ToolsCommonPlugin() {
+ LoggerUtil.setup();
+ LOGGER.trace("ToolsCommonPlugin: START");
+
plugin = this;
- getLogger();
}
/*
@@ -90,13 +96,4 @@
return result;
}
- static Logger log;
-
- public static Logger getLogger() {
- if (log == null) {
- log = Logger.getLogger(PLUGIN_ID);
- }
- return log;
- }
-
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -6,8 +6,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager;
@@ -16,12 +14,17 @@
import org.omg.CosNaming.BindingIteratorHolder;
import org.omg.CosNaming.BindingListHolder;
import org.omg.CosNaming.NamingContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* CORBAに関するユーティリティ
*/
public class CorbaUtil {
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(CorbaUtil.class);
+
/**
* 対象のNamingContextExtから子供のBindingをListとして返す
*
@@ -63,11 +66,13 @@
private static ORB orb = ORB.init(new String[] {}, createProps());
static {
try {
- Method declaredMethod = orb.getClass().getMethod("getLogger", String.class);
- Logger logger = (Logger) declaredMethod.invoke(orb, "");
- logger.setLevel(Level.SEVERE);
+ Method declaredMethod = orb.getClass().getMethod("getLogger",
+ String.class);
+ java.util.logging.Logger logger = (java.util.logging.Logger) declaredMethod
+ .invoke(orb, "");
+ logger.setLevel(java.util.logging.Level.SEVERE);
} catch (Exception e) {
- e.printStackTrace(); // system error
+ LOGGER.error("Fail to get logger", e);
}
}
@@ -98,11 +103,12 @@
}
private static PropertyChangeListener createListner() {
- return new PropertyChangeListener(){
-// @Override
+ return new PropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
setConnectionTimeout();
- }};
+ }
+ };
}
/**
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -10,19 +10,22 @@
import java.util.List;
import java.util.Map;
-import jp.go.aist.rtm.toolscommon.model.component.*;
-
-import jp.go.aist.rtm.toolscommon.model.core.Point;
import jp.go.aist.rtm.toolscommon.corba.CorbaUtil;
import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
import jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification;
import jp.go.aist.rtm.toolscommon.model.component.ConfigurationSet;
import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
+import jp.go.aist.rtm.toolscommon.model.component.ContextHandler;
import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
import jp.go.aist.rtm.toolscommon.model.component.CorbaConfigurationSet;
import jp.go.aist.rtm.toolscommon.model.component.CorbaConnectorProfile;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaContextHandler;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaObserver;
import jp.go.aist.rtm.toolscommon.model.component.CorbaPortSynchronizer;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
import jp.go.aist.rtm.toolscommon.model.component.InPort;
import jp.go.aist.rtm.toolscommon.model.component.NameValue;
@@ -33,6 +36,7 @@
import jp.go.aist.rtm.toolscommon.model.component.ServicePort;
import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
import jp.go.aist.rtm.toolscommon.model.component.SystemDiagramKind;
+import jp.go.aist.rtm.toolscommon.model.core.Point;
import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.ecore.EClass;
@@ -41,13 +45,14 @@
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.omg.PortableServer.Servant;
import org.omg.CORBA.Any;
import org.omg.CORBA.TCKind;
+import org.omg.PortableServer.Servant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import RTC.ComponentProfile;
import RTC.ExecutionContextProfile;
-import RTC.ExecutionContextService;
import RTC.PortProfile;
import RTC.RTObject;
import _SDOPackage.Configuration;
@@ -62,6 +67,10 @@
*/
public class ComponentFactoryImpl extends EFactoryImpl implements
ComponentFactory {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(ComponentFactoryImpl.class);
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
@@ -731,7 +740,7 @@
}
}
} catch (Exception e) {
- e.printStackTrace();// system error
+ LOGGER.error("Fail to insert string. value=" + initialValue, e);
}
return any;
@@ -748,12 +757,12 @@
if (((Any) instanceValue).type().kind() == TCKind.tk_wstring) {
result = ((Any) instanceValue).extract_wstring();
} else if (((Any) instanceValue).type().kind() == TCKind.tk_string) {
- result = ((Any) instanceValue).extract_string();
+ result = ((Any) instanceValue).extract_string();
} else {
result = ((Any) instanceValue).extract_Object().toString();
}
} catch (Exception e) {
- e.printStackTrace(); // system error/
+ LOGGER.error("Fail to extract string. value=" + instanceValue, e);
}
return (result != null) ? result : "";
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -18,7 +18,6 @@
import jp.go.aist.rtm.toolscommon.model.component.ContextHandler;
import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
-import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
import jp.go.aist.rtm.toolscommon.model.component.InPort;
import jp.go.aist.rtm.toolscommon.model.component.NameValue;
import jp.go.aist.rtm.toolscommon.model.component.OutPort;
@@ -41,6 +40,8 @@
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <!-- begin-user-doc -->
@@ -78,6 +79,10 @@
* @generated
*/
public abstract class ComponentImpl extends WrapperObjectImpl implements Component {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(ComponentImpl.class);
+
/**
* The cached value of the '{@link #getConfigurationSets() <em>Configuration Sets</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -505,8 +510,8 @@
}
}
return result;
- } catch (ConcurrentModificationException ex) {
- ex.printStackTrace();
+ } catch (ConcurrentModificationException e) {
+ LOGGER.error("Fail to select ports", e);
// 別スレッドで更新がかかった時は、とりあえず空のリストを返しておく
return new BasicEList<E>();
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -34,6 +34,8 @@
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.ui.views.properties.IPropertySource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <!-- begin-user-doc -->
@@ -51,6 +53,10 @@
* @generated
*/
public class ComponentSpecificationImpl extends ComponentImpl implements ComponentSpecification {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(ComponentSpecificationImpl.class);
+
/**
* The default value of the '{@link #getAliasName() <em>Alias Name</em>}' attribute.
* <!-- begin-user-doc -->
@@ -550,7 +556,7 @@
try {
refMap.syncronizeLocal(this);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to synchronize local", e);
}
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -54,6 +54,8 @@
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.ui.views.properties.IPropertySource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import RTC.ComponentProfile;
import RTC.RTObject;
@@ -92,6 +94,10 @@
* @generated
*/
public class CorbaComponentImpl extends ComponentImpl implements CorbaComponent {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(CorbaComponentImpl.class);
+
/**
* The default value of the '{@link #getCorbaObject() <em>Corba Object</em>}' attribute.
* <!-- begin-user-doc -->
@@ -1051,7 +1057,7 @@
}
}
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to activate configuration-set", e);
return false;
}
return true;
@@ -1074,11 +1080,11 @@
}
return org.set_members(list.toArray(new SDO[0]));
} catch (NotAvailable e) {
- e.printStackTrace();
+ LOGGER.error("Fail to set members (not available)", e);
} catch (InternalError e) {
- e.printStackTrace();
+ LOGGER.error("Fail to set members (internal)", e);
} catch (InvalidParameter e) {
- e.printStackTrace();
+ LOGGER.error("Fail to set members (invalid parameter)", e);
}
return false;
}
@@ -1111,11 +1117,11 @@
}
return org.add_members(list.toArray(new SDO[0]));
} catch (NotAvailable e) {
- e.printStackTrace();
+ LOGGER.error("Fail to add members (not available)", e);
} catch (InternalError e) {
- e.printStackTrace();
+ LOGGER.error("Fail to add members (internal)", e);
} catch (InvalidParameter e) {
- e.printStackTrace();
+ LOGGER.error("Fail to add members (invalid parameter)", e);
}
return false;
}
@@ -1152,11 +1158,11 @@
return org.remove_member(corbaComponent.getCorbaObjectInterface()
.get_sdo_id());
} catch (NotAvailable e) {
- e.printStackTrace();
+ LOGGER.error("Fail to remove member (not available)", e);
} catch (InternalError e) {
- e.printStackTrace();
+ LOGGER.error("Fail to remove member (internal)", e);
} catch (InvalidParameter e) {
- e.printStackTrace();
+ LOGGER.error("Fail to remove member (invalid parameter)", e);
}
return false;
}
@@ -1200,7 +1206,7 @@
}
result = true;
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to update configuration-set", e);
result = false;
}
return result;
@@ -1779,7 +1785,7 @@
try {
referenceMapping.syncronizeLocal(this);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to synchronize local", e);
return;
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -6,9 +6,6 @@
*/
package jp.go.aist.rtm.toolscommon.model.component.impl;
-import java.util.logging.Logger;
-
-import jp.go.aist.rtm.toolscommon.ToolsCommonPlugin;
import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
@@ -17,6 +14,8 @@
import org.eclipse.emf.ecore.EClass;
import org.omg.PortableServer.Servant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static jp.go.aist.rtm.toolscommon.util.RTMixin.*;
@@ -31,7 +30,8 @@
*/
public class CorbaLogObserverImpl extends CorbaObserverImpl implements CorbaLogObserver {
- static Logger log = ToolsCommonPlugin.getLogger();
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(CorbaLogObserverImpl.class);
public static final String[] LEVEL_NAMES = new String[] { "SILENT", //
"ERROR", //
@@ -141,8 +141,8 @@
}
public void save(OpenRTM.LogRecord record) {
- log.info("publish(" + LEVEL_NAMES[record.level.value()] + ", "
- + record.loggername + ", " + record.message + ")");
+ LOGGER.info("publish({}, {}, {})", LEVEL_NAMES[record.level.value()],
+ record.loggername, record.message);
RTCLogStore.eINSTANCE.save(serviceProfile.id, rtcName, record);
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -7,11 +7,7 @@
package jp.go.aist.rtm.toolscommon.model.component.impl;
import java.util.UUID;
-import java.util.logging.Logger;
-import _SDOPackage.ServiceProfile;
-
-import jp.go.aist.rtm.toolscommon.ToolsCommonPlugin;
import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
import jp.go.aist.rtm.toolscommon.model.component.CorbaObserver;
@@ -20,19 +16,20 @@
import jp.go.aist.rtm.toolscommon.ui.propertysource.CorbaObserverPropertySource;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.ui.views.properties.IPropertySource;
-
import org.omg.CORBA.ORB;
import org.omg.CORBA.ORBPackage.InvalidName;
import org.omg.PortableServer.POA;
import org.omg.PortableServer.POAHelper;
import org.omg.PortableServer.Servant;
import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import _SDOPackage.ServiceProfile;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Corba Observer</b></em>'.
@@ -48,6 +45,10 @@
* @generated
*/
public class CorbaObserverImpl extends EObjectImpl implements CorbaObserver {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(CorbaObserverImpl.class);
+
/**
* The default value of the '{@link #getServiceProfile() <em>Service Profile</em>}' attribute.
* <!-- begin-user-doc -->
@@ -88,8 +89,6 @@
*/
protected Servant servant = SERVANT_EDEFAULT;
- static Logger log = ToolsCommonPlugin.getLogger();
-
protected IPropertyMap properties;
static ORB orb = null;
@@ -106,10 +105,10 @@
rootpoa = POAHelper.narrow(orb
.resolve_initial_references("RootPOA"));
rootpoa.the_POAManager().activate();
- } catch (InvalidName e1) {
- e1.printStackTrace();
+ } catch (InvalidName e) {
+ LOGGER.error("Fail to resolve reference RootPOA", e);
} catch (AdapterInactive e) {
- e.printStackTrace();
+ LOGGER.error("Fail to activate POAManager", e);
}
}
@@ -210,6 +209,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public boolean attachComponent(CorbaComponent component) {
// TODO: implement this method
// Ensure that you remove @generated or mark it @generated NOT
@@ -221,6 +221,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public boolean detachComponent() {
// TODO: implement this method
// Ensure that you remove @generated or mark it @generated NOT
@@ -232,6 +233,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public boolean finish() {
// TODO: implement this method
// Ensure that you remove @generated or mark it @generated NOT
@@ -244,11 +246,11 @@
serviceProfile.id = UUID.randomUUID().toString();
result = config.add_service_profile(serviceProfile);
//
- if( result ) {
- log.info("add_service_profile: id=" + serviceProfile.id
- + " type=" + serviceProfile.interface_type + " ior="
- + serviceProfile.service + " obs="
- + this.getClass().getName());
+ if (result) {
+ LOGGER.info(
+ "add_service_profile: id={} type={} ior={} obs={}",
+ serviceProfile.id, serviceProfile.interface_type,
+ serviceProfile.service, this.getClass().getName());
}
} catch (Exception e) {
result = false;
@@ -261,10 +263,9 @@
try {
result = config.remove_service_profile(serviceProfile.id);
//
- log.info("remove_service_profile: id=" + serviceProfile.id
- + " type=" + serviceProfile.interface_type + " ior="
- + serviceProfile.service + " obs="
- + this.getClass().getName());
+ LOGGER.info("remove_service_profile: id={} type={} ior={} obs={}",
+ serviceProfile.id, serviceProfile.interface_type,
+ serviceProfile.service, this.getClass().getName());
} catch (Exception e) {
result = false;
}
@@ -316,6 +317,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public IPropertyMap getPropertyMap() {
return properties;
}
@@ -370,7 +372,7 @@
return result.toString();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
java.lang.Object result = null;
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -13,6 +13,10 @@
import jp.go.aist.rtm.toolscommon.model.component.CorbaPortSynchronizer;
import jp.go.aist.rtm.toolscommon.model.component.Port;
import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import RTC.ConnectorProfileHolder;
import RTC.PortService;
import RTC.ReturnCode_t;
@@ -28,6 +32,9 @@
*/
public class CorbaPortConnectorImpl extends PortConnectorImpl implements PortConnector {
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(CorbaPortConnectorImpl.class);
+
@Override
public boolean createConnectorR() {
return createConnectorR(getSource(), getTarget(), getConnectorProfile());
@@ -71,7 +78,7 @@
return ret == RTC.ReturnCode_t.RTC_OK;
} catch (RuntimeException e) {
- e.printStackTrace();
+ LOGGER.error("Fail to create connector", e);
}
return false;
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -6,14 +6,26 @@
*/
package jp.go.aist.rtm.toolscommon.model.component.impl;
+import static jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager.KEY_STATUS_OBSERVER_HB_ENABLE;
+import static jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager.KEY_STATUS_OBSERVER_HB_INTERVAL;
+import static jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager.KEY_STATUS_OBSERVER_HB_TRYCOUNT;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_ActiveConfigurationSet;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_ConfigurationSets;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ComponentState;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ECProfile;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ECState;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCComponentProfile;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCExecutionContexts;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCPortProfile;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCRTObjects;
+import static jp.go.aist.rtm.toolscommon.util.RTMixin.eql;
+
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Logger;
-import jp.go.aist.rtm.toolscommon.ToolsCommonPlugin;
import jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager;
import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
@@ -24,20 +36,9 @@
import org.eclipse.emf.ecore.EClass;
import org.omg.PortableServer.Servant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import static jp.go.aist.rtm.toolscommon.util.RTMixin.*;
-import static jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager.*;
-
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCComponentProfile;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCExecutionContexts;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCPortProfile;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCRTObjects;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ComponentState;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ECProfile;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ECState;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_ActiveConfigurationSet;
-import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_ConfigurationSets;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Corba Status Observer</b></em>'.
@@ -49,7 +50,8 @@
*/
public class CorbaStatusObserverImpl extends CorbaObserverImpl implements CorbaStatusObserver {
- static Logger log = ToolsCommonPlugin.getLogger();
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(CorbaStatusObserverImpl.class);
public static final String[] TYPE_NAMES = new String[] {
"COMPONENT_PROFILE", //
@@ -213,8 +215,8 @@
}
String profId = (serviceProfile == null) ? "" : serviceProfile.id;
- log.info("update_status(" + TYPE_NAMES[status_kind.value()] + ", "
- + hint + "): id=" + profId);
+ LOGGER.info("update_status({}, {}): id={}",
+ TYPE_NAMES[status_kind.value()], hint, profId);
if (CorbaObserverStore.eINSTANCE.isEmptyComponentReference(rtc)) {
return;
@@ -350,7 +352,7 @@
}
String p = name.substring(name.lastIndexOf(".") + 1);
- log.info("property changed: " + p);
+ LOGGER.info("property changed: {}", p);
if (!KEY_STATUS_OBSERVER_HB_ENABLE.equals(name)
&& !KEY_STATUS_OBSERVER_HB_INTERVAL.equals(name)
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -6,8 +6,8 @@
*/
package jp.go.aist.rtm.toolscommon.model.manager.impl;
-import RTC.ComponentProfile;
-import RTC.RTObject;
+import java.util.Collection;
+
import jp.go.aist.rtm.toolscommon.model.component.Component;
import jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl;
import jp.go.aist.rtm.toolscommon.model.core.CorePackage;
@@ -29,12 +29,15 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import RTC.ComponentProfile;
+import RTC.RTObject;
import RTM.ManagerHelper;
import RTM.ManagerProfile;
import RTM.ModuleProfile;
-import java.util.Collection;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>RTC Manager</b></em>'.
@@ -56,6 +59,10 @@
*/
public class RTCManagerImpl extends CorbaWrapperObjectImpl implements
RTCManager {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(RTCManagerImpl.class);
+
/**
* The default value of the '{@link #getManagerProfile() <em>Manager Profile</em>}' attribute.
* <!-- begin-user-doc -->
@@ -852,14 +859,14 @@
return new ReferenceMapping[] {};
}
- private void synchronizeLocalAttribute(EReference reference) {
+ private void synchronizeLocalAttribute(EReference reference) {
for (AttributeMapping attibuteMapping : getAttributeMappings()) {
if (reference != null) {
if (reference.equals(attibuteMapping.getLocalFeature())) {
try {
attibuteMapping.syncronizeLocal(this);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to synchronize local", e);
}
return;
}
@@ -867,7 +874,7 @@
try {
attibuteMapping.syncronizeLocal(this);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to synchronize local", e);
return;
}
}
@@ -880,11 +887,11 @@
try {
referenceMapping.syncronizeLocal(this);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to synchronize local", e);
}
}
}
-
+
private long lastExecutedTime;
private static long SYNC_MANUAL_INTERVAL = 1000L;
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationManager.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationManager.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -7,6 +7,8 @@
import jp.go.aist.rtm.toolscommon.synchronizationframework.mapping.MappingRule;
import org.eclipse.emf.ecore.EObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* 同期マネージャ
@@ -15,6 +17,10 @@
*
*/
public class SynchronizationManager {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(SynchronizationManager.class);
+
private MappingRule[] mappingRules;
/**
@@ -64,7 +70,7 @@
narrowedRemoteObjects, link);
assignSynchonizationSupport(result);
} catch (Exception e) {
- e.printStackTrace(); // system error
+ LOGGER.error("Fail to assign synchronization support", e);
}
}
//
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -17,11 +17,17 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ローカルオブジェクトに対して、同期機能を提供するクラス
*/
public class SynchronizationSupport {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(SynchronizationSupport.class);
+
private LocalObject localObject;
private MappingRule mappingRule;
@@ -131,7 +137,7 @@
try {
attibuteMapping.syncronizeLocal(localObject);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to synchronize local", e);
}
}
}
@@ -147,7 +153,7 @@
try {
referenceMapping.syncronizeLocal(localObject);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to synchronize local", e);
}
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -4,7 +4,6 @@
import java.util.List;
import jp.go.aist.rtm.toolscommon.model.component.Component;
-import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
import jp.go.aist.rtm.toolscommon.model.component.util.CorbaPropertyMap;
@@ -41,6 +40,8 @@
import org.eclipse.ui.views.properties.IPropertySheetEntry;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.IPropertySourceProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Rtc専用のプロパティシートページクラス
@@ -52,6 +53,9 @@
public class RtcPropertySheetPage implements IPropertySheetPage,
IPageBookViewPage {
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(RtcPropertySheetPage.class);
+
private StackLayout stackLayout;
private Composite composite;
@@ -256,7 +260,7 @@
IWorkbenchPage page = window.getActivePage();
page.showView(viewId, null, IWorkbenchPage.VIEW_VISIBLE);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fail to show view", e);
}
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java 2016-02-20 17:37:17 UTC (rev 544)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java 2016-02-20 17:38:11 UTC (rev 545)
@@ -51,6 +51,8 @@
import org.openrtp.namespaces.rts.version02.TargetComponentExt;
import org.openrtp.namespaces.rts.version02.TargetPort;
import org.openrtp.namespaces.rts.version02.TargetPortExt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import RTC.RTObject;
import RTC.RTObjectHelper;
@@ -62,7 +64,10 @@
*
*/
public class RtsProfileHandler extends ProfileHandlerBase {
-
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(RtsProfileHandler.class);
+
private boolean online;
private RtsProfileExt originalProfile;
private List<String> savedConnectors;
@@ -88,6 +93,7 @@
}
public RtsProfileExt load(String targetFile) throws Exception {
+ LOGGER.debug("load: targetFile=<{}>", targetFile);
XmlHandler handler = new XmlHandler();
RtsProfileExt profile = handler.loadXmlRts(targetFile);
return profile;
More information about the openrtm-commit
mailing list