This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new f56d386 Modeler: Remove duplicated obj attr Date type. f56d386 is described below commit f56d386326a6bf3308adfa6d99f940f70ec0caaa Author: Arseni Bulatski <ancars...@gmail.com> AuthorDate: Thu Feb 7 15:11:12 2019 +0300 Modeler: Remove duplicated obj attr Date type. --- .../apache/cayenne/modeler/util/ModelerUtil.java | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) 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 a8af240..a8717b8 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 @@ -19,18 +19,6 @@ package org.apache.cayenne.modeler.util; -import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.apache.cayenne.configuration.DataNodeDescriptor; -import org.apache.cayenne.map.DataMap; -import org.apache.cayenne.map.DbEntity; -import org.apache.cayenne.modeler.Application; -import org.apache.cayenne.modeler.ModelerConstants; -import org.apache.cayenne.modeler.action.ActionManager; -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 javax.swing.Action; import javax.swing.ImageIcon; import java.awt.Dimension; @@ -54,6 +42,18 @@ import java.util.ResourceBundle; import java.util.Set; import java.util.UUID; +import org.apache.cayenne.configuration.DataChannelDescriptor; +import org.apache.cayenne.configuration.DataNodeDescriptor; +import org.apache.cayenne.map.DataMap; +import org.apache.cayenne.map.DbEntity; +import org.apache.cayenne.modeler.Application; +import org.apache.cayenne.modeler.ModelerConstants; +import org.apache.cayenne.modeler.action.ActionManager; +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; + /** * Various unorganized utility methods used by CayenneModeler. * @@ -122,7 +122,6 @@ public final class ModelerUtil { Short.class.getName(), Time.class.getName(), Timestamp.class.getName(), - Date.class.getName(), GregorianCalendar.class.getName(), Calendar.class.getName(), UUID.class.getName(),