Skip to content

Commit ddaa268

Browse files
committed
java-se: Moves to a different package then the handlers in core [fix]
This fixes an OSGi bundling issue.
1 parent 523a796 commit ddaa268

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

modules/java-se-addons/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SPDX-License-Identifier: Unlicense
88
<modelVersion>4.0.0</modelVersion>
99

1010
<properties>
11-
<project.packageName>com.illposed.osc</project.packageName>
11+
<project.packageName>com.illposed.osc.argument.handler.javase</project.packageName>
1212
<supported.osc.version>1.0</supported.osc.version>
1313
</properties>
1414

@@ -38,7 +38,7 @@ SPDX-License-Identifier: Unlicense
3838
<configuration>
3939
<instructions>
4040
<Export-Package>
41-
${project.packageName}.argument.handler,
41+
${project.packageName},
4242
</Export-Package>
4343
<Supported-OSC-Version>${supported.osc.version}</Supported-OSC-Version>
4444
</instructions>

modules/java-se-addons/src/main/java/com/illposed/osc/argument/handler/Activator.java renamed to modules/java-se-addons/src/main/java/com/illposed/osc/argument/handler/javase/Activator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: BSD-3-Clause
44

5-
package com.illposed.osc.argument.handler;
5+
package com.illposed.osc.argument.handler.javase;
66

77
import com.illposed.osc.argument.ArgumentHandler;
88
import org.slf4j.Logger;

modules/java-se-addons/src/main/java/com/illposed/osc/argument/handler/AwtColorArgumentHandler.java renamed to modules/java-se-addons/src/main/java/com/illposed/osc/argument/handler/javase/AwtColorArgumentHandler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
// SPDX-FileCopyrightText: 2015-2017 C. Ramakrishnan / Illposed Software
2-
// SPDX-FileCopyrightText: 2021 Robin Vobruba <hoijui.quaero@gmail.com>
2+
// SPDX-FileCopyrightText: 2021-2024 Robin Vobruba <hoijui.quaero@gmail.com>
33
//
44
// SPDX-License-Identifier: BSD-3-Clause
55

6-
package com.illposed.osc.argument.handler;
6+
package com.illposed.osc.argument.handler.javase;
77

88
import com.illposed.osc.BytesReceiver;
99
import com.illposed.osc.OSCParseException;
1010
import com.illposed.osc.OSCSerializeException;
1111
import com.illposed.osc.argument.ArgumentHandler;
1212
import com.illposed.osc.argument.OSCColor;
13+
import com.illposed.osc.argument.handler.ColorArgumentHandler;
1314

1415
import java.awt.Color;
1516
import java.nio.ByteBuffer;

modules/java-se-addons/src/main/java/com/illposed/osc/argument/handler/package-info.java renamed to modules/java-se-addons/src/main/java/com/illposed/osc/argument/handler/javase/package-info.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
/**
66
* Provides {@link com.illposed.osc.argument.ArgumentHandler} implementations.
7-
* Most, if not all of them can be found in the OSC specification (1.0 and 1.1).
7+
* The ones in this package are Java SE specific,
8+
* meaning they work on Oracle JDK and OpenJDK,
9+
* but specifically not on Android.
810
*/
9-
package com.illposed.osc.argument.handler;
11+
package com.illposed.osc.argument.handler.javase;

modules/java-se-addons/src/test/java/com/illposed/osc/argument/handler/AwtColorArgumentHandlerTest.java renamed to modules/java-se-addons/src/test/java/com/illposed/osc/argument/handler/javase/AwtColorArgumentHandlerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-FileCopyrightText: 2015 C. Ramakrishnan / Illposed Software
2-
// SPDX-FileCopyrightText: 2021 Robin Vobruba <hoijui.quaero@gmail.com>
2+
// SPDX-FileCopyrightText: 2021-2024 Robin Vobruba <hoijui.quaero@gmail.com>
33
//
44
// SPDX-License-Identifier: BSD-3-Clause
55

6-
package com.illposed.osc.argument.handler;
6+
package com.illposed.osc.argument.handler.javase;
77

88
import com.illposed.osc.BufferBytesReceiver;
99
import com.illposed.osc.argument.ArgumentHandler;

0 commit comments

Comments
 (0)