Author: lemovice
Date: Sat Dec 7 18:15:15 2013
New Revision: 4707
Log:
Individual Editor, Add Families Child and Families Spouse tabs
Remove FamilyNamesListPAnel as it is no more used
Added:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamiliesListPanel.form
- copied, changed from r4697,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamiliesListPanel.java
- copied, changed from r4697,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.java
Removed:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.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/IndividualsListPanel.java
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NameEditorPanel.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 18:15:15 2013
@@ -176,3 +176,5 @@
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=
+IndividualEditorPanel.familiesChildPanel.TabConstraints.tabTitle=Families Child
+IndividualEditorPanel.familiesSpousePanel.TabConstraints.tabTitle=Families
Spouse
Copied:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamiliesListPanel.form
(from r4697,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.form)
==============================================================================
---
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.form
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamiliesListPanel.form
Sat Dec 7 18:15:15 2013
@@ -90,9 +90,8 @@
<Component class="javax.swing.JTable" name="familyNamesTable">
<Properties>
<Property name="model" type="javax.swing.table.TableModel"
editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code="familyNamesTableModel" type="code"/>
+ <Connection code="familiesTableModel" type="code"/>
</Property>
- <Property name="columnSelectionAllowed" type="boolean"
value="true"/>
<Property name="tableHeader" type="javax.swing.table.JTableHeader"
editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
<TableHeader reorderingAllowed="true" resizingAllowed="true"/>
</Property>
Copied:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamiliesListPanel.java
(from r4697,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.java)
==============================================================================
---
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyNamesListPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamiliesListPanel.java
Sat Dec 7 18:15:15 2013
@@ -1,19 +1,23 @@
package ancestris.modules.editors.genealogyeditor.panels;
-import ancestris.modules.editors.genealogyeditor.models.FamilyNamesTableModel;
+import ancestris.modules.editors.genealogyeditor.models.FamiliesTableModel;
+import genj.gedcom.Fam;
+import genj.gedcom.Property;
+import java.util.List;
/**
*
* @author dominique
*/
-public class FamilyNamesListPanel extends javax.swing.JPanel {
+public class FamiliesListPanel extends javax.swing.JPanel {
- private FamilyNamesTableModel familyNamesTableModel = new
FamilyNamesTableModel();
+ private FamiliesTableModel familiesTableModel = new FamiliesTableModel();
+ private Property root;
/**
- * Creates new form FamilyNamesListPanel
+ * Creates new form FamiliesListPanel
*/
- public FamilyNamesListPanel() {
+ public FamiliesListPanel() {
initComponents();
}
@@ -69,8 +73,7 @@
});
familyNamesToolBar.add(deleteFamilyNameButton);
- familyNamesTable.setModel(familyNamesTableModel);
- familyNamesTable.setColumnSelectionAllowed(true);
+ familyNamesTable.setModel(familiesTableModel);
familyNamesTable.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
familyNamesTableMouseClicked(evt);
@@ -109,7 +112,6 @@
private void
deleteFamilyNameButtonActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_deleteFamilyNameButtonActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_deleteFamilyNameButtonActionPerformed
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton addFamilyNameButton;
private javax.swing.JButton deleteFamilyNameButton;
@@ -118,4 +120,9 @@
private javax.swing.JTable familyNamesTable;
private javax.swing.JToolBar familyNamesToolBar;
// End of variables declaration//GEN-END:variables
+
+ public void setFamiliesList(Property root, List<Fam> familiesList) {
+ this.root = root;
+ familiesTableModel.update(familiesList);
+ }
}
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 18:15:15 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" pref="175"
max="32767" attributes="0"/>
+ <Component id="individualInformationTabbedPane" max="32767"
attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@@ -177,6 +177,62 @@
</Component>
</SubComponents>
</Container>
+ <Container class="javax.swing.JPanel" name="familiesChildPanel">
+ <Constraints>
+ <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"
value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
+ <JTabbedPaneConstraints tabName="Families Child">
+ <Property name="tabTitle" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="IndividualEditorPanel.familiesChildPanel.TabConstraints.tabTitle"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ </Property>
+ </JTabbedPaneConstraints>
+ </Constraint>
+ </Constraints>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="familiesChildListPanel" alignment="0"
pref="733" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="familiesChildListPanel" alignment="0"
pref="144" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component
class="ancestris.modules.editors.genealogyeditor.panels.FamiliesListPanel"
name="familiesChildListPanel">
+ </Component>
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="familiesSpousePanel">
+ <Constraints>
+ <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"
value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
+ <JTabbedPaneConstraints tabName="Families Spouse">
+ <Property name="tabTitle" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="IndividualEditorPanel.familiesSpousePanel.TabConstraints.tabTitle"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ </Property>
+ </JTabbedPaneConstraints>
+ </Constraint>
+ </Constraints>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="familiesSpouseListPanel" alignment="0"
pref="733" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="familiesSpouseListPanel" alignment="0"
pref="144" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component
class="ancestris.modules.editors.genealogyeditor.panels.FamiliesListPanel"
name="familiesSpouseListPanel">
+ </Component>
+ </SubComponents>
+ </Container>
<Container class="javax.swing.JPanel" name="sourcesPanel">
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"
value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
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 18:15:15 2013
@@ -8,6 +8,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.imageio.ImageIO;
import org.jdesktop.swingx.JXImagePanel;
@@ -46,6 +47,10 @@
individualInformationTabbedPane = new javax.swing.JTabbedPane();
eventsPanel = new javax.swing.JPanel();
eventsListPanel = new
ancestris.modules.editors.genealogyeditor.panels.EventsListPanel();
+ familiesChildPanel = new javax.swing.JPanel();
+ familiesChildListPanel = new
ancestris.modules.editors.genealogyeditor.panels.FamiliesListPanel();
+ familiesSpousePanel = new javax.swing.JPanel();
+ familiesSpouseListPanel = new
ancestris.modules.editors.genealogyeditor.panels.FamiliesListPanel();
sourcesPanel = new javax.swing.JPanel();
sourcesListPanel = new
ancestris.modules.editors.genealogyeditor.panels.SourcesListPanel();
namesPanel = new javax.swing.JPanel();
@@ -89,7 +94,7 @@
.addGroup(generalPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(generalPanelLayout.createSequentialGroup()
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(simpleNameEditorPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 572, Short.MAX_VALUE))
+ .addComponent(simpleNameEditorPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
.addGroup(generalPanelLayout.createSequentialGroup()
.addGap(25, 25, 25)
.addComponent(sexBeanPanel,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -119,28 +124,54 @@
eventsPanel.setLayout(eventsPanelLayout);
eventsPanelLayout.setHorizontalGroup(
eventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(eventsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 726, Short.MAX_VALUE)
+ .addComponent(eventsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
);
eventsPanelLayout.setVerticalGroup(
eventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(eventsPanelLayout.createSequentialGroup()
- .addComponent(eventsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE)
+ .addComponent(eventsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE)
.addGap(0, 0, 0))
);
individualInformationTabbedPane.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("IndividualEditorPanel.eventsPanel.TabConstraints.tabTitle"),
new Object[] {}), new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Event.png")),
eventsPanel); // NOI18N
+ javax.swing.GroupLayout familiesChildPanelLayout = new
javax.swing.GroupLayout(familiesChildPanel);
+ familiesChildPanel.setLayout(familiesChildPanelLayout);
+ familiesChildPanelLayout.setHorizontalGroup(
+
familiesChildPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(familiesChildListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
+ );
+ familiesChildPanelLayout.setVerticalGroup(
+
familiesChildPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(familiesChildListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE)
+ );
+
+
individualInformationTabbedPane.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("IndividualEditorPanel.familiesChildPanel.TabConstraints.tabTitle"),
new Object[] {}), familiesChildPanel); // NOI18N
+
+ javax.swing.GroupLayout familiesSpousePanelLayout = new
javax.swing.GroupLayout(familiesSpousePanel);
+ familiesSpousePanel.setLayout(familiesSpousePanelLayout);
+ familiesSpousePanelLayout.setHorizontalGroup(
+
familiesSpousePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(familiesSpouseListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
+ );
+ familiesSpousePanelLayout.setVerticalGroup(
+
familiesSpousePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(familiesSpouseListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE)
+ );
+
+
individualInformationTabbedPane.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("IndividualEditorPanel.familiesSpousePanel.TabConstraints.tabTitle"),
new Object[] {}), familiesSpousePanel); // NOI18N
+
javax.swing.GroupLayout sourcesPanelLayout = new
javax.swing.GroupLayout(sourcesPanel);
sourcesPanel.setLayout(sourcesPanelLayout);
sourcesPanelLayout.setHorizontalGroup(
sourcesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(sourcesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 726, Short.MAX_VALUE)
+ .addComponent(sourcesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
);
sourcesPanelLayout.setVerticalGroup(
sourcesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING,
sourcesPanelLayout.createSequentialGroup()
.addGap(0, 0, 0)
- .addComponent(sourcesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE))
+ .addComponent(sourcesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE))
);
individualInformationTabbedPane.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("IndividualEditorPanel.sourcesPanel.TabConstraints.tabTitle"),
new Object[] {}), new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Source.png")),
sourcesPanel); // NOI18N
@@ -149,13 +180,13 @@
namesPanel.setLayout(namesPanelLayout);
namesPanelLayout.setHorizontalGroup(
namesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(namesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 726, Short.MAX_VALUE)
+ .addComponent(namesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
);
namesPanelLayout.setVerticalGroup(
namesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING,
namesPanelLayout.createSequentialGroup()
.addGap(0, 0, 0)
- .addComponent(namesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE))
+ .addComponent(namesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE))
);
individualInformationTabbedPane.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("IndividualEditorPanel.namesPanel.TabConstraints.tabTitle"),
new Object[] {}), new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Name.png")),
namesPanel); // NOI18N
@@ -164,13 +195,13 @@
notesPanel.setLayout(notesPanelLayout);
notesPanelLayout.setHorizontalGroup(
notesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(notesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 726, Short.MAX_VALUE)
+ .addComponent(notesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
);
notesPanelLayout.setVerticalGroup(
notesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING,
notesPanelLayout.createSequentialGroup()
.addGap(0, 0, 0)
- .addComponent(notesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE))
+ .addComponent(notesListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE))
);
individualInformationTabbedPane.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("IndividualEditorPanel.notesPanel.TabConstraints.tabTitle"),
new Object[] {}), new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Note.png")),
notesPanel); // NOI18N
@@ -179,13 +210,13 @@
referencesPanel.setLayout(referencesPanelLayout);
referencesPanelLayout.setHorizontalGroup(
referencesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(associationsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 726, Short.MAX_VALUE)
+ .addComponent(associationsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
);
referencesPanelLayout.setVerticalGroup(
referencesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING,
referencesPanelLayout.createSequentialGroup()
.addGap(0, 0, 0)
- .addComponent(associationsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE))
+ .addComponent(associationsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE))
);
individualInformationTabbedPane.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("IndividualEditorPanel.referencesPanel.TabConstraints.tabTitle"),
new Object[] {}), new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Association.png")),
referencesPanel); // NOI18N
@@ -194,13 +225,13 @@
galleryPanel.setLayout(galleryPanelLayout);
galleryPanelLayout.setHorizontalGroup(
galleryPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(multimediaObjectsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 726, Short.MAX_VALUE)
+ .addComponent(multimediaObjectsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE)
);
galleryPanelLayout.setVerticalGroup(
galleryPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING,
galleryPanelLayout.createSequentialGroup()
.addGap(0, 0, 0)
- .addComponent(multimediaObjectsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE))
+ .addComponent(multimediaObjectsListPanel,
javax.swing.GroupLayout.DEFAULT_SIZE, 144, Short.MAX_VALUE))
);
individualInformationTabbedPane.addTab("Gallery", new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Media.png")),
galleryPanel); // NOI18N
@@ -230,6 +261,10 @@
private
ancestris.modules.editors.genealogyeditor.panels.AssociationsListPanel
associationsListPanel;
private ancestris.modules.editors.genealogyeditor.panels.EventsListPanel
eventsListPanel;
private javax.swing.JPanel eventsPanel;
+ private ancestris.modules.editors.genealogyeditor.panels.FamiliesListPanel
familiesChildListPanel;
+ private javax.swing.JPanel familiesChildPanel;
+ private ancestris.modules.editors.genealogyeditor.panels.FamiliesListPanel
familiesSpouseListPanel;
+ private javax.swing.JPanel familiesSpousePanel;
private javax.swing.JPanel galleryPanel;
private javax.swing.JPanel generalPanel;
private javax.swing.JLabel individualIDLabel;
@@ -272,7 +307,7 @@
simpleNameEditorPanel.set(individual, null);
}
namesListPanel.setNamesList(individual, namesList);
-
+
PropertySex sex = (PropertySex) individual.getProperty("SEX", true);
if (sex == null) {
individual.setSex(PropertySex.UNKNOWN);
@@ -286,6 +321,12 @@
}
eventsListPanel.setEventsList(individual, eventsList);
+ List<Fam> familiesChildList =
Arrays.asList(individual.getFamiliesWhereChild());
+ familiesChildListPanel.setFamiliesList(individual, familiesChildList);
+
+ List<Fam> familiesSpouseList =
Arrays.asList(individual.getFamiliesWhereSpouse());
+ familiesSpouseListPanel.setFamiliesList(individual,
familiesSpouseList);
+
List<Source> sourcesList = new ArrayList<Source>();
for (PropertySource sourceRef :
individual.getProperties(PropertySource.class)) {
sourcesList.add((Source) sourceRef.getTargetEntity());
@@ -330,7 +371,6 @@
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
-
}
}
}
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualsListPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualsListPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualsListPanel.java
Sat Dec 7 18:15:15 2013
@@ -2,7 +2,8 @@
import ancestris.modules.editors.genealogyeditor.models.IndividualsTableModel;
import ancestris.util.swing.DialogManager;
-import genj.gedcom.*;
+import genj.gedcom.Indi;
+import genj.gedcom.Property;
import java.util.List;
import org.openide.DialogDescriptor;
import org.openide.util.NbBundle;
@@ -132,7 +133,6 @@
}//GEN-LAST:event_editChildButtonActionPerformed
private void deleteChildButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_deleteChildButtonActionPerformed
-
}//GEN-LAST:event_deleteChildButtonActionPerformed
private void individualsTableMouseClicked(java.awt.event.MouseEvent evt)
{//GEN-FIRST:event_individualsTableMouseClicked
@@ -150,7 +150,6 @@
}
}
}//GEN-LAST:event_individualsTableMouseClicked
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton addChildButton;
private javax.swing.JScrollPane childrensScrollPane;
@@ -166,4 +165,5 @@
}
public void commit() {
- }}
+ }
+}
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
Sat Dec 7 18:15:15 2013
@@ -259,7 +259,7 @@
}// </editor-fold>//GEN-END:initComponents
private void nameTypeComboBoxActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_nameTypeComboBoxActionPerformed
- // TODO add your handling code here:
+ nameTypeModified = true;
}//GEN-LAST:event_nameTypeComboBoxActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel familyNameLabel;
@@ -307,6 +307,7 @@
} else {
nameTypeComboBox.setSelectedIndex(1);
}
+ nameTypeModified = false;
/*
* NPFX Non indexing name piece that appears preceding the given
@@ -316,13 +317,15 @@
*/
Property firstnamePrefix = name.getProperty("NPFX");
firstNamePrefixTextField.setText(firstnamePrefix != null ?
firstnamePrefix.getValue() : "");
-
+ firstNamePrefixModified = false;
+
/*
* GIVN Given name or earned name. Different given names are
* separated by a comma.
*/
Property givenName = name.getProperty("GIVN");
firstNameTextField.setText(givenName != null ?
givenName.getValue() : name.getFirstName());
+ firstNameModified = false;
/*
* NSFX Non-indexing name piece that appears after the given name
@@ -331,6 +334,7 @@
*/
Property firstNameSuffix = name.getProperty("NSFX");
firstNameSuffixTextField.setText(firstNameSuffix != null ?
firstNameSuffix.getValue() : "");
+ firstNameSuffixModified = false;
/*
* SPFX surname prefix or article used in a family name. Different
@@ -339,7 +343,7 @@
*/
Property familyNamePrefix = name.getProperty("SPFX");
familyNamePrefixTextField.setText(familyNamePrefix != null ?
familyNamePrefix.getValue() : "");
-
+ familyNamePrefixModified = false;
/*
* SURN Surname or family name. Different surnames are separated by
@@ -351,6 +355,7 @@
} else {
familyNameTextField.setText(name.getLastName());
}
+ familyNameModified = false;
/*
* NICK A descriptive or familiar name used in connection with
one's
@@ -358,9 +363,10 @@
*/
Property nickName = name.getProperty("NICK");
nicknameTextField.setText(nickName != null ? nickName.getValue() :
"");
-
+ nicknameModified = false;
} else {
nameTypeComboBox.setSelectedIndex(1);
+ nameTypeModified = false;
}
}
@@ -375,23 +381,20 @@
public void perform(Gedcom gedcom) throws GedcomException {
if (name == null) {
logger.log(Level.INFO, "Add property NAME");
+
name = (PropertyName) root.addProperty("NAME", "");
- if (version.equals("5.5.1")) {
- logger.log(Level.INFO, "Add property TYPE");
-
- name.addProperty("TYPE",
nameTypeComboBox.getSelectedItem().toString());
- }
}
if (version.equals("5.5.1") && nameTypeModified == true) {
Property nameType = name.getProperty("TYPE");
if (nameType == null) {
- logger.log(Level.INFO, "Create property Name");
-
+ logger.log(Level.INFO, "Add property TYPE");
+
name.addProperty("TYPE",
nameTypeComboBox.getSelectedItem().toString());
} else {
logger.log(Level.INFO, "Update property TYPE");
+
nameType.setValue(nameTypeComboBox.getSelectedItem().toString());
}
}
---------------------------------------------------------------------
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]
