Author: lemovice
Date: Sun Oct 13 09:25:11 2013
New Revision: 4619
Log:
Add synchronization vs editors on reference selection
Added:
trunk/AncestrisExtensions/editors.place/
- copied from r4617, /trunk/AncestrisExtensions/placeeditor/
trunk/AncestrisExtensions/editors.place/nbproject/platform.properties
- copied unchanged from r4617,
/trunk/AncestrisExtensions/nbproject/platform.properties
Removed:
trunk/AncestrisExtensions/placeeditor/
Modified:
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/Bundle.properties
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/models/ReferencesTableModel.java
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.form
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.java
Modified:
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/Bundle.properties
==============================================================================
---
/trunk/AncestrisExtensions/placeeditor/src/ancestris/modules/editors/placeeditor/Bundle.properties
(original)
+++
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/Bundle.properties
Sun Oct 13 09:25:11 2013
@@ -1,4 +1,4 @@
-OpenIDE-Module-Name=placeeditor
+OpenIDE-Module-Name=editors.place
FindPlacePanel.placeLabel.text=Place
FindPlacePanel.placeTextField.text=
FindPlacePanel.searchPlaceButton.text=Search
Modified:
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/models/ReferencesTableModel.java
==============================================================================
---
/trunk/AncestrisExtensions/placeeditor/src/ancestris/modules/editors/placeeditor/models/ReferencesTableModel.java
(original)
+++
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/models/ReferencesTableModel.java
Sun Oct 13 09:25:11 2013
@@ -34,14 +34,27 @@
@Override
public Object getValueAt(int row, int column) {
- PropertyPlace place = referencesTableValues.get(row);
- Entity entity = place.getEntity();
- Property parent = place.getParent();
+ if (row < getRowCount()) {
+ PropertyPlace place = referencesTableValues.get(row);
+ Entity entity = place.getEntity();
+ Property parent = place.getParent();
- if (column == 0) {
- return PropertyTag2Name.getTagName(parent.getTag());
+ if (column == 0) {
+ return PropertyTag2Name.getTagName(parent.getTag());
+ } else {
+ return entity.toString(false);
+ }
} else {
- return entity.toString(false);
+ return "";
+ }
+ }
+
+ public Entity getValueAt(int row) {
+ if (row < getRowCount()) {
+ PropertyPlace place = referencesTableValues.get(row);
+ return place.getEntity();
+ } else {
+ return null;
}
}
Modified:
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.form
==============================================================================
---
/trunk/AncestrisExtensions/placeeditor/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.form
(original)
+++
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.form
Sun Oct 13 09:25:11 2013
@@ -254,7 +254,7 @@
<Layout
class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
- <Component class="javax.swing.JTable" name="jTable1">
+ <Component class="javax.swing.JTable"
name="placeReferencesTable">
<Properties>
<Property name="model" type="javax.swing.table.TableModel"
editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="referencesTableModel" type="code"/>
Modified:
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.java
==============================================================================
---
/trunk/AncestrisExtensions/placeeditor/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.place/src/ancestris/modules/editors/placeeditor/panels/PlacesEditorPanel.java
Sun Oct 13 09:25:11 2013
@@ -4,7 +4,12 @@
import ancestris.modules.editors.placeeditor.models.GeonamePostalCodeListModel;
import ancestris.modules.editors.placeeditor.models.ReferencesTableModel;
import ancestris.modules.place.geonames.GeonamesPlacesList;
+import ancestris.view.SelectionDispatcher;
+import genj.gedcom.Context;
+import genj.gedcom.Entity;
import genj.gedcom.PropertyPlace;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.util.List;
import java.util.Set;
import javax.swing.DefaultComboBoxModel;
@@ -32,7 +37,7 @@
String[] jurisdictions = ((PropertyPlace)
propertyPlaceArray[0]).getJurisdictions();
if (jurisdictions.length > 1) {
if (jurisdictions[1].isEmpty() == false) {
- List<Place> findPlaces = new
GeonamesPlacesList().findPlace((PropertyPlace)propertyPlaceArray[0]);
+ List<Place> findPlaces = new
GeonamesPlacesList().findPlace((PropertyPlace) propertyPlaceArray[0]);
if (findPlaces != null) {
for (Place place : findPlaces) {
@@ -47,7 +52,15 @@
}
initComponents();
-
+ placeReferencesTable.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ int rowIndex =
placeReferencesTable.convertRowIndexToModel(placeReferencesTable.getSelectedRow());
+ Entity entity =
((ReferencesTableModel)placeReferencesTable.getModel()).getValueAt(rowIndex);
+ SelectionDispatcher.fireSelection(new Context(entity));
+ }
+ });
+
Place selectedItem = (Place) jComboBox1.getSelectedItem();
if (selectedItem != null) {
latitudeTextField.setText(selectedItem.getLatitude().toString());
@@ -201,7 +214,7 @@
jTextField3 = new javax.swing.JTextField();
PlaceReferencesPanel = new javax.swing.JPanel();
jScrollPane1 = new javax.swing.JScrollPane();
- jTable1 = new javax.swing.JTable();
+ placeReferencesTable = new javax.swing.JTable();
jPanel1 = new javax.swing.JPanel();
jLabel9 = new javax.swing.JLabel();
latitudeLabel = new javax.swing.JLabel();
@@ -308,8 +321,8 @@
jTabbedPane1.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/placeeditor/panels/Bundle").getString("PlacesEditorPanel.PlaceEditorPanel.TabConstraints.tabTitle"),
new Object[] {}), PlaceEditorPanel); // NOI18N
- jTable1.setModel(referencesTableModel);
- jScrollPane1.setViewportView(jTable1);
+ placeReferencesTable.setModel(referencesTableModel);
+ jScrollPane1.setViewportView(placeReferencesTable);
javax.swing.GroupLayout PlaceReferencesPanelLayout = new
javax.swing.GroupLayout(PlaceReferencesPanel);
PlaceReferencesPanel.setLayout(PlaceReferencesPanelLayout);
@@ -437,7 +450,6 @@
private javax.swing.JPanel jPanel1;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTabbedPane jTabbedPane1;
- private javax.swing.JTable jTable1;
private javax.swing.JTextField jTextField1;
private javax.swing.JTextField jTextField12;
private javax.swing.JTextField jTextField2;
@@ -451,5 +463,6 @@
private javax.swing.JTextField latitudeTextField;
private javax.swing.JLabel longitudeLabel;
private javax.swing.JTextField longitudeTextField;
+ private javax.swing.JTable placeReferencesTable;
// End of variables declaration//GEN-END:variables
}
---------------------------------------------------------------------
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]
