Author: lemovice
Date: Sat Dec 7 18:18:07 2013
New Revision: 4708
Log:
Add Table model for familiesList Panel
Added:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/FamiliesTableModel.java
- copied, changed from r4691,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/IndividualsTableModel.java
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/Bundle.properties
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/Bundle.properties
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/Bundle.properties
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/Bundle.properties
Sat Dec 7 18:18:07 2013
@@ -15,4 +15,8 @@
IndividualsTableModel.column.DeathDate.title=Death date
NamesTableModel.column.FirstName.title=Firstname
-NamesTableModel.column.LastName.title=Last Name
\ No newline at end of file
+NamesTableModel.column.LastName.title=Last Name
+
+FamiliesTableModel.column.ID.title=Identifier
+FamiliesTableModel.column.Father.title=Father
+FamiliesTableModel.column.Mother.title=Mother
\ No newline at end of file
Copied:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/FamiliesTableModel.java
(from r4691,
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/IndividualsTableModel.java)
==============================================================================
---
/trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/IndividualsTableModel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/FamiliesTableModel.java
Sat Dec 7 18:18:07 2013
@@ -1,6 +1,6 @@
package ancestris.modules.editors.genealogyeditor.models;
-import genj.gedcom.Indi;
+import genj.gedcom.Fam;
import java.util.ArrayList;
import java.util.List;
import javax.swing.table.AbstractTableModel;
@@ -10,28 +10,20 @@
*
* @author dominique
*/
-public class IndividualsTableModel extends AbstractTableModel {
+public class FamiliesTableModel extends AbstractTableModel {
- private List<Indi> individualsList = new ArrayList<Indi>();
+ private List<Fam> familiesList = new ArrayList<Fam>();
private String[] columnsName = {
- NbBundle.getMessage(IndividualsTableModel.class,
"IndividualsTableModel.column.ID.title"),
- NbBundle.getMessage(IndividualsTableModel.class,
"IndividualsTableModel.column.Name.title"),
- NbBundle.getMessage(IndividualsTableModel.class,
"IndividualsTableModel.column.Sex.title"),
- NbBundle.getMessage(IndividualsTableModel.class,
"IndividualsTableModel.column.BirthDate.title"),
- NbBundle.getMessage(IndividualsTableModel.class,
"IndividualsTableModel.column.DeathDate.title")
- };
- private String[] sex = {
- NbBundle.getMessage(SexComboBoxModel.class,
"SexComboBoxModel.SexType.UNKNOWN"),
- NbBundle.getMessage(SexComboBoxModel.class,
"SexComboBoxModel.SexType.MALE"),
- NbBundle.getMessage(SexComboBoxModel.class,
"SexComboBoxModel.SexType.FEMALE")
- };
+ NbBundle.getMessage(FamiliesTableModel.class,
"FamiliesTableModel.column.ID.title"),
+ NbBundle.getMessage(FamiliesTableModel.class,
"FamiliesTableModel.column.Father.title"),
+ NbBundle.getMessage(FamiliesTableModel.class,
"FamiliesTableModel.column.Mother.title"),};
- public IndividualsTableModel() {
+ public FamiliesTableModel() {
}
@Override
public int getRowCount() {
- return individualsList.size();
+ return familiesList.size();
}
@Override
@@ -41,18 +33,14 @@
@Override
public Object getValueAt(int row, int column) {
- if (row < individualsList.size()) {
- Indi individual = individualsList.get(row);
+ if (row < familiesList.size()) {
+ Fam family = familiesList.get(row);
if (column == 0) {
- return individual.getId();
+ return family.getId();
} else if (column == 1) {
- return individual.getName();
+ return family.getHusband() != null ?
family.getHusband().getName() : "";
} else if (column == 2) {
- return sex[individual.getSex()];
- } else if (column == 3) {
- return individual.getBirthAsString();
- } else if (column == 4) {
- return individual.getDeathAsString();
+ return family.getWife() != null ? family.getWife().getName() :
"";
} else {
return "";
}
@@ -66,22 +54,22 @@
return columnsName[col];
}
- public void add(Indi individual) {
- this.individualsList.add(individual);
+ public void add(Fam family) {
+ this.familiesList.add(family);
fireTableDataChanged();
}
- public void addAll(List<Indi> individualsList) {
- this.individualsList.addAll(individualsList);
+ public void addAll(List<Fam> familiesList) {
+ this.familiesList.addAll(familiesList);
fireTableDataChanged();
}
- public void update(List<Indi> individualsList) {
- this.individualsList.clear();
- addAll(individualsList);
+ public void update(List<Fam> familiesList) {
+ this.familiesList.clear();
+ addAll(familiesList);
}
- public Indi getValueAt(int row) {
- return individualsList.get(row);
+ public Fam getValueAt(int row) {
+ return familiesList.get(row);
}
}
---------------------------------------------------------------------
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]
