diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 20149c2e..d42aaad2 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 encoding//src/jar-specific/java=UTF-8 -encoding//src/js-specific/java=UTF-8 encoding//src/main/java=UTF-8 encoding//src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java=UTF-8 encoding//src/main/java/org/warp/picalculator/math/MathematicalSymbols.java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/main/rules=UTF-8 +encoding//src/teavm-specific/java=UTF-8 encoding//src/test/java=UTF-8 diff --git a/math-rules-cache.zip b/math-rules-cache.zip index cf88bd56..8b961d68 100644 Binary files a/math-rules-cache.zip and b/math-rules-cache.zip differ diff --git a/pom.xml b/pom.xml index 6846218d..d3e47d1a 100755 --- a/pom.xml +++ b/pom.xml @@ -128,9 +128,9 @@ - jsprofile + teavmprofile - js-specific + teavm-specific src/main/rules diff --git a/src/main/java/org/warp/picalculator/gui/DisplayManager.java b/src/main/java/org/warp/picalculator/gui/DisplayManager.java index 67d3353f..19d74729 100755 --- a/src/main/java/org/warp/picalculator/gui/DisplayManager.java +++ b/src/main/java/org/warp/picalculator/gui/DisplayManager.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import org.apache.commons.lang3.tuple.Pair; import org.warp.picalculator.ConsoleUtils; import org.warp.picalculator.PlatformUtils; import org.warp.picalculator.StaticVars; @@ -402,7 +403,15 @@ public final class DisplayManager implements RenderingLoop { Observable workTimer = Observable.interval(tickDuration); - Observable.combineChanged(workTimer, engine.onResize()).subscribe((pair) -> { + Observable onResizeObservable = engine.onResize(); + Observable> refreshObservable; + if (onResizeObservable == null) { + refreshObservable = workTimer.map((l) -> Pair.of(l, null)); + } else { + refreshObservable = Observable.combineChanged(workTimer, engine.onResize()); + } + + refreshObservable.subscribe((pair) -> { double dt = 0; final long newtime = System.nanoTime(); if (precTime == -1) { diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java b/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java index 57a5e606..9a865aed 100644 --- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java +++ b/src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java @@ -9,7 +9,7 @@ import org.warp.picalculator.StaticVars; import org.warp.picalculator.Utils; import org.warp.picalculator.device.Keyboard; import org.warp.picalculator.event.Key; -import org.warp.picalculator.flow.DObservable; +import org.warp.picalculator.flow.Observable; import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.RenderingLoop; @@ -139,7 +139,7 @@ public class Headless24bitEngine implements org.warp.picalculator.gui.graphiceng } @Override - public DObservable onResize() { + public Observable onResize() { return null; } diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java b/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java index 48fc30ef..c165e4f0 100755 --- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java +++ b/src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java @@ -9,7 +9,7 @@ import org.warp.picalculator.StaticVars; import org.warp.picalculator.Utils; import org.warp.picalculator.device.Keyboard; import org.warp.picalculator.event.Key; -import org.warp.picalculator.flow.DObservable; +import org.warp.picalculator.flow.Observable; import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.RenderingLoop; import org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitRenderer; @@ -138,7 +138,7 @@ public class Headless256Engine implements org.warp.picalculator.gui.graphicengin } @Override - public DObservable onResize() { + public Observable onResize() { return null; } diff --git a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java b/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java index 12938038..3d819ac7 100644 --- a/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java +++ b/src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java @@ -9,7 +9,7 @@ import org.warp.picalculator.StaticVars; import org.warp.picalculator.Utils; import org.warp.picalculator.device.Keyboard; import org.warp.picalculator.event.Key; -import org.warp.picalculator.flow.DObservable; +import org.warp.picalculator.flow.Observable; import org.warp.picalculator.gui.graphicengine.Renderer; import org.warp.picalculator.gui.graphicengine.RenderingLoop; import org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitRenderer; @@ -138,7 +138,7 @@ public class Headless8Engine implements org.warp.picalculator.gui.graphicengine. } @Override - public DObservable onResize() { + public Observable onResize() { return null; } diff --git a/src/js-specific/java/ar/com/hjg/pngj/BufferedStreamFeeder.java b/src/teavm-specific/java/ar/com/hjg/pngj/BufferedStreamFeeder.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/BufferedStreamFeeder.java rename to src/teavm-specific/java/ar/com/hjg/pngj/BufferedStreamFeeder.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ChunkReader.java b/src/teavm-specific/java/ar/com/hjg/pngj/ChunkReader.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ChunkReader.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ChunkReader.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ChunkSeqBuffering.java b/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqBuffering.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ChunkSeqBuffering.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqBuffering.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ChunkSeqReader.java b/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReader.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ChunkSeqReader.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReader.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java b/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ChunkSeqSkipping.java b/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqSkipping.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ChunkSeqSkipping.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqSkipping.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/DeflatedChunkReader.java b/src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunkReader.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/DeflatedChunkReader.java rename to src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunkReader.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/DeflatedChunksSet.java b/src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunksSet.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/DeflatedChunksSet.java rename to src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunksSet.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/Deinterlacer.java b/src/teavm-specific/java/ar/com/hjg/pngj/Deinterlacer.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/Deinterlacer.java rename to src/teavm-specific/java/ar/com/hjg/pngj/Deinterlacer.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/FilterType.java b/src/teavm-specific/java/ar/com/hjg/pngj/FilterType.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/FilterType.java rename to src/teavm-specific/java/ar/com/hjg/pngj/FilterType.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IBytesConsumer.java b/src/teavm-specific/java/ar/com/hjg/pngj/IBytesConsumer.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IBytesConsumer.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IBytesConsumer.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IChunkFactory.java b/src/teavm-specific/java/ar/com/hjg/pngj/IChunkFactory.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IChunkFactory.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IChunkFactory.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IDatChunkWriter.java b/src/teavm-specific/java/ar/com/hjg/pngj/IDatChunkWriter.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IDatChunkWriter.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IDatChunkWriter.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IImageLine.java b/src/teavm-specific/java/ar/com/hjg/pngj/IImageLine.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IImageLine.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IImageLine.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IImageLineArray.java b/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineArray.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IImageLineArray.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IImageLineArray.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IImageLineFactory.java b/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineFactory.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IImageLineFactory.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IImageLineFactory.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IImageLineSet.java b/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSet.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IImageLineSet.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSet.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IImageLineSetFactory.java b/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSetFactory.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IImageLineSetFactory.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSetFactory.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IPngWriterFactory.java b/src/teavm-specific/java/ar/com/hjg/pngj/IPngWriterFactory.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IPngWriterFactory.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IPngWriterFactory.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/IdatSet.java b/src/teavm-specific/java/ar/com/hjg/pngj/IdatSet.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/IdatSet.java rename to src/teavm-specific/java/ar/com/hjg/pngj/IdatSet.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ImageInfo.java b/src/teavm-specific/java/ar/com/hjg/pngj/ImageInfo.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ImageInfo.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ImageInfo.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ImageLineByte.java b/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineByte.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ImageLineByte.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ImageLineByte.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ImageLineHelper.java b/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineHelper.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ImageLineHelper.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ImageLineHelper.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ImageLineInt.java b/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineInt.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ImageLineInt.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ImageLineInt.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/ImageLineSetDefault.java b/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineSetDefault.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/ImageLineSetDefault.java rename to src/teavm-specific/java/ar/com/hjg/pngj/ImageLineSetDefault.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngHelperInternal.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngHelperInternal.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngHelperInternal2.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal2.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngHelperInternal2.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal2.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngReader.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngReader.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngReader.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngReader.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngReaderApng.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderApng.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngReaderApng.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngReaderApng.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngReaderByte.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderByte.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngReaderByte.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngReaderByte.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngReaderFilter.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderFilter.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngReaderFilter.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngReaderFilter.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngReaderInt.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderInt.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngReaderInt.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngReaderInt.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngWriter.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngWriter.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngWriter.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngWriter.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngWriterHc.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngWriterHc.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngWriterHc.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngWriterHc.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngjBadCrcException.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngjBadCrcException.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngjBadCrcException.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngjBadCrcException.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngjException.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngjException.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngjException.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngjException.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngjExceptionInternal.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngjExceptionInternal.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngjExceptionInternal.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngjExceptionInternal.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngjInputException.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngjInputException.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngjInputException.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngjInputException.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngjOutputException.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngjOutputException.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngjOutputException.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngjOutputException.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/PngjUnsupportedException.java b/src/teavm-specific/java/ar/com/hjg/pngj/PngjUnsupportedException.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/PngjUnsupportedException.java rename to src/teavm-specific/java/ar/com/hjg/pngj/PngjUnsupportedException.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/RowInfo.java b/src/teavm-specific/java/ar/com/hjg/pngj/RowInfo.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/RowInfo.java rename to src/teavm-specific/java/ar/com/hjg/pngj/RowInfo.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkFactory.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkFactory.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkFactory.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkFactory.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkHelper.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkHelper.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkHelper.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkHelper.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkRaw.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkRaw.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunkRaw.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkRaw.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunksList.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksList.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunksList.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksList.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunk.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunk.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunk.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunk.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/PngMetadata.java b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngMetadata.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/PngMetadata.java rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngMetadata.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/chunks/package.html b/src/teavm-specific/java/ar/com/hjg/pngj/chunks/package.html similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/chunks/package.html rename to src/teavm-specific/java/ar/com/hjg/pngj/chunks/package.html diff --git a/src/js-specific/java/ar/com/hjg/pngj/package.html b/src/teavm-specific/java/ar/com/hjg/pngj/package.html similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/package.html rename to src/teavm-specific/java/ar/com/hjg/pngj/package.html diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/CompressorStream.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStream.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/CompressorStream.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStream.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/PixelsWriter.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriter.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/PixelsWriter.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriter.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java diff --git a/src/js-specific/java/ar/com/hjg/pngj/pixels/package.html b/src/teavm-specific/java/ar/com/hjg/pngj/pixels/package.html similarity index 100% rename from src/js-specific/java/ar/com/hjg/pngj/pixels/package.html rename to src/teavm-specific/java/ar/com/hjg/pngj/pixels/package.html diff --git a/src/js-specific/java/org/warp/picalculator/ConsoleUtils.java b/src/teavm-specific/java/org/warp/picalculator/ConsoleUtils.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/ConsoleUtils.java rename to src/teavm-specific/java/org/warp/picalculator/ConsoleUtils.java diff --git a/src/js-specific/java/org/warp/picalculator/PlatformUtils.java b/src/teavm-specific/java/org/warp/picalculator/PlatformUtils.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/PlatformUtils.java rename to src/teavm-specific/java/org/warp/picalculator/PlatformUtils.java diff --git a/src/js-specific/java/org/warp/picalculator/ZipUtils.java b/src/teavm-specific/java/org/warp/picalculator/ZipUtils.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/ZipUtils.java rename to src/teavm-specific/java/org/warp/picalculator/ZipUtils.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DAtomicInteger.java b/src/teavm-specific/java/org/warp/picalculator/deps/DAtomicInteger.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DAtomicInteger.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DAtomicInteger.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DEngine.java b/src/teavm-specific/java/org/warp/picalculator/deps/DEngine.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DEngine.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DEngine.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DGpio.java b/src/teavm-specific/java/org/warp/picalculator/deps/DGpio.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DGpio.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DGpio.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DJDTCompiler.java b/src/teavm-specific/java/org/warp/picalculator/deps/DJDTCompiler.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DJDTCompiler.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DJDTCompiler.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DSemaphore.java b/src/teavm-specific/java/org/warp/picalculator/deps/DSemaphore.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DSemaphore.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DSemaphore.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java b/src/teavm-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DStandardOpenOption.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DSystem.java b/src/teavm-specific/java/org/warp/picalculator/deps/DSystem.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DSystem.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DSystem.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/DURLClassLoader.java b/src/teavm-specific/java/org/warp/picalculator/deps/DURLClassLoader.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/DURLClassLoader.java rename to src/teavm-specific/java/org/warp/picalculator/deps/DURLClassLoader.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/StorageUtils.java b/src/teavm-specific/java/org/warp/picalculator/deps/StorageUtils.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/StorageUtils.java rename to src/teavm-specific/java/org/warp/picalculator/deps/StorageUtils.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java b/src/teavm-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java rename to src/teavm-specific/java/org/warp/picalculator/deps/jogamp/DJogamp.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/nio/DFiles.java b/src/teavm-specific/java/org/warp/picalculator/deps/nio/DFiles.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/nio/DFiles.java rename to src/teavm-specific/java/org/warp/picalculator/deps/nio/DFiles.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/nio/DPath.java b/src/teavm-specific/java/org/warp/picalculator/deps/nio/DPath.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/nio/DPath.java rename to src/teavm-specific/java/org/warp/picalculator/deps/nio/DPath.java diff --git a/src/js-specific/java/org/warp/picalculator/deps/nio/DPaths.java b/src/teavm-specific/java/org/warp/picalculator/deps/nio/DPaths.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/deps/nio/DPaths.java rename to src/teavm-specific/java/org/warp/picalculator/deps/nio/DPaths.java diff --git a/src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlEngine.java b/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlEngine.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlEngine.java rename to src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlEngine.java diff --git a/src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlFont.java b/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlFont.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlFont.java rename to src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlFont.java diff --git a/src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlRenderer.java b/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlRenderer.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlRenderer.java rename to src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlRenderer.java diff --git a/src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlSkin.java b/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlSkin.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlSkin.java rename to src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/HtmlSkin.java diff --git a/src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/InputEvent.java b/src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/InputEvent.java similarity index 100% rename from src/js-specific/java/org/warp/picalculator/gui/graphicengine/html/InputEvent.java rename to src/teavm-specific/java/org/warp/picalculator/gui/graphicengine/html/InputEvent.java