From 4cf03028c9c1e2b47a5f659bdc5c656fedd61499 Mon Sep 17 00:00:00 2001 From: Ernesto Corbellini <ecorbellini@ekumenlabs.com> Date: Tue, 22 Dec 2015 15:39:36 -0300 Subject: [PATCH] Added license information to the sources. --- .../rosjava_actionlib/ActionClient.java | 16 ++++++++ .../ActionClientListener.java | 37 ++++++++++++++++++- .../rosjava_actionlib/ActionServer.java | 2 +- .../ActionServerListener.java | 17 +++++++++ .../rosjava_actionlib/CommStateMachine.java | 19 ++++++---- .../rosjava_actionlib/GoalIDGenerator.java | 1 + .../rosjava_actionlib/ServerStateMachine.java | 16 ++++++-- .../ekumen/rosjava_actionlib/TestClient.java | 20 ++++++++++ .../ekumen/rosjava_actionlib/TestServer.java | 20 ++++++++++ 9 files changed, 135 insertions(+), 13 deletions(-) diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java index ac4c0b8..5b90aa8 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java @@ -1,3 +1,19 @@ +/** + * Copyright 2015 Ekumen www.ekumenlabs.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.github.ekumen.rosjava_actionlib; import org.ros.namespace.GraphName; diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java index fec5aca..bc80d03 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java @@ -1,3 +1,19 @@ +/** + * Copyright 2015 Ekumen www.ekumenlabs.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.github.ekumen.rosjava_actionlib; import org.ros.internal.message.Message; @@ -8,9 +24,28 @@ import actionlib_msgs.GoalStatusArray; * Listener interface to receive the incoming messages from the ActionLib server. * A client should implement this interface if it wants to receive the callbacks * with information from the server. + * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com> */ -public interface ActionClientListener<T_ACTION_FEEDBACK extends Message, T_ACTION_RESULT extends Message> { +public interface ActionClientListener<T_ACTION_FEEDBACK extends Message, + T_ACTION_RESULT extends Message> { + /** + * Called when a result message is received from the server. + * @param result Result message from the server. The type of this message + * depends on the application. + */ void resultReceived(T_ACTION_RESULT result); + + /** + * Called when a feedback message is received from the server. + * @param feedback The feedback message received from the server. The type of + * this message depends on the application. + */ void feedbackReceived(T_ACTION_FEEDBACK feedback); + + /** + * Called when a status message is received from the server. + * @param status The status message received from the server. + * @see actionlib_msgs.GoalStatusArray + */ void statusReceived(GoalStatusArray status); } diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java index a2fbed9..858f787 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java @@ -1,5 +1,5 @@ /** - * Copyright 2015 Creativa77 www.ekumenlab + * Copyright 2015 Ekumen www.ekumenlabs.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java index 80b4e19..4243625 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java @@ -1,3 +1,19 @@ +/** + * Copyright 2015 Ekumen www.ekumenlabs.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.github.ekumen.rosjava_actionlib; import org.ros.internal.message.Message; @@ -8,6 +24,7 @@ import actionlib_msgs.GoalID; * Listener interface to receive the incoming messages from the ActionLib client. * A server should implement this interface if it wants to receive the callbacks * with information from the client. + * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com> */ public interface ActionServerListener<T_ACTION_GOAL extends Message> { /** diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/CommStateMachine.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/CommStateMachine.java index c59e515..cdc0a2b 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/CommStateMachine.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/CommStateMachine.java @@ -1,13 +1,19 @@ /** - * Copyright (c) 2015, Ernesto Corbellini, Ekumen + * Copyright 2015 Ekumen www.ekumenlabs.com * - * Based on actionlib code by Stuart Glaser, Willow Garage + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Pending license. + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package com.github.ekumen.rosjava_actionlib; @@ -17,12 +23,11 @@ import java.util.Iterator; /** * State machine for the action client. - * + * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com> * Comments: * - The state returned on a transition is actually a vector of states that should be transitioned in sequence. - * + * TODO: change class name to ClientStateMachine */ -// TODO: change class name to ClientStateMachine public class CommStateMachine { // Local class to hold the states public static class ClientStates { diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/GoalIDGenerator.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/GoalIDGenerator.java index 20b0e09..acf6a1d 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/GoalIDGenerator.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/GoalIDGenerator.java @@ -1,4 +1,5 @@ /* + * Copyright (C) 2015 Ernesto Corbellini, ecorbellini@ekumenlabs.com * Copyright (C) 2011 Alexander Perzylo, Technische Universität München * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java index a7137a5..fb335b6 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java @@ -1,11 +1,19 @@ /** - * Copyright (c) 2015, Ernesto Corbellini, Ekumen + * Copyright 2015 Ekumen www.ekumenlabs.com * - * Pending license. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package com.github.ekumen.rosjava_actionlib; import java.lang.Exception; @@ -13,7 +21,7 @@ import actionlib_msgs.GoalStatus; /* * Class to manage the server state machine transitions. - * @author Ernesto Corbellini + * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com> */ public class ServerStateMachine { public static class Events { diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java index c599f3b..b77ed32 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java @@ -1,3 +1,19 @@ +/** + * Copyright 2015 Ekumen www.ekumenlabs.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.github.ekumen.rosjava_actionlib; import java.util.List; @@ -15,6 +31,10 @@ import actionlib_msgs.GoalStatusArray; import actionlib_msgs.GoalID; import actionlib_msgs.GoalStatus; +/** + * Class to test the actionlib client. + * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com> + */ public class TestClient extends AbstractNodeMain implements ActionClientListener<FibonacciActionFeedback, FibonacciActionResult> { private ActionClient ac = null; private volatile boolean resultReceived = false; diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java index 31f6d49..626da46 100644 --- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java +++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java @@ -1,3 +1,19 @@ +/** + * Copyright 2015 Ekumen www.ekumenlabs.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.github.ekumen.rosjava_actionlib; import java.util.List; @@ -15,6 +31,10 @@ import actionlib_msgs.GoalStatusArray; import actionlib_msgs.GoalID; import actionlib_msgs.GoalStatus; + /** + * Class to test the actionlib server. + * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com> + */ public class TestServer extends AbstractNodeMain implements ActionServerListener<FibonacciActionGoal> { private ActionServer<FibonacciActionGoal, FibonacciActionFeedback, FibonacciActionResult> as = null; private volatile FibonacciActionGoal currentGoal = null; -- GitLab