Jni moved to different directory

JNI/src/jni/AlphaChannelData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum AlphaChannelData {
   Present,

JNI/src/jni/AreaD.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class AreaD {
   private long swigCPtr;

JNI/src/jni/AreaF.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class AreaF {
   private long swigCPtr;

JNI/src/jni/AreaI.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class AreaI {
   private long swigCPtr;

JNI/src/jni/AtlasMapRendererConfiguration.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class AtlasMapRendererConfiguration extends MapRendererConfiguration {
   private long swigCPtr;
@@ -50,7 +50,7 @@ public class AtlasMapRendererConfiguration extends MapRendererConfiguration {
   }
 
   public void copyTo(MapRendererConfiguration other) {
-    OsmAndCoreJNI.AtlasMapRendererConfiguration_copyTo(swigCPtr, this, MapRendererConfiguration.getCPtr(other), other);
+    OsmAndCoreJNI.AtlasMapRendererConfiguration_copyTo(swigCPtr, this, getCPtr(other), other);
   }
 
   public MapRendererConfiguration createCopy() {

JNI/src/jni/BinaryMapDataProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapDataProvider extends IMapTiledDataProvider {
   private long swigCPtr;

JNI/src/jni/BinaryMapDataTile.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapDataTile extends MapTiledData {
   private long swigCPtr;

JNI/src/jni/BinaryMapPrimitivesProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapPrimitivesProvider extends IMapTiledDataProvider {
   private long swigCPtr;

JNI/src/jni/BinaryMapPrimitivesTile.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapPrimitivesTile extends MapTiledData {
   private long swigCPtr;

JNI/src/jni/BinaryMapRasterBitmapTileProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapRasterBitmapTileProvider extends IMapRasterBitmapTileProvider {
   private long swigCPtr;

JNI/src/jni/BinaryMapRasterBitmapTileProvider_Software.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapRasterBitmapTileProvider_Software extends BinaryMapRasterBitmapTileProvider {
   private long swigCPtr;

JNI/src/jni/BinaryMapRasterizedTile.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapRasterizedTile extends RasterBitmapTile {
   private long swigCPtr;

JNI/src/jni/BinaryMapStaticSymbolsProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapStaticSymbolsProvider extends IMapTiledSymbolsProvider {
   private long swigCPtr;

JNI/src/jni/BinaryMapStaticSymbolsTile.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BinaryMapStaticSymbolsTile extends TiledMapSymbolsData {
   private long swigCPtr;

JNI/src/jni/BoolPtr.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class BoolPtr {
   private long swigCPtr;

JNI/src/jni/ColorARGB.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ColorARGB {
   private long swigCPtr;

JNI/src/jni/ColorRGB.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ColorRGB {
   private long swigCPtr;

JNI/src/jni/CoreResourcesEmbeddedBundle.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class CoreResourcesEmbeddedBundle extends ICoreResourcesProvider {
   private long swigCPtr;

JNI/src/jni/DefaultLogSink.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class DefaultLogSink extends ILogSink {
   private long swigCPtr;

JNI/src/jni/DoublePtr.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class DoublePtr {
   private long swigCPtr;

JNI/src/jni/Edge.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum Edge {
   Invalid(OsmAndCoreJNI.Edge_Invalid_get()),

JNI/src/jni/ElevationDataTile.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ElevationDataTile extends MapTiledData {
   private long swigCPtr;

JNI/src/jni/FColorARGB.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class FColorARGB {
   private long swigCPtr;

JNI/src/jni/FColorRGB.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class FColorRGB {
   private long swigCPtr;

JNI/src/jni/FloatPtr.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class FloatPtr {
   private long swigCPtr;

JNI/src/jni/ICoreResourcesProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ICoreResourcesProvider {
   private long swigCPtr;

JNI/src/jni/ILogSink.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ILogSink {
   private long swigCPtr;

JNI/src/jni/IMapDataProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapDataProvider {
   private long swigCPtr;

JNI/src/jni/IMapElevationDataProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapElevationDataProvider extends IMapTiledDataProvider {
   private long swigCPtr;

JNI/src/jni/IMapKeyedDataProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapKeyedDataProvider extends IMapDataProvider {
   private long swigCPtr;

JNI/src/jni/IMapKeyedSymbolsProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapKeyedSymbolsProvider extends IMapKeyedDataProvider {
   private long swigCPtr;

JNI/src/jni/IMapRasterBitmapTileProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapRasterBitmapTileProvider extends IMapTiledDataProvider {
   private long swigCPtr;

JNI/src/jni/IMapRenderer.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapRenderer {
   private long swigCPtr;

JNI/src/jni/IMapStylesCollection.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapStylesCollection {
   private long swigCPtr;

JNI/src/jni/IMapStylesPresetsCollection.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapStylesPresetsCollection {
   private long swigCPtr;

JNI/src/jni/IMapTiledDataProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapTiledDataProvider extends IMapDataProvider {
   private long swigCPtr;

JNI/src/jni/IMapTiledSymbolsProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IMapTiledSymbolsProvider extends IMapTiledDataProvider {
   private long swigCPtr;

JNI/src/jni/IObfsCollection.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IObfsCollection {
   private long swigCPtr;

JNI/src/jni/IObservable.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IObservable {
   private long swigCPtr;

JNI/src/jni/IOnlineTileSources.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IOnlineTileSources {
   private long swigCPtr;

JNI/src/jni/IntPtr.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class IntPtr {
   private long swigCPtr;

JNI/src/jni/KeyedMapSymbolsData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class KeyedMapSymbolsData extends MapKeyedData {
   private long swigCPtr;

JNI/src/jni/LanguageId.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum LanguageId {
   Invariant(OsmAndCoreJNI.LanguageId_Invariant_get()),

JNI/src/jni/LatLon.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class LatLon {
   private long swigCPtr;

JNI/src/jni/LogSeverityLevel.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum LogSeverityLevel {
   Error(OsmAndCoreJNI.LogSeverityLevel_Error_get()),

JNI/src/jni/Logger.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class Logger {
   private long swigCPtr;

JNI/src/jni/MapData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapData {
   private long swigCPtr;

JNI/src/jni/MapFoundationType.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum MapFoundationType {
   Undefined(OsmAndCoreJNI.MapFoundationType_Undefined_get()),

JNI/src/jni/MapKeyedData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapKeyedData extends MapData {
   private long swigCPtr;

JNI/src/jni/MapPresentationEnvironment.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapPresentationEnvironment {
   private long swigCPtr;

JNI/src/jni/MapRendererClass.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum MapRendererClass {
   AtlasMapRenderer_OpenGL2plus,

JNI/src/jni/MapRendererConfiguration.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapRendererConfiguration {
   private long swigCPtr;

JNI/src/jni/MapRendererDebugSettings.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapRendererDebugSettings {
   private long swigCPtr;

JNI/src/jni/MapRendererSetupOptions.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapRendererSetupOptions {
   private long swigCPtr;

JNI/src/jni/MapRendererState.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapRendererState {
   private long swigCPtr;

JNI/src/jni/MapRendererStateChange.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum MapRendererStateChange {
   RasterLayers_Providers(OsmAndCoreJNI.MapRendererStateChange_RasterLayers_Providers_get()),

JNI/src/jni/MapRendererStateChanges.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapRendererStateChanges {
   private long swigCPtr;

JNI/src/jni/MapStyleBuiltinValueDefinitions.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapStyleBuiltinValueDefinitions {
   private long swigCPtr;

JNI/src/jni/MapStyleConstantValue.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapStyleConstantValue {
   private long swigCPtr;

JNI/src/jni/MapStylePreset.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapStylePreset {
   private long swigCPtr;

JNI/src/jni/MapStyleRulesetType.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum MapStyleRulesetType {
   Invalid(OsmAndCoreJNI.MapStyleRulesetType_Invalid_get()),

JNI/src/jni/MapStyleValueDataType.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum MapStyleValueDataType {
   Boolean,

JNI/src/jni/MapStyleValueDefinition.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapStyleValueDefinition {
   private long swigCPtr;

JNI/src/jni/MapStylesCollection.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapStylesCollection extends IMapStylesCollection {
   private long swigCPtr;

JNI/src/jni/MapStylesPresetsCollection.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapStylesPresetsCollection extends IMapStylesPresetsCollection {
   private long swigCPtr;

JNI/src/jni/MapSymbol.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapSymbol {
   private long swigCPtr;

JNI/src/jni/MapSymbolsGroup.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapSymbolsGroup {
   private long swigCPtr;

JNI/src/jni/MapTiledData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class MapTiledData extends MapData {
   private long swigCPtr;

JNI/src/jni/OOBBD.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class OOBBD {
   private long swigCPtr;

JNI/src/jni/OOBBF.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class OOBBF {
   private long swigCPtr;

JNI/src/jni/OOBBI.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class OOBBI {
   private long swigCPtr;

JNI/src/jni/ObfAddressBlockType.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum ObfAddressBlockType {
   CitiesOrTowns(OsmAndCoreJNI.ObfAddressBlockType_CitiesOrTowns_get()),

JNI/src/jni/ObfDataInterface.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ObfDataInterface {
   private long swigCPtr;

JNI/src/jni/ObfFile.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ObfFile {
   private long swigCPtr;

JNI/src/jni/ObfInfo.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ObfInfo {
   private long swigCPtr;

JNI/src/jni/ObfMapSectionDataBlockId.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ObfMapSectionDataBlockId {
   private long swigCPtr;

JNI/src/jni/ObfRoutingSectionDataBlockId.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ObfRoutingSectionDataBlockId {
   private long swigCPtr;

JNI/src/jni/ObfsCollection.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ObfsCollection extends IObfsCollection {
   private long swigCPtr;

JNI/src/jni/OnlineRasterMapTileProvider.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class OnlineRasterMapTileProvider extends IMapRasterBitmapTileProvider {
   private long swigCPtr;

JNI/src/jni/OnlineTileSources.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class OnlineTileSources extends IOnlineTileSources {
   private long swigCPtr;

JNI/src/jni/OsmAndCore.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class OsmAndCore implements OsmAndCoreConstants {
   public static boolean InitializeCore(ICoreResourcesProvider coreResourcesProvider) {

JNI/src/jni/OsmAndCoreConstants.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public interface OsmAndCoreConstants {
   public final static int OSMAND_DEBUG = OsmAndCoreJNI.OSMAND_DEBUG_get();

JNI/src/jni/OsmAndCoreJNI.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class OsmAndCoreJNI {
   public final static native long new_BoolPtr();

JNI/src/jni/PointD.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class PointD {
   private long swigCPtr;

JNI/src/jni/PointF.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class PointF {
   private long swigCPtr;

JNI/src/jni/PointI.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class PointI {
   private long swigCPtr;

JNI/src/jni/Primitiviser.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class Primitiviser {
   private long swigCPtr;

JNI/src/jni/QIODeviceLogSink.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class QIODeviceLogSink extends ILogSink {
   private long swigCPtr;

JNI/src/jni/QStringList.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class QStringList {
   private long swigCPtr;

JNI/src/jni/Quadrant.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum Quadrant {
   NE(OsmAndCoreJNI.Quadrant_NE_get()),

JNI/src/jni/RasterBitmapTile.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class RasterBitmapTile extends MapTiledData {
   private long swigCPtr;

JNI/src/jni/RasterMapLayerId.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum RasterMapLayerId {
   Invalid(OsmAndCoreJNI.RasterMapLayerId_Invalid_get()),

JNI/src/jni/ResolvedMapStyle.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ResolvedMapStyle {
   private long swigCPtr;

JNI/src/jni/ResourcesManager.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class ResourcesManager {
   private long swigCPtr;

JNI/src/jni/RoutingDataLevel.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public enum RoutingDataLevel {
   Basemap,

JNI/src/jni/SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class SWIGTYPE_p_BinaryMapDataProvider_Metrics__Metric_obtainData {
   private long swigCPtr;

JNI/src/jni/SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class SWIGTYPE_p_BinaryMapPrimitivesProvider_Metrics__Metric_obtainData {
   private long swigCPtr;

JNI/src/jni/SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class SWIGTYPE_p_BinaryMapRasterBitmapTileProvider_Metrics__Metric_obtainData {
   private long swigCPtr;

JNI/src/jni/SWIGTYPE_p_FilterMapObjectsByIdFunction.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class SWIGTYPE_p_FilterMapObjectsByIdFunction {
   private long swigCPtr;

JNI/src/jni/SWIGTYPE_p_FilterRoadsByIdFunction.java

@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package net.osmand.core.jni;
+package jni;
 
 public class SWIGTYPE_p_FilterRoadsByIdFunction {
   private long swigCPtr;