Skip to content

Move org.ros2.rcljava.events.publisher_statuses to org.ros2.rcljava.publisher.statuses #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanpauno merged 1 commit into from
Aug 24, 2020
Merged

Move org.ros2.rcljava.events.publisher_statuses to org.ros2.rcljava.publisher.statuses #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rcljava/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ set(${PROJECT_NAME}_jni_sources
"src/main/cpp/org_ros2_rcljava_contexts_ContextImpl.cpp"
"src/main/cpp/org_ros2_rcljava_executors_BaseExecutor.cpp"
"src/main/cpp/org_ros2_rcljava_events_EventHandlerImpl.cpp"
"src/main/cpp/org_ros2_rcljava_events_publisher_statuses_LivelinessLost.cpp"
"src/main/cpp/org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible.cpp"
"src/main/cpp/org_ros2_rcljava_publisher_statuses_LivelinessLost.cpp"
"src/main/cpp/org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible.cpp"
"src/main/cpp/org_ros2_rcljava_node_NodeImpl.cpp"
"src/main/cpp/org_ros2_rcljava_publisher_PublisherImpl.cpp"
"src/main/cpp/org_ros2_rcljava_service_ServiceImpl.cpp"
Expand Down Expand Up @@ -133,8 +133,8 @@ set(${PROJECT_NAME}_sources
"src/main/java/org/ros2/rcljava/events/EventStatus.java"
"src/main/java/org/ros2/rcljava/events/PublisherEventStatus.java"
"src/main/java/org/ros2/rcljava/events/SubscriptionEventStatus.java"
"src/main/java/org/ros2/rcljava/events/publisher_statuses/LivelinessLost.java"
"src/main/java/org/ros2/rcljava/events/publisher_statuses/OfferedQosIncompatible.java"
"src/main/java/org/ros2/rcljava/publisher/statuses/LivelinessLost.java"
"src/main/java/org/ros2/rcljava/publisher/statuses/OfferedQosIncompatible.java"
"src/main/java/org/ros2/rcljava/executors/AnyExecutable.java"
"src/main/java/org/ros2/rcljava/executors/BaseExecutor.java"
"src/main/java/org/ros2/rcljava/executors/Executor.java"
Expand Down
24 changes: 12 additions & 12 deletions ...vents_publisher_statuses_LivelinessLost.h → ...ljava_publisher_statuses_LivelinessLost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,51 @@
// limitations under the License.

#include <jni.h>
/* Header for class org_ros2_rcljava_events_publisher_statuses_LivelinessLost */
/* Header for class org_ros2_rcljava_publisher_statuses_LivelinessLost */

#ifndef ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_LIVELINESSLOST_H_
#define ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_LIVELINESSLOST_H_
#ifndef ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_LIVELINESSLOST_H_
#define ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_LIVELINESSLOST_H_
#ifdef __cplusplus
extern "C" {
#endif

/*
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
* Method: nativeAllocateRCLStatusEvent
* Signature: ()J
*/
JNIEXPORT jlong JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
JNIEnv *, jclass);

/*
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
* Method: nativeDeallocateRCLStatusEvent
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
JNIEnv *, jclass, jlong);

/*
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
* Method: nativeFromRCLEvent
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeFromRCLEvent(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeFromRCLEvent(
JNIEnv *, jobject, jlong);

/*
* Class: org_ros2_rcljava_events_publisher_statuses_LivelinessLost
* Class: org_ros2_rcljava_publisher_statuses_LivelinessLost
* Method: nativeGetPublisherEventType
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeGetPublisherEventType(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeGetPublisherEventType(
JNIEnv *, jclass);

#ifdef __cplusplus
}
#endif
#endif // ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_LIVELINESSLOST_H_
#endif // ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_LIVELINESSLOST_H_
24 changes: 12 additions & 12 deletions ...blisher_statuses_OfferedQosIncompatible.h → ...blisher_statuses_OfferedQosIncompatible.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,51 @@
// limitations under the License.

#include <jni.h>
/* Header for class org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible */
/* Header for class org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible */

#ifndef ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
#define ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
#ifndef ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
#define ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
#ifdef __cplusplus
extern "C" {
#endif

/*
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
* Method: nAllocateRCLStatusEvent
* Signature: ()J
*/
JNIEXPORT jlong JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
JNIEnv *, jclass);

/*
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
* Method: nDeallocateRCLStatusEvent
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
JNIEnv *, jclass, jlong);

/*
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
* Method: nFromRCLEvent
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCLEvent(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nFromRCLEvent(
JNIEnv *, jobject, jlong);

/*
* Class: org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible
* Class: org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible
* Method: nGetPublisherEventType
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nGetPublisherEventType(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nGetPublisherEventType(
JNIEnv *, jclass);

#ifdef __cplusplus
}
#endif
#endif // ORG_ROS2_RCLJAVA_EVENTS_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
#endif // ORG_ROS2_RCLJAVA_PUBLISHER_STATUSES_OFFEREDQOSINCOMPATIBLE_H_
10 changes: 5 additions & 5 deletions ...nts_publisher_statuses_LivelinessLost.cpp → ...ava_publisher_statuses_LivelinessLost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "org_ros2_rcljava_events_publisher_statuses_LivelinessLost.h"
#include "org_ros2_rcljava_publisher_statuses_LivelinessLost.h"

#include <jni.h>
#include <stdlib.h>
Expand All @@ -24,7 +24,7 @@
using rcljava_common::exceptions::rcljava_throw_exception;

JNIEXPORT jlong JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeAllocateRCLStatusEvent(
JNIEnv * env, jclass)
{
void * p = malloc(sizeof(rmw_liveliness_lost_status_t));
Expand All @@ -36,14 +36,14 @@ Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeAllocateRC
}

JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeDeallocateRCLStatusEvent(
JNIEnv *, jclass, jlong handle)
{
free(reinterpret_cast<void *>(handle));
}

JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeFromRCLEvent(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeFromRCLEvent(
JNIEnv * env, jobject self, jlong handle)
{
auto * p = reinterpret_cast<rmw_liveliness_lost_status_t *>(handle);
Expand All @@ -66,7 +66,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeFromRCLEve
}

JNIEXPORT jint JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_LivelinessLost_nativeGetPublisherEventType(
Java_org_ros2_rcljava_publisher_statuses_LivelinessLost_nativeGetPublisherEventType(
JNIEnv *, jclass)
{
return RCL_PUBLISHER_LIVELINESS_LOST;
Expand Down
14 changes: 7 additions & 7 deletions ...isher_statuses_OfferedQosIncompatible.cpp → ...isher_statuses_OfferedQosIncompatible.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "org_ros2_rcljava_events_publisher_statuses_OfferedQosIncompatible.h"
#include "org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible.h"

#include <jni.h>
#include <stdlib.h>
Expand All @@ -25,7 +25,7 @@
using rcljava_common::exceptions::rcljava_throw_exception;

JNIEXPORT jlong JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nAllocateRCLStatusEvent(
JNIEnv * env, jclass)
{
void * p = malloc(sizeof(rmw_offered_qos_incompatible_event_status_t));
Expand All @@ -37,14 +37,14 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nAllocat
}

JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nDeallocateRCLStatusEvent(
JNIEnv *, jclass, jlong handle)
{
free(reinterpret_cast<void *>(handle));
}

JNIEXPORT void JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCLEvent(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nFromRCLEvent(
JNIEnv * env, jobject self, jlong handle)
{
auto * p = reinterpret_cast<rmw_offered_qos_incompatible_event_status_t *>(handle);
Expand All @@ -55,7 +55,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCL
// TODO(ivanpauno): class and field lookup could be done at startup time
jclass clazz = env->GetObjectClass(self);
jclass qos_kind_clazz = env->FindClass(
"org/ros2/rcljava/events/publisher_statuses/OfferedQosIncompatible$PolicyKind");
"org/ros2/rcljava/publisher/statuses/OfferedQosIncompatible$PolicyKind");
if (env->ExceptionCheck()) {
return;
}
Expand All @@ -68,7 +68,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCL
return;
}
const char * enum_class_path =
"Lorg/ros2/rcljava/events/publisher_statuses/OfferedQosIncompatible$PolicyKind;";
"Lorg/ros2/rcljava/publisher/statuses/OfferedQosIncompatible$PolicyKind;";
jfieldID policy_kind_fid = env->GetFieldID(clazz, "lastPolicyKind", enum_class_path);
if (env->ExceptionCheck()) {
return;
Expand Down Expand Up @@ -113,7 +113,7 @@ Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nFromRCL
}

JNIEXPORT jint JNICALL
Java_org_ros2_rcljava_events_publisher_1statuses_OfferedQosIncompatible_nGetPublisherEventType(
Java_org_ros2_rcljava_publisher_statuses_OfferedQosIncompatible_nGetPublisherEventType(
JNIEnv *, jclass)
{
return RCL_PUBLISHER_OFFERED_INCOMPATIBLE_QOS;
Expand Down
2 changes: 1 addition & 1 deletion ...ts/publisher_statuses/LivelinessLost.java → ...va/publisher/statuses/LivelinessLost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package org.ros2.rcljava.events.publisher_statuses;
package org.ros2.rcljava.publisher.statuses;

import java.util.function.Supplier;

Expand Down
2 changes: 1 addition & 1 deletion ...sher_statuses/OfferedQosIncompatible.java → ...sher/statuses/OfferedQosIncompatible.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package org.ros2.rcljava.events.publisher_statuses;
package org.ros2.rcljava.publisher.statuses;

import java.util.function.Supplier;

Expand Down
2 changes: 1 addition & 1 deletion rcljava/src/test/java/org/ros2/rcljava/SpinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.ros2.rcljava.concurrent.Callback;
import org.ros2.rcljava.consumers.Consumer;
import org.ros2.rcljava.events.EventHandler;
import org.ros2.rcljava.events.publisher_statuses.OfferedQosIncompatible;
import org.ros2.rcljava.publisher.statuses.OfferedQosIncompatible;
import org.ros2.rcljava.executors.Executor;
import org.ros2.rcljava.executors.SingleThreadedExecutor;
import org.ros2.rcljava.node.ComposableNode;
Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/test/java/org/ros2/rcljava/publisher/PublisherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.ros2.rcljava.RCLJava;
import org.ros2.rcljava.consumers.Consumer;
import org.ros2.rcljava.events.EventHandler;
import org.ros2.rcljava.events.publisher_statuses.LivelinessLost;
import org.ros2.rcljava.events.publisher_statuses.OfferedQosIncompatible;
import org.ros2.rcljava.publisher.statuses.LivelinessLost;
import org.ros2.rcljava.publisher.statuses.OfferedQosIncompatible;
import org.ros2.rcljava.exceptions.RCLException;
import org.ros2.rcljava.node.Node;

Expand Down