Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 808EFC4FA for ; Sun, 3 Nov 2013 21:20:59 +0000 (UTC) Received: (qmail 35737 invoked by uid 500); 3 Nov 2013 21:20:59 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 35709 invoked by uid 500); 3 Nov 2013 21:20:59 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 35702 invoked by uid 99); 3 Nov 2013 21:20:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Nov 2013 21:20:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Nov 2013 21:20:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 415B6238883D; Sun, 3 Nov 2013 21:20:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1538459 - /cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java Date: Sun, 03 Nov 2013 21:20:36 -0000 To: commits@cayenne.apache.org From: dkazimirchyk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131103212036.415B6238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkazimirchyk Date: Sun Nov 3 21:20:35 2013 New Revision: 1538459 URL: http://svn.apache.org/r1538459 Log: CAY-1797 NPE importing DataMap patch by Oleg Artyukevich Modified: cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java Modified: cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java?rev=1538459&r1=1538458&r2=1538459&view=diff ============================================================================== --- cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java (original) +++ cayenne/main/branches/STABLE-3.1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java Sun Nov 3 21:20:35 2013 @@ -33,6 +33,7 @@ import org.apache.cayenne.modeler.Applic import org.apache.cayenne.modeler.pref.FSPath; import org.apache.cayenne.modeler.util.CayenneAction; import org.apache.cayenne.modeler.util.FileFilters; +import org.apache.cayenne.resource.Resource; import org.apache.cayenne.util.NamedObjectFactory; import org.apache.cayenne.util.ResourceLocator; import org.apache.commons.logging.Log; @@ -92,6 +93,13 @@ public class ImportDataMapAction extends else { newMap.setName(NamedObjectFactory.createName(DataMap.class, domain)); } + + Resource baseResource = domain.getConfigurationSource(); + + if (baseResource != null) { + Resource dataMapResource = baseResource.getRelativeResource(newMap.getName()); + newMap.setConfigurationSource(dataMapResource); + } getProjectController().addDataMap(this, newMap); }