Author: lemovice
Date: Sun Nov 4 22:39:19 2012
New Revision: 3662
Log:
Add ancestris plugin dependency
Modified:
trunk/AncestrisExtensions/gedcom.checkduplicates/nbproject/genfiles.properties
trunk/AncestrisExtensions/gedcom.checkduplicates/nbproject/project.xml
trunk/AncestrisExtensions/gedcom.checkduplicates/src/ancestris/modules/gedcom/checkduplicates/CheckDuplicates.java
Modified:
trunk/AncestrisExtensions/gedcom.checkduplicates/nbproject/genfiles.properties
==============================================================================
---
trunk/AncestrisExtensions/gedcom.checkduplicates/nbproject/genfiles.properties
(original)
+++
trunk/AncestrisExtensions/gedcom.checkduplicates/nbproject/genfiles.properties
Sun Nov 4 22:39:19 2012
@@ -3,6 +3,6 @@
build.xml.stylesheet.CRC32=a56c6a5b@2.47.2
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=76e3c84a
+nbproject/build-impl.xml.data.CRC32=8acadf54
nbproject/build-impl.xml.script.CRC32=57d04365
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.2
Modified: trunk/AncestrisExtensions/gedcom.checkduplicates/nbproject/project.xml
==============================================================================
Binary files. No diff available.
Modified:
trunk/AncestrisExtensions/gedcom.checkduplicates/src/ancestris/modules/gedcom/checkduplicates/CheckDuplicates.java
==============================================================================
---
trunk/AncestrisExtensions/gedcom.checkduplicates/src/ancestris/modules/gedcom/checkduplicates/CheckDuplicates.java
(original)
+++
trunk/AncestrisExtensions/gedcom.checkduplicates/src/ancestris/modules/gedcom/checkduplicates/CheckDuplicates.java
Sun Nov 4 22:39:19 2012
@@ -1,5 +1,6 @@
package ancestris.modules.gedcom.checkduplicates;
+import ancestris.core.pluginservice.AncestrisPlugin;
import ancestris.modules.gedcom.utilities.*;
import genj.gedcom.Entity;
import genj.gedcom.Gedcom;
@@ -15,12 +16,14 @@
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.NbBundle;
+import org.openide.util.lookup.ServiceProvider;
/**
*
* @author lemovice left and right entities could be the same.
*/
-public class CheckDuplicates implements Runnable {
+@ServiceProvider(service = ancestris.core.pluginservice.PluginInterface.class)
+public class CheckDuplicates extends AncestrisPlugin implements Runnable {
private static final Logger log =
Logger.getLogger(CheckDuplicates.class.getName());
private Gedcom leftGedcom;
@@ -30,12 +33,17 @@
{
put(Gedcom.INDI, new IndiMatcher());
put(Gedcom.FAM, new FamMatcher());
- put(Gedcom.NOTE, new NoteMatcher());
- put(Gedcom.SOUR, new SourceMatcher());
- put(Gedcom.REPO, new RepositoryMatcher());
+// put(Gedcom.NOTE, new NoteMatcher());
+// put(Gedcom.SOUR, new SourceMatcher());
+// put(Gedcom.REPO, new RepositoryMatcher());
put(Gedcom.SUBM, new SubmitterMatcher());
}
};
+
+ public CheckDuplicates() {
+ this.leftGedcom = null;
+ this.rightGedcom = null;
+ }
public CheckDuplicates(Gedcom leftGedcom, Gedcom rightGedcom) {
this.leftGedcom = leftGedcom;
@@ -45,6 +53,9 @@
@Override
public void run() {
final LinkedList<PotentialMatch<? extends Entity>> matchesLinkedList =
new LinkedList<PotentialMatch<? extends Entity>>();
+ if (leftGedcom == null || rightGedcom == null) {
+ return;
+ }
try {
for (String tag : entitiesMatchers.keySet()) {
List<? extends Entity> leftEntity = new
ArrayList(leftGedcom.getEntities(tag));
---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org
<*> Pour vous desinscrire de cette liste, envoyez un mail a :
ancestris-commit-unsubscr...@ml.arvernes.com
<*> Pour obtenir de l'aide sur les commandes de la liste :
ancestris-commit-h...@ml.arvernes.com
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 :
ancestris-commit-thread.3...@ml.arvernes.com
