From f88794667494b6977031258d9141db4dfc8aa022 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 3 May 2015 15:57:11 +0200 Subject: [PATCH] Remove lib --- .../net/osmand/render/RenderingRulesStoragePrinter.java | 8 +++++++- OsmAnd/build.gradle | 3 +-- OsmAnd/project.properties | 2 -- .../CacheFragmentStatePagerAdapter.java | 0 .../android/observablescrollview/ObservableGridView.java | 0 .../android/observablescrollview/ObservableListView.java | 0 .../observablescrollview/ObservableScrollView.java | 0 .../ObservableScrollViewCallbacks.java | 0 .../android/observablescrollview/ObservableWebView.java | 0 .../android/observablescrollview/ScrollState.java | 0 .../android/observablescrollview/ScrollUtils.java | 0 .../android/observablescrollview/Scrollable.java | 0 .../TouchInterceptionFrameLayout.java | 0 13 files changed, 8 insertions(+), 5 deletions(-) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/ObservableListView.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/ScrollState.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/Scrollable.java (100%) rename {eclipse-compile/observable/java => OsmAnd/src}/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java (100%) diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java b/OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java index 2e96511c32..9d243fbc80 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java @@ -1,6 +1,7 @@ package net.osmand.render; import gnu.trove.iterator.TIntObjectIterator; +import gnu.trove.map.hash.TIntObjectHashMap; import java.io.File; import java.io.FileInputStream; @@ -59,7 +60,12 @@ public class RenderingRulesStoragePrinter { } }; storage.parseRulesFromXmlInputStream(is, resolver); - new RenderingRulesStoragePrinter().printJavaFile(storage); + new RenderingRulesStoragePrinter().printCppRules(storage, RenderingRulesStorage.ORDER_RULES); + } + + protected void printCppRules(RenderingRulesStorage storage, int rules) throws IOException { + TIntObjectHashMap rp = storage.tagValueGlobalRules[rules]; + } protected void printJavaFile(RenderingRulesStorage storage) throws IOException { diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 15f9e80caa..d0cc8eac2c 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -302,10 +302,9 @@ dependencies { exclude: [ "QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar", - "android-support*.jar", "OsmAndCore_android.jar", "OsmAndCore_wrapper.jar"]) - compile "com.github.ksoichiro:android-observablescrollview:1.5.0" + // compile "com.github.ksoichiro:android-observablescrollview:1.5.0" // compile "com.android.support:appcompat-v7:21.0.3" // compile "com.github.shell-software:fab:1.0.5" legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar" diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties index d122cb8411..fd62b55da2 100644 --- a/OsmAnd/project.properties +++ b/OsmAnd/project.properties @@ -13,5 +13,3 @@ split.density=false target=android-21 dex.force.jumbo=true android.library.reference.1=../eclipse-compile/appcompat -android.library.reference.2=../eclipse-compile/observable -android.library.reference.2=../eclipse-compile/observable diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableListView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableListView.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableListView.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableListView.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ScrollState.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollState.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ScrollState.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollState.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/Scrollable.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/Scrollable.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/Scrollable.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/Scrollable.java diff --git a/eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java similarity index 100% rename from eclipse-compile/observable/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java rename to OsmAnd/src/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java