Author: lemovice
Date: Sun Dec 8 23:44:26 2013
New Revision: 4729
Log:
Add event place column and row sorter.
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/Bundle.properties
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/EventsTableModel.java
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/EventsListPanel.java
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
Sun Dec 8 23:44:26 2013
@@ -20,4 +20,8 @@
FamiliesTableModel.column.ID.title=Identifier
FamiliesTableModel.column.husband.title=Husband
FamiliesTableModel.column.wife.title=Wife
-FamiliesTableModel.column.weddingDate.title=wedding date
\ No newline at end of file
+FamiliesTableModel.column.weddingDate.title=wedding date
+
+EventsTableModel.column.ID.eventType=Event type
+EventsTableModel.column.ID.date=date
+EventsTableModel.column.ID.place=place
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/EventsTableModel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/EventsTableModel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/models/EventsTableModel.java
Sun Dec 8 23:44:26 2013
@@ -2,9 +2,11 @@
import ancestris.modules.gedcom.utilities.PropertyTag2Name;
import genj.gedcom.PropertyEvent;
+import genj.gedcom.PropertyPlace;
import java.util.ArrayList;
import java.util.List;
import javax.swing.table.AbstractTableModel;
+import org.openide.util.NbBundle;
/**
*
@@ -13,7 +15,11 @@
public class EventsTableModel extends AbstractTableModel {
List<PropertyEvent> eventsList = new ArrayList<PropertyEvent>();
- String[] columnsName = {"Event type", "date"};
+ String[] columnsName = {
+ NbBundle.getMessage(EventsTableModel.class,
"EventsTableModel.column.ID.eventType"),
+ NbBundle.getMessage(EventsTableModel.class,
"EventsTableModel.column.ID.date"),
+ NbBundle.getMessage(EventsTableModel.class,
"EventsTableModel.column.ID.place")
+ };
public EventsTableModel() {
}
@@ -34,8 +40,11 @@
PropertyEvent propertyEvent = eventsList.get(row);
if (column == 0) {
return PropertyTag2Name.getTagName(propertyEvent.getTag());
- } else {
+ } else if (column == 1) {
return propertyEvent.getDate() != null ?
propertyEvent.getDate().getDisplayValue() : "";
+ } else {
+ PropertyPlace place = (PropertyPlace)
propertyEvent.getProperty("PLAC");
+ return place.format("all");
}
} else {
return "";
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 23:44:26 2013
@@ -7,6 +7,8 @@
import genj.gedcom.PropertyEvent;
import java.util.ArrayList;
import java.util.List;
+import javax.swing.table.TableModel;
+import javax.swing.table.TableRowSorter;
import org.openide.DialogDescriptor;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
@@ -29,6 +31,8 @@
*/
public EventsListPanel() {
initComponents();
+ TableRowSorter<TableModel> sorter = new
TableRowSorter<TableModel>(eventsTable.getModel());
+ eventsTable.setRowSorter(sorter);
}
/**
@@ -115,35 +119,26 @@
}// </editor-fold>//GEN-END:initComponents
private void addEventButtonActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_addEventButtonActionPerformed
-/*
- try {
- mRoot.getGedcom().doUnitOfWork(new UnitOfWork() {
-
- @Override
- public void perform(Gedcom gedcom) throws GedcomException {
- mEvent = (PropertyEvent) mRoot.addProperty("", "");
- mEvent.addProperty("DATE", "");
- }
- }); // end of doUnitOfWork
- } catch (GedcomException ex) {
- Exceptions.printStackTrace(ex);
- } finally {
- EventEditorPanel eventEditorPanel = new EventEditorPanel();
-
- eventEditorPanel.set(mRoot, mEvent);
-
- ADialog eventEditorDialog = new ADialog(
- NbBundle.getMessage(EventEditorPanel.class,
"EventEditorPanel.title"),
- eventEditorPanel);
-
- eventEditorDialog.setDialogId(EventEditorPanel.class.getName());
- if (eventEditorDialog.show() == DialogDescriptor.OK_OPTION) {
- mEventsTableModel.add(eventEditorPanel.commit());
- } else {
- mRoot.getGedcom().undoUnitOfWork(false);
- }
- }
-*/
+ /*
+ * try { mRoot.getGedcom().doUnitOfWork(new UnitOfWork() {
+ *
+ * @Override public void perform(Gedcom gedcom) throws GedcomException
{
+ * mEvent = (PropertyEvent) mRoot.addProperty("", "");
+ * mEvent.addProperty("DATE", ""); } }); // end of doUnitOfWork } catch
+ * (GedcomException ex) { Exceptions.printStackTrace(ex); } finally {
+ * EventEditorPanel eventEditorPanel = new EventEditorPanel();
+ *
+ * eventEditorPanel.set(mRoot, mEvent);
+ *
+ * ADialog eventEditorDialog = new ADialog(
+ * NbBundle.getMessage(EventEditorPanel.class,
+ * "EventEditorPanel.title"), eventEditorPanel);
+ *
+ * eventEditorDialog.setDialogId(EventEditorPanel.class.getName()); if
+ * (eventEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+ * mEventsTableModel.add(eventEditorPanel.commit()); } else {
+ * mRoot.getGedcom().undoUnitOfWork(false); } }
+ */
}//GEN-LAST:event_addEventButtonActionPerformed
private void editEventButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_editEventButtonActionPerformed
---------------------------------------------------------------------
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]
