Skip to content

Commit af60743

Browse files
ivanpaunoivanpauno
committed
Move events.publisher_statuses to publisher.statuses (osrf#12)
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
1 parent e80c5df commit af60743

File tree

9 files changed

+45
-45
lines changed

9 files changed

+45
-45
lines changed

‎rcljava/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ set(${PROJECT_NAME}_jni_sources
6060
"src/main/cpp/org_ros2_rcljava_contexts_ContextImpl.cpp"
6161
"src/main/cpp/org_ros2_rcljava_executors_BaseExecutor.cpp"
6262
"src/main/cpp/org_ros2_rcljava_events_EventHandlerImpl.cpp"
63-
"src/main/cpp/org_ros2_rcljava_events_publisher_statuses_LivelinessLost.cpp"
64-
"src/main/cpp/org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible.cpp"
63+
"src/main/cpp/org_ros2_rcljava_publisher_statuses_LivelinessLost.cpp"
64+
"src/main/cpp/org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible.cpp"
6565
"src/main/cpp/org_ros2_rcljava_node_NodeImpl.cpp"
6666
"src/main/cpp/org_ros2_rcljava_publisher_PublisherImpl.cpp"
6767
"src/main/cpp/org_ros2_rcljava_service_ServiceImpl.cpp"
@@ -133,8 +133,8 @@ set(${PROJECT_NAME}_sources
133133
"src/main/java/org/ros2/rcljava/events/EventStatus.java"
134134
"src/main/java/org/ros2/rcljava/events/PublisherEventStatus.java"
135135
"src/main/java/org/ros2/rcljava/events/SubscriptionEventStatus.java"
136-
"src/main/java/org/ros2/rcljava/events/publisher_statuses/LivelinessLost.java"
137-
"src/main/java/org/ros2/rcljava/events/publisher_statuses/OfferedQosIncompatible.java"
136+
"src/main/java/org/ros2/rcljava/publisher/statuses/LivelinessLost.java"
137+
"src/main/java/org/ros2/rcljava/publisher/statuses/OfferedQosIncompatible.java"
138138
"src/main/java/org/ros2/rcljava/executors/AnyExecutable.java"
139139
"src/main/java/org/ros2/rcljava/executors/BaseExecutor.java"
140140
"src/main/java/org/ros2/rcljava/executors/Executor.java"

rcljava/include/org_ros2_rcljava_events_publisher_statuses_LivelinessLost.h renamed to rcljava/include/org_ros2_rcljava_publisher_statuses_LivelinessLost.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,51 @@
1313
// limitations under the License.
1414

1515
#include <jni.h>
16-
/* Header for class org_ros2_rcljava_events_publisher_statuses_LivelinessLost */
16+
/* Header for class org_ros2_rcljava_publisher_statuses_LivelinessLost */
1717

18-
#ifndef ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_LIVELINESSLOST_H_
19-
#define ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_LIVELINESSLOST_H_
18+
#ifndef ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_LIVELINESSLOST_H_
19+
#define ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_LIVELINESSLOST_H_
2020
#ifdef __cplusplus
2121
extern "C" {
2222
#endif
2323

2424
/*
25-
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
25+
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
2626
* Method: nativeAllocateRCLStatusEvent
2727
* Signature: ()J
2828
*/
2929
JNIEXPORT jlong JNICALL
30-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
30+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
3131
JNIEnv *, jclass);
3232

3333
/*
34-
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
34+
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
3535
* Method: nativeDeallocateRCLStatusEvent
3636
* Signature: (J)V
3737
*/
3838
JNIEXPORT void JNICALL
39-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
39+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
4040
JNIEnv *, jclass, jlong);
4141

4242
/*
43-
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
43+
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
4444
* Method: nativeFromRCLEvent
4545
* Signature: (J)V
4646
*/
4747
JNIEXPORT void JNICALL
48-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeFromRCLEvent(
48+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeFromRCLEvent(
4949
JNIEnv *, jobject, jlong);
5050

5151
/*
52-
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
52+
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
5353
* Method: nativeGetPublisherEventType
5454
* Signature: ()I
5555
*/
5656
JNIEXPORT jint JNICALL
57-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeGetPublisherEventType(
57+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeGetPublisherEventType(
5858
JNIEnv *, jclass);
5959

6060
#ifdef __cplusplus
6161
}
6262
#endif
63-
#endif // ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_LIVELINESSLOST_H_
63+
#endif // ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_LIVELINESSLOST_H_

rcljava/include/org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible.h renamed to rcljava/include/org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,51 @@
1313
// limitations under the License.
1414

1515
#include <jni.h>
16-
/* Header for class org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible */
16+
/* Header for class org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible */
1717

18-
#ifndef ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
19-
#define ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
18+
#ifndef ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
19+
#define ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
2020
#ifdef __cplusplus
2121
extern "C" {
2222
#endif
2323

2424
/*
25-
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
25+
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
2626
* Method: nAllocateRCLStatusEvent
2727
* Signature: ()J
2828
*/
2929
JNIEXPORT jlong JNICALL
30-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
30+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
3131
JNIEnv *, jclass);
3232

3333
/*
34-
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
34+
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
3535
* Method: nDeallocateRCLStatusEvent
3636
* Signature: (J)V
3737
*/
3838
JNIEXPORT void JNICALL
39-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
39+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
4040
JNIEnv *, jclass, jlong);
4141

4242
/*
43-
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
43+
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
4444
* Method: nFromRCLEvent
4545
* Signature: (J)V
4646
*/
4747
JNIEXPORT void JNICALL
48-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCLEvent(
48+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nFromRCLEvent(
4949
JNIEnv *, jobject, jlong);
5050

5151
/*
52-
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
52+
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
5353
* Method: nGetPublisherEventType
5454
* Signature: ()I
5555
*/
5656
JNIEXPORT jint JNICALL
57-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nGetPublisherEventType(
57+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nGetPublisherEventType(
5858
JNIEnv *, jclass);
5959

6060
#ifdef __cplusplus
6161
}
6262
#endif
63-
#endif // ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
63+
#endif // ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_

rcljava/src/main/cpp/org_ros2_rcljava_events_publisher_statuses_LivelinessLost.cpp renamed to rcljava/src/main/cpp/org_ros2_rcljava_publisher_statuses_LivelinessLost.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "org_ros2_rcljava_events_publisher_statuses_LivelinessLost.h"
15+
#include "org_ros2_rcljava_publisher_statuses_LivelinessLost.h"
1616

1717
#include <jni.h>
1818
#include <stdlib.h>
@@ -24,7 +24,7 @@
2424
using rcljava_common::exceptions::rcljava_throw_exception;
2525

2626
JNIEXPORT jlong JNICALL
27-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
27+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
2828
JNIEnv * env, jclass)
2929
{
3030
void * p = malloc(sizeof(rmw_liveliness_lost_status_t));
@@ -36,14 +36,14 @@ Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeAllocateRC
3636
}
3737

3838
JNIEXPORT void JNICALL
39-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
39+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
4040
JNIEnv *, jclass, jlong handle)
4141
{
4242
free(reinterpret_cast<void *>(handle));
4343
}
4444

4545
JNIEXPORT void JNICALL
46-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeFromRCLEvent(
46+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeFromRCLEvent(
4747
JNIEnv * env, jobject self, jlong handle)
4848
{
4949
auto * p = reinterpret_cast<rmw_liveliness_lost_status_t *>(handle);
@@ -66,7 +66,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeFromRCLEve
6666
}
6767

6868
JNIEXPORT jint JNICALL
69-
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeGetPublisherEventType(
69+
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeGetPublisherEventType(
7070
JNIEnv *, jclass)
7171
{
7272
return RCL_PUBLISHER_LIVELINESS_LOST;

rcljava/src/main/cpp/org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible.cpp renamed to rcljava/src/main/cpp/org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible.h"
15+
#include "org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible.h"
1616

1717
#include <jni.h>
1818
#include <stdlib.h>
@@ -25,7 +25,7 @@
2525
using rcljava_common::exceptions::rcljava_throw_exception;
2626

2727
JNIEXPORT jlong JNICALL
28-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
28+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
2929
JNIEnv * env, jclass)
3030
{
3131
void * p = malloc(sizeof(rmw_offered_qos_incompatible_event_status_t));
@@ -37,14 +37,14 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nAllocat
3737
}
3838

3939
JNIEXPORT void JNICALL
40-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
40+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
4141
JNIEnv *, jclass, jlong handle)
4242
{
4343
free(reinterpret_cast<void *>(handle));
4444
}
4545

4646
JNIEXPORT void JNICALL
47-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCLEvent(
47+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nFromRCLEvent(
4848
JNIEnv * env, jobject self, jlong handle)
4949
{
5050
auto * p = reinterpret_cast<rmw_offered_qos_incompatible_event_status_t *>(handle);
@@ -55,7 +55,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCL
5555
// TODO(ivanpauno): class and field lookup could be done at startup time
5656
jclass clazz = env->GetObjectClass(self);
5757
jclass qos_kind_clazz = env->FindClass(
58-
"org/ros2/rcljava/events/publisher_statuses/OfferedQosIncompatible$PolicyKind");
58+
"org/ros2/rcljava/publisher/statuses/OfferedQosIncompatible$PolicyKind");
5959
if (env->ExceptionCheck()) {
6060
return;
6161
}
@@ -68,7 +68,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCL
6868
return;
6969
}
7070
const char * enum_class_path =
71-
"Lorg/ros2/rcljava/events/publisher_statuses/OfferedQosIncompatible$PolicyKind;";
71+
"Lorg/ros2/rcljava/publisher/statuses/OfferedQosIncompatible$PolicyKind;";
7272
jfieldID policy_kind_fid = env->GetFieldID(clazz, "lastPolicyKind", enum_class_path);
7373
if (env->ExceptionCheck()) {
7474
return;
@@ -113,7 +113,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCL
113113
}
114114

115115
JNIEXPORT jint JNICALL
116-
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nGetPublisherEventType(
116+
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nGetPublisherEventType(
117117
JNIEnv *, jclass)
118118
{
119119
return RCL_PUBLISHER_OFFERED_INCOMPATIBLE_QOS;

rcljava/src/main/java/org/ros2/rcljava/events/publisher_statuses/LivelinessLost.java renamed to rcljava/src/main/java/org/ros2/rcljava/publisher/statuses/LivelinessLost.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package org.ros2.rcljava.events.publisher_statuses;
15+
package org.ros2.rcljava.publisher.statuses;
1616

1717
import java.util.function.Supplier;
1818

rcljava/src/main/java/org/ros2/rcljava/events/publisher_statuses/OfferedQosIncompatible.java renamed to rcljava/src/main/java/org/ros2/rcljava/publisher/statuses/OfferedQosIncompatible.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package org.ros2.rcljava.events.publisher_statuses;
15+
package org.ros2.rcljava.publisher.statuses;
1616

1717
import java.util.function.Supplier;
1818

‎rcljava/src/test/java/org/ros2/rcljava/SpinTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.ros2.rcljava.concurrent.Callback;
3131
import org.ros2.rcljava.consumers.Consumer;
3232
import org.ros2.rcljava.events.EventHandler;
33-
import org.ros2.rcljava.events.publisher_statuses.OfferedQosIncompatible;
33+
import org.ros2.rcljava.publisher.statuses.OfferedQosIncompatible;
3434
import org.ros2.rcljava.executors.Executor;
3535
import org.ros2.rcljava.executors.SingleThreadedExecutor;
3636
import org.ros2.rcljava.node.ComposableNode;

‎rcljava/src/test/java/org/ros2/rcljava/publisher/PublisherTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.ros2.rcljava.RCLJava;
2727
import org.ros2.rcljava.consumers.Consumer;
2828
import org.ros2.rcljava.events.EventHandler;
29-
import org.ros2.rcljava.events.publisher_statuses.LivelinessLost;
30-
import org.ros2.rcljava.events.publisher_statuses.OfferedQosIncompatible;
29+
import org.ros2.rcljava.publisher.statuses.LivelinessLost;
30+
import org.ros2.rcljava.publisher.statuses.OfferedQosIncompatible;
3131
import org.ros2.rcljava.exceptions.RCLException;
3232
import org.ros2.rcljava.node.Node;
3333

0 commit comments

Comments
 (0)