Author: lemovice
Date: Sun Dec 8 17:03:23 2013
New Revision: 4720
Log:
Correct NPE in NotesListPanel, Add LinktoNote button root property update
after link remain to be done
Update IndividualsListPanel and RepositoriesListPanel
Added:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/actions/GenealogyEditorCreateNoteAction.java
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/Bundle.properties
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/IndividualsListPanel.java
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NoteEditorPanel.java
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.java
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.form
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.java
Added:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/actions/GenealogyEditorCreateNoteAction.java
==============================================================================
--- (empty file)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/actions/GenealogyEditorCreateNoteAction.java
Sun Dec 8 17:03:23 2013
@@ -0,0 +1,69 @@
+package ancestris.modules.editors.genealogyeditor.actions;
+
+import ancestris.modules.editors.genealogyeditor.panels.IndividualEditorPanel;
+import ancestris.modules.editors.genealogyeditor.panels.NoteEditorPanel;
+import ancestris.util.swing.DialogManager;
+import genj.gedcom.*;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import org.openide.DialogDescriptor;
+import org.openide.loaders.DataObject;
+
+import org.openide.awt.ActionRegistration;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionID;
+import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
+import org.openide.util.NbBundle.Messages;
+import org.openide.util.Utilities;
+
+@ActionID(category = "Edit",
+id =
"ancestris.modules.editors.genealogyeditor.actions.GenealogyEditorCreateNoteAction")
+@ActionRegistration(iconBase =
"ancestris/modules/editors/genealogyeditor/resources/Note_add.png",
+displayName = "#CTL_GenealogyEditorCreateNoteAction")
+@ActionReferences({
+ @ActionReference(path = "Toolbars/GenealogyEditor", position = 400)
+})
+@Messages("CTL_GenealogyEditorCreateNoteAction=Create new note")
+public final class GenealogyEditorCreateNoteAction implements ActionListener {
+
+ private final DataObject context;
+ private Note mNote;
+
+ public GenealogyEditorCreateNoteAction(DataObject context) {
+ this.context = context;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ev) {
+ Context gedcomContext;
+
+ if ((gedcomContext =
Utilities.actionsGlobalContext().lookup(Context.class)) != null) {
+ Gedcom gedcom = gedcomContext.getGedcom();
+ try {
+ gedcom.doUnitOfWork(new UnitOfWork() {
+
+ @Override
+ public void perform(Gedcom gedcom) throws GedcomException {
+ mNote = (Note) gedcom.createEntity(Gedcom.NOTE);
+ }
+ }); // end of doUnitOfWork
+ } catch (GedcomException ex) {
+ Exceptions.printStackTrace(ex);
+ } finally {
+ NoteEditorPanel noteEditorPanel = new NoteEditorPanel();
+ noteEditorPanel.set(mNote);
+ DialogManager.ADialog noteEditorDialog = new
DialogManager.ADialog(
+ NbBundle.getMessage(NoteEditorPanel.class,
"NoteEditorPanel.title"),
+ noteEditorPanel);
+ noteEditorDialog.setDialogId(NoteEditorPanel.class.getName());
+ if (noteEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+ noteEditorPanel.commit();
+ } else {
+ gedcom.undoUnitOfWork(false);
+ }
+ }
+ }
+ }
+}
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 17:03:23 2013
@@ -150,10 +150,6 @@
MultimediaObjectsListPanel.deleteMMObjectButton2.toolTipText=Delete selected
multimedia object
MultimediaObjectsListPanel.editMMObjectButton2.toolTipText=Edit selected
multimedia object
-RepositoriesListPanel.addSourceButton.toolTipText=add source
-RepositoriesListPanel.deleteSourceButton.toolTipText=delete source
-RepositoriesListPanel.editSourceButton.toolTipText=Edit source
-
AssociationsListPanel.addReferenceButton.toolTipText=Add new multimedia Object
FamilyEditorPanel.multimediaObjectsListPanel.name=
@@ -178,3 +174,7 @@
ChildrensListPanel.editChildrenButton.toolTipText=Edit current children
ChildrensListPanel.deleteChildrenButton.toolTipText=Delete the selected
children
ChildrensListPanel.linkToChildrenButton.toolTipText=Add an existing children
+RepositoriesListPanel.addRepositoryButton.toolTipText=add source
+RepositoriesListPanel.editRepositoryButton.toolTipText=Edit source
+RepositoriesListPanel.deleteRepositoryButton.toolTipText=delete source
+NotesListPanel.linkToNoteButton.toolTipText=Link to an existing note
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
Sun Dec 8 17:03:23 2013
@@ -2,10 +2,10 @@
import ancestris.modules.editors.genealogyeditor.models.IndividualsTableModel;
import ancestris.util.swing.DialogManager;
-import genj.gedcom.Indi;
-import genj.gedcom.Property;
+import genj.gedcom.*;
import java.util.List;
import org.openide.DialogDescriptor;
+import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
/**
@@ -16,6 +16,7 @@
private IndividualsTableModel mIndividualsTableModel = new
IndividualsTableModel();
private Property mRoot;
+ Indi mIndividual;
/**
* Creates new form IndividualsListPanel
@@ -101,18 +102,31 @@
}// </editor-fold>//GEN-END:initComponents
private void addIndividualButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_addIndividualButtonActionPerformed
- Indi individual = new Indi();
-// individual.setName("", family.getHusband().getName());
- IndividualEditorPanel individualEditorPanel = new
IndividualEditorPanel();
- individualEditorPanel.set(individual);
-
- DialogManager.ADialog individualEditorDialog = new
DialogManager.ADialog(
- NbBundle.getMessage(IndividualEditorPanel.class,
"IndividualEditorPanel.title"),
- individualEditorPanel);
-
individualEditorDialog.setDialogId(IndividualEditorPanel.class.getName());
+ Gedcom gedcom = mRoot.getGedcom();
+ try {
+ gedcom.doUnitOfWork(new UnitOfWork() {
+
+ @Override
+ public void perform(Gedcom gedcom) throws GedcomException {
+ mIndividual = (Indi) gedcom.createEntity(Gedcom.INDI);
+ }
+ }); // end of doUnitOfWork
+ } catch (GedcomException ex) {
+ Exceptions.printStackTrace(ex);
+ } finally {
+ IndividualEditorPanel individualEditorPanel = new
IndividualEditorPanel();
+ individualEditorPanel.set(mIndividual);
- if (individualEditorDialog.show() == DialogDescriptor.OK_OPTION) {
- mIndividualsTableModel.add(individualEditorPanel.getIndividual());
+ DialogManager.ADialog individualEditorDialog = new
DialogManager.ADialog(
+ NbBundle.getMessage(IndividualEditorPanel.class,
"IndividualEditorPanel.title"),
+ individualEditorPanel);
+
individualEditorDialog.setDialogId(IndividualEditorPanel.class.getName());
+
+ if (individualEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+ mIndividualsTableModel.add(individualEditorPanel.commit());
+ } else {
+ gedcom.undoUnitOfWork(false);
+ }
}
}//GEN-LAST:event_addIndividualButtonActionPerformed
@@ -128,6 +142,7 @@
individualEditorDialog.setDialogId(IndividualEditorPanel.class.getName());
if (individualEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+ individualEditorPanel.commit();
}
}
}//GEN-LAST:event_editIndividualButtonActionPerformed
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NoteEditorPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NoteEditorPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NoteEditorPanel.java
Sun Dec 8 17:03:23 2013
@@ -12,8 +12,8 @@
*/
public class NoteEditorPanel extends javax.swing.JPanel {
- private Note note;
- private ReferencesTableModel referencesTableModel = new
ReferencesTableModel();
+ private Note mNote;
+ private ReferencesTableModel mReferencesTableModel = new
ReferencesTableModel();
/**
* Creates new form NoteEditorPanel
@@ -110,7 +110,6 @@
.addContainerGap())
);
}// </editor-fold>//GEN-END:initComponents
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel noteIDLabel;
private javax.swing.JTextField noteIDTextField;
@@ -127,14 +126,14 @@
* @return the note
*/
public Note get() {
- return note;
+ return mNote;
}
/**
* @param note the note to set
*/
public void set(Note note) {
- this.note = note;
+ this.mNote = note;
noteIDTextField.setText(note.getId());
noteTextTextArea.setText(note.getValue() != null ? note.getValue() :
"");
List<Entity> entitiesList = new ArrayList<Entity>();
@@ -144,16 +143,20 @@
referencesListPanel.set(note, entitiesList);
}
- public void commit() {
+ public Note commit() {
try {
- note.getGedcom().doUnitOfWork(new UnitOfWork() {
+ mNote.getGedcom().doUnitOfWork(new UnitOfWork() {
@Override
public void perform(Gedcom gedcom) throws GedcomException {
+ mNote.setValue(noteTextTextArea.getText());
}
}); // end of doUnitOfWork
} catch (GedcomException ex) {
Exceptions.printStackTrace(ex);
- }
+ return null;
+ } finally {
+ return mNote;
+ }
}
}
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.form
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.form
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.form
Sun Dec 8 17:03:23 2013
@@ -88,6 +88,22 @@
<EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="deleteNoteButtonActionPerformed"/>
</Events>
</Component>
+ <Component class="javax.swing.JButton" name="linkToNoteButton">
+ <Properties>
+ <Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3"
name="/ancestris/modules/editors/genealogyeditor/resources/link_add.png"/>
+ </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="NotesListPanel.linkToNoteButton.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ </Property>
+ <Property name="focusable" type="boolean" value="false"/>
+ <Property name="horizontalTextPosition" type="int" value="0"/>
+ <Property name="verticalTextPosition" type="int" value="3"/>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="linkToNoteButtonActionPerformed"/>
+ </Events>
+ </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JScrollPane" name="notesScrollPane">
@@ -100,7 +116,7 @@
<Component class="javax.swing.JTable" name="notesTable">
<Properties>
<Property name="model" type="javax.swing.table.TableModel"
editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code="notesTableModel" type="code"/>
+ <Connection code="mNotesTableModel" type="code"/>
</Property>
<Property name="showHorizontalLines" type="boolean" value="false"/>
<Property name="showVerticalLines" type="boolean" value="false"/>
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/NotesListPanel.java
Sun Dec 8 17:03:23 2013
@@ -1,12 +1,14 @@
package ancestris.modules.editors.genealogyeditor.panels;
import ancestris.modules.editors.genealogyeditor.models.NotesTableModel;
+import ancestris.util.swing.DialogManager;
import ancestris.util.swing.DialogManager.ADialog;
-import genj.gedcom.Gedcom;
-import genj.gedcom.Note;
-import genj.gedcom.Property;
+import genj.gedcom.*;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.openide.DialogDescriptor;
+import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
/**
@@ -15,8 +17,9 @@
*/
public class NotesListPanel extends javax.swing.JPanel {
- private Property root;
- private NotesTableModel notesTableModel = new NotesTableModel();
+ private Property mRoot;
+ private NotesTableModel mNotesTableModel = new NotesTableModel();
+ private Note mNote;
/**
* Creates new form NotesListPanel
@@ -38,6 +41,7 @@
addNoteButton = new javax.swing.JButton();
editNoteButton = new javax.swing.JButton();
deleteNoteButton = new javax.swing.JButton();
+ linkToNoteButton = new javax.swing.JButton();
notesScrollPane = new javax.swing.JScrollPane();
notesTable = new javax.swing.JTable();
@@ -80,7 +84,19 @@
});
notesToolBar.add(deleteNoteButton);
- notesTable.setModel(notesTableModel);
+ linkToNoteButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/link_add.png")));
// NOI18N
+
linkToNoteButton.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("NotesListPanel.linkToNoteButton.toolTipText"),
new Object[] {})); // NOI18N
+ linkToNoteButton.setFocusable(false);
+
linkToNoteButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+
linkToNoteButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ linkToNoteButton.addActionListener(new java.awt.event.ActionListener()
{
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ linkToNoteButtonActionPerformed(evt);
+ }
+ });
+ notesToolBar.add(linkToNoteButton);
+
+ notesTable.setModel(mNotesTableModel);
notesTable.setShowHorizontalLines(false);
notesTable.setShowVerticalLines(false);
notesTable.addMouseListener(new java.awt.event.MouseAdapter() {
@@ -108,15 +124,29 @@
}// </editor-fold>//GEN-END:initComponents
private void addNoteButtonActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_addNoteButtonActionPerformed
- NoteEditorPanel noteEditorPanel = new NoteEditorPanel();
- noteEditorPanel.set(new Note(Gedcom.NOTE, ""));
- ADialog noteEditorDialog = new ADialog(
- NbBundle.getMessage(NoteEditorPanel.class,
"NoteEditorPanel.title"),
- noteEditorPanel);
- noteEditorDialog.setDialogId(NoteEditorPanel.class.getName());
-
- if (noteEditorDialog.show() == DialogDescriptor.OK_OPTION) {
- notesTableModel.add(noteEditorPanel.get());
+ Gedcom gedcom = mRoot.getGedcom();
+ try {
+ gedcom.doUnitOfWork(new UnitOfWork() {
+
+ @Override
+ public void perform(Gedcom gedcom) throws GedcomException {
+ mNote = (Note) gedcom.createEntity(Gedcom.NOTE);
+ }
+ }); // end of doUnitOfWork
+ } catch (GedcomException ex) {
+ Exceptions.printStackTrace(ex);
+ } finally {
+ NoteEditorPanel noteEditorPanel = new NoteEditorPanel();
+ noteEditorPanel.set(mNote);
+ ADialog noteEditorDialog = new ADialog(
+ NbBundle.getMessage(NoteEditorPanel.class,
"NoteEditorPanel.title"),
+ noteEditorPanel);
+ noteEditorDialog.setDialogId(NoteEditorPanel.class.getName());
+ if (noteEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+ mNotesTableModel.add(noteEditorPanel.commit());
+ } else {
+ gedcom.undoUnitOfWork(false);
+ }
}
}//GEN-LAST:event_addNoteButtonActionPerformed
@@ -125,7 +155,7 @@
if (selectedRow != -1) {
int rowIndex = notesTable.convertRowIndexToModel(selectedRow);
NoteEditorPanel noteEditorPanel = new NoteEditorPanel();
- noteEditorPanel.set(notesTableModel.getValueAt(rowIndex));
+ noteEditorPanel.set(mNotesTableModel.getValueAt(rowIndex));
ADialog noteEditorDialog = new ADialog(
NbBundle.getMessage(NoteEditorPanel.class,
"NoteEditorPanel.title"),
@@ -133,6 +163,7 @@
noteEditorDialog.setDialogId(NoteEditorPanel.class.getName());
if (noteEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+ noteEditorPanel.commit();
}
}
}//GEN-LAST:event_editNoteButtonActionPerformed
@@ -147,7 +178,7 @@
if (selectedRow != -1) {
int rowIndex = notesTable.convertRowIndexToModel(selectedRow);
NoteEditorPanel noteEditorPanel = new NoteEditorPanel();
- noteEditorPanel.set(notesTableModel.getValueAt(rowIndex));
+ noteEditorPanel.set(mNotesTableModel.getValueAt(rowIndex));
ADialog noteEditorDialog = new ADialog(
NbBundle.getMessage(NoteEditorPanel.class,
"NoteEditorPanel.title"),
@@ -155,24 +186,51 @@
noteEditorDialog.setDialogId(NoteEditorPanel.class.getName());
if (noteEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+ noteEditorPanel.commit();
}
}
}
}//GEN-LAST:event_notesTableMouseClicked
+
+ private void linkToNoteButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_linkToNoteButtonActionPerformed
+ List<Note> notesList = new ArrayList<Note>((Collection<Note>)
mRoot.getGedcom().getEntities(Gedcom.NOTE));
+
+ NotesListPanel notesListPanel = new NotesListPanel();
+ notesListPanel.setNotesList(mRoot, notesList);
+ DialogManager.ADialog individualsListDialog = new
DialogManager.ADialog(
+ NbBundle.getMessage(IndividualsListPanel.class,
"NoteEditorPanel.title"),
+ notesListPanel);
+
individualsListDialog.setDialogId(IndividualsListPanel.class.getName());
+
+ if (individualsListDialog.show() == DialogDescriptor.OK_OPTION) {
+ mNotesTableModel.add(notesListPanel.getSelectedNote());
+ }
+ }//GEN-LAST:event_linkToNoteButtonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton addNoteButton;
private javax.swing.JButton deleteNoteButton;
private javax.swing.JButton editNoteButton;
+ private javax.swing.JButton linkToNoteButton;
private javax.swing.JScrollPane notesScrollPane;
private javax.swing.JTable notesTable;
private javax.swing.JToolBar notesToolBar;
// End of variables declaration//GEN-END:variables
public void setNotesList(Property root, List<Note> notesList) {
- this.root = root;
- notesTableModel.update(notesList);
+ this.mRoot = root;
+ mNotesTableModel.update(notesList);
}
public void commit() {
}
+
+ private Note getSelectedNote() {
+ int selectedRow = notesTable.getSelectedRow();
+ if (selectedRow != -1) {
+ int rowIndex = notesTable.convertRowIndexToModel(selectedRow);
+ return mNotesTableModel.getValueAt(rowIndex);
+ } else {
+ return null;
+ }
+ }
}
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.form
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.form
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.form
Sun Dec 8 17:03:23 2013
@@ -40,52 +40,52 @@
<Layout
class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
<SubComponents>
- <Component class="javax.swing.JButton" name="addSourceButton">
+ <Component class="javax.swing.JButton" name="addRepositoryButton">
<Properties>
<Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3"
name="/ancestris/modules/editors/genealogyeditor/resources/edit_add.png"/>
</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="RepositoriesListPanel.addSourceButton.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="RepositoriesListPanel.addRepositoryButton.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
- <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="addSourceButtonActionPerformed"/>
+ <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="addRepositoryButtonActionPerformed"/>
</Events>
</Component>
- <Component class="javax.swing.JButton" name="editSourceButton">
+ <Component class="javax.swing.JButton" name="editRepositoryButton">
<Properties>
<Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3"
name="/ancestris/modules/editors/genealogyeditor/resources/edit.png"/>
</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="RepositoriesListPanel.editSourceButton.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="RepositoriesListPanel.editRepositoryButton.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
- <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="editSourceButtonActionPerformed"/>
+ <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="editRepositoryButtonActionPerformed"/>
</Events>
</Component>
- <Component class="javax.swing.JButton" name="deleteSourceButton">
+ <Component class="javax.swing.JButton" name="deleteRepositoryButton">
<Properties>
<Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3"
name="/ancestris/modules/editors/genealogyeditor/resources/edit_delete.png"/>
</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="RepositoriesListPanel.deleteSourceButton.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
+ <ResourceString
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties"
key="RepositoriesListPanel.deleteRepositoryButton.toolTipText"
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}"),
{arguments})"/>
</Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
- <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="deleteSourceButtonActionPerformed"/>
+ <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="deleteRepositoryButtonActionPerformed"/>
</Events>
</Component>
</SubComponents>
Modified:
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.java
==============================================================================
---
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.java
(original)
+++
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/RepositoriesListPanel.java
Sun Dec 8 17:03:23 2013
@@ -31,50 +31,50 @@
private void initComponents() {
sourcesToolBar = new javax.swing.JToolBar();
- addSourceButton = new javax.swing.JButton();
- editSourceButton = new javax.swing.JButton();
- deleteSourceButton = new javax.swing.JButton();
+ addRepositoryButton = new javax.swing.JButton();
+ editRepositoryButton = new javax.swing.JButton();
+ deleteRepositoryButton = new javax.swing.JButton();
sourcesScrollPane = new javax.swing.JScrollPane();
sourcesTable = new javax.swing.JTable();
sourcesToolBar.setFloatable(false);
sourcesToolBar.setRollover(true);
- addSourceButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit_add.png")));
// NOI18N
-
addSourceButton.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("RepositoriesListPanel.addSourceButton.toolTipText"),
new Object[] {})); // NOI18N
- addSourceButton.setFocusable(false);
-
addSourceButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-
addSourceButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- addSourceButton.addActionListener(new java.awt.event.ActionListener() {
+ addRepositoryButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit_add.png")));
// NOI18N
+
addRepositoryButton.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("RepositoriesListPanel.addRepositoryButton.toolTipText"),
new Object[] {})); // NOI18N
+ addRepositoryButton.setFocusable(false);
+
addRepositoryButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+
addRepositoryButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ addRepositoryButton.addActionListener(new
java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- addSourceButtonActionPerformed(evt);
+ addRepositoryButtonActionPerformed(evt);
}
});
- sourcesToolBar.add(addSourceButton);
+ sourcesToolBar.add(addRepositoryButton);
- editSourceButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit.png")));
// NOI18N
-
editSourceButton.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("RepositoriesListPanel.editSourceButton.toolTipText"),
new Object[] {})); // NOI18N
- editSourceButton.setFocusable(false);
-
editSourceButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-
editSourceButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- editSourceButton.addActionListener(new java.awt.event.ActionListener()
{
+ editRepositoryButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit.png")));
// NOI18N
+
editRepositoryButton.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("RepositoriesListPanel.editRepositoryButton.toolTipText"),
new Object[] {})); // NOI18N
+ editRepositoryButton.setFocusable(false);
+
editRepositoryButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+
editRepositoryButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ editRepositoryButton.addActionListener(new
java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- editSourceButtonActionPerformed(evt);
+ editRepositoryButtonActionPerformed(evt);
}
});
- sourcesToolBar.add(editSourceButton);
+ sourcesToolBar.add(editRepositoryButton);
- deleteSourceButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit_delete.png")));
// NOI18N
-
deleteSourceButton.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("RepositoriesListPanel.deleteSourceButton.toolTipText"),
new Object[] {})); // NOI18N
- deleteSourceButton.setFocusable(false);
-
deleteSourceButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-
deleteSourceButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- deleteSourceButton.addActionListener(new
java.awt.event.ActionListener() {
+ deleteRepositoryButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit_delete.png")));
// NOI18N
+
deleteRepositoryButton.setToolTipText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("RepositoriesListPanel.deleteRepositoryButton.toolTipText"),
new Object[] {})); // NOI18N
+ deleteRepositoryButton.setFocusable(false);
+
deleteRepositoryButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+
deleteRepositoryButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ deleteRepositoryButton.addActionListener(new
java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- deleteSourceButtonActionPerformed(evt);
+ deleteRepositoryButtonActionPerformed(evt);
}
});
- sourcesToolBar.add(deleteSourceButton);
+ sourcesToolBar.add(deleteRepositoryButton);
sourcesTable.setModel(repositoriesTableModel);
sourcesTable.setShowHorizontalLines(false);
@@ -103,20 +103,20 @@
);
}// </editor-fold>//GEN-END:initComponents
- private void addSourceButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_addSourceButtonActionPerformed
+ private void addRepositoryButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_addRepositoryButtonActionPerformed
- }//GEN-LAST:event_addSourceButtonActionPerformed
+ }//GEN-LAST:event_addRepositoryButtonActionPerformed
- private void editSourceButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_editSourceButtonActionPerformed
+ private void
editRepositoryButtonActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_editRepositoryButtonActionPerformed
int selectedRow = sourcesTable.getSelectedRow();
if (selectedRow != -1) {
}
- }//GEN-LAST:event_editSourceButtonActionPerformed
+ }//GEN-LAST:event_editRepositoryButtonActionPerformed
- private void deleteSourceButtonActionPerformed(java.awt.event.ActionEvent
evt) {//GEN-FIRST:event_deleteSourceButtonActionPerformed
+ private void
deleteRepositoryButtonActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_deleteRepositoryButtonActionPerformed
// TODO add your handling code here:
- }//GEN-LAST:event_deleteSourceButtonActionPerformed
+ }//GEN-LAST:event_deleteRepositoryButtonActionPerformed
private void sourcesTableMouseClicked(java.awt.event.MouseEvent evt)
{//GEN-FIRST:event_sourcesTableMouseClicked
if (evt.getClickCount() >= 2) {
@@ -124,9 +124,9 @@
}//GEN-LAST:event_sourcesTableMouseClicked
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton addSourceButton;
- private javax.swing.JButton deleteSourceButton;
- private javax.swing.JButton editSourceButton;
+ private javax.swing.JButton addRepositoryButton;
+ private javax.swing.JButton deleteRepositoryButton;
+ private javax.swing.JButton editRepositoryButton;
private javax.swing.JScrollPane sourcesScrollPane;
private javax.swing.JTable sourcesTable;
private javax.swing.JToolBar sourcesToolBar;
---------------------------------------------------------------------
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]
