You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/02/07 18:34:18 UTC
svn commit: r907453 - in /cayenne/main/branches/STABLE-3.0:
docs/doc/src/main/resources/
framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/
framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/
Author: aadamchik
Date: Sun Feb 7 17:34:17 2010
New Revision: 907453
URL: http://svn.apache.org/viewvc?rev=907453&view=rev
Log:
CAY-1385 Modeler: error dialog doesn't show the correct version
Modified:
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=907453&r1=907452&r2=907453&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt Sun Feb 7 17:34:17 2010
@@ -17,6 +17,7 @@
CAY-1379 Error resolving fault, no matching row exists in the database
CAY-1382 org.apache.cayenne.reflect.EnumConverter not handling null values for ExtendedEnumerations
CAY-1383 unneeded target in modeler attributes inspection
+CAY-1385 Modeler: error dialog doesn't show the correct version
----------------------------------
Release: 3.0 RC 2
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java?rev=907453&r1=907452&r2=907453&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java Sun Feb 7 17:34:17 2010
@@ -20,25 +20,35 @@
package org.apache.cayenne.modeler.dialog;
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.HeadlessException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JEditorPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.ScrollPaneConstants;
+
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.util.CayenneDialog;
import org.apache.cayenne.modeler.util.PanelFactory;
+import org.apache.cayenne.util.LocalizedStringsHandler;
import org.apache.cayenne.util.Util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.scopemvc.util.UIStrings;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
/**
* Displays CayenneModeler exceptions and warning messages.
*
@@ -213,10 +223,10 @@
PrintWriter out = new PrintWriter(str);
// first add extra diagnostics
- String version = UIStrings.get("cayenne.version");
+ String version = LocalizedStringsHandler.getString("cayenne.version");
version = (version != null) ? version : "(unknown)";
- String buildDate = UIStrings.get("cayenne.build.date");
+ String buildDate = LocalizedStringsHandler.getString("cayenne.build.date");
buildDate = (buildDate != null) ? buildDate : "(unknown)";
out.println("CayenneModeler Info");
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties?rev=907453&r1=907452&r2=907453&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties Sun Feb 7 17:34:17 2010
@@ -15,9 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-cayenne.bugreport.url = http://issues.apache.org/cayenne/
+cayenne.bugreport.url = http://issues.apache.org/jira/browse/CAY
-cayenne.modeler.about.info = (c) 2001-2009 Apache Software Foundation and individual authors.\
+cayenne.modeler.about.info = (c) 2001-2010 Apache Software Foundation and individual authors.\
<br><br>http://cayenne.apache.org/<br>