WIP: Use manifold + fixes

MultiSubDownloader/pom.xml

@@ -7,19 +7,12 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>multisubdownloader</artifactId>
-	<name>MultiSubDownloader</name>
+    <artifactId>multisubdownloader</artifactId>
+    <name>MultiSubDownloader</name>
 
-	<repositories>
-		<repository>
-			<id>d-maven</id>
-			<url>http://d-maven.googlecode.com/svn/trunk/repo</url>
-		</repository>
-	</repositories>
-
-	<properties>
-		<build.timestamp>${maven.build.timestamp}</build.timestamp>
-	</properties>
+    <properties>
+        <build.timestamp>${maven.build.timestamp}</build.timestamp>
+    </properties>
 
 	<dependencies>
 		<dependency>
@@ -62,6 +55,14 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>systems.manifold</groupId>
+			<artifactId>manifold-ext-rt</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>systems.manifold</groupId>
+			<artifactId>manifold-props-rt</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -109,11 +110,52 @@
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
 			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>add-generated-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-source/openapi/src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgs combine.children="append">
+						<arg>-Xplugin:Manifold</arg>
+					</compilerArgs>
+					<annotationProcessorPaths combine.children="append">
+						<path>
+							<groupId>systems.manifold</groupId>
+							<artifactId>manifold-ext</artifactId>
+							<version>${manifold.version}</version>
+						</path>
+						<path>
+							<groupId>systems.manifold</groupId>
+							<artifactId>manifold-props</artifactId>
+							<version>${manifold.version}</version>
+						</path>
+						<path>
+							<groupId>systems.manifold</groupId>
+							<artifactId>manifold-strings</artifactId>
+							<version>${manifold.version}</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -159,15 +201,12 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
 				<executions>
 					<execution>
+						<id>gestdown</id>
 						<goals>
 							<goal>generate</goal>
 						</goals>
@@ -203,7 +242,33 @@
 								<importMapping>java.time.OffsetDateTime=java.time.Instant</importMapping>
 								<importMapping>java.time.LocalDateTime=java.time.Instant</importMapping>
 							</importMappings>
-
+						</configuration>
+					</execution>
+					<execution>
+						<id>opensubtitles</id>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<generatorName>java</generatorName>
+							<inputSpec>${project.basedir}/src/main/resources/opensubtitles/open-api.json</inputSpec>
+							<output>${project.build.directory}/generated-source/openapi</output>
+							<modelPackage>org.opensubtitles.model</modelPackage>
+							<apiPackage>org.opensubtitles.api</apiPackage>
+							<invokerPackage>org.opensubtitles.invoker</invokerPackage>
+							<packageName>org.opensubtitles</packageName>
+							<!--<language>java</language>-->
+							<!--<skipValidateSpec>true</skipValidateSpec>-->
+							<apisToGenerate>Authentication,Download,Subtitles</apisToGenerate>
+							<generateModelTests>false</generateModelTests>
+							<configOptions>
+								<typeMappings>integer=int,int=int</typeMappings>
+								<useSwaggerAnnotations>false</useSwaggerAnnotations>
+								<serializableModel>true</serializableModel>
+								<booleanGetterPrefix>is</booleanGetterPrefix>
+								<disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
+								<!--<sourceFolder>src/gen/java</sourceFolder>-->
+							</configOptions>
 						</configuration>
 					</execution>
 				</executions>

MultiSubDownloader/src/main/java/extensions/java/awt/Component/ComponentExt.java

@@ -0,0 +1,82 @@
+package extensions.java.awt.Component;
+
+import java.awt.*;
+import java.awt.event.MouseListener;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import lombok.experimental.UtilityClass;
+import manifold.ext.rt.api.Extension;
+import manifold.ext.rt.api.Self;
+import manifold.ext.rt.api.This;
+import org.jetbrains.annotations.Nullable;
+
+@UtilityClass
+@Extension
+public class ComponentExt {
+
+    public static void setRecursive(@This Component component, Consumer<Component> consumer) {
+        setRecursive(component, consumer, _ -> true);
+    }
+
+    public static void setRecursive(@This Component component, Consumer<Component> consumer,
+            Predicate<Container> condition) {
+        if (component != null) {
+            consumer.accept(component);
+            if (component instanceof Container container && condition.test(container)) {
+                container.getComponents().forEach(child -> setRecursive(child, consumer, condition));
+            }
+        }
+    }
+
+    public static @Self Component mouseListener(@This Component component, @Nullable MouseListener listener) {
+        component.addMouseListener(listener);
+        return component;
+    }
+
+    public static @Self Component addTo(@This Component child, Container parent) {
+        parent.addComponent(child);
+        return child;
+    }
+
+    public static @Self Component addTo(@This Component child, Container parent, Object constraints) {
+        parent.addComponent(child, constraints);
+        return child;
+    }
+
+    public static @Self Component withSize(@This Component component, Dimension size) {
+        component.size = size;
+        component.minimumSize = size;
+        component.maximumSize = size;
+        component.preferredSize = size;
+        return component;
+    }
+
+    public static @Self Component minSize(@This Component component, Dimension minSize) {
+        component.minimumSize = minSize;
+        return component;
+    }
+
+    public static @Self Component minSize(@This Component component, int minWidth, int minHeight) {
+        return component.minSize(new Dimension(minWidth, minHeight));
+    }
+
+    public static @Self Component maxSize(@This Component component, Dimension maximumSize) {
+        component.maximumSize = maximumSize;
+        return component;
+    }
+
+    public static @Self Component maxSize(@This Component component, int maxWidth, int maxHeight) {
+        return component.maxSize(new Dimension(maxWidth, maxHeight));
+    }
+
+    public static @Self Component font(@This Component component, Font font) {
+        component.setFont(font);
+        return component;
+    }
+
+    public static @Self Component focusable(@This Component component, boolean focusable) {
+        component.setFocusable(focusable);
+        return component;
+    }
+}

