enhance i18n demo

git-svn-id: https://svn.argeo.org/commons/trunk@4799 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/argeo_demo_web.properties b/demo/argeo_demo_web.properties
index 877eaf26e5d6c6a23f92a93031adc761894bcd29..0be4dce77ffd1826a5e2105384011424431ef30a 100644 (file)
--- a/demo/argeo_demo_web.properties
+++ b/demo/argeo_demo_web.properties
@@ -22,7 +22,9 @@ org.argeo.security.ui.initialPerspective=org.argeo.demo.i18n.perspective
 
 log4j.configuration=file:../../log4j-demo.properties
 
-## important to enable internationalization of plugin.xml labels. 
+## important to enable internationalization of plugin.xml labels.
+## Note that enabling this reduce server performances; see 
+## bug 244468 for details : https://bugs.eclipse.org/bugs/show_bug.cgi?id=244468 
 eclipse.registry.MultiLanguage=true
 
 # Note default URL to access the webapp

diff --git a/demo/plugins/org.argeo.demo.i18n/META-INF/spring/views.xml b/demo/plugins/org.argeo.demo.i18n/META-INF/spring/views.xml
index 6b2ba524260d471c34cf9447441a8ecc1562a9df..056b7f1ca0b4d1e8a63ff7a6fdae5323a1da7b75 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/META-INF/spring/views.xml
+++ b/demo/plugins/org.argeo.demo.i18n/META-INF/spring/views.xml
@@ -3,7 +3,6 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
-
        <!-- Views -->
        <bean id="simpleTreeView" class="org.argeo.demo.i18n.views.SimpleTreeView"
                scope="prototype">

diff --git a/demo/plugins/org.argeo.demo.i18n/plugin.xml b/demo/plugins/org.argeo.demo.i18n/plugin.xml
index 0b7bd09979605d9775e572deaf4b311e0a4c240a..47d343e1bf10e1901a08b19f53e5b2844044503b 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/plugin.xml
+++ b/demo/plugins/org.argeo.demo.i18n/plugin.xml
@@ -8,7 +8,7 @@
             class="org.argeo.demo.i18n.I18nDemoPerspective"
             icon="icons/i18n.gif"
             id="org.argeo.demo.i18n.perspective"
-            name="%I18nDemoPerspective_name">
+            name="%I18nDemoPerspective_Name">
       </perspective>
    </extension>
    <!-- Views --> 
@@ -18,7 +18,7 @@
           class="org.argeo.eclipse.spring.SpringExtensionFactory"
           icon="icons/browser.gif"
           id="org.argeo.demo.i18n.simpleTreeView"
-          name="%SimpleTreeView_name">
+          name="%SimpleTreeView_Name">
           </view>
    </extension>
    <!-- Editors --> 
@@ -27,7 +27,7 @@
             <editor
                  class="org.argeo.eclipse.spring.SpringExtensionFactory"
               id="org.argeo.demo.i18n.simpleMultitabEditor"
-              name="%SimpleMultitabEditor_name"
+              name="%SimpleMultitabEditor_Name"
               icon="icons/i18n.gif"
               default="false">
         </editor>
@@ -35,21 +35,22 @@
        <!-- Commands --> 
        <extension
          point="org.eclipse.ui.commands">
-       <command
-                       defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-                       id="org.argeo.jcr.ui.explorer.openGenericNodeEditor"
-                       name="Open generic node Editor">
-                       <commandParameter
-                               id="org.argeo.jcr.ui.explorer.nodePath"
-                               name="Node path">
-                       </commandParameter>
-               </command>    
+               <command
+                       defaultHandler="org.argeo.demo.i18n.commands.OpenDialog"
+                       id="org.argeo.demo.i18n.openDialog"
+                       name="This name should not be displayed - check plugin.xml">
+               </command>   
     </extension>
 
     <!-- Menus --> 
        <extension point="org.eclipse.ui.menus">
                <menuContribution
                        locationURI="popup:org.argeo.demo.i18n.simpleTreeView">
+                       <command
+                               commandId="org.argeo.demo.i18n.openDialog"
+                               style="push"
+                               label="%OpenDialog_Label">
+                       </command>
                </menuContribution>
        </extension>
        

