java: obey our coding standard

[simgrid.git] / src / bindings / java / JavaContext.hpp

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index a1a7ba1..2724033 100644 (file)
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -1,5 +1,6 @@
-/* Copyright (c) 2009-2010, 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Context switching within the JVM.                                        */
+
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,17 +9,13 @@
 #define SIMGRID_JAVA_JAVA_CONTEXT_HPP
 
 #include <functional>
-
 #include <jni.h>
 
-#include <xbt/misc.h>
-#include <simgrid/simix.h>
-#include <xbt/xbt_os_thread.h>
-
-#include "src/simix/smx_private.h"
+#include "simgrid/simix.h"
+#include "src/simix/smx_private.hpp"
+#include "xbt/xbt_os_thread.h"
 
-#include "jmsg.h"
-#include "jmsg_process.h"
+#include "jmsg.hpp"
 
 namespace simgrid {
 namespace kernel {
@@ -30,15 +27,15 @@ class JavacontextFactory;
 class JavaContext : public simgrid::kernel::context::Context {
 public:
   // The java process instance bound with the msg process structure:
-  jobject jprocess = nullptr;
+  jobject jprocess_ = nullptr;
   // JNI interface pointer associated to this thread:
-  JNIEnv *jenv = nullptr;
-  xbt_os_thread_t thread = nullptr;
-  // Sempahore used to schedule/yield the process:
-  xbt_os_sem_t begin = nullptr;
+  JNIEnv* jenv_           = nullptr;
+  xbt_os_thread_t thread_ = nullptr;
+  // Sempahore used to schedule/yield to the process:
+  xbt_os_sem_t begin_ = nullptr;
   // Semaphore used to schedule/unschedule the process:
-  xbt_os_sem_t end = nullptr;
-public:
+  xbt_os_sem_t end_ = nullptr;
+
   friend class JavaContextFactory;
   JavaContext(std::function<void()> code,
           void_pfn_smxprocess_t cleanup_func,