MultiSubDownloader/src/main/java/extensions/java/awt/Container/ContainerExt.java

@@ -0,0 +1,33 @@
+package extensions.java.awt.Container;
+
+import java.awt.*;
+
+import lombok.experimental.UtilityClass;
+import manifold.ext.rt.api.Extension;
+import manifold.ext.rt.api.Self;
+import manifold.ext.rt.api.This;
+
+@UtilityClass
+@Extension
+public class ContainerExt {
+
+    public static @Self Container addComponent(@This Container component, Component child) {
+        component.add(child);
+        return component;
+    }
+
+    public static @Self Container addComponent(@This Container component, Component child, Object constraints) {
+        component.add(child, constraints);
+        return component;
+    }
+
+    public static @Self Container addComponent(@This Container component, Object constraints, Component child) {
+        component.add(child, constraints);
+        return component;
+    }
+
+    public static @Self Container layout(@This Container container, LayoutManager mgr) {
+        container.setLayout(mgr);
+        return container;
+    }
+}

MultiSubDownloader/src/main/java/extensions/javax/swing/AbstractButton/AbstractButtonExt.java

@@ -0,0 +1,46 @@
+package extensions.javax.swing.AbstractButton;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.function.Consumer;
+
+import lombok.experimental.UtilityClass;
+import manifold.ext.rt.api.Extension;
+import manifold.ext.rt.api.Self;
+import manifold.ext.rt.api.This;
+import org.lodder.subtools.sublibrary.util.BooleanConsumer;
+
+@UtilityClass
+@Extension
+public class AbstractButtonExt {
+
+    public static @Self AbstractButton actionListener(@This AbstractButton abstractButton, ActionListener listener) {
+        abstractButton.addActionListener(listener);
+        return abstractButton;
+    }
+
+    public static @Self AbstractButton actionListener(@This AbstractButton abstractButton, Runnable listener) {
+        return abstractButton.actionListener(_ -> listener.run());
+    }
+
+    public static @Self AbstractButton actionListenerSelf(@This AbstractButton abstractButton,
+            Consumer<AbstractButton> selfConsumerListener) {
+        return abstractButton.actionListener(_ -> selfConsumerListener.accept(abstractButton));
+    }
+
+    public static @Self AbstractButton selectedListener(@This AbstractButton abstractButton,
+            BooleanConsumer selectedConsumer) {
+        return abstractButton.actionListener(_ -> selectedConsumer.accept(abstractButton.isSelected()));
+    }
+
+    public static @Self AbstractButton actionCommand(@This AbstractButton abstractButton, String actionCommand) {
+        abstractButton.setActionCommand(actionCommand);
+        return abstractButton;
+    }
+
+    public static @Self AbstractButton withMargin(@This AbstractButton abstractButton, Insets insets) {
+        abstractButton.setMargin(insets);
+        return abstractButton;
+    }
+}

MultiSubDownloader/src/main/java/extensions/javax/swing/JButton/JButtonExt.java

@@ -0,0 +1,18 @@
+package extensions.javax.swing.JButton;
+
+import javax.swing.*;
+
+import lombok.experimental.UtilityClass;
+import manifold.ext.rt.api.Extension;
+import manifold.ext.rt.api.Self;
+import manifold.ext.rt.api.This;
+
+@UtilityClass
+@Extension
+public class JButtonExt {
+
+    public static @Self JButton defaultButtonFor(@This JButton abstractButton, JRootPane rootPane) {
+        rootPane.setDefaultButton(abstractButton);
+        return abstractButton;
+    }
+}

MultiSubDownloader/src/main/java/extensions/javax/swing/JCheckBox/JCheckBoxExt.java

@@ -0,0 +1,29 @@
+package extensions.javax.swing.JCheckBox;
+
+import javax.swing.*;
+
+import lombok.experimental.UtilityClass;
+import manifold.ext.rt.api.Extension;
+import manifold.ext.rt.api.Self;
+import manifold.ext.rt.api.This;
+import org.lodder.subtools.sublibrary.util.BooleanConsumer;
+
+@Extension
+@UtilityClass
+public class JCheckBoxExt {
+
+    public static @Self JCheckBox addCheckedChangeListener(@This JCheckBox checkBox, BooleanConsumer... listeners) {
+        checkBox.addItemListener(e -> listeners.forEach(lis -> lis.accept(((JCheckBox) e.getSource()).isSelected())));
+        return checkBox;
+    }
+
+    public static @Self JCheckBox visible(@This JCheckBox checkBox, boolean visible) {
+        checkBox.setVisible(visible);
+        return checkBox;
+    }
+
+    public static @Self JCheckBox selected(@This JCheckBox checkBox, boolean selected) {
+        checkBox.setSelected(selected);
+        return checkBox;
+    }
+}