Author: lemovice
Date: Sun Dec 8 14:33:05 2013
New Revision: 4716
Log:
Correct NPE on NameEditorPanel creation
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/Bundle.properties
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/EventsListPanel.java
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.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
Sun Dec 8 14:33:05 2013
@@ -110,15 +110,23 @@
PlaceEditorPanel.gedcomLongitudeLabel.text=Longitude
PlaceEditorPanel.gedcomLatitudeLabel.text=Latitude
-NameEditorPanel.jLabel1.text=common first name
+NameEditorPanel.title.edit=Edit name
+NameEditorPanel.title.create=Create new name
NameEditorPanel.firstNameLabel.text=First Name
-NameEditorPanel.firstNameSuffixTextField.text=
NameEditorPanel.firstNameSufixLabel.text=Suffix
NameEditorPanel.firstNamePanel.border.title=First Name
NameEditorPanel.firstNamePrefixLabel.text=Title
-NameEditorPanel.jLabel2.text=Nickname
NameEditorPanel.familyNamesPanel.border.title=Family Names
NameEditorPanel.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.familyNameLabel.text=Family Name
+NameEditorPanel.firstNameTextField.toolTipText=Given name or earned
name.\nDifferent given names are separated by a comma.
+NameEditorPanel.familyNameTextField.toolTipText=Surname or family
name.\nDifferent surnames are separated by a comma.
+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.firstNamePrefixTextField.toolTipText=name piece that appears
preceding the given name and surname parts.\nDifferent name prefix parts are
separated by a comma.
EventsListPanel.addEventButton.toolTipText=Add event
EventsListPanel.deleteEventButton.toolTipText=Delete event
@@ -147,20 +155,6 @@
RepositoriesListPanel.editSourceButton.toolTipText=Edit source
AssociationsListPanel.addReferenceButton.toolTipText=Add new multimedia Object
-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=
FamilyEditorPanel.multimediaObjectsListPanel.name=
FamilyEditorPanel.addHusbandButton.toolTipText=Add father
@@ -179,3 +173,4 @@
ChildrensListPanel.linkToChildrenButton.text=
FamilyEditorPanel.linktoHusbandButton.text=
FamilyEditorPanel.linkToWifeButton.text=
+NameEditorPanel.firstNameSuffixTextField.text=
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/EventsListPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/EventsListPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/EventsListPanel.java
Sun Dec 8 14:33:05 2013
@@ -2,7 +2,9 @@
import ancestris.modules.editors.genealogyeditor.models.EventsTableModel;
import ancestris.util.swing.DialogManager.ADialog;
-import genj.gedcom.*;
+import genj.gedcom.GedcomException;
+import genj.gedcom.Property;
+import genj.gedcom.PropertyEvent;
import java.util.ArrayList;
import java.util.List;
import org.openide.DialogDescriptor;
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.form
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.form
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.form
Sun Dec 8 14:33:05 2013
@@ -119,9 +119,6 @@
<Properties>
<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="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="NameEditorPanel.firstNamePrefixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
@@ -132,9 +129,6 @@
</Component>
<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="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="NameEditorPanel.firstNameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
@@ -153,9 +147,6 @@
<Component class="javax.swing.JTextField" name="familyNamePrefixTextField">
<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="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="NameEditorPanel.familyNamePrefixTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
@@ -167,9 +158,6 @@
<Component class="javax.swing.JTextField" name="familyNameTextField">
<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="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="NameEditorPanel.familyNameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
@@ -203,9 +191,6 @@
<Properties>
<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="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="NameEditorPanel.nicknameTextField.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.java
Sun Dec 8 14:33:05 2013
@@ -69,7 +69,6 @@
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("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() {
@@ -89,7 +88,6 @@
}
});
-
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() {
@@ -112,7 +110,6 @@
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("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() {
@@ -133,7 +130,6 @@
});
familyNameTextField.setColumns(16);
-
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() {
@@ -178,7 +174,6 @@
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("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() {
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
Sun Dec 8 14:33:05 2013
@@ -110,7 +110,7 @@
NameEditorPanel nameEditorPanel = new NameEditorPanel();
nameEditorPanel.set(root, null);
ADialog nameEditorDialog = new ADialog(
- NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title"),
+ NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title.create"),
nameEditorPanel);
nameEditorDialog.setDialogId(NameEditorPanel.class.getName());
@@ -127,7 +127,7 @@
NameEditorPanel nameEditorPanel = new NameEditorPanel();
nameEditorPanel.set(root, namesTableModel.getValueAt(rowIndex));
ADialog nameEditorDialog = new ADialog(
- NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title"),
+ NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title.edit"),
nameEditorPanel);
nameEditorDialog.setDialogId(NameEditorPanel.class.getName());
@@ -148,7 +148,7 @@
NameEditorPanel nameEditorPanel = new NameEditorPanel();
nameEditorPanel.set(root, namesTableModel.getValueAt(rowIndex));
ADialog nameEditorDialog = new ADialog(
- NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title"),
+ NbBundle.getMessage(NameEditorPanel.class,
"NameEditorPanel.title.edit"),
nameEditorPanel);
nameEditorDialog.setDialogId(NameEditorPanel.class.getName());
---------------------------------------------------------------------
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]
