Revision: 1299
Author: mathiasbr
Date: 2006-08-13 13:05:43 -0700 (Sun, 13 Aug 2006)
ViewCVS: http://svn.sourceforge.net/spring-rich-c/?rev=1299&view=rev
Log Message:
-----------
i18n support for preference dialog
fix for RCP-356
Modified Paths:
--------------
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/FormBackedPreferencePage.java
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceDialog.java
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferencePage.java
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_de.properties
Modified:
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/FormBackedPreferencePage.java
===================================================================
---
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/FormBackedPreferencePage.java
2006-08-13 20:03:53 UTC (rev 1298)
+++
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/FormBackedPreferencePage.java
2006-08-13 20:05:43 UTC (rev 1299)
@@ -28,7 +28,11 @@
super(id);
}
- protected final JComponent createContents() {
+ public FormBackedPreferencePage(String id, boolean autoconfigure) {
+ super(id, autoconfigure);
+ }
+
+ protected final JComponent createContents() {
form = createForm();
Assert.notNull(form,
"You must set the form before contents are
created.");
Modified:
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceDialog.java
===================================================================
---
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceDialog.java
2006-08-13 20:03:53 UTC (rev 1298)
+++
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceDialog.java
2006-08-13 20:05:43 UTC (rev 1299)
@@ -31,8 +31,12 @@
private Settings settings;
- public PreferenceDialog() {
- super(new TreeCompositeDialogPage("preferenceDialog"));
+ public PreferenceDialog() {
+ this("preferenceDialog");
+ }
+
+ public PreferenceDialog(String dialogId) {
+ super(new TreeCompositeDialogPage(dialogId));
}
private void addPage(PreferencePage page) {
Modified:
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
===================================================================
---
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
2006-08-13 20:03:53 UTC (rev 1298)
+++
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
2006-08-13 20:05:43 UTC (rev 1299)
@@ -20,6 +20,8 @@
import java.util.List;
import org.springframework.binding.validation.Severity;
+import org.springframework.richclient.application.ApplicationServicesLocator;
+import
org.springframework.richclient.application.config.ApplicationObjectConfigurer;
import org.springframework.richclient.core.Message;
import org.springframework.richclient.dialog.MessageDialog;
import org.springframework.richclient.settings.SettingsException;
@@ -32,49 +34,71 @@
*/
public class PreferenceManager {
- private PreferenceDialog dialog;
+ private PreferenceDialog dialog;
- private List preferencePages = new ArrayList();
+ private List preferencePages = new ArrayList();
- private SettingsManager settingsManager;
+ private SettingsManager settingsManager;
- public void showDialog() {
- if (dialog == null) {
- dialog = new PreferenceDialog();
+ private ApplicationObjectConfigurer objectConfigurer;
- for (Iterator iter = preferencePages.iterator();
iter.hasNext();) {
- PreferencePage page = (PreferencePage)
iter.next();
- if (page.getParent() == null) {
- dialog.addPreferencePage(page);
- } else {
-
dialog.addPreferencePage(page.getParent(), page);
- }
- }
+ public void showDialog() {
+ if (dialog == null) {
+ dialog = createDialog();
- dialog.setTitle("Preferences");
- try {
-
dialog.setSettings(settingsManager.getUserSettings());
- } catch (SettingsException e) {
- new MessageDialog("Error", new
Message(e.getMessage(), Severity.ERROR)).showDialog();
- e.printStackTrace();
- }
- }
+ for (Iterator iter = preferencePages.iterator(); iter.hasNext();) {
+ PreferencePage page = (PreferencePage) iter.next();
+ if (page.getParent() == null) {
+ dialog.addPreferencePage(page);
+ } else {
+ dialog.addPreferencePage(page.getParent(), page);
+ }
+ }
- // dialog creation can fail
- if (dialog != null) {
- dialog.showDialog();
- }
- }
+ try {
+ dialog.setSettings(settingsManager.getUserSettings());
+ } catch (SettingsException e) {
+ new MessageDialog("Error", new Message(e.getMessage(),
Severity.ERROR)).showDialog();
+ e.printStackTrace();
+ }
+ }
- public void setPreferencePages(List pages) {
- preferencePages = pages;
- }
+ // dialog creation can fail
+ if (dialog != null) {
+ dialog.showDialog();
+ }
+ }
- public SettingsManager getSettingsManager() {
- return settingsManager;
- }
+ /**
+ * @return
+ */
+ protected PreferenceDialog createDialog() {
+ PreferenceDialog dialog = new PreferenceDialog();
+ getObjectConfigurer().configure(dialog, "preferenceDialog");
+ return dialog;
+ }
- public void setSettingsManager(SettingsManager settingsManager) {
- this.settingsManager = settingsManager;
- }
+ public ApplicationObjectConfigurer getObjectConfigurer() {
+ if (objectConfigurer == null) {
+ objectConfigurer = (ApplicationObjectConfigurer)
ApplicationServicesLocator.services().getService(
+ ApplicationObjectConfigurer.class);
+ }
+ return objectConfigurer;
+ }
+
+ public void setObjectConfigurer(ApplicationObjectConfigurer
objectConfigurer) {
+ this.objectConfigurer = objectConfigurer;
+ }
+
+ public void setPreferencePages(List pages) {
+ preferencePages = pages;
+ }
+
+ public SettingsManager getSettingsManager() {
+ return settingsManager;
+ }
+
+ public void setSettingsManager(SettingsManager settingsManager) {
+ this.settingsManager = settingsManager;
+ }
}
\ No newline at end of file
Modified:
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferencePage.java
===================================================================
---
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferencePage.java
2006-08-13 20:03:53 UTC (rev 1298)
+++
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferencePage.java
2006-08-13 20:05:43 UTC (rev 1299)
@@ -41,7 +41,11 @@
super(id);
}
- /**
+ public PreferencePage(String id, boolean autoconfigure) {
+ super(id, autoconfigure);
+ }
+
+ /**
* @return array containing "Restore defaults" and "Apply" commands
*/
protected ActionCommand[] getCommands() {
Modified:
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
===================================================================
---
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
2006-08-13 20:03:53 UTC (rev 1298)
+++
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
2006-08-13 20:05:43 UTC (rev 1299)
@@ -119,6 +119,8 @@
nextCommand.label=&Next >
backCommand.label=< &Back
+preferenceDialog.title=Preferences
+
# fields
name.displayName=Name
Modified:
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_de.properties
===================================================================
---
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_de.properties
2006-08-13 20:03:53 UTC (rev 1298)
+++
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_de.properties
2006-08-13 20:05:43 UTC (rev 1299)
@@ -109,6 +109,8 @@
nextCommand.label=&Weiter >
backCommand.label=< &Zur\xFCck
+preferenceDialog.title=Einstellungen
+
# fields
name.displayName=Name
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
spring-rich-c-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
