Main module headers are moved 1 level up

e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>

modules/java/generator/config/core.filelist

@@ -1,2 +1,2 @@
-include/opencv2/core/core.hpp
+include/opencv2/core.hpp
 ../java/generator/src/cpp/core_manual.hpp

modules/java/generator/gen_java.py

@@ -884,7 +884,7 @@ public class %(jc)s {
 #define LOG_TAG "org.opencv.%(m)s"
 
 #include "common.h"
-#include "opencv2/%(m)s/%(m)s.hpp"
+#include "opencv2/%(m)s.hpp"
 
 using namespace cv;
 

modules/java/generator/src/cpp/Mat.cpp

@@ -1,7 +1,7 @@
 #define LOG_TAG "org.opencv.core.Mat"
 
 #include "common.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 
 using namespace cv;
 

modules/java/generator/src/cpp/VideoCapture.cpp

@@ -5,7 +5,7 @@
 #ifdef HAVE_OPENCV_HIGHGUI
 
 #include "opencv2/highgui/highgui_c.h"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 using namespace cv;
 
 

modules/java/generator/src/cpp/converters.h

@@ -1,5 +1,5 @@
 #include "opencv2/opencv_modules.hpp"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "features2d_manual.hpp"
 
 void Mat_to_vector_int(cv::Mat& mat, std::vector<int>& v_int);

modules/java/generator/src/cpp/core_manual.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 
 namespace cv
 {

modules/java/generator/src/cpp/features2d_manual.hpp

@@ -4,7 +4,7 @@
 #include "opencv2/opencv_modules.hpp"
 
 #ifdef HAVE_OPENCV_FEATURES2D
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
 
 #undef SIMPLEBLOB // to solve conflict with wincrypt.h on windows
 

modules/java/generator/src/cpp/jni_part.cpp

@@ -3,23 +3,23 @@
 #include "opencv2/opencv_modules.hpp"
 
 #ifdef HAVE_OPENCV_NONFREE
-#  include "opencv2/nonfree/nonfree.hpp"
+#  include "opencv2/nonfree.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_FEATURES2D
-#  include "opencv2/features2d/features2d.hpp"
+#  include "opencv2/features2d.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_VIDEO
-#  include "opencv2/video/video.hpp"
+#  include "opencv2/video.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_ML
-#  include "opencv2/ml/ml.hpp"
+#  include "opencv2/ml.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_CONTRIB
-#  include "opencv2/contrib/contrib.hpp"
+#  include "opencv2/contrib.hpp"
 #endif
 
 extern "C" {

modules/java/generator/src/cpp/utils.cpp

@@ -1,8 +1,8 @@
 #define LOG_TAG "org.opencv.android.Utils"
 #include "common.h"
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
 
 #ifdef __ANDROID__
 #include <android/bitmap.h>