Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 37393 invoked from network); 24 Apr 2009 14:14:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Apr 2009 14:14:59 -0000 Received: (qmail 80589 invoked by uid 500); 24 Apr 2009 14:14:59 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 80564 invoked by uid 500); 24 Apr 2009 14:14: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 80555 invoked by uid 99); 24 Apr 2009 14:14:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2009 14:14:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 24 Apr 2009 14:14:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D4D4C2388A46; Fri, 24 Apr 2009 14:14:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r768317 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java Date: Fri, 24 Apr 2009 14:14:35 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090424141435.D4D4C2388A46@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Fri Apr 24 14:14:35 2009 New Revision: 768317 URL: http://svn.apache.org/viewvc?rev=768317&view=rev Log: CAY-1211 Modeler: blown out warning dialogs patch by Olga Tkachova - the error text is neatly wrapped now Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=768317&r1=768316&r2=768317&view=diff ============================================================================== --- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original) +++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri Apr 24 14:14:35 2009 @@ -33,6 +33,7 @@ CAY-1175 Replace String column name capitalization property with an enum CAY-1184 Callback methods should default to usable names CAY-1185 Expression API: boolean support in string representation +CAY-1211 Modeler: blown out warning dialogs Bug Fixes Since M5: Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java?rev=768317&r1=768316&r2=768317&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java (original) +++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java Fri Apr 24 14:14:35 2009 @@ -25,6 +25,7 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.Map; +import java.util.StringTokenizer; import javax.swing.DefaultComboBoxModel; import javax.swing.JOptionPane; @@ -240,8 +241,29 @@ } catch (Throwable th) { th = Util.unwindException(th); - JOptionPane.showMessageDialog(null, "Error connecting to DB: " - + th.getLocalizedMessage(), "Warning", JOptionPane.WARNING_MESSAGE); + String message = "Error connecting to DB: " + th.getLocalizedMessage(); + + StringTokenizer st = new StringTokenizer(message); + StringBuilder sbMessage = new StringBuilder(); + int len = 0; + + String tempString; + while (st.hasMoreTokens()) { + tempString = st.nextElement().toString(); + if(len < 110){ + len = len + tempString.length() + 1; + } else { + sbMessage.append("\n"); + len = 0; + } + sbMessage.append(tempString + " "); + } + + JOptionPane.showMessageDialog( + null, + sbMessage.toString(), + "Warning", + JOptionPane.WARNING_MESSAGE); return; } }