diff --git a/demo/plugins/org.argeo.demo.i18n/properties/plugin.properties b/demo/plugins/org.argeo.demo.i18n/properties/plugin.properties
index d53d3ceb863aa2768c73034f5f4afb7b3ddd69d8..359fa2593f14f8718163df3029a8fca8d15285fe 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/properties/plugin.properties
+++ b/demo/plugins/org.argeo.demo.i18n/properties/plugin.properties
@@ -1,8 +1,9 @@
 
 ## commands label
+OpenDialog_Label=Open a dialog box 
 
 ## View, perspective and editor labels 
-I18nDemoPerspective_name=Demo Internationalization
-SimpleTreeView_name=Simple tree view
-SimpleMultitabEditor_name=Simple multi-tab editor
+I18nDemoPerspective_Name=Demo Internationalization
+SimpleTreeView_Name=Simple tree view
+SimpleMultitabEditor_Name=Simple multi-tab editor
 LocaleSettingsPage_Title=Manage localization settings
\ No newline at end of file

diff --git a/demo/plugins/org.argeo.demo.i18n/properties/plugin_fr.properties b/demo/plugins/org.argeo.demo.i18n/properties/plugin_fr.properties
index 3ca9a12be1642c83a5f4acb7870bc8f2f5bf1d8c..2842f134e0bad065c259e67db125e2f655d3277c 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/properties/plugin_fr.properties
+++ b/demo/plugins/org.argeo.demo.i18n/properties/plugin_fr.properties
@@ -1,8 +1,9 @@
 
 ## commands label
+OpenDialog_Label=Ouvrir une fenêtre de dialogue
 
 ## View, perspective and editor labels 
-I18nDemoPerspective_name=Demo - Internationalisation
-SimpleTreeView_name=Simple vue en arbre
-SimpleMultitabEditor_name=Simple editeur à onglets multiples.
+I18nDemoPerspective_Name=Demo - Internationalisation
+SimpleTreeView_Name=Simple vue en arbre
+SimpleMultitabEditor_Name=Simple editeur à onglets multiples.
 LocaleSettingsPage_Title=Gérer les informations de localisation
\ No newline at end of file

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoMessages.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoMessages.java
index 00001d5c7e91329d5e1ed543258d5dd0f48fe67b..b9914137062fd80d886a2f29bc3ebc36d06ba578 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoMessages.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoMessages.java
@@ -14,11 +14,28 @@ public class I18nDemoMessages extends NLS {
 
        private static final String BUNDLENAME = I18nDemoPlugin.ID + ".messages"; // $NON-NLS−1$
 
+       // Errors & warnings
+       public String OpenDialog_Title;
+       public String OpenDialog_Message;
+
+       // Commands
+
+       // Editor
        public String SimpleMultitabEditor_MultiSectionPageTitle;
        public String SimpleMultitabEditor_SimplePageTitle;
-       public String MultiSelectionPage_DescriptionSectionTitle;
-       public String MultiSelectionPage_DetailsSectionTitle;
-       public String testLbl;
+
+       // Pages
+       public String MultiSectionPage_DescriptionSectionTitle;
+       public String MultiSectionPage_DescriptionSectionTxt;
+       public String MultiSectionPage_DetailsSectionTitle;
+       public String MultiSectionPage_PopupTitle;
+       public String MultiSectionPage_PopupText;
+       public String SimplePage_DescriptionTxt;
+
+       // Buttons
+       public String MultiSectionPage_Btn1Lbl;
+       public String MultiSectionPage_Btn2Lbl;
+       public String MultiSectionPage_Btn3Lbl;
 
        // Code that enable handling of concurrent multi sessions locales
        static {

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoPlugin.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoPlugin.java
index a1a338376448566b41f0719d62d0d2c33c33f713..32d3f0875810122e23422653d0ed29d8c718d579 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoPlugin.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/I18nDemoPlugin.java
@@ -25,8 +25,6 @@ public class I18nDemoPlugin extends AbstractUIPlugin {
         * The constructor
         */
        public I18nDemoPlugin() {
-               // Locale currentLocale = new Locale("fr");
-               // Locale.setDefault(currentLocale);
        }
 
        /*

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/ImplementationLoader.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/ImplementationLoader.java
index 041740b6dd06f7435ebc6d54e2d6a0fbaa4f114a..f51fbb33c5d173b6403352fbfc22d1215bc05e9c 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/ImplementationLoader.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/ImplementationLoader.java
@@ -2,9 +2,6 @@ package org.argeo.demo.i18n;
 
 import java.text.MessageFormat;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * This class enable single sourcing between RAP and RCP. For this to run
  * correctly, following conventions must be respected:
@@ -18,8 +15,8 @@ import org.apache.commons.logging.LogFactory;
  */
 
 public class ImplementationLoader {
-       private final static Log log = LogFactory
-                       .getLog(ImplementationLoader.class);
+       // private final static Log log = LogFactory
+       // .getLog(ImplementationLoader.class);
 
        public static Object newInstance(
                        @SuppressWarnings("rawtypes") final Class type) {

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/commands/OpenDialog.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/commands/OpenDialog.java
new file mode 100644 (file)
index 0000000..adfde57
--- /dev/null
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/commands/OpenDialog.java
@@ -0,0 +1,33 @@
+package org.argeo.demo.i18n.commands;
+
+import org.argeo.demo.i18n.I18nDemoMessages;
+import org.argeo.demo.i18n.I18nDemoPlugin;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.MessageBox;
+
+/**
+ * Open a dummy dialog box with internationalized messages.
+ */
+public class OpenDialog extends AbstractHandler {
+
+       public final static String ID = I18nDemoPlugin.ID + ".openDialog";
+
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+
+               MessageBox mb = new MessageBox(I18nDemoPlugin.getDefault()
+                               .getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.OK
+                               | SWT.CANCEL);
+
+               // Title
+               mb.setText(I18nDemoMessages.get().OpenDialog_Title);
+
+               // Message
+               mb.setMessage(I18nDemoMessages.get().OpenDialog_Message);
+               mb.open();
+
+               return null;
+       }
+}

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java
index 1804b1d4ee2c8e9c30e1dd7559749c739fdc1e2a..7e12e85b81a0e368b397ac12c8c1c0f23cbd6bd6 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/MultiSectionPage.java
@@ -1,12 +1,15 @@
 package org.argeo.demo.i18n.editors;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.demo.i18n.I18nDemoMessages;
+import org.argeo.demo.i18n.I18nDemoPlugin;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.AbstractFormPart;
 import org.eclipse.ui.forms.IManagedForm;
@@ -16,7 +19,6 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 /**
  * Offers two main sections : one to display a text area with a summary of all
@@ -24,7 +26,7 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
  * enable browsing
  * */
 public class MultiSectionPage extends FormPage {
-       private final static Log log = LogFactory.getLog(MultiSectionPage.class);
+       // private final static Log log = LogFactory.getLog(MultiSectionPage.class);
 
        // this page UI components
        private FormToolkit tk;
@@ -41,15 +43,15 @@ public class MultiSectionPage extends FormPage {
                Composite body = form.getBody();
                body.setLayout(twt);
 
-               createHistorySection(form.getBody());
-               createTreeSection(form.getBody());
+               createDetailsSection(form.getBody());
+               createDescriptionSection(form.getBody());
        }
 
-       protected void createTreeSection(Composite parent) {
+       protected void createDescriptionSection(Composite parent) {
                // Section Layout & MetaData
                Section section = tk.createSection(parent, Section.TWISTIE);
                section.setLayoutData(new GridData(GridData.FILL_BOTH));
-               section.setText(I18nDemoMessages.get().MultiSelectionPage_DescriptionSectionTitle);
+               section.setText(I18nDemoMessages.get().MultiSectionPage_DescriptionSectionTitle);
 
                // Section Body
                Composite body = tk.createComposite(section, SWT.FILL);
@@ -60,26 +62,56 @@ public class MultiSectionPage extends FormPage {
 
                body.setLayoutData(new GridData(GridData.FILL_BOTH));
                section.setExpanded(true);
+
+               // button line
+               Button b1 = new Button(body, SWT.PUSH | SWT.FILL);
+               b1.setText(I18nDemoMessages.get().MultiSectionPage_Btn1Lbl);
+               Button b2 = new Button(body, SWT.PUSH | SWT.FILL);
+               b2.setText(I18nDemoMessages.get().MultiSectionPage_Btn2Lbl);
+               Button b3 = new Button(body, SWT.PUSH | SWT.FILL);
+               b3.setText(I18nDemoMessages.get().MultiSectionPage_Btn3Lbl);
+
+               addAListener(b1);
+               addAListener(b2);
+               addAListener(b3);
+       }
+
+       private void addAListener(Button b) {
+               b.addSelectionListener(new SelectionAdapter() {
+                       public void widgetSelected(SelectionEvent e) {
+                               MessageBox mb = new MessageBox(I18nDemoPlugin.getDefault()
+                                               .getWorkbench().getActiveWorkbenchWindow().getShell(),
+                                               SWT.OK);
+                               // Title
+                               mb.setText(I18nDemoMessages.get().MultiSectionPage_PopupTitle);
+                               // Message
+                               mb.setMessage(I18nDemoMessages.get().MultiSectionPage_PopupText);
+                               mb.open();
+                       }
+               });
        }
 
-       protected void createHistorySection(Composite parent) {
+       protected void createDetailsSection(Composite parent) {
 
                // Section Layout
                Section section = tk.createSection(parent, Section.TWISTIE);
                section.setLayoutData(new GridData(TableWrapData.FILL_GRAB));
-               TableWrapLayout twt = new TableWrapLayout();
-               section.setLayout(twt);
+               GridLayout gd = new GridLayout();
+               section.setLayout(gd);
 
                // Set title of the section
-               section.setText(I18nDemoMessages.get().MultiSelectionPage_DetailsSectionTitle);
+               section.setText(I18nDemoMessages.get().MultiSectionPage_DetailsSectionTitle);
 
                final Text styledText = tk.createText(section, "", SWT.FULL_SELECTION
-                               | SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
+                               | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
                styledText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-               section.setClient(styledText);
                styledText.setEditable(false);
+               styledText
+                               .setText(I18nDemoMessages.get().MultiSectionPage_DescriptionSectionTxt);
                section.setExpanded(false);
 
+               section.setClient(styledText);
+
                AbstractFormPart part = new AbstractFormPart() {
                        public void commit(boolean onSave) {
                        }

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimpleMultitabEditor.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimpleMultitabEditor.java
index 967c75624c5d2ea86c541bc665c111da8abfa1b4..e187b17ed1e114a7c063f4fcf62b69e0cf327f36 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimpleMultitabEditor.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimpleMultitabEditor.java
@@ -1,7 +1,5 @@
 package org.argeo.demo.i18n.editors;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.demo.i18n.I18nDemoMessages;
 import org.argeo.demo.i18n.I18nDemoPlugin;
@@ -19,8 +17,8 @@ import org.eclipse.ui.forms.editor.FormEditor;
  */
 public class SimpleMultitabEditor extends FormEditor {
 
-       private final static Log log = LogFactory
-                       .getLog(SimpleMultitabEditor.class);
+       // private final static Log log = LogFactory
+       // .getLog(SimpleMultitabEditor.class);
        public final static String ID = I18nDemoPlugin.ID + ".simpleMultitabEditor";
 
        private SimplePage simplePage;

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimplePage.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimplePage.java
index b19056fbd2c77022901e4bc2589f17427589a4a5..087efec00c029d66dcd3c296ef3bc7fa5f5b043e 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimplePage.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/editors/SimplePage.java
@@ -1,15 +1,8 @@
 package org.argeo.demo.i18n.editors;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
+import org.argeo.demo.i18n.I18nDemoMessages;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.AbstractFormPart;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
@@ -23,7 +16,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
  */
 
 public class SimplePage extends FormPage {
-       private final static Log log = LogFactory.getLog(SimplePage.class);
+       // private final static Log log = LogFactory.getLog(SimplePage.class);
 
        // Utils
        // protected DateFormat timeFormatter = new
@@ -31,7 +24,8 @@ public class SimplePage extends FormPage {
 
        // This page widgets
        private FormToolkit tk;
-       private List<Control> modifyableProperties = new ArrayList<Control>();
+
+       // private List<Control> modifyableProperties = new ArrayList<Control>();
 
        public SimplePage(FormEditor editor, String title) {
                super(editor, "id", title);
@@ -49,7 +43,7 @@ public class SimplePage extends FormPage {
 
        private void createPropertiesPart(Composite parent) {
                // Initializes form part
-               tk.createLabel(parent, "Implement something");
+               tk.createLabel(parent, I18nDemoMessages.get().SimplePage_DescriptionTxt);
                AbstractFormPart part = new AbstractFormPart() {
                        public void commit(boolean onSave) {
                                if (onSave) {
@@ -69,18 +63,15 @@ public class SimplePage extends FormPage {
        //
        // LISTENERS
        //
-
-       private class ModifiedFieldListener implements ModifyListener {
-
-               private AbstractFormPart formPart;
-
-               public ModifiedFieldListener(AbstractFormPart generalPart) {
-                       this.formPart = generalPart;
-               }
-
-               public void modifyText(ModifyEvent e) {
-                       formPart.markDirty();
-               }
-       }
-
+       /*
+        * UNUSED FOR THE TIME BEING private class ModifiedFieldListener implements
+        * ModifyListener {
+        * 
+        * private AbstractFormPart formPart;
+        * 
+        * public ModifiedFieldListener(AbstractFormPart generalPart) {
+        * this.formPart = generalPart; }
+        * 
+        * public void modifyText(ModifyEvent e) { formPart.markDirty(); } }
+        */
 }

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/preferences/LocaleSettingsPage.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/preferences/LocaleSettingsPage.java
index fa6e34dccafe8a42538fc0c7245196d84abcbdeb..4eec1405aad3bb2ff268f725c79ae5d28815aed0 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/preferences/LocaleSettingsPage.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/preferences/LocaleSettingsPage.java
@@ -22,7 +22,7 @@ public class LocaleSettingsPage extends FieldEditorPreferencePage implements
                                "An example of a multiple-choice preference", 1,
                                new String[][] { { "&Choice 1", "choice1" },
                                                { "C&hoice 2", "choice2" } }, getFieldEditorParent()));
-               addField(new StringFieldEditor("MySTRING1", "A &text preference:",
+               addField(new StringFieldEditor("locale", "Chosen locale",
                                getFieldEditorParent()));
                addField(new StringFieldEditor("MySTRING2", "A &text preference:",
                                getFieldEditorParent()));

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/utils/GenericDoubleClickListener.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/utils/GenericDoubleClickListener.java
index e7ffda6aadba4e19ecb5ec32eac746aae2b2779e..1a898b7a451fe5c37fcbba15e74870b76bd7dc7b 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/utils/GenericDoubleClickListener.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/utils/GenericDoubleClickListener.java
@@ -1,7 +1,5 @@
 package org.argeo.demo.i18n.utils;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.demo.i18n.I18nDemoPlugin;
 import org.argeo.demo.i18n.editors.SimpleMultitabEditor;
@@ -18,13 +16,13 @@ import org.eclipse.ui.PartInitException;
  */
 public class GenericDoubleClickListener implements IDoubleClickListener {
 
-       private final static Log log = LogFactory
-                       .getLog(GenericDoubleClickListener.class);
+       // private final static Log log = LogFactory
+       // .getLog(GenericDoubleClickListener.class);
 
-       private TreeViewer treeViewer;
+       // private TreeViewer treeViewer;
 
        public GenericDoubleClickListener(TreeViewer treeViewer) {
-               this.treeViewer = treeViewer;
+               // this.treeViewer = treeViewer;
        }
 
        public void doubleClick(DoubleClickEvent event) {

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/views/SimpleTreeView.java b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/views/SimpleTreeView.java
index 6d7d21ac67d3b6e581706b3990e40206dafd2c91..3783294ae501ffe6fe8ede31291ecef8996462f3 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/views/SimpleTreeView.java
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/java/org/argeo/demo/i18n/views/SimpleTreeView.java
@@ -1,7 +1,5 @@
 package org.argeo.demo.i18n.views;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.demo.i18n.I18nDemoPlugin;
 import org.argeo.demo.i18n.providers.SimpleContentProvider;
 import org.argeo.demo.i18n.providers.SimpleLabelProvider;
@@ -24,8 +22,7 @@ import org.eclipse.ui.part.ViewPart;
  */
 
 public class SimpleTreeView extends ViewPart {
-       private final static Log log = LogFactory.getLog(SimpleTreeView.class);
-
+       // private final static Log log = LogFactory.getLog(SimpleTreeView.class);
        public final static String ID = I18nDemoPlugin.ID + ".simpleTreeView";
 
        // This page widgets
@@ -81,7 +78,5 @@ public class SimpleTreeView extends ViewPart {
        @Override
        public void setFocus() {
                // Do nothing for the time being.
-
        }
-
 }

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages.properties b/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages.properties
index db7d254accc1ec2102eab532146b01b2725f51d1..f61bdf4ab4817a12f63f01034e2c629f696e9b17 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages.properties
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages.properties
@@ -3,6 +3,8 @@
 ## Generic labels
 
 ## Errors & warnings 
+OpenDialog_Title=Dialog Popup
+OpenDialog_Message=This pop-up shows an internationalized message to the end user.
 
 ## Commands 
 
@@ -11,9 +13,18 @@ SimpleMultitabEditor_MultiSectionPageTitle=More information
 SimpleMultitabEditor_SimplePageTitle=Base information
 
 ## Pages 
-MultiSelectionPage_DescriptionSectionTitle=Description
-MultiSelectionPage_DetailsSectionTitle=Details
+MultiSectionPage_DescriptionSectionTitle=Description
+MultiSectionPage_DescriptionSectionTxt=This section displays an internationalized text description.
+MultiSectionPage_DetailsSectionTitle=Details
+MultiSectionPage_PopupTitle=Popup Title 
+MultiSectionPage_PopupText=Current window has been open thanks to a button.
 
- 
+SimplePage_DescriptionTxt=This editor does nothing. It's just here to present all widgets' Ui that can be internationalized with i18n mecanisms.
+
+## Buttons 
+MultiSectionPage_Btn1Lbl=First button
+MultiSectionPage_Btn2Lbl=Second button
+MultiSectionPage_Btn3Lbl=Third button
+  
 ## Dummy ones 
 testLbl=Internationalizations of messages seems to work properly.

diff --git a/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages_fr.properties b/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages_fr.properties
index 67ff3e2e2ad1d4ac1591ca3d737cfdea103d1614..8984d4c61d9d4b48e6e795f805f24dd8dc085f92 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages_fr.properties
+++ b/demo/plugins/org.argeo.demo.i18n/src/main/resources/org/argeo/demo/i18n/messages_fr.properties
@@ -2,8 +2,9 @@
 
 ## Generic labels 
 
-
 ## Errors & warnings 
+OpenDialog_Title=Pop-up de dialogue
+OpenDialog_Message=Cette fenêtre montre un message internationalisé.
 
 ## Commands 
 
@@ -11,9 +12,19 @@
 SimpleMultitabEditor_MultiSectionPageTitle=Plus d'informations
 SimpleMultitabEditor_SimplePageTitle=Informations de base
 ## Pages 
-MultiSelectionPage_DescriptionSectionTitle=Description
-MultiSelectionPage_DetailsSectionTitle=Détails
+MultiSectionPage_DescriptionSectionTitle=Description
+MultiSectionPage_DescriptionSectionTxt=Cette section contient une description internationalisée.
+MultiSectionPage_DetailsSectionTitle=Détails
+MultiSectionPage_PopupTitle=Titre de la fenêtre 
+MultiSectionPage_PopupText=Cette fenêtre a été ouverte par un bouton
+
+SimplePage_DescriptionTxt=Cet éditeur ne fait rien, il permet juste de présenter l'ensemble des éléments d'UI internationalisable via les mécanisme i18n d'Eclipse.
+
 
+## Buttons 
+MultiSectionPage_Btn1Lbl=Premier bouton
+MultiSectionPage_Btn2Lbl=Deuxième bouton
+MultiSectionPage_Btn3Lbl=Troisième bouton
  
 ## Dummy ones 
 testLbl=L'internationnalisation des messages semble fonctionner correctement.