New GUI Look and Feel

impexp-client/build.gradle

@@ -14,11 +14,14 @@ dependencies {
     api project(':impexp-core')
     api project(':impexp-client-common')
     api project(':impexp-kml-collada-plugin')
+    api 'com.formdev:flatlaf:0.44'
+    api 'com.formdev:flatlaf-extras:0.44'
+    api 'com.formdev:flatlaf-swingx:0.44'
     api 'com.fifesoft:rsyntaxtextarea:3.1.1'
-    api ('org.citydb:swingx-ws:1.1.3') {
+    api ('org.citydb:swingx-ws:1.1.4') {
         transitive = false
     }
-    api ('org.citydb:swingx-all:1.6.7') {
+    api ('org.citydb:swingx-all:1.6.8') {
         transitive = false
     }
 

impexp-client/src/main/java/org/citydb/cli/ExportVisCommand.java

@@ -33,13 +33,11 @@
 import org.citydb.cli.options.vis.QueryOption;
 import org.citydb.config.Config;
 import org.citydb.config.project.database.DatabaseConnection;
-import org.citydb.config.project.kmlExporter.ADEPreference;
-import org.citydb.config.project.kmlExporter.ADEPreferences;
 import org.citydb.config.project.kmlExporter.KmlExportConfig;
 import org.citydb.database.DatabaseController;
+import org.citydb.log.Logger;
 import org.citydb.modules.kml.controller.KmlExportException;
 import org.citydb.modules.kml.controller.KmlExporter;
-import org.citydb.log.Logger;
 import org.citydb.plugin.CliCommand;
 import org.citydb.plugin.cli.DatabaseOption;
 import org.citydb.plugin.cli.ThreadPoolOption;
@@ -144,24 +142,7 @@ private void setDisplayOptions(KmlExportConfig kmlExportConfig) {
         if (displayOption != null) {
             kmlExportConfig.setLodToExportFrom(displayOption.getLod());
             kmlExportConfig.setAppearanceTheme(displayOption.getAppearanceTheme());
-
-            displayOption.toDisplayForms(kmlExportConfig.getBuildingDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getWaterBodyDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getLandUseDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getVegetationDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getTransportationDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getReliefDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getCityFurnitureDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getGenericCityObjectDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getCityObjectGroupDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getBridgeDisplayForms());
-            displayOption.toDisplayForms(kmlExportConfig.getTunnelDisplayForms());
-
-            for (ADEPreferences preferences : kmlExportConfig.getADEPreferences().values()) {
-                for (ADEPreference preference : preferences.getPreferences().values()) {
-                    displayOption.toDisplayForms(preference.getDisplayForms());
-                }
-            }
+            kmlExportConfig.setDisplayForms(displayOption.toDisplayForms());
         }
     }
 

impexp-client/src/main/java/org/citydb/cli/GuiCommand.java

@@ -28,10 +28,12 @@
 
 package org.citydb.cli;
 
+import com.formdev.flatlaf.FlatLightLaf;
 import org.citydb.ImpExpException;
 import org.citydb.config.Config;
 import org.citydb.config.ConfigUtil;
 import org.citydb.config.gui.GuiConfig;
+import org.citydb.config.gui.style.Theme;
 import org.citydb.database.DatabaseController;
 import org.citydb.gui.ImpExpGui;
 import org.citydb.gui.components.SplashScreen;
@@ -40,7 +42,9 @@
 import org.citydb.gui.modules.importer.CityGMLImportPlugin;
 import org.citydb.gui.modules.kml.KMLExportPlugin;
 import org.citydb.gui.modules.preferences.PreferencesPlugin;
+import org.citydb.gui.util.GuiUtil;
 import org.citydb.gui.util.OSXAdapter;
+import org.citydb.log.Logger;
 import org.citydb.plugin.CliCommand;
 import org.citydb.plugin.InternalPlugin;
 import org.citydb.plugin.Plugin;
@@ -74,15 +78,18 @@ public class GuiCommand extends CliCommand implements StartupProgressListener {
     private ImpExpCli parent;
 
     private final PluginManager pluginManager = PluginManager.getInstance();
+    private final Logger log = Logger.getInstance();
+
+    private GuiConfig guiConfig;
     private int processSteps;
     private SplashScreen splashScreen;
 
     @Override
     public Integer call() throws Exception {
         Config config = ObjectRegistry.getInstance().getConfig();
 
-        // load GUI configuration
-        loadGuiConfig(config);
+        // set GUI configuration
+        config.setGuiConfig(guiConfig);
 
         // initialize predefined GUI components
         ImpExpGui impExpGui = new ImpExpGui(parent.getConfigFile());
@@ -102,19 +109,19 @@ public Integer call() throws Exception {
         return 0;
     }
 
-    private void loadGuiConfig(Config config) {
+    private GuiConfig loadGuiConfig() {
         Path guiConfigFile = CoreConstants.IMPEXP_DATA_DIR
                 .resolve(ClientConstants.CONFIG_DIR)
                 .resolve(ClientConstants.GUI_SETTINGS_FILE);
 
+        Object object = null;
         try {
-            Object object = ConfigUtil.getInstance().unmarshal(guiConfigFile.toFile());
-            if (object instanceof GuiConfig) {
-                config.setGuiConfig((GuiConfig) object);
-            }
+            object = ConfigUtil.getInstance().unmarshal(guiConfigFile.toFile());
         } catch (JAXBException | IOException e) {
             //
         }
+
+        return object instanceof GuiConfig ? (GuiConfig) object : new GuiConfig();
     }
 
     private void initializeViewComponents(ImpExpGui impExpGui, Config config) {
@@ -148,23 +155,40 @@ public void preprocess(CommandLine commandLine) throws Exception {
         parent.useDefaultConfiguration(true)
                 .failOnADEExceptions(false);
 
-        // set look & feel
+        // load GUI configuration
+        guiConfig = loadGuiConfig();
+        String laf = GuiUtil.getLaf(guiConfig.getAppearance().getTheme());
+
         try {
-            javax.swing.UIManager.setLookAndFeel(javax.swing.UIManager.getSystemLookAndFeelClassName());
-            if (OSXAdapter.IS_MAC_OS_X) {
-                OSXAdapter.setDockIconImage(Toolkit.getDefaultToolkit().getImage(getClass().getResource("/org/citydb/gui/images/common/logo_small.png")));
+            // set look and feel
+            UIManager.setLookAndFeel(laf);
+        } catch (Exception e) {
+            log.error("Failed to install look and feel theme '" + laf + "'.", e);
+            guiConfig.getAppearance().setTheme(Theme.LIGHT);
+            FlatLightLaf.install();
+        }
+
+        if (OSXAdapter.IS_MAC_OS) {
+            OSXAdapter.setDockIconImage(Toolkit.getDefaultToolkit().getImage(getClass().getResource("/org/citydb/gui/logos/logo_small.png")));
+            if (System.getProperty("apple.laf.useScreenMenuBar") == null) {
                 System.setProperty("apple.laf.useScreenMenuBar", "true");
             }
-        } catch (Exception e) {
-            throw new ImpExpException("Failed to initialize user interface.", e);
         }
 
+        // enable window decorations
+        JFrame.setDefaultLookAndFeelDecorated(true);
+        JDialog.setDefaultLookAndFeelDecorated(true);
+
+        // set UI defaults
+        UIManager.put("CheckBox.iconTextGap", 6);
+        UIManager.put("RadioButton.iconTextGap", 6);
+
         // splash screen
         if (!hideSplash) {
-            splashScreen = new SplashScreen(3, 477, Color.BLACK);
+            splashScreen = new SplashScreen(5, 485, Color.BLACK);
             splashScreen.setMessage("Version \"" + getClass().getPackage().getImplementationVersion() + "\"");
             parent.withStartupProgressListener(this);
-            SwingUtilities.invokeLater(() -> splashScreen.setVisible(true));
+            splashScreen.setVisible(true);
         }
     }
 

impexp-client/src/main/java/org/citydb/cli/options/vis/DisplayOption.java

@@ -29,14 +29,14 @@
 package org.citydb.cli.options.vis;
 
 import org.citydb.config.project.kmlExporter.DisplayForm;
+import org.citydb.config.project.kmlExporter.DisplayFormType;
+import org.citydb.config.project.kmlExporter.DisplayForms;
 import org.citydb.config.project.kmlExporter.KmlExportConfig;
 import org.citydb.plugin.cli.CliOption;
 import picocli.CommandLine;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class DisplayOption implements CliOption {
     @CommandLine.Option(names = {"-D", "--display-mode"}, split = ",", paramLabel = "<mode>", required = true,
@@ -71,43 +71,38 @@ public String getAppearanceTheme() {
         return "none".equalsIgnoreCase(theme) ? KmlExportConfig.THEME_NULL : theme;
     }
 
-    public void toDisplayForms(List<DisplayForm> displayForms) {
-        Map<Integer, DisplayForm> candidates = displayForms.stream()
-                .collect(Collectors.toMap(DisplayForm::getForm, d -> d));
+    public DisplayForms toDisplayForms() {
+        DisplayForms displayForms = new DisplayForms();
 
         int visibleTo = -1;
         for (Mode mode : Mode.values()) {
-            DisplayForm displayForm = candidates.computeIfAbsent(mode.type, v -> new DisplayForm(mode.type, -1, -1));
-            displayForm.setActive(modes.contains(mode) && lod.ordinal() >= mode.minimumLod);
+            DisplayForm displayForm = DisplayForm.of(mode.type);
+            displayForm.setActive(modes.contains(mode) && mode.type.isAchievableFromLoD(lod.ordinal()));
             if (displayForm.isActive()) {
                 int visibleFrom = this.visibleFrom != null ? this.visibleFrom.getOrDefault(mode, 0) : 0;
                 displayForm.setVisibleFrom(visibleFrom);
-                displayForm.setVisibleUpTo(visibleTo);
+                displayForm.setVisibleTo(visibleTo);
                 visibleTo = visibleFrom;
             }
+
+            displayForms.add(displayForm);
         }
 
-        candidates.values().forEach(displayForm -> {
-            if (!displayForms.contains(displayForm)) {
-                displayForms.add(displayForm);
-            }
-        });
+        return displayForms;
     }
 
     public enum Mode {
-        collada("collada", DisplayForm.COLLADA, 1),
-        geometry("geometry", DisplayForm.GEOMETRY, 1),
-        extruded("extruded", DisplayForm.EXTRUDED, 1),
-        footprint("footprint", DisplayForm.FOOTPRINT, 0);
+        collada("collada", DisplayFormType.COLLADA),
+        geometry("geometry", DisplayFormType.GEOMETRY),
+        extruded("extruded", DisplayFormType.EXTRUDED),
+        footprint("footprint", DisplayFormType.FOOTPRINT);
 
         private final String value;
-        private final int type;
-        private final int minimumLod;
+        private final DisplayFormType type;
 
-        Mode(String value, int type, int minimumLod) {
+        Mode(String value, DisplayFormType type) {
             this.value = value;
             this.type = type;
-            this.minimumLod = minimumLod;
         }
 
         @Override

impexp-client/src/main/java/org/citydb/cli/options/vis/QueryOption.java

@@ -51,6 +51,7 @@ public SimpleKmlQuery toSimpleKmlQuery() {
         query.setMode(resourceIdOption != null ? SimpleKmlQueryMode.SINGLE : SimpleKmlQueryMode.BBOX);
 
         if (typeNamesOption != null) {
+            query.setUseTypeNames(true);
             query.setFeatureTypeFilter(typeNamesOption.toFeatureTypeFilter());
         }