diff --git a/.idea/libraries/Maven__com_fifesoft_autocomplete_3_2_0.xml b/.idea/libraries/Maven__com_fifesoft_autocomplete_3_3_0.xml similarity index 63% rename from .idea/libraries/Maven__com_fifesoft_autocomplete_3_2_0.xml rename to .idea/libraries/Maven__com_fifesoft_autocomplete_3_3_0.xml index 3e042cd6..cf2a678a 100644 --- a/.idea/libraries/Maven__com_fifesoft_autocomplete_3_2_0.xml +++ b/.idea/libraries/Maven__com_fifesoft_autocomplete_3_3_0.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fifesoft_rsyntaxtextarea_3_2_0.xml b/.idea/libraries/Maven__com_fifesoft_rsyntaxtextarea_3_3_1.xml similarity index 61% rename from .idea/libraries/Maven__com_fifesoft_rsyntaxtextarea_3_2_0.xml rename to .idea/libraries/Maven__com_fifesoft_rsyntaxtextarea_3_3_1.xml index f0d5ef23..6486a0b6 100644 --- a/.idea/libraries/Maven__com_fifesoft_rsyntaxtextarea_3_2_0.xml +++ b/.idea/libraries/Maven__com_fifesoft_rsyntaxtextarea_3_3_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_formdev_flatlaf_2_6.xml b/.idea/libraries/Maven__com_formdev_flatlaf_2_6.xml deleted file mode 100644 index b755bc3b..00000000 --- a/.idea/libraries/Maven__com_formdev_flatlaf_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_formdev_flatlaf_3_0.xml b/.idea/libraries/Maven__com_formdev_flatlaf_3_0.xml new file mode 100644 index 00000000..4995e855 --- /dev/null +++ b/.idea/libraries/Maven__com_formdev_flatlaf_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_formdev_flatlaf_extras_2_6.xml b/.idea/libraries/Maven__com_formdev_flatlaf_extras_3_0.xml similarity index 64% rename from .idea/libraries/Maven__com_formdev_flatlaf_extras_2_6.xml rename to .idea/libraries/Maven__com_formdev_flatlaf_extras_3_0.xml index 5395337e..01fbda4c 100644 --- a/.idea/libraries/Maven__com_formdev_flatlaf_extras_2_6.xml +++ b/.idea/libraries/Maven__com_formdev_flatlaf_extras_3_0.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_numbers_arrays_1_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_apache_commons_commons_numbers_arrays_1_1.xml similarity index 59% rename from .idea/libraries/Maven__org_apache_commons_commons_numbers_arrays_1_1_SNAPSHOT.xml rename to .idea/libraries/Maven__org_apache_commons_commons_numbers_arrays_1_1.xml index eda715d3..f0d34310 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_numbers_arrays_1_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_numbers_arrays_1_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_numbers_combinatorics_1_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_apache_commons_commons_numbers_combinatorics_1_1.xml similarity index 55% rename from .idea/libraries/Maven__org_apache_commons_commons_numbers_combinatorics_1_1_SNAPSHOT.xml rename to .idea/libraries/Maven__org_apache_commons_commons_numbers_combinatorics_1_1.xml index abe4a98b..72118b8a 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_numbers_combinatorics_1_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_numbers_combinatorics_1_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_numbers_core_1_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_apache_commons_commons_numbers_core_1_1.xml similarity index 60% rename from .idea/libraries/Maven__org_apache_commons_commons_numbers_core_1_1_SNAPSHOT.xml rename to .idea/libraries/Maven__org_apache_commons_commons_numbers_core_1_1.xml index a03e23d2..0f7ba0f8 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_numbers_core_1_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_numbers_core_1_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_numbers_field_1_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_apache_commons_commons_numbers_field_1_1.xml similarity index 60% rename from .idea/libraries/Maven__org_apache_commons_commons_numbers_field_1_1_SNAPSHOT.xml rename to .idea/libraries/Maven__org_apache_commons_commons_numbers_field_1_1.xml index 36eed852..3f0b1569 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_numbers_field_1_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_numbers_field_1_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_numbers_fraction_1_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_apache_commons_commons_numbers_fraction_1_1.xml similarity index 58% rename from .idea/libraries/Maven__org_apache_commons_commons_numbers_fraction_1_1_SNAPSHOT.xml rename to .idea/libraries/Maven__org_apache_commons_commons_numbers_fraction_1_1.xml index ba579d30..6fae8056 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_numbers_fraction_1_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_numbers_fraction_1_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_numbers_gamma_1_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_apache_commons_commons_numbers_gamma_1_1.xml similarity index 60% rename from .idea/libraries/Maven__org_apache_commons_commons_numbers_gamma_1_1_SNAPSHOT.xml rename to .idea/libraries/Maven__org_apache_commons_commons_numbers_gamma_1_1.xml index cfbaed7b..b23a6b7a 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_numbers_gamma_1_1_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_numbers_gamma_1_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_locationtech_proj4j_proj4j_1_1_6_SNAPSHOT.xml b/.idea/libraries/Maven__org_locationtech_proj4j_proj4j_1_2_2.xml similarity index 56% rename from .idea/libraries/Maven__org_locationtech_proj4j_proj4j_1_1_6_SNAPSHOT.xml rename to .idea/libraries/Maven__org_locationtech_proj4j_proj4j_1_2_2.xml index 8d2ba86b..5792e9d4 100644 --- a/.idea/libraries/Maven__org_locationtech_proj4j_proj4j_1_1_6_SNAPSHOT.xml +++ b/.idea/libraries/Maven__org_locationtech_proj4j_proj4j_1_2_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/meteoinfo-chart/meteoinfo-chart.iml b/meteoinfo-chart/meteoinfo-chart.iml index 552eb241..c6bee690 100644 --- a/meteoinfo-chart/meteoinfo-chart.iml +++ b/meteoinfo-chart/meteoinfo-chart.iml @@ -13,16 +13,125 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,109 +149,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/meteoinfo-chart/pom.xml b/meteoinfo-chart/pom.xml index 3087bac7..25682bed 100644 --- a/meteoinfo-chart/pom.xml +++ b/meteoinfo-chart/pom.xml @@ -14,6 +14,8 @@ 1.8 1.8 + 2.4 + v2.4.0-rc4 @@ -75,31 +77,6 @@ l2fprod-common-all 0.1 - - org.freehep - freehep-util - 2.0.2 - - - org.freehep - freehep-graphicsio-emf - 2.4 - - - org.freehep - freehep-graphicsio-pdf - 2.4 - - - org.freehep - freehep-graphics2d - 2.4 - - - org.freehep - freehep-graphicsio-ps - 2.4 - - - org.jogamp.gluegen gluegen-rt - v2.4.0-rc4 + ${jogl.version} org.jogamp.gluegen gluegen-rt-natives-macosx-universal - v2.4.0-rc4 + ${jogl.version} - org.jogamp.gluegen gluegen-rt-natives-linux-aarch64 - v2.4.0-rc4 + ${jogl.version} - org.jogamp.gluegen gluegen-rt-natives-linux-amd64 - v2.4.0-rc4 + ${jogl.version} - org.jogamp.gluegen gluegen-rt-natives-linux-armv6hf - v2.4.0-rc4 + ${jogl.version} - org.jogamp.gluegen gluegen-rt-natives-linux-i586 - v2.4.0-rc4 + ${jogl.version} - org.jogamp.gluegen gluegen-rt-natives-macosx-universal - v2.4.0-rc4 + ${jogl.version} - org.jogamp.gluegen gluegen-rt-natives-windows-amd64 - v2.4.0-rc4 + ${jogl.version} - org.jogamp.gluegen gluegen-rt-natives-windows-i586 - v2.4.0-rc4 + ${jogl.version} org.joml diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java index 573985c5..b734979a 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/GraphicFactory.java @@ -10,7 +10,7 @@ import org.meteoinfo.chart.ChartText; import org.meteoinfo.chart.ChartText3D; import org.meteoinfo.chart.jogl.mc.CallbackMC; import org.meteoinfo.chart.jogl.mc.MarchingCubes; -import org.meteoinfo.chart.jogl.pipe.PipeShape; +import org.meteoinfo.chart.graphic.pipe.PipeShape; import org.meteoinfo.chart.shape.TextureShape; import org.meteoinfo.common.*; import org.meteoinfo.common.colors.ColorMap; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Line.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Line.java similarity index 98% rename from meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Line.java rename to meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Line.java index a84b2416..65580dfa 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Line.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Line.java @@ -1,4 +1,4 @@ -package org.meteoinfo.chart.jogl.pipe; +package org.meteoinfo.chart.graphic.pipe; import org.joml.Vector2f; import org.joml.Vector3f; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Matrix4f.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Matrix4f.java similarity index 99% rename from meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Matrix4f.java rename to meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Matrix4f.java index 378bb734..8297e661 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Matrix4f.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Matrix4f.java @@ -1,4 +1,4 @@ -package org.meteoinfo.chart.jogl.pipe; +package org.meteoinfo.chart.graphic.pipe; import org.joml.Vector3f; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Pipe.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Pipe.java similarity index 99% rename from meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Pipe.java rename to meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Pipe.java index d3bdb812..cbce110c 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Pipe.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Pipe.java @@ -1,4 +1,4 @@ -package org.meteoinfo.chart.jogl.pipe; +package org.meteoinfo.chart.graphic.pipe; import org.joml.Vector3f; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/PipeShape.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/PipeShape.java similarity index 98% rename from meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/PipeShape.java rename to meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/PipeShape.java index f922e3fb..436ed0d4 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/PipeShape.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/PipeShape.java @@ -1,4 +1,4 @@ -package org.meteoinfo.chart.jogl.pipe; +package org.meteoinfo.chart.graphic.pipe; import org.meteoinfo.chart.jogl.Transform; import org.meteoinfo.geometry.shape.PointZ; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Plane.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Plane.java similarity index 99% rename from meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Plane.java rename to meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Plane.java index c4b3d952..dcd9e6b2 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/pipe/Plane.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/graphic/pipe/Plane.java @@ -1,4 +1,4 @@ -package org.meteoinfo.chart.jogl.pipe; +package org.meteoinfo.chart.graphic.pipe; import org.joml.Vector3f; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/GLPlot.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/GLPlot.java index b9a4a217..0c75be9e 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/GLPlot.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/GLPlot.java @@ -16,8 +16,8 @@ import org.joml.Vector3f; import org.meteoinfo.chart.*; import org.meteoinfo.chart.axis.Axis; import org.meteoinfo.chart.graphic.*; -import org.meteoinfo.chart.jogl.pipe.Pipe; -import org.meteoinfo.chart.jogl.pipe.PipeShape; +import org.meteoinfo.chart.graphic.pipe.Pipe; +import org.meteoinfo.chart.graphic.pipe.PipeShape; import org.meteoinfo.chart.jogl.tessellator.Primitive; import org.meteoinfo.chart.jogl.tessellator.TessPolygon; import org.meteoinfo.chart.plot.GridLine; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/Plot3DGL.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/Plot3DGL.java index ed4671df..831c9a1b 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/Plot3DGL.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/Plot3DGL.java @@ -10,7 +10,6 @@ import com.jogamp.opengl.*; import com.jogamp.opengl.glu.GLU; import com.jogamp.opengl.glu.GLUquadric; import com.jogamp.opengl.glu.GLUtessellator; -import com.jogamp.opengl.glu.gl2.GLUgl2; import com.jogamp.opengl.math.VectorUtil; import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil; import com.jogamp.opengl.util.awt.TextRenderer; @@ -23,8 +22,8 @@ import org.joml.Vector3f; import org.meteoinfo.chart.*; import org.meteoinfo.chart.axis.Axis; import org.meteoinfo.chart.graphic.*; -import org.meteoinfo.chart.jogl.pipe.Pipe; -import org.meteoinfo.chart.jogl.pipe.PipeShape; +import org.meteoinfo.chart.graphic.pipe.Pipe; +import org.meteoinfo.chart.graphic.pipe.PipeShape; import org.meteoinfo.chart.jogl.tessellator.Primitive; import org.meteoinfo.chart.jogl.tessellator.TessPolygon; import org.meteoinfo.chart.plot.GridLine; diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/render/jogl/PipeRender.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/render/jogl/PipeRender.java index 37b24816..b2b87643 100644 --- a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/render/jogl/PipeRender.java +++ b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/render/jogl/PipeRender.java @@ -8,16 +8,12 @@ import org.meteoinfo.chart.graphic.GraphicCollection3D; import org.meteoinfo.chart.jogl.Program; import org.meteoinfo.chart.jogl.Transform; import org.meteoinfo.chart.jogl.Utils; -import org.meteoinfo.chart.jogl.pipe.Pipe; -import org.meteoinfo.chart.jogl.pipe.PipeShape; +import org.meteoinfo.chart.graphic.pipe.Pipe; +import org.meteoinfo.chart.graphic.pipe.PipeShape; import org.meteoinfo.geometry.graphic.Graphic; import org.meteoinfo.geometry.legend.BreakTypes; import org.meteoinfo.geometry.legend.ColorBreak; import org.meteoinfo.geometry.legend.ColorBreakCollection; -import org.meteoinfo.geometry.legend.PolylineBreak; -import org.meteoinfo.geometry.shape.PointZ; -import org.meteoinfo.geometry.shape.Polyline; -import org.meteoinfo.geometry.shape.PolylineZShape; import java.nio.FloatBuffer; import java.nio.IntBuffer; diff --git a/meteoinfo-console/meteoinfo-console.iml b/meteoinfo-console/meteoinfo-console.iml index 73ff954d..b2558e47 100644 --- a/meteoinfo-console/meteoinfo-console.iml +++ b/meteoinfo-console/meteoinfo-console.iml @@ -12,8 +12,8 @@ - - + + @@ -32,12 +32,12 @@ - - - - - - + + + + + + diff --git a/meteoinfo-console/pom.xml b/meteoinfo-console/pom.xml index c77a01ea..3e89c2e4 100644 --- a/meteoinfo-console/pom.xml +++ b/meteoinfo-console/pom.xml @@ -11,6 +11,11 @@ meteoinfo-console + + 1.8 + 1.8 + + org.python @@ -20,12 +25,12 @@ com.fifesoft rsyntaxtextarea - 3.2.0 + 3.3.1 com.fifesoft autocomplete - 3.2.0 + 3.3.0 org.meteothink diff --git a/meteoinfo-data/meteoinfo-data.iml b/meteoinfo-data/meteoinfo-data.iml index 2d953a9d..21de8a63 100644 --- a/meteoinfo-data/meteoinfo-data.iml +++ b/meteoinfo-data/meteoinfo-data.iml @@ -30,12 +30,12 @@ - - - - - - + + + + + + diff --git a/meteoinfo-dataframe/meteoinfo-dataframe.iml b/meteoinfo-dataframe/meteoinfo-dataframe.iml index 1b1c627c..44e27aa7 100644 --- a/meteoinfo-dataframe/meteoinfo-dataframe.iml +++ b/meteoinfo-dataframe/meteoinfo-dataframe.iml @@ -29,12 +29,12 @@ - - - - - - + + + + + + diff --git a/meteoinfo-geo/meteoinfo-geo.iml b/meteoinfo-geo/meteoinfo-geo.iml index c629ead9..dd29d3ee 100644 --- a/meteoinfo-geo/meteoinfo-geo.iml +++ b/meteoinfo-geo/meteoinfo-geo.iml @@ -22,12 +22,12 @@ - - - - - - + + + + + + @@ -114,8 +114,8 @@ - - + + diff --git a/meteoinfo-geo/pom.xml b/meteoinfo-geo/pom.xml index ead2bb1b..4853af63 100644 --- a/meteoinfo-geo/pom.xml +++ b/meteoinfo-geo/pom.xml @@ -14,6 +14,8 @@ 1.8 1.8 + 2.4 + 3.0 @@ -83,12 +85,12 @@ com.formdev flatlaf - 2.6 + ${flatlaf.version} com.formdev flatlaf-extras - 2.6 + ${flatlaf.version} org.freehep @@ -98,22 +100,22 @@ org.freehep freehep-graphicsio-emf - 2.4 + ${freehep.version} org.freehep freehep-graphicsio-pdf - 2.4 + ${freehep.version} org.freehep freehep-graphics2d - 2.4 + ${freehep.version} org.freehep freehep-graphicsio-ps - 2.4 + ${freehep.version} com.itextpdf diff --git a/meteoinfo-geometry/meteoinfo-geometry.iml b/meteoinfo-geometry/meteoinfo-geometry.iml index 67c88350..c1159a44 100644 --- a/meteoinfo-geometry/meteoinfo-geometry.iml +++ b/meteoinfo-geometry/meteoinfo-geometry.iml @@ -29,12 +29,12 @@ - - - - - - + + + + + + diff --git a/meteoinfo-image/meteoinfo-image.iml b/meteoinfo-image/meteoinfo-image.iml index b55e14f5..a711805c 100644 --- a/meteoinfo-image/meteoinfo-image.iml +++ b/meteoinfo-image/meteoinfo-image.iml @@ -22,12 +22,12 @@ - - - - - - + + + + + + @@ -88,5 +88,10 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-lab/meteoinfo-lab.iml b/meteoinfo-lab/meteoinfo-lab.iml index 80e6fa6d..6ec4e3a4 100644 --- a/meteoinfo-lab/meteoinfo-lab.iml +++ b/meteoinfo-lab/meteoinfo-lab.iml @@ -88,9 +88,21 @@ - - + + + + + + + + + + + + + + @@ -108,18 +120,6 @@ - - - - - - - - - - - - @@ -139,8 +139,8 @@ - - + + @@ -151,12 +151,12 @@ - - - - - - + + + + + + @@ -164,7 +164,7 @@ - - + + \ No newline at end of file diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml index 359eac59..2e2e0495 100644 --- a/meteoinfo-lab/milconfig.xml +++ b/meteoinfo-lab/milconfig.xml @@ -1,11 +1,9 @@ - - + - @@ -16,6 +14,8 @@ + + @@ -34,5 +34,5 @@
- + diff --git a/meteoinfo-lab/pom.xml b/meteoinfo-lab/pom.xml index 4ce420a0..f680a54b 100644 --- a/meteoinfo-lab/pom.xml +++ b/meteoinfo-lab/pom.xml @@ -32,7 +32,7 @@ org.slf4j slf4j-simple - 2.0.0 + 2.0.5