[openrtm-commit:00872] r677 - in trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . executionContext

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-07-25 16:01:30 +0900 (Wed, 25 Jul 2012)
New Revision: 677

Modified:
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExtTrigExecutionContext.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java
Log:
Fixed comments.  Fixed log messages.

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2012-03-30 06:16:09 UTC (rev 676)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2012-07-25 07:01:30 UTC (rev 677)
@@ -667,7 +667,7 @@
         ArrayList<Properties> ec_args = new ArrayList<Properties>() ;
         if (getContextOptions(ec_args)!=ReturnCode_t.RTC_OK )
         {
-            rtcout.println(Logbuf.ERROR,"Vaild EC options are nao available. Aborting");
+            rtcout.println(Logbuf.ERROR,"Valid EC options are not available. Aborting");
             return ReturnCode_t.BAD_PARAMETER;
             
         }
@@ -6306,7 +6306,6 @@
          ReturnCode_t ret = ReturnCode_t.RTC_OK;
          Set<String> avail_ec
            = ExecutionContextFactory.instance().getIdentifiers();
-
          for (int ic=0; ic < ec_args.size(); ++ic) {
              String ec_type = ec_args.get(ic).getProperty("type");
              String ec_name = ec_args.get(ic).getProperty("name");

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java	2012-03-30 06:16:09 UTC (rev 676)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExecutionContextBase.java	2012-07-25 07:01:30 UTC (rev 677)
@@ -136,7 +136,7 @@
     public String getKindString(ExecutionKind kind);
 
     /**
-     * {@.ja ExecutionKind を設定する
+     * {@.ja ExecutionKind を設定する}
      * {@.en Set the ExecutionKind}
      * <p>
      * {@.ja この ExecutionContext の ExecutionKind を設定する}
@@ -240,7 +240,7 @@
     public boolean finalizeExecutionContext();
     /**
      * {@.ja Propertiesから実行コンテキストをセットする}
-     * {@.en Setting execution rate from given properties.
+     * {@.en Setting execution rate from given properties.}
      * @param props 
      *   {@.ja ExecutionContextProfile::properties にセットするプロパティー}
      *   {@.en Properties to be set to ExecutionContextProfile::properties.}
@@ -290,17 +290,20 @@
     public ExecutionContextProfile onGetProfile(ExecutionContextProfile profile);
 
     /**
-     * @brief onWaitingActivated() template function
+     * {@.ja onWaitingActivated() template function}
+     * {@.en onWaitingActivated() template function}
      */
     public ReturnCode_t onWaitingActivated(RTObjectStateMachine comp, long count);
 
-    /*!
-     * @brief onWaitingDeactivated() template function
+    /**
+     * {@.ja onWaitingDeactivated() template function}
+     * {@.en onWaitingDeactivated() template function}
      */
     public ReturnCode_t onWaitingDeactivated(RTObjectStateMachine comp, long count);
 
-    /*!
-     * @brief onWaitingReset() template function
+    /**
+     * {@.ja onWaitingReset() template function}
+     * {@.en onWaitingReset() template function}
      */
     public ReturnCode_t onWaitingReset(RTObjectStateMachine comp, long count);
 

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExtTrigExecutionContext.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExtTrigExecutionContext.java	2012-03-30 06:16:09 UTC (rev 676)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/ExtTrigExecutionContext.java	2012-07-25 07:01:30 UTC (rev 677)
@@ -333,7 +333,8 @@
     }
 
     /**
-     * @brief onWaitingActivated() template function
+     * {@.ja onWaitingActivated() template function}
+     * {@.en onWaitingActivated() template function}
      */
     public ReturnCode_t onWaitingActivated(RTObjectStateMachine comp, long count)
     {

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java	2012-03-30 06:16:09 UTC (rev 676)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/executionContext/PeriodicExecutionContext.java	2012-07-25 07:01:30 UTC (rev 677)
@@ -402,7 +402,8 @@
     }
 
     /**
-     * @brief onWaitingActivated() template function
+     * {@.ja onWaitingActivated() template function}
+     * {@.en onWaitingActivated() template function}
      */
     public ReturnCode_t onWaitingActivated(RTObjectStateMachine comp, long count)
     {