Skip to content

Commit

Permalink
Merge pull request #42 from nextbreakpoint/dev/2.3.1
Browse files Browse the repository at this point in the history
Dev/2.3.1
  • Loading branch information
nextbreakpoint authored Jul 20, 2024
2 parents 8bf27d6 + 4c1020e commit 1784ece
Show file tree
Hide file tree
Showing 494 changed files with 568 additions and 1,052 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# NextFractal 2.3.0
# NextFractal 2.3.1

Copyright 2015-2024 Andrea Medeghini

Expand Down
6 changes: 1 addition & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project name="NextFractal">
<property environment="env" />
<property name="openjfx.version" value="22.0.1" />
<property name="nextfractal.version" value="2.3.0" />
<property name="nextfractal.version" value="2.3.1" />
<property name="nextfractal.year" value="2024" />
<property name="application" value="NextFractal" />
<property name="description" value="NextFractal is an application for creating fractals" />
Expand Down Expand Up @@ -49,8 +49,6 @@
<delete failonerror="true" dir="@{basedir}/dist/@{os}_@{arch}"/>
<delete failonerror="true" dir="@{basedir}/build/@{os}_@{arch}"/>
<mkdir dir="@{basedir}/build/@{os}_@{arch}"/>
<maven basedir="@{basedir}/com.nextbreakpoint.nextfractal.libraries" command="@{command}" goal="clean" options="-t ../toolchains-@{os}.xml" resultproperty="@{resultproperty}" />
<maven basedir="@{basedir}/com.nextbreakpoint.nextfractal.libraries" command="@{command}" goal="install" options="-t ../toolchains-@{os}.xml" resultproperty="@{resultproperty}" />
<maven basedir="@{basedir}" command="@{command}" goal="clean" options="-t toolchains-@{os}.xml -P @{os}_@{arch}" resultproperty="@{resultproperty}" />
<maven basedir="@{basedir}" command="@{command}" goal="package" options="-t toolchains-@{os}.xml -P @{os}_@{arch}" resultproperty="@{resultproperty}" />
<copy failonerror="true" todir="@{basedir}/build/@{os}_@{arch}/app/libs" overwrite="true">
Expand Down Expand Up @@ -536,8 +534,6 @@
</replaceregexp>
<maven basedir="${basedir}" command="mvn" goal="versions:set" options="-DnewVersion=${nextfractal.version}" resultproperty="maven.build.result"/>
<maven basedir="${basedir}" command="mvn" goal="versions:commit" options="" resultproperty="maven.build.result"/>
<maven basedir="${basedir}/com.nextbreakpoint.nextfractal.libraries" command="mvn" goal="versions:set" options="-DnewVersion=${nextfractal.version}" resultproperty="maven.build.result"/>
<maven basedir="${basedir}/com.nextbreakpoint.nextfractal.libraries" command="mvn" goal="versions:commit" options="" resultproperty="maven.build.result"/>
</target>
<target name="change-copyright">
<changecopyright basedir="${basedir}" path="com.nextbreakpoint.nextfractal.core/src/main/java" file="copyright.txt"/>
Expand Down
13 changes: 2 additions & 11 deletions com.nextbreakpoint.nextfractal.contextfree.javafx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,19 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.nextfractal</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<artifactId>com.nextbreakpoint.nextfractal.contextfree.javafx</artifactId>
<dependencies>
<dependency>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.nextfractal.libraries</artifactId>
<artifactId>com.nextbreakpoint.nextfractal.core.javafx</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.nextfractal.contextfree</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.nextfractal.core.javafx</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import com.nextbreakpoint.nextfractal.core.javafx.render.JavaFXRendererFactory;
import com.nextbreakpoint.nextfractal.core.render.RendererFactory;
import com.nextbreakpoint.nextfractal.core.render.RendererGraphicsContext;
import com.nextbreakpoint.nextfractal.core.render.RendererPoint;
import com.nextbreakpoint.nextfractal.core.render.RendererSize;
import com.nextbreakpoint.nextfractal.core.render.RendererTile;
import javafx.scene.canvas.Canvas;
import lombok.extern.java.Log;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.nextbreakpoint.nextfractal.contextfree.javafx;

import com.nextbreakpoint.nextfractal.contextfree.module.ContextFreeMetadata;
import com.nextbreakpoint.nextfractal.core.common.Metadata;
import com.nextbreakpoint.nextfractal.core.javafx.MetadataDelegate;
import com.nextbreakpoint.nextfractal.core.javafx.RenderingContext;
import com.nextbreakpoint.nextfractal.core.javafx.ToolContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import com.nextbreakpoint.nextfractal.core.javafx.AdvancedTextField;
import com.nextbreakpoint.nextfractal.core.javafx.AttributeEditor;
import com.nextbreakpoint.nextfractal.core.params.Attribute;
import io.reactivex.rxjavafx.observables.JavaFxObservable;
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
import javafx.scene.control.Tooltip;
import org.reactfx.EventStreams;

import java.util.concurrent.TimeUnit;
import java.time.Duration;

public class SeedAttributeEditor extends AttributeEditor {
private final Attribute attribute;
Expand All @@ -24,10 +23,9 @@ public SeedAttributeEditor(Attribute attribute) {

setCenter(textField);

JavaFxObservable.changesOf(textField.textProperty())
.subscribeOn(JavaFxScheduler.platform())
.throttleWithTimeout(500, TimeUnit.MILLISECONDS)
.subscribe(result -> {
EventStreams.changesOf(textField.textProperty())
.successionEnds(Duration.ofMillis(500))
.subscribe(change -> {
if (getDelegate() != null) {
getDelegate().onEditorChanged(this);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down Expand Up @@ -27,13 +27,9 @@

module com.nextbreakpoint.nextfractal.contextfree.javafx {
requires static lombok;
requires java.logging;
requires javafx.controls;
requires com.nextbreakpoint.common;
requires com.nextbreakpoint.nextfractal.libraries;
requires com.nextbreakpoint.nextfractal.core;
requires com.nextbreakpoint.nextfractal.contextfree;
requires com.nextbreakpoint.nextfractal.core.javafx;
requires transitive com.nextbreakpoint.nextfractal.contextfree;
requires transitive com.nextbreakpoint.nextfractal.core.javafx;
requires com.nextbreakpoint.convertedlibraries.richtextfx;
provides com.nextbreakpoint.nextfractal.core.javafx.UIFactory with ContextFreeUIFactory;
provides com.nextbreakpoint.nextfractal.core.javafx.AttributeEditorFactory with SeedAttributeEditorFactory;
}
20 changes: 5 additions & 15 deletions com.nextbreakpoint.nextfractal.contextfree/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.nextfractal</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<artifactId>com.nextbreakpoint.nextfractal.contextfree</artifactId>
<build>
Expand Down Expand Up @@ -47,28 +47,18 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.nextfractal.libraries</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.nextfractal.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.convertedlibraries.antlr4-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.convertedlibraries.commons-math3</artifactId>
</dependency>
</dependencies>
<profiles>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* NextFractal 2.3.0
* NextFractal 2.3.1
* https://github.com/nextbreakpoint/nextfractal
*
* Copyright 2015-2024 Andrea Medeghini
Expand Down
Loading

0 comments on commit 1784ece

Please sign in to comment.