fix spelling

r2-shared/src/main/java/org/readium/r2/shared/Contributor.kt

@@ -12,14 +12,14 @@ import java.io.Serializable
 
 class Contributor : JSONable, Serializable {
 
-    var multilangName:MultilangString = MultilangString()
+    var multilanguageName:MultilanguageString = MultilanguageString()
     var sortAs: String? = null
     var roles: MutableList<String> = mutableListOf()
     var links: MutableList<Link> = mutableListOf()
     var identifier: String? = null
 
     var name: String? = null
-        get() = multilangName.singleString
+        get() = multilanguageName.singleString
 
     override fun getJSON() : JSONObject{
         val obj = JSONObject()
@@ -38,7 +38,7 @@ fun parseContributors(contributors: Any) : List<Contributor> {
     when (contributors) {
         is String -> {
             val c = Contributor()
-            c.multilangName.singleString = contributors
+            c.multilanguageName.singleString = contributors
             result.add(c)
         }
         is JSONObject -> {
@@ -59,10 +59,10 @@ fun parseContributor(cDict: JSONObject) : Contributor {
 
     if (cDict.has("name")){
         if (cDict.get("name") is String) {
-            c.multilangName.singleString = cDict.getString("name")
+            c.multilanguageName.singleString = cDict.getString("name")
         } else if (cDict.get("name") is JSONObject) {
             val array = cDict.getJSONObject("name")
-            c.multilangName.multiString = array as MutableMap<String, String>
+            c.multilanguageName.multiString = array as MutableMap<String, String>
         }
 
     }

r2-shared/src/main/java/org/readium/r2/shared/Link.kt

@@ -36,7 +36,7 @@ class Link : JSONable, Serializable {
     /// Indicate the bitrate for the link resource.
     var bitrate: Int? = null
 
-    //  The underlaying nodes in a tree structure of Links
+    //  The underlying nodes in a tree structure of Links
     var children: MutableList<Link> = mutableListOf()
     //  The MediaOverlays associated to the resource of the Link
     var mediaOverlays: MediaOverlays? = null

r2-shared/src/main/java/org/readium/r2/shared/MediaOverlays.kt

@@ -6,7 +6,7 @@
 
 package org.readium.r2.shared
 
-class MediaOverlays(var nodes: MutableList<MediaOverlayNode> = mutableListOf()){
+class MediaOverlays(private var nodes: MutableList<MediaOverlayNode> = mutableListOf()){
 
     fun clip(id: String) : Clip {
         val clip: Clip

r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt

@@ -15,10 +15,10 @@ import java.util.*
 
 class Metadata : Serializable {
     /// The structure used for the serialisation.
-    var multilangTitle: MultilangString? = null
+    var multilanguageTitle: MultilanguageString? = null
     /// The title of the publication.
     var title: String = ""
-        get() = multilangTitle?.singleString ?: ""
+        get() = multilanguageTitle?.singleString ?: ""
 
     var languages: MutableList<String> = mutableListOf()
     lateinit var identifier: String
@@ -52,7 +52,7 @@ class Metadata : Serializable {
 
     var duration: Int? = null
 
-    fun titleForLang(key: String) : String?  = multilangTitle?.multiString?.get(key)
+    fun titleForLang(key: String) : String?  = multilanguageTitle?.multiString?.get(key)
 
     fun writeJSON() : JSONObject{
         val obj = JSONObject()
@@ -86,8 +86,8 @@ class Metadata : Serializable {
 fun parseMetadata(metadataDict:JSONObject) : Metadata {
     val m = Metadata()
     if (metadataDict.has("title")) {
-        m.multilangTitle = MultilangString()
-        m.multilangTitle?.singleString = metadataDict.getString("title")
+        m.multilanguageTitle = MultilanguageString()
+        m.multilanguageTitle?.singleString = metadataDict.getString("title")
     }
     if (metadataDict.has("identifier")) {
         m.identifier = metadataDict.getString("identifier")

r2-shared/src/main/java/org/readium/r2/shared/MultilangString.kt → r2-shared/src/main/java/org/readium/r2/shared/MultilanguageString.kt

@@ -8,7 +8,7 @@ package org.readium.r2.shared
 
 import java.io.Serializable
 
-class MultilangString : Serializable{
+class MultilanguageString : Serializable{
 
     var singleString: String? = null
     var multiString: MutableMap<String, String> = mutableMapOf()

r2-shared/src/main/java/org/readium/r2/shared/UserProperties.kt

@@ -31,7 +31,7 @@ class Enumerable(var index: Int, private val values: List<String>, ref: String,
 class Incremental(var value: Float,
                   val min: Float,
                   val max: Float,
-                  val step: Float,
+                  private val step: Float,
                   private val suffix: String,
                   ref: String,
                   name: String) :
@@ -66,15 +66,15 @@ class UserProperties : Serializable {
 
     val properties: MutableList<UserProperty> = mutableListOf()
 
-    fun addIncrementable(nValue: Float, min: Float, max: Float, step: Float, suffix: String, ref: String, name: String) {
+    fun addIncremental(nValue: Float, min: Float, max: Float, step: Float, suffix: String, ref: String, name: String) {
         properties.add(Incremental(nValue, min, max, step, suffix, ref, name))
     }
 
     fun addSwitchable(onValue: String, offValue: String, on: Boolean, ref: String, name: String) {
         properties.add(Switchable(onValue, offValue, on, ref, name))
     }
 
-    fun addEnumeratable(index: Int, values: List<String>, ref: String, name: String) {
+    fun addEnumerable(index: Int, values: List<String>, ref: String, name: String) {
         properties.add(Enumerable(index, values, ref, name))
     }