added CityJSON support flag to ADE info dialog

CHANGES.md

@@ -5,17 +5,21 @@ Change Log
 
 * Completely redesigned command-line interface (CLI) to be able to invoke default import, export and delete operations
   without the need for passing an XML config file. [#147](https://github.com/3dcitydb/importer-exporter/pull/147)
-* CityJSON import (already working in `master`). [#88](https://github.com/3dcitydb/importer-exporter/issues/88)
-* CityJSON export. [#89](https://github.com/3dcitydb/importer-exporter/issues/89)
-* Added extension mechanism to KML/COLLADA/glTF-Exporter to support CityGML ADEs. [#124](https://github.com/3dcitydb/importer-exporter/pull/124)
-* Improved CityGML export performance (as much as 10-15 times faster in case the Importer/Exporter is not running on the same machine or in the same local network as the database server). [#126
-  ](https://github.com/3dcitydb/importer-exporter/pull/126), [#136](https://github.com/3dcitydb/importer-exporter/pull/136), [#137](https://github.com/3dcitydb/importer-exporter/pull/137)
+* CityJSON import (already working in `master`). [#88](https://github.com/3dcitydb/importer-exporter/issues/88),
+  [#92](https://github.com/3dcitydb/importer-exporter/pull/92)
+* CityJSON export. [#89](https://github.com/3dcitydb/importer-exporter/issues/89),
+  [#166](https://github.com/3dcitydb/importer-exporter/pull/166)
+* Added extension mechanism to KML/COLLADA/glTF exporter to support CityGML ADEs. [#124](https://github.com/3dcitydb/importer-exporter/pull/124)
+* Improved CityGML export performance (as much as 10-15 times faster in case the Importer/Exporter is not running on
+  the same machine or in the same local network as the database server). [#126](https://github.com/3dcitydb/importer-exporter/pull/126),
+  [#136](https://github.com/3dcitydb/importer-exporter/pull/136), [#137](https://github.com/3dcitydb/importer-exporter/pull/137)
 * Implemented a more modern GUI look&feel that scales better on HiDPI displays. [#149](https://github.com/3dcitydb/importer-exporter/pull/149)
 * Added explicit CLI script in addition to the start script for simplifying the use of Importer/Exporter CLI mode. [#123](https://github.com/3dcitydb/importer-exporter/pull/123)
 * Added support for importing and exporting arbitrary surfaces as exterior of solids. [#130](https://github.com/3dcitydb/importer-exporter/pull/130)
 * Enhanced LoD export filter with the option to only export the minimum or maximum LoD from the list of selected LoDs. [#133](https://github.com/3dcitydb/importer-exporter/pull/133)
 * Added support for exporting binary glTF and Draco compression in KML/COLLADA/glTF exports. [#142](https://github.com/3dcitydb/importer-exporter/pull/142)
 * Fixed bug in SQL query builder. [#122](https://github.com/3dcitydb/importer-exporter/pull/122)
+* Java 11 or higher is now mandatory to run the Importer/Exporter.
 * General tweaks, bugfixes, and code refactoring
 
 ### 4.2.3 - 2020-04-06

impexp-client/src/main/java/org/citydb/gui/modules/database/util/ADEInfoDialog.java

@@ -29,6 +29,8 @@
 
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import com.formdev.flatlaf.ui.FlatTabbedPaneUI;
+import org.citydb.ade.ADEExtension;
+import org.citydb.ade.ADEExtensionManager;
 import org.citydb.config.i18n.Language;
 import org.citydb.database.schema.mapping.AbstractType;
 import org.citydb.database.schema.mapping.AppSchema;
@@ -39,6 +41,7 @@
 import org.citydb.gui.components.common.TitledPanel;
 import org.citydb.gui.factory.PopupMenuDecorator;
 import org.citydb.gui.util.GuiUtil;
+import org.citygml4j.builder.cityjson.extension.CityJSONExtension;
 import org.citygml4j.model.module.citygml.CityGMLVersion;
 
 import javax.swing.*;
@@ -96,7 +99,7 @@ else if (objectClassId > upperObjectClassId)
             JScrollPane descriptionPane = new JScrollPane(descriptionText);
             descriptionPane.setMinimumSize(descriptionPane.getPreferredSize());
 
-            JLabel cityGMLLabel = new JLabel("CityGML");
+            JLabel cityGMLLabel = new JLabel(Language.I18N.getString("db.dialog.ade.label.encoding"));
             JPanel cityGMLPanel = new JPanel();
             cityGMLPanel.setLayout(new OverlayLayout(cityGMLPanel));
             {
@@ -110,11 +113,18 @@ else if (objectClassId > upperObjectClassId)
 
                 int i = 0;
                 for (CityGMLVersion cityGMLVersion : CityGMLVersion.getInstances()) {
-                    JCheckBox versionCheck = new JCheckBox(cityGMLVersion.toString());
+                    JCheckBox versionCheck = new JCheckBox("CityGML " + cityGMLVersion.toString());
                     versionCheck.setSelected(adeSchema.getSchemas().stream().anyMatch(s -> s.isAvailableForCityGML(cityGMLVersion)));
                     content.add(versionCheck, GuiUtil.setConstraints(i++, 0, 0, 0, GridBagConstraints.NONE, 0, 0, 0, 10));
                 }
 
+                JCheckBox cityJSONExtension = new JCheckBox("CityJSON 1.0");
+                ADEExtension adeExtension = ADEExtensionManager.getInstance().getExtensionById(adeInfo.getId());
+                cityJSONExtension.setSelected(adeExtension != null
+                        && adeExtension.getADEContexts().stream()
+                        .allMatch(adeContext -> adeContext instanceof CityJSONExtension));
+
+                content.add(cityJSONExtension, GuiUtil.setConstraints(i++, 0, 0, 0, GridBagConstraints.NONE, 0, 0, 0, 10));
                 content.add(Box.createHorizontalGlue(), GuiUtil.setConstraints(i, 0, 1, 0, GridBagConstraints.HORIZONTAL, 0, 0, 0, 0));
                 cityGMLPanel.add(content);
             }

impexp-config/src/main/resources/org/citydb/config/i18n/language_de.properties

@@ -316,6 +316,7 @@ db.dialog.ade.label.name=Name
 db.dialog.ade.label.version=Version
 db.dialog.ade.label.description=Beschreibung
 db.dialog.ade.label.identifier=Identifier
+db.dialog.ade.label.encoding=Datenformat
 db.dialog.ade.label.feature=Top-Level Features
 db.dialog.ade.label.feature.types=Features
 db.dialog.ade.label.dbPrefix=Tabellen-Präfix

impexp-config/src/main/resources/org/citydb/config/i18n/language_en.properties

@@ -316,6 +316,7 @@ db.dialog.ade.label.name=Name
 db.dialog.ade.label.version=Version
 db.dialog.ade.label.description=Description
 db.dialog.ade.label.identifier=Identifier
+db.dialog.ade.label.encoding=Encoding
 db.dialog.ade.label.feature=Top-level features
 db.dialog.ade.label.feature.types=Features
 db.dialog.ade.label.dbPrefix=Table prefix