From fe70923036f1d4cd0eb149b8c56c1398d86ebe82 Mon Sep 17 00:00:00 2001
From: wyq <yaqiang.wang@gmail.com>
Date: Tue, 1 Mar 2022 09:31:49 +0800
Subject: [PATCH] update FlatLAF to version 2.0.2

---
 .../libraries/Maven__com_formdev_flatlaf_2_0_1.xml  | 13 -------------
 .../Maven__com_formdev_flatlaf_extras_2_0_1.xml     | 13 -------------
 meteoinfo-chart/meteoinfo-chart.iml                 |  4 ++--
 meteoinfo-geo/meteoinfo-geo.iml                     |  4 ++--
 meteoinfo-geo/pom.xml                               |  4 ++--
 meteoinfo-lab/meteoinfo-lab.iml                     |  4 ++--
 meteoinfo-lab/milconfig.xml                         |  6 +++---
 .../java/org/meteoinfo/lab/gui/ConsoleDockable.java |  2 ++
 meteoinfo-map/meteoinfo-map.iml                     |  4 ++--
 9 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 .idea/libraries/Maven__com_formdev_flatlaf_2_0_1.xml
 delete mode 100644 .idea/libraries/Maven__com_formdev_flatlaf_extras_2_0_1.xml

diff --git a/.idea/libraries/Maven__com_formdev_flatlaf_2_0_1.xml b/.idea/libraries/Maven__com_formdev_flatlaf_2_0_1.xml
deleted file mode 100644
index 971c3ae6..00000000
--- a/.idea/libraries/Maven__com_formdev_flatlaf_2_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.formdev:flatlaf:2.0.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/formdev/flatlaf/2.0.1/flatlaf-2.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/formdev/flatlaf/2.0.1/flatlaf-2.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/formdev/flatlaf/2.0.1/flatlaf-2.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_formdev_flatlaf_extras_2_0_1.xml b/.idea/libraries/Maven__com_formdev_flatlaf_extras_2_0_1.xml
deleted file mode 100644
index dcdf7cf7..00000000
--- a/.idea/libraries/Maven__com_formdev_flatlaf_extras_2_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.formdev:flatlaf-extras:2.0.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/formdev/flatlaf-extras/2.0.1/flatlaf-extras-2.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/formdev/flatlaf-extras/2.0.1/flatlaf-extras-2.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/formdev/flatlaf-extras/2.0.1/flatlaf-extras-2.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/meteoinfo-chart/meteoinfo-chart.iml b/meteoinfo-chart/meteoinfo-chart.iml
index a5ab9d3f..41118f56 100644
--- a/meteoinfo-chart/meteoinfo-chart.iml
+++ b/meteoinfo-chart/meteoinfo-chart.iml
@@ -83,8 +83,8 @@
     </orderEntry>
     <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.formdev:svgSalamander:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13.2" level="project" />
     <orderEntry type="module" module-name="meteoinfo-ui" />
diff --git a/meteoinfo-geo/meteoinfo-geo.iml b/meteoinfo-geo/meteoinfo-geo.iml
index abd90696..1afa7261 100644
--- a/meteoinfo-geo/meteoinfo-geo.iml
+++ b/meteoinfo-geo/meteoinfo-geo.iml
@@ -97,8 +97,8 @@
     <orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-greek:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-cyrillic:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.formdev:svgSalamander:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.freehep:freehep-util:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.netbeans:openide-lookup:1.9-patched-1.0" level="project" />
diff --git a/meteoinfo-geo/pom.xml b/meteoinfo-geo/pom.xml
index ca1d4a15..9d67296d 100644
--- a/meteoinfo-geo/pom.xml
+++ b/meteoinfo-geo/pom.xml
@@ -83,12 +83,12 @@
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>flatlaf</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>flatlaf-extras</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.freehep</groupId>
diff --git a/meteoinfo-lab/meteoinfo-lab.iml b/meteoinfo-lab/meteoinfo-lab.iml
index 21a8a178..8f488141 100644
--- a/meteoinfo-lab/meteoinfo-lab.iml
+++ b/meteoinfo-lab/meteoinfo-lab.iml
@@ -92,8 +92,8 @@
     </orderEntry>
     <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.formdev:svgSalamander:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13.2" level="project" />
     <orderEntry type="module" module-name="meteoinfo-ui" />
diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml
index ada767f2..2265ea0d 100644
--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@@ -21,12 +21,12 @@
     <OpenedFiles>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\traj_3d.py"/>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d_earth\contourf.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\hdf\CloudSAT_Swath.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\hdf\CloudSAT_CWC.py"/>
     </OpenedFiles>
     <RecentFiles>
       <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot\traj_3d.py"/>
       <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d_earth\contourf.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\hdf\CloudSAT_Swath.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\hdf\CloudSAT_CWC.py"/>
     </RecentFiles>
   </File>
   <Font>
@@ -34,5 +34,5 @@
   </Font>
   <LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
   <Figure DoubleBuffering="true"/>
-  <Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
+  <Startup MainFormLocation="-7,0" MainFormSize="1356,773"/>
 </MeteoInfo>
diff --git a/meteoinfo-lab/src/main/java/org/meteoinfo/lab/gui/ConsoleDockable.java b/meteoinfo-lab/src/main/java/org/meteoinfo/lab/gui/ConsoleDockable.java
index c17a5931..6c8814b5 100644
--- a/meteoinfo-lab/src/main/java/org/meteoinfo/lab/gui/ConsoleDockable.java
+++ b/meteoinfo-lab/src/main/java/org/meteoinfo/lab/gui/ConsoleDockable.java
@@ -211,6 +211,7 @@ public class ConsoleDockable extends DefaultSingleCDockable {
 
             @Override
             protected String doInBackground() throws Exception {
+                parent.getProgressBar().setVisible(true);
                 interp.console.setStyle(consoleColors.getCommandColor());
                 interp.console.println("evaluate selection...");
                 interp.console.setStyle(consoleColors.getCodeLinesColor());
@@ -233,6 +234,7 @@ public class ConsoleDockable extends DefaultSingleCDockable {
                 interp.console.print(">>> ", consoleColors.getPromptColor());
                 interp.console.setStyle(consoleColors.getCommandColor());
                 interp.exec("mipylib.plotlib.miplot.isinteractive = True");
+                parent.getProgressBar().setVisible(false);
             }
         };
         myWorker.execute();
diff --git a/meteoinfo-map/meteoinfo-map.iml b/meteoinfo-map/meteoinfo-map.iml
index 18c0bd82..21271050 100644
--- a/meteoinfo-map/meteoinfo-map.iml
+++ b/meteoinfo-map/meteoinfo-map.iml
@@ -83,8 +83,8 @@
     </orderEntry>
     <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.0.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.formdev:svgSalamander:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13.2" level="project" />
     <orderEntry type="module" module-name="meteoinfo-ui" />