Author: lemovice
Date: Sat Dec 7 16:12:01 2013
New Revision: 4706
Log:
NameSimpleEditor is now the default Name Editor.
Added:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.form
- copied, changed from r4705,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.java
- copied, changed from r4705,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.java
Removed:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.java
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/Bundle.properties
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.java
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NamesListPanel.java
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/Bundle.properties
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/Bundle.properties
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/Bundle.properties
Sat Dec 7 16:12:01 2013
@@ -162,20 +162,17 @@
RepositoriesListPanel.editSourceButton.toolTipText=Edit source
AssociationsListPanel.addReferenceButton.toolTipText=Add new multimedia Object
-
-NameSimpleEditorPanel.nicknameLabel.text=Nick Name
-NameSimpleEditorPanel.firstnameLabel.text=First Name
-NameSimpleEditorPanel.nicknameTextField.toolTipText=A descriptive or familiar
name used in connection with one's proper name.
-NameSimpleEditorPanel.nicknameTextField.text=
-NameSimpleEditorPanel.familyNameTextField.toolTipText=Surname or family
name.\nDifferent surnames are separated by a comma.
-NameSimpleEditorPanel.familyNameTextField.text=
-NameSimpleEditorPanel.familyNamePrefixTextField.toolTipText=Surname prefix or
article used in a family name.\nDifferent surname articles are separated by a
comma,\nfor example in the name "de la Cruz", this value would be "de, la".
-NameSimpleEditorPanel.familyNamePrefixTextField.text=
-NameSimpleEditorPanel.familyNameLabel.text=Family Name
-NameSimpleEditorPanel.firstNameTextField.toolTipText=Given name or earned
name.\nDifferent given names are separated by a comma.
-NameSimpleEditorPanel.firstNameTextField.text=
-NameSimpleEditorPanel.firstNamePrefixTextField.toolTipText=name piece that
appears preceding the given name and surname parts.\nDifferent name prefix
parts are separated by a comma.
-NameSimpleEditorPanel.firstNamePrefixTextField.text=
-NameSimpleEditorPanel.firstNameSuffixTextField.toolTipText=name piece that
appears after the given name and surname parts.\nDifferent name suffix parts
are separated by a comma.
-NameSimpleEditorPanel.firstNameSuffixTextField.text=
-NameSimpleEditorPanel.nameTypeLabel.text=Name Type
+NameEditorPanel.firstnameLabel.text=First Name
+NameEditorPanel.firstNameSuffixTextField.toolTipText=name piece that appears
after the given name and surname parts.\nDifferent name suffix parts are
separated by a comma.
+NameEditorPanel.nicknameLabel.text=Nick Name
+NameEditorPanel.nicknameTextField.toolTipText=A descriptive or familiar name
used in connection with one's proper name.
+NameEditorPanel.nicknameTextField.text=
+NameEditorPanel.familyNameLabel.text=Family Name
+NameEditorPanel.firstNameTextField.toolTipText=Given name or earned
name.\nDifferent given names are separated by a comma.
+NameEditorPanel.firstNameTextField.text=
+NameEditorPanel.familyNameTextField.toolTipText=Surname or family
name.\nDifferent surnames are separated by a comma.
+NameEditorPanel.familyNameTextField.text=
+NameEditorPanel.familyNamePrefixTextField.toolTipText=Surname prefix or
article used in a family name.\nDifferent surname articles are separated by a
comma,\nfor example in the name "de la Cruz", this value would be "de, la".
+NameEditorPanel.familyNamePrefixTextField.text=
+NameEditorPanel.firstNamePrefixTextField.toolTipText=name piece that appears
preceding the given name and surname parts.\nDifferent name prefix parts are
separated by a comma.
+NameEditorPanel.firstNamePrefixTextField.text=
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.form
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.form
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.form
Sat Dec 7 16:12:01 2013
@@ -40,7 +40,7 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="generalPanel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="individualInformationTabbedPane" max="32767"
attributes="0"/>
+ <Component id="individualInformationTabbedPane" pref="175"
max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@@ -110,7 +110,7 @@
</Property>
</Properties>
</Component>
- <Component
class="ancestris.modules.editors.genealogyeditor.panels.NameSimpleEditorPanel"
name="simpleNameEditorPanel">
+ <Component
class="ancestris.modules.editors.genealogyeditor.panels.NameEditorPanel"
name="simpleNameEditorPanel">
</Component>
<Component
class="ancestris.modules.editors.genealogyeditor.beans.SexBean"
name="sexBeanPanel">
</Component>
@@ -160,13 +160,13 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="eventsListPanel" alignment="0" pref="726"
max="32767" attributes="0"/>
+ <Component id="eventsListPanel" alignment="0" pref="733"
max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <Component id="eventsListPanel" pref="148" max="32767"
attributes="0"/>
+ <Component id="eventsListPanel" pref="144" max="32767"
attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
</Group>
</Group>
@@ -194,14 +194,14 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="sourcesListPanel" alignment="0" pref="726"
max="32767" attributes="0"/>
+ <Component id="sourcesListPanel" alignment="0" pref="733"
max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
- <Component id="sourcesListPanel" pref="148" max="32767"
attributes="0"/>
+ <Component id="sourcesListPanel" pref="144" max="32767"
attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -228,14 +228,14 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="namesListPanel" alignment="0" pref="726"
max="32767" attributes="0"/>
+ <Component id="namesListPanel" alignment="0" pref="733"
max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
- <Component id="namesListPanel" pref="148" max="32767"
attributes="0"/>
+ <Component id="namesListPanel" pref="144" max="32767"
attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -262,14 +262,14 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="notesListPanel" alignment="0" pref="726"
max="32767" attributes="0"/>
+ <Component id="notesListPanel" alignment="0" pref="733"
max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
- <Component id="notesListPanel" pref="148" max="32767"
attributes="0"/>
+ <Component id="notesListPanel" pref="144" max="32767"
attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -296,14 +296,14 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="associationsListPanel" alignment="0"
pref="726" max="32767" attributes="0"/>
+ <Component id="associationsListPanel" alignment="0"
pref="733" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
- <Component id="associationsListPanel" pref="148"
max="32767" attributes="0"/>
+ <Component id="associationsListPanel" pref="144"
max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -328,14 +328,14 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="multimediaObjectsListPanel" alignment="0"
pref="726" max="32767" attributes="0"/>
+ <Component id="multimediaObjectsListPanel" alignment="0"
pref="733" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
- <Component id="multimediaObjectsListPanel" pref="148"
max="32767" attributes="0"/>
+ <Component id="multimediaObjectsListPanel" pref="144"
max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualEditorPanel.java
Sat Dec 7 16:12:01 2013
@@ -40,7 +40,7 @@
generalPanel = new javax.swing.JPanel();
individualIDLabel = new javax.swing.JLabel();
individualIDTextField = new javax.swing.JTextField();
- simpleNameEditorPanel = new
ancestris.modules.editors.genealogyeditor.panels.NameSimpleEditorPanel();
+ simpleNameEditorPanel = new
ancestris.modules.editors.genealogyeditor.panels.NameEditorPanel();
sexBeanPanel = new
ancestris.modules.editors.genealogyeditor.beans.SexBean();
jXImagePanel1 = new org.jdesktop.swingx.JXImagePanel();
individualInformationTabbedPane = new javax.swing.JTabbedPane();
@@ -243,7 +243,7 @@
private javax.swing.JPanel notesPanel;
private javax.swing.JPanel referencesPanel;
private ancestris.modules.editors.genealogyeditor.beans.SexBean
sexBeanPanel;
- private
ancestris.modules.editors.genealogyeditor.panels.NameSimpleEditorPanel
simpleNameEditorPanel;
+ private ancestris.modules.editors.genealogyeditor.panels.NameEditorPanel
simpleNameEditorPanel;
private ancestris.modules.editors.genealogyeditor.panels.SourcesListPanel
sourcesListPanel;
private javax.swing.JPanel sourcesPanel;
// End of variables declaration//GEN-END:variables
Copied:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.form
(from r4705,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.form)
==============================================================================
---
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.form
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.form
Sat Dec 7 16:12:01 2013
@@ -90,7 +90,7 @@
<Component class="javax.swing.JLabel" name="nameTypeLabel">
<Properties>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.nameTypeLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.nameTypeLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
</Component>
@@ -111,7 +111,7 @@
<Component class="javax.swing.JLabel" name="firstnameLabel">
<Properties>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.firstnameLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.firstnameLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
</Component>
@@ -120,10 +120,10 @@
<Property name="columns" type="int" value="8"/>
<Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.firstNamePrefixTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.firstNamePrefixTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.firstNamePrefixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.firstNamePrefixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
<AuxValues>
@@ -133,10 +133,10 @@
<Component class="javax.swing.JTextField" name="firstNameTextField">
<Properties>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.firstNameTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.firstNameTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.firstNameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.firstNameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
<AuxValues>
@@ -146,7 +146,7 @@
<Component class="javax.swing.JLabel" name="familyNameLabel">
<Properties>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.familyNameLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.familyNameLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
</Component>
@@ -154,10 +154,10 @@
<Properties>
<Property name="columns" type="int" value="8"/>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.familyNamePrefixTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.familyNamePrefixTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.familyNamePrefixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.familyNamePrefixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
<AuxValues>
@@ -168,10 +168,10 @@
<Properties>
<Property name="columns" type="int" value="16"/>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.familyNameTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.familyNameTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.familyNameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.familyNameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
<AuxValues>
@@ -182,10 +182,10 @@
<Properties>
<Property name="columns" type="int" value="8"/>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.firstNameSuffixTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.firstNameSuffixTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.firstNameSuffixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.firstNameSuffixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
<AuxValues>
@@ -195,7 +195,7 @@
<Component class="javax.swing.JLabel" name="nicknameLabel">
<Properties>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.nicknameLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.nicknameLabel.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
</Component>
@@ -204,10 +204,10 @@
<Property name="columns" type="int" value="8"/>
<Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.nicknameTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.nicknameTextField.text"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameSimpleEditorPanel.nicknameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="NameEditorPanel.nicknameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
</Properties>
<AuxValues>
Copied:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.java
(from r4705,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.java)
==============================================================================
---
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameSimpleEditorPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.java
Sat Dec 7 16:12:01 2013
@@ -13,7 +13,7 @@
*
* @author dominique
*/
-public class NameSimpleEditorPanel extends javax.swing.JPanel {
+public class NameEditorPanel extends javax.swing.JPanel {
private NameTypeComboBoxModel nameTypeComboBoxModelModel = new
NameTypeComboBoxModel();
private Indi root;
@@ -25,17 +25,13 @@
private boolean firstNameSuffixModified;
private boolean firstNameModified;
private boolean nicknameModified;
- private final static Logger logger =
Logger.getLogger(NameSimpleEditorPanel.class.getName(), null);
+ private final static Logger logger =
Logger.getLogger(NameEditorPanel.class.getName(), null);
/**
- * Creates new form NameSimpleEditorPanel
+ * Creates new form NameEditorPanel
*/
- public NameSimpleEditorPanel() {
+ public NameEditorPanel() {
initComponents();
-
- // Listen for changes in the familyNamePrefixTextField
- // Listen for changes in the familyNamePrefixTextField
-
}
/**
@@ -59,7 +55,7 @@
nicknameLabel = new javax.swing.JLabel();
nicknameTextField = new javax.swing.JTextField();
-
nameTypeLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.nameTypeLabel.text"),
new Object[] {})); // NOI18N
+
nameTypeLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.nameTypeLabel.text"),
new Object[] {})); // NOI18N
nameTypeComboBox.setEditable(true);
nameTypeComboBox.setModel(nameTypeComboBoxModelModel);
@@ -69,12 +65,12 @@
}
});
-
firstnameLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.firstnameLabel.text"),
new Object[] {})); // NOI18N
+
firstnameLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.firstnameLabel.text"),
new Object[] {})); // NOI18N
firstNamePrefixTextField.setColumns(8);
firstNamePrefixTextField.setHorizontalAlignment(javax.swing.JTextField.LEFT);
-
firstNamePrefixTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.firstNamePrefixTextField.text"),
new Object[] {})); // NOI18N
-
firstNamePrefixTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.firstNamePrefixTextField.toolTipText"),
new Object[] {})); // NOI18N
+
firstNamePrefixTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.firstNamePrefixTextField.text"),
new Object[] {})); // NOI18N
+
firstNamePrefixTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.firstNamePrefixTextField.toolTipText"),
new Object[] {})); // NOI18N
firstNamePrefixTextField.getDocument().addDocumentListener(new
DocumentListener() {
@Override
@@ -93,8 +89,8 @@
}
});
-
firstNameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.firstNameTextField.text"),
new Object[] {})); // NOI18N
-
firstNameTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.firstNameTextField.toolTipText"),
new Object[] {})); // NOI18N
+
firstNameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.firstNameTextField.text"),
new Object[] {})); // NOI18N
+
firstNameTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.firstNameTextField.toolTipText"),
new Object[] {})); // NOI18N
firstNameTextField.getDocument().addDocumentListener(new
DocumentListener() {
@Override
@@ -113,11 +109,11 @@
}
});
-
familyNameLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.familyNameLabel.text"),
new Object[] {})); // NOI18N
+
familyNameLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.familyNameLabel.text"),
new Object[] {})); // NOI18N
familyNamePrefixTextField.setColumns(8);
-
familyNamePrefixTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.familyNamePrefixTextField.text"),
new Object[] {})); // NOI18N
-
familyNamePrefixTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.familyNamePrefixTextField.toolTipText"),
new Object[] {})); // NOI18N
+
familyNamePrefixTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.familyNamePrefixTextField.text"),
new Object[] {})); // NOI18N
+
familyNamePrefixTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.familyNamePrefixTextField.toolTipText"),
new Object[] {})); // NOI18N
familyNamePrefixTextField.getDocument().addDocumentListener(new
DocumentListener() {
@Override
@@ -137,8 +133,8 @@
});
familyNameTextField.setColumns(16);
-
familyNameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.familyNameTextField.text"),
new Object[] {})); // NOI18N
-
familyNameTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.familyNameTextField.toolTipText"),
new Object[] {})); // NOI18N
+
familyNameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.familyNameTextField.text"),
new Object[] {})); // NOI18N
+
familyNameTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.familyNameTextField.toolTipText"),
new Object[] {})); // NOI18N
familyNameTextField.getDocument().addDocumentListener(new
DocumentListener() {
@Override
@@ -158,8 +154,8 @@
});
firstNameSuffixTextField.setColumns(8);
-
firstNameSuffixTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.firstNameSuffixTextField.text"),
new Object[] {})); // NOI18N
-
firstNameSuffixTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.firstNameSuffixTextField.toolTipText"),
new Object[] {})); // NOI18N
+
firstNameSuffixTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.firstNameSuffixTextField.text"),
new Object[] {})); // NOI18N
+
firstNameSuffixTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.firstNameSuffixTextField.toolTipText"),
new Object[] {})); // NOI18N
firstNameSuffixTextField.getDocument().addDocumentListener(new
DocumentListener() {
@Override
@@ -178,12 +174,12 @@
}
});
-
nicknameLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.nicknameLabel.text"),
new Object[] {})); // NOI18N
+
nicknameLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.nicknameLabel.text"),
new Object[] {})); // NOI18N
nicknameTextField.setColumns(8);
nicknameTextField.setHorizontalAlignment(javax.swing.JTextField.LEFT);
-
nicknameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.nicknameTextField.text"),
new Object[] {})); // NOI18N
-
nicknameTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameSimpleEditorPanel.nicknameTextField.toolTipText"),
new Object[] {})); // NOI18N
+
nicknameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.nicknameTextField.text"),
new Object[] {})); // NOI18N
+
nicknameTextField.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NameEditorPanel.nicknameTextField.toolTipText"),
new Object[] {})); // NOI18N
nicknameTextField.getDocument().addDocumentListener(new
DocumentListener() {
@Override
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NamesListPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NamesListPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NamesListPanel.java
Sat Dec 7 16:12:01 2013
@@ -107,7 +107,7 @@
}// </editor-fold>//GEN-END:initComponents
private void addNameButtonActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_addNameButtonActionPerformed
- NameSimpleEditorPanel nameEditorPanel = new NameSimpleEditorPanel();
+ NameEditorPanel nameEditorPanel = new NameEditorPanel();
nameEditorPanel.set(root, null);
ADialog nameEditorDialog = new ADialog(
NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title"),
@@ -124,7 +124,7 @@
int selectedRow = namesTable.getSelectedRow();
if (selectedRow != -1) {
int rowIndex = namesTable.convertRowIndexToModel(selectedRow);
- NameSimpleEditorPanel nameEditorPanel = new
NameSimpleEditorPanel();
+ NameEditorPanel nameEditorPanel = new NameEditorPanel();
nameEditorPanel.set(root, namesTableModel.getValueAt(rowIndex));
ADialog nameEditorDialog = new ADialog(
NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title"),
@@ -145,7 +145,7 @@
int selectedRow = namesTable.getSelectedRow();
if (selectedRow != -1) {
int rowIndex = namesTable.convertRowIndexToModel(selectedRow);
- NameSimpleEditorPanel nameEditorPanel = new
NameSimpleEditorPanel();
+ NameEditorPanel nameEditorPanel = new NameEditorPanel();
nameEditorPanel.set(root, namesTableModel.getValueAt(rowIndex));
ADialog nameEditorDialog = new ADialog(
NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title"),
---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org
<*> Pour vous desinscrire de cette liste, envoyez un mail a :
[email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
[email protected]
Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira
d'envoyer le message :
[email protected]
