Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 94135 invoked from network); 24 Sep 2010 18:52:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 24 Sep 2010 18:52:44 -0000 Received: (qmail 1530 invoked by uid 500); 24 Sep 2010 18:52:44 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 1498 invoked by uid 500); 24 Sep 2010 18:52:44 -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 1491 invoked by uid 99); 24 Sep 2010 18:52:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Sep 2010 18:52:44 +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 Sep 2010 18:52:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2FD382388999; Fri, 24 Sep 2010 18:52:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1001027 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java Date: Fri, 24 Sep 2010 18:52:23 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100924185223.2FD382388999@eris.apache.org> Author: aadamchik Date: Fri Sep 24 18:52:22 2010 New Revision: 1001027 URL: http://svn.apache.org/viewvc?rev=1001027&view=rev Log: CAY-1485 Memory information for about dialog * patch by Andrei Veprev Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.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=1001027&r1=1001026&r2=1001027&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 Sep 24 18:52:22 2010 @@ -60,6 +60,13 @@ CAY-1364 SQL server don't support notati CAY-1430 Problems with TINYINT type mapping ---------------------------------- +Release: 3.0.2 +Date: +---------------------------------- + +CAY-1485 Memory information for about dialog + +---------------------------------- Release: 3.0.1 Date: ---------------------------------- Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java?rev=1001027&r1=1001026&r2=1001027&view=diff ============================================================================== --- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java (original) +++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java Fri Sep 24 18:52:22 2010 @@ -67,21 +67,27 @@ public class AboutDialog extends JFrame */ static synchronized String getInfoString() { if (infoString == null) { - - double bytes = Runtime.getRuntime().maxMemory(); - long mBytes = Math.round(bytes / 1024 / 1024); - + + double maxMemory = (double) Runtime.getRuntime().maxMemory() / 1024 / 1024; + double totalMemory = (double) Runtime.getRuntime().totalMemory() / 1024 / 1024; + double freeMemory = (double) Runtime.getRuntime().freeMemory() / 1024 / 1024; + StringBuffer buffer = new StringBuffer(); buffer.append(""); buffer.append(""); buffer.append(UIStrings.get("cayenne.modeler.about.info")); buffer.append(""); - + buffer.append(""); - buffer.append("
JVM: " + System.getProperty("java.vm.name") + " " + - System.getProperty("java.version")); - buffer.append("
Max Heap Size: " + mBytes + " MB"); - + buffer.append("
JVM: " + + System.getProperty("java.vm.name") + + " " + + System.getProperty("java.version")); + buffer.append(String.format( + "
Memory: used %.2f MB, max %.2f MB", + totalMemory - freeMemory, + maxMemory)); + String version = LocalizedStringsHandler.getString("cayenne.version"); if (version != null) { buffer.append("
Version: ").append(version);