Skip to content

Commit 9221bb4

Browse files
committed
refactored Orientation into enum for usage in various orientation attributes
1 parent 51d4e7c commit 9221bb4

File tree

4 files changed

+21
-27
lines changed

4 files changed

+21
-27
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package de.gmuth.ipp.attributes
2+
3+
/**
4+
* Copyright (c) 2020-2024 Gerhard Muth
5+
*/
6+
7+
enum class Orientation(val code: Int) {
8+
Portrait(3),
9+
Landscape(4),
10+
ReverseLandscape(5),
11+
ReversePortrait(6),
12+
None(7); // PWG 5100.13
13+
}

src/main/kotlin/de/gmuth/ipp/attributes/OrientationRequested.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/main/kotlin/de/gmuth/ipp/attributes/TemplateAttributes.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ object TemplateAttributes {
4848
fun finishings(values: Collection<Finishing>) =
4949
IppAttribute("finishings", IppTag.Enum, values.map { it.code })
5050

51+
@JvmStatic
52+
fun orientationRequested(orientation: Orientation) =
53+
IppAttribute("orientation-requested", IppTag.Enum, orientation.code)
54+
5155
@JvmStatic
5256
fun mediaSource(keyword: String) =
5357
IppAttribute("media-source", Keyword, keyword)

src/test/kotlin/de/gmuth/ipp/client/IppPrinterTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
package de.gmuth.ipp.client
22

33
/**
4-
* Copyright (c) 2021-2023 Gerhard Muth
4+
* Copyright (c) 2021-2024 Gerhard Muth
55
*/
66

77
import de.gmuth.ipp.attributes.*
88
import de.gmuth.ipp.attributes.Finishing.Punch
99
import de.gmuth.ipp.attributes.Finishing.Staple
10+
import de.gmuth.ipp.attributes.Orientation.Portrait
1011
import de.gmuth.ipp.attributes.PrinterType.Capability.CanPunchOutput
1112
import de.gmuth.ipp.attributes.TemplateAttributes.copies
1213
import de.gmuth.ipp.attributes.TemplateAttributes.finishings
1314
import de.gmuth.ipp.attributes.TemplateAttributes.jobName
1415
import de.gmuth.ipp.attributes.TemplateAttributes.jobPriority
1516
import de.gmuth.ipp.attributes.TemplateAttributes.numberUp
17+
import de.gmuth.ipp.attributes.TemplateAttributes.orientationRequested
1618
import de.gmuth.ipp.attributes.TemplateAttributes.pageRanges
1719
import de.gmuth.ipp.attributes.TemplateAttributes.printerResolution
1820
import de.gmuth.ipp.client.WhichJobs.Completed
1921
import de.gmuth.ipp.core.IppOperation.GetPrinterAttributes
20-
import de.gmuth.ipp.attributes.Marker
2122
import java.io.File
2223
import java.io.FileInputStream
2324
import java.net.URI
2425
import java.util.logging.Logger.getLogger
2526
import kotlin.io.path.createTempDirectory
26-
import kotlin.io.path.pathString
2727
import kotlin.test.Test
2828
import kotlin.test.assertEquals
2929
import kotlin.test.assertFalse
@@ -120,7 +120,7 @@ class IppPrinterTests {
120120
numberUp(1),
121121
pageRanges(1..5),
122122
printerResolution(600),
123-
OrientationRequested.Portrait,
123+
orientationRequested(Portrait),
124124
ColorMode.Monochrome,
125125
Sides.TwoSidedLongEdge,
126126
PrintQuality.High,

0 commit comments

Comments
 (0)