Author: dandre
Date: Fri Nov 29 00:58:10 2013
New Revision: 4686
Log:
* remove duplicate entry for Tre Module save filter
* fix issuer where treeview context is not set (ie at startup) when saving with
option
* use serviceprovider for privacy filter as this spi is singleton, remove
Installer class
Removed:
trunk/AncestrisCore/gedcom.privacy.standard/src/ancestris/gedcom/privacy/standard/Installer.java
Modified:
trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java
trunk/AncestrisCore/gedcom.privacy.standard/manifest.mf
trunk/AncestrisCore/modules.views.tree/src/ancestris/modules/views/tree/TreeTopComponent.java
trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
Modified: trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java
==============================================================================
--- trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java
(original)
+++ trunk/AncestrisCore/core/src/ancestris/gedcom/GedcomDirectory.java Fri Nov
29 00:58:10 2013
@@ -308,13 +308,18 @@
// textPassword.setEditable(pwd!=Gedcom.PASSWORD_UNKNOWN);
// options.add(textPassword);
- Collection<? extends Filter> filters =
AncestrisPlugin.lookupAll(Filter.class);
ArrayList<Filter> theFilters = new ArrayList<Filter>(5);
- for (Filter f : filters) {
+ for (Filter f : AncestrisPlugin.lookupAll(Filter.class)) {
if (f.canApplyTo(context.getGedcom())) {
theFilters.add(f);
}
}
+ for (Filter f : Lookup.getDefault().lookupAll(Filter.class)) {
+ if (f.canApplyTo(context.getGedcom())) {
+ theFilters.add(f);
+ }
+ }
+
SaveOptionsWidget options = new SaveOptionsWidget(context.getGedcom(),
theFilters.toArray(new Filter[]{}));//,
(Filter[])viewManager.getViews(Filter.class, gedcomBeingSaved));
File file = chooseFile(RES.getString("cc.save.title",
context.getGedcom().toString()), RES.getString("cc.save.action"), options,
context.getGedcom().toString());
if (file == null) {
Modified: trunk/AncestrisCore/gedcom.privacy.standard/manifest.mf
==============================================================================
--- trunk/AncestrisCore/gedcom.privacy.standard/manifest.mf (original)
+++ trunk/AncestrisCore/gedcom.privacy.standard/manifest.mf Fri Nov 29
00:58:10 2013
@@ -1,6 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: ancestris.gedcom.privacy.standard
-OpenIDE-Module-Install: ancestris/gedcom/privacy/standard/Installer.class
OpenIDE-Module-Layer: ancestris/gedcom/privacy/standard/layer.xml
OpenIDE-Module-Localizing-Bundle:
ancestris/gedcom/privacy/standard/Bundle.properties
OpenIDE-Module-Specification-Version: 0.8.0
Modified:
trunk/AncestrisCore/modules.views.tree/src/ancestris/modules/views/tree/TreeTopComponent.java
==============================================================================
---
trunk/AncestrisCore/modules.views.tree/src/ancestris/modules/views/tree/TreeTopComponent.java
(original)
+++
trunk/AncestrisCore/modules.views.tree/src/ancestris/modules/views/tree/TreeTopComponent.java
Fri Nov 29 00:58:10 2013
@@ -12,10 +12,9 @@
package ancestris.modules.views.tree;
import ancestris.core.pluginservice.AncestrisPlugin;
-import ancestris.core.pluginservice.PluginInterface;
-import ancestris.view.GenjViewTopComponent;
import ancestris.view.AncestrisDockModes;
import ancestris.view.AncestrisViewInterface;
+import ancestris.view.GenjViewTopComponent;
import genj.gedcom.Entity;
import genj.gedcom.Gedcom;
import genj.gedcom.Property;
@@ -34,7 +33,7 @@
autostore = false)
@RetainLocation(AncestrisDockModes.OUTPUT)
@ServiceProvider(service = AncestrisViewInterface.class)
-public final class TreeTopComponent extends GenjViewTopComponent implements
Filter{
+public final class TreeTopComponent extends GenjViewTopComponent{
private static TreeTopComponent factory;
private static ViewFactory viewfactory = new TreeViewFactory();
@@ -97,20 +96,4 @@
protected String preferredID() {
return PREFERRED_ID;
}
-
- public String getFilterName() {
- return ((TreeView)getView()).getFilterName();
- }
-
- public boolean veto(Property property) {
- return ((TreeView)getView()).veto(property);
- }
-
- public boolean veto(Entity entity) {
- return ((TreeView)getView()).veto(entity);
- }
-
- public boolean canApplyTo(Gedcom gedcom) {
- return ((TreeView)getView()).canApplyTo(gedcom);
- }
}
Modified: trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
==============================================================================
--- trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
(original)
+++ trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java Fri Nov
29 00:58:10 2013
@@ -104,12 +104,13 @@
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.NbBundle;
+import org.openide.util.lookup.ServiceProvider;
/**
* TreeView
*/
// FIXME: used to find proper TreeView component for RootAction
-//XXX: not used @ServiceProvider(service=TreeView.class)
+//@ServiceProvider(service=TreeView.class)
public class TreeView extends View implements Filter {
protected final static ImageIcon BOOKMARK_ICON = new
ImageIcon(TreeView.class, "images/Bookmark");
@@ -221,14 +222,16 @@
}
public Gedcom getGedcom() {
- return (context == null ? null : context.getGedcom());
+ if (context != null && context.getGedcom()!= null){
+ return context.getGedcom();
+ }
+ return model.getRoot() == null ? null: model.getRoot().getGedcom();
}
@Override
public void addNotify() {
super.addNotify();
-//XXX: removed in favour of GenjViewProxy AncestrisPlugin.register (this);
- // FIXME: should be removed? use @serviceprovider?
+ // Used only for Filter interface
AncestrisPlugin.register(this);
}
@@ -269,7 +272,6 @@
REGISTRY.put("hide.descendants", model.getHideDescendantsIDs());
AncestrisPlugin.unregister(this);
-//XXX: removed in favour of GenjViewProxy AncestrisPlugin.unregister(this);
// done
super.removeNotify();
}
@@ -1630,6 +1632,6 @@
@Override
public boolean canApplyTo(Gedcom gedcom) {
- return (gedcom != null && gedcom.equals(context.getGedcom()));
+ return (gedcom != null && gedcom.equals(getGedcom()));
}
} //TreeView
---------------------------------------------------------------------
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]
