[cayenne] branch master updated: Add new value types to the modeler

[nt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a6cd57  Add new value types to the modeler
5a6cd57 is described below

commit 5a6cd573cdc7df9af1deae279f7769f8a5e43fff
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Nov 4 17:21:24 2020 +0300

    Add new value types to the modeler
---
 .../org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java  | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
index 52182ee..889eb36 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
@@ -224,7 +224,7 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL
 
         TableColumn typeColumn = table.getColumnModel().getColumn(ObjAttributeTableModel.OBJ_ATTRIBUTE_TYPE);
 
-        JComboBox javaTypesCombo = Application.getWidgetFactory().createComboBox(typeNames.toArray(), false);
+        JComboBox<String> javaTypesCombo = Application.getWidgetFactory().createComboBox(typeNames.toArray(new String[0]), false);
         AutoCompletion.enable(javaTypesCombo, false, true);
         typeColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(javaTypesCombo));
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
index 8ec7015..47c2c80 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
@@ -53,6 +53,9 @@ import org.apache.cayenne.modeler.action.MultipleObjectsAction;
 import org.apache.cayenne.modeler.pref.FSPath;
 import org.apache.cayenne.reflect.PropertyUtils;
 import org.apache.cayenne.util.CayenneMapEntry;
+import org.apache.cayenne.value.GeoJson;
+import org.apache.cayenne.value.Json;
+import org.apache.cayenne.value.Wkt;
 
 /**
  * Various unorganized utility methods used by CayenneModeler.
@@ -126,6 +129,9 @@ public final class ModelerUtil {
                 Calendar.class.getName(),
                 UUID.class.getName(),
                 Serializable.class.getName(),
+                Json.class.getName(),
+                Wkt.class.getName(),
+                GeoJson.class.getName(),
                 "java.lang.Character[]",
                 "java.lang.Byte[]",
                 "java.time.LocalDate",