Upgraded to IntelliJ IDEA 14.1.5

diff --git a/Open-ILS/src/Android/core/core.iml b/Open-ILS/src/Android/core/core.iml
index 11ca7f9..9f34edd 100644 (file)
--- a/Open-ILS/src/Android/core/core.iml
+++ b/Open-ILS/src/Android/core/core.iml
@@ -13,10 +13,9 @@
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="libs" level="project" />
     <orderEntry type="module" module-name="appcompat" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/ImageDownloader.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/ImageDownloader.java
index c02f1a9..ddc316d 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/ImageDownloader.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/ImageDownloader.java
@@ -206,7 +206,7 @@ public class ImageDownloader {
         final HttpClient client = (mode == Mode.NO_ASYNC_TASK) ? new DefaultHttpClient()
                 : AndroidHttpClient.newInstance("Android");
 
-        Log.d(LOG_TAG, "GETURL " + url);
+        Log.d(LOG_TAG, url + " GET");
         HttpGet getRequest = null;
         try {
             getRequest = new HttpGet(url);

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/misc.xml b/Open-ILS/src/Android/cwmars_app/.idea/misc.xml
index ce05366..bcea67a 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/.idea/misc.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/misc.xml
@@ -3,8 +3,7 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/vcs.xml b/Open-ILS/src/Android/cwmars_app/.idea/vcs.xml
index def6a6a..4fce1d8 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/.idea/vcs.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index d5e60c6..92083d4 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -3,7 +3,7 @@
           package="org.cwmars"
           android:installLocation="auto"
           android:versionCode="6"
-          android:versionName="1.1">
+          android:versionName="1.2">
 
     <uses-sdk
         android:minSdkVersion="8"