[openrtm-commit:00614] r654 - in branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . executionContext
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 1月 26日 (木) 17:56:53 JST
Author: fsi-katami
Date: 2012-01-26 17:56:52 +0900 (Thu, 26 Jan 2012)
New Revision: 654
Added:
branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/IExecutionContextBase.java
Modified:
branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java
branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java
branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/OpenHRPExecutionContext.java
branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java
Log:
Daily check in. refs #2322
Modified: branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java 2012-01-25 08:53:20 UTC (rev 653)
+++ branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java 2012-01-26 08:56:52 UTC (rev 654)
@@ -2756,7 +2756,7 @@
Properties temp = m_config.getNode(category + "." + type_name);
Vector<String> keys = temp.propertyNames();
int length = keys.size();
- if (!(length == 1 && keys.get(length).equals("config_file"))) {
+ if (!(length == 1 && keys.get(length-1).equals("config_file"))) {
type_prop.merge(m_config.getNode(category + "." + type_name));
rtcout.println(Logbuf.INFO,
"Component type conf exists in rtc.conf. Merged.");
Modified: branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java
===================================================================
--- branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java 2012-01-25 08:53:20 UTC (rev 653)
+++ branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java 2012-01-26 08:56:52 UTC (rev 654)
@@ -156,8 +156,10 @@
*/
public boolean finalizeExecutionContext();
// public abstract boolean finalizeExecutionContext();
+/*
public ExecutionContextProfile m_profile
= new ExecutionContextProfile();
+*/
/*
protected ExecutionContextProfile m_profile
= new ExecutionContextProfile();
Modified: branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java
===================================================================
--- branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java 2012-01-25 08:53:20 UTC (rev 653)
+++ branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextProfile.java 2012-01-26 08:56:52 UTC (rev 654)
@@ -286,8 +286,8 @@
if (rtobj==null) {
rtcout.println(Logbuf.ERROR,"Narrowing failed.");
return ReturnCode_t.RTC_ERROR;
- }
- m_profile.owner = (RTObject)m_profile.owner._duplicate();
+ }
+ m_profile.owner = (RTObject)rtobj._duplicate();
return ReturnCode_t.RTC_OK;
}
@@ -538,7 +538,8 @@
* {@.ja ECProfile}
* {@.en ECProfile}
*/
- private RTC.ExecutionContextProfile m_profile;
+ private RTC.ExecutionContextProfile m_profile
+ = new RTC.ExecutionContextProfile();
/**
* {@.ja mutex of ExecutionContextProfile}
Added: branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/IExecutionContextBase.java
===================================================================
--- branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/IExecutionContextBase.java (rev 0)
+++ branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/IExecutionContextBase.java 2012-01-26 08:56:52 UTC (rev 654)
@@ -0,0 +1,46 @@
+package jp.go.aist.rtm.RTC.executionContext;
+
+import org.omg.CORBA.SystemException;
+
+import RTC.ExecutionContextService;
+import OpenRTM.ExtTrigExecutionContextServicePOA;
+
+import jp.go.aist.rtm.RTC.RTObject_impl;
+import jp.go.aist.rtm.RTC.util.Properties;
+import RTC.ExecutionKind;
+import RTC.ReturnCode_t;
+
+/**
+ * <p>Periodic Sampled Data Processing(周期実行用)ExecutionContextのベースとなる
+ * 抽象クラスです。</p>
+ */
+//public abstract class ExecutionContextBase
+// implements ECNewDeleteFunc {
+public interface IExecutionContextBase extends ECNewDeleteFunc {
+
+ /**
+ * {@.ja ExecutionContextクラスの初期化関数}
+ * {@.en Initialization function of ExecutionContext class}
+ */
+ public void init(Properties props);
+
+ /**
+ * <p> bindComponent </p>
+ *
+ * @param rtc RTObject
+ * @return ReturnCode_t
+ *
+ */
+ public ReturnCode_t bindComponent(RTObject_impl rtc);
+
+ public boolean finalizeExecutionContext();
+/*
+ public ExecutionContextProfile m_profile
+ = new jp.go.aist.rtm.RTC.executionContext.ExecutionContextProfile();
+*/
+/*
+ protected ExecutionContextProfile m_profile
+ = new ExecutionContextProfile();
+*/
+
+}
Modified: branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/OpenHRPExecutionContext.java
===================================================================
--- branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/OpenHRPExecutionContext.java 2012-01-25 08:53:20 UTC (rev 653)
+++ branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/OpenHRPExecutionContext.java 2012-01-26 08:56:52 UTC (rev 654)
@@ -108,7 +108,7 @@
// manager.registerECFactory("jp.go.aist.rtm.RTC.executionContext.OpenHRPExecutionContext");
ExecutionContextFactory<ExecutionContextBase,String> factory
= ExecutionContextFactory.instance();
- factory.addFactory("SynchExtTriggerEC",
+ factory.addFactory("jp.go.aist.rtm.RTC.executionContext.OpenHRPExecutionContext",
new OpenHRPExecutionContext(),
new OpenHRPExecutionContext());
}
Modified: branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java
===================================================================
--- branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java 2012-01-25 08:53:20 UTC (rev 653)
+++ branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java 2012-01-26 08:56:52 UTC (rev 654)
@@ -3,6 +3,8 @@
import java.util.Vector;
import jp.go.aist.rtm.RTC.Manager;
+import jp.go.aist.rtm.RTC.ObjectCreator;
+import jp.go.aist.rtm.RTC.ObjectDestructor;
import jp.go.aist.rtm.RTC.RTObject_impl;
import jp.go.aist.rtm.RTC.StateAction;
import jp.go.aist.rtm.RTC.StateHolder;
@@ -14,9 +16,9 @@
import jp.go.aist.rtm.RTC.util.Properties;
import jp.go.aist.rtm.RTC.util.TimeValue;
import jp.go.aist.rtm.RTC.util.equalFunctor;
+//import RTC.ExecutionContextProfile;
import OpenRTM.DataFlowComponent;
import OpenRTM.DataFlowComponentHelper;
-import RTC.ExecutionContextProfile;
import RTC.ExecutionContextProfileHolder;
import RTC.ExecutionContextService;
import RTC.ExecutionContextServiceHelper;
@@ -32,7 +34,9 @@
*/
//public class PeriodicExecutionContext extends ExtTrigExecutionContextServicePOA implements Runnable, ExecutionContextBase {
-public class PeriodicExecutionContext extends ExecutionContextServicePOA implements Runnable, ExecutionContextBase {
+public class PeriodicExecutionContext
+extends ExecutionContextServicePOA
+implements Runnable, ObjectCreator<ExecutionContextBase>, ObjectDestructor, ExecutionContextBase {
/**
@@ -1102,7 +1106,7 @@
/**
* <p>ExecutionContextProfileです。</p>
*/
- //protected ExecutionContextProfile m_profile = new ExecutionContextProfile();
+ protected ExecutionContextProfile m_profile = new ExecutionContextProfile();
/**
* <p>ExecutionContextの動作周期です。</p>
*/
@@ -1121,10 +1125,40 @@
* @param manager Managerオブジェクト
*/
public static void PeriodicExecutionContextInit(Manager manager) {
- manager.registerECFactory("jp.go.aist.rtm.RTC.executionContext.PeriodicExecutionContext");
+ //manager.registerECFactory("jp.go.aist.rtm.RTC.executionContext.PeriodicExecutionContext");
+ ExecutionContextFactory<ExecutionContextBase,String> factory
+ = ExecutionContextFactory.instance();
+ factory.addFactory("jp.go.aist.rtm.RTC.executionContext.PeriodicExecutionContext",
+ new PeriodicExecutionContext(),
+ new PeriodicExecutionContext());
}
/**
+ * {@.ja PeriodicExecutionContext を生成する}
+ * {@.en Creats PeriodicExecutionContext}
+ *
+ * @return
+ * {@.ja 生成されたinstance}
+ * {@.en Object Created instances}
+ *
+ *
+ */
+ public ExecutionContextBase creator_() {
+ return new PeriodicExecutionContext();
+ }
+ /**
+ * {@.ja Object を破棄する}
+ * {@.en Destructs Object}
+ *
+ * @param obj
+ * {@.ja 破棄するインタスタンス}
+ * {@.en The target instances for destruction}
+ *
+ */
+ public void destructor_(Object obj) {
+ obj = null;
+ }
+ /**
* <p>ExecutionContextのインスタンスを取得します。</p>
*
* @return ExecutionContextインスタンス
openrtm-commit メーリングリストの案内