refactored ColorMode from enum to class to support optional values as…

… well, e.g. ColorMode("highlight")
gmuth · Oct 10, 2023 · 547d44e · 547d44e
1 parent 07e2d3e
commit 547d44e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/main/kotlin/de/gmuth/ipp/attributes/ColorMode.kt b/src/main/kotlin/de/gmuth/ipp/attributes/ColorMode.kt
@@ -10,11 +10,19 @@ import de.gmuth.ipp.core.IppAttributesGroup
 import de.gmuth.ipp.core.IppException
 import de.gmuth.ipp.core.IppTag.Keyword
 
-enum class ColorMode(private val keyword: String) : IppAttributeBuilder {
+// https://ftp.pwg.org/pub/pwg/candidates/cs-ippjobprinterext3v10-20120727-5100.13.pdf  - 5.2.3
+class ColorMode(private val keyword: String) : IppAttributeBuilder {
 
-    Auto("auto"),
-    Color("color"),
-    Monochrome("monochrome");
+    companion object {
+        @JvmField
+        val Auto = ColorMode("auto")
+
+        @JvmField
+        val Color = ColorMode("color")
+
+        @JvmField
+        val Monochrome = ColorMode("monochrome")
+    }
 
     override fun buildIppAttribute(printerAttributes: IppAttributesGroup) = IppAttribute(
         when { // use job-creation-attributes-supported? // 5100.11

diff --git a/src/main/kotlin/de/gmuth/ipp/iana/IppRegistrationsSection2.kt b/src/main/kotlin/de/gmuth/ipp/iana/IppRegistrationsSection2.kt
@@ -73,8 +73,8 @@ object IppRegistrationsSection2 {
 
     }
 
-    private val attributesMap: Map<String, Attribute>
-    private val aliasMap: Map<String, String>
+    internal val attributesMap: Map<String, Attribute>
+    internal val aliasMap: Map<String, String>
 
     init {
         // source: https://www.iana.org/assignments/ipp-registrations/ipp-registrations-2.csv

diff --git a/src/main/kotlin/de/gmuth/ipp/iana/IppRegistrationsSection6.kt b/src/main/kotlin/de/gmuth/ipp/iana/IppRegistrationsSection6.kt
@@ -25,8 +25,8 @@ object IppRegistrationsSection6 {
         override fun toString() = "$attribute/$value ($syntax) = $name $reference "
     }
 
-    private val enumAttributeValuesMap: Map<String, EnumAttributeValue>
-    private val aliasMap: Map<String, String>
+    internal val enumAttributeValuesMap: Map<String, EnumAttributeValue>
+    internal val aliasMap: Map<String, String>
 
     init {
         // source: https://www.iana.org/assignments/ipp-registrations/ipp-registrations-6.csv