Merge pull request #18 from nextbreakpoint/development

Development
nextbreakpoint · Apr 29, 2019 · d5635c8 · d5635c8
2 parents e240bcd + 6f17590
commit d5635c8
Show file tree

Hide file tree

Showing 480 changed files with 992 additions and 980 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# NextFractal 2.1.0
+# NextFractal 2.1.1
 
-Copyright 2015-2018 Andrea Medeghini
+Copyright 2015-2019 Andrea Medeghini
 
 NextFractal is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

diff --git a/build.xml b/build.xml
@@ -2,8 +2,8 @@
 <project name="NextFractal">
 	<property environment="env" />
 	<property name="maven.home" value="${env.M2_HOME}" />
-	<property name="nextfractal.version" value="2.1.0" />
-	<property name="nextfractal.year" value="2018" />
+	<property name="nextfractal.version" value="2.1.1" />
+	<property name="nextfractal.year" value="2019" />
 	<property name="nextfractal.folder" value="NextFractal" />
 	<property name="mainmodule" value="com.nextbreakpoint.nextfractal.main" />
 	<macrodef name="maven">

diff --git a/com.nextbreakpoint.nextfractal.contextfree.javafx/pom.xml b/com.nextbreakpoint.nextfractal.contextfree.javafx/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.nextbreakpoint</groupId>
         <artifactId>com.nextbreakpoint.nextfractal</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>com.nextbreakpoint.nextfractal.contextfree.javafx</artifactId>
     <dependencies>

diff --git a/...src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/ContextFreeUIFactory.java b/...src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/ContextFreeUIFactory.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *
@@ -62,7 +62,7 @@ public Pane createEditorPane(EventBus eventBus, Session session) {
 
 	@Override
 	public Pane createRenderPane(EventBus eventBus, Session session, int width, int height) {
-		return new RenderPane(session, eventBus, width, height, 1, 1);
+		return new RenderPane((ContextFreeSession) session, eventBus, width, height, 1, 1);
 	}
 
 	@Override

diff --git a/...ee.javafx/src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/EditorPane.java b/...ee.javafx/src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/EditorPane.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ee.javafx/src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/ParamsPane.java b/...ee.javafx/src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/ParamsPane.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ee.javafx/src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/RenderPane.java b/...ee.javafx/src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/RenderPane.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *
@@ -91,13 +91,13 @@ public class RenderPane extends BorderPane {
 	private volatile boolean hasError;
 	private ContextFreeSession contextFreeSession;
 
-	public RenderPane(Session session, EventBus eventBus, int width, int height, int rows, int columns) {
+	public RenderPane(ContextFreeSession session, EventBus eventBus, int width, int height, int rows, int columns) {
 		this.width = width;
 		this.height = height;
 		this.rows = rows;
 		this.columns = columns;
 
-		contextFreeSession = (ContextFreeSession) session;
+		contextFreeSession = session;
 
 		errorProperty = new StringObservableValue();
 		errorProperty.setValue(null);

diff --git a/com.nextbreakpoint.nextfractal.contextfree/pom.xml b/com.nextbreakpoint.nextfractal.contextfree/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
         <groupId>com.nextbreakpoint</groupId>
         <artifactId>com.nextbreakpoint.nextfractal</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
 	<artifactId>com.nextbreakpoint.nextfractal.contextfree</artifactId>
    	<build>

diff --git a/...ntextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/Compiler.java b/...ntextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/Compiler.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ee/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerBuilder.java b/...ee/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerBuilder.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerClassException.java b/...main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerClassException.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...free/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerError.java b/...free/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerError.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/.../main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerErrorStrategy.java b/.../main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerErrorStrategy.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerReport.java b/...ree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerReport.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ain/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerSourceException.java b/...ain/java/com/nextbreakpoint/nextfractal/contextfree/compiler/CompilerSourceException.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...n/java/com/nextbreakpoint/nextfractal/contextfree/compiler/InterpreterReportCompiler.java b/...n/java/com/nextbreakpoint/nextfractal/contextfree/compiler/InterpreterReportCompiler.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...free/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/AffineTransform1D.java b/...free/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/AffineTransform1D.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ee/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/AffineTransformTime.java b/...ee/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/AffineTransformTime.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...tal.contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/Bounds.java b/...tal.contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/Bounds.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ee/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/ExtendedGeneralPath.java b/...ee/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/ExtendedGeneralPath.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...e/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/ExtendedPathIterator.java b/...e/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/ExtendedPathIterator.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...textfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/ExtendedShape.java b/...textfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/ExtendedShape.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...tal.contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/Rand64.java b/...tal.contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/core/Rand64.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ontextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFCanvas.java b/...ontextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFCanvas.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...al.contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDG.java b/...al.contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDG.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...textfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDGDriver.java b/...textfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDGDriver.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *
@@ -196,6 +196,7 @@ public String shapeToString(int shape) {
 	public void includeFile(String fileName, Token location) {
 		try {
 			String path = relativeFilePath(currentPath, fileName);
+			info("Include file " + path, location);
 //			if (path.endsWith(".nf.zip")) {
 //				throw new UnsupportedOperationException();
 //			}

diff --git a/...textfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDGLogger.java b/...textfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDGLogger.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...xtfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDGRenderer.java b/...xtfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFDGRenderer.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStack.java b/...contextfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStack.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...extfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackItem.java b/...extfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackItem.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...ree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackIterator.java b/...ree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackIterator.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackModification.java b/...src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackModification.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *

diff --git a/...tfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackNumber.java b/...tfree/src/main/java/com/nextbreakpoint/nextfractal/contextfree/grammar/CFStackNumber.java
@@ -1,8 +1,8 @@
 /*
- * NextFractal 2.1.0
+ * NextFractal 2.1.1
  * https://github.com/nextbreakpoint/nextfractal
  *
- * Copyright 2015-2018 Andrea Medeghini
+ * Copyright 2015-2019 Andrea Medeghini
  *
  * This file is part of NextFractal.
  *