Changeset 6088

Timestamp:

Aug 21, 2012, 2:51:28 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1680 and #1681. Added filter so that disabled extensions are not used.

Location:

trunk/src/core/net/sf/basedb/util/overview

Files:

• OverviewUtil.java (modified) (2 diffs)
• loader/ExtensionChildNodeLoader.java (modified) (2 diffs)
• validator/ExtensionNodeValidator.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/util/overview/OverviewUtil.java

@@ -58 +58 @@
 import net.sf.basedb.util.extensions.ExtensionsInvoker;
 import net.sf.basedb.util.extensions.Registry;
+import net.sf.basedb.util.extensions.manager.Settings;
 import net.sf.basedb.util.overview.extensions.ValidationRuleAction;
 import net.sf.basedb.util.overview.filter.BasicItemFilter;
@@ -204 +205 @@
     // Check extensions registry for more validation rules
     Registry registry = Application.getExtensionsManager().getRegistry();
+    Settings settings = Application.getExtensionsManager().getSettings();
     ExtensionsInvoker<ValidationRuleAction> invoker = 
-      (ExtensionsInvoker<ValidationRuleAction>)registry.useExtensions(new ClientContext(dc, overview), null, "net.sf.basedb.util.overview.validationrule");
+      (ExtensionsInvoker<ValidationRuleAction>)registry.useExtensions(new ClientContext(dc, overview), settings, "net.sf.basedb.util.overview.validationrule");
     
     List<ValidationRuleAction> xtRules = (List<ValidationRuleAction>)IteratorUtils.toList(invoker.iterator());

trunk/src/core/net/sf/basedb/util/overview/loader/ExtensionChildNodeLoader.java

@@ -27 +27 @@
 import net.sf.basedb.util.extensions.ExtensionsInvoker;
 import net.sf.basedb.util.extensions.Registry;
+import net.sf.basedb.util.extensions.manager.Settings;
 import net.sf.basedb.util.overview.OverviewContext;
 import net.sf.basedb.util.overview.Node;
@@ -124 +125 @@
     // Find and use any registered extensions
     Registry registry = Application.getExtensionsManager().getRegistry();
+    Settings settings = Application.getExtensionsManager().getSettings();
     ExtensionsInvoker<ChildNodeLoaderAction> invoker = 
-      (ExtensionsInvoker<ChildNodeLoaderAction>)registry.useExtensions(clientContext, null, "net.sf.basedb.util.overview.loader");
+      (ExtensionsInvoker<ChildNodeLoaderAction>)registry.useExtensions(clientContext, settings, "net.sf.basedb.util.overview.loader");
     
     for (ChildNodeLoaderAction a : invoker)

trunk/src/core/net/sf/basedb/util/overview/validator/ExtensionNodeValidator.java

@@ -32 +32 @@
 import net.sf.basedb.util.extensions.ExtensionsInvoker;
 import net.sf.basedb.util.extensions.Registry;
+import net.sf.basedb.util.extensions.manager.Settings;
 import net.sf.basedb.util.overview.OverviewContext;
 import net.sf.basedb.util.overview.Node;
@@ -188 +189 @@
       // Find and use any registered extensions
       Registry registry = Application.getExtensionsManager().getRegistry();
-      ExtensionsInvoker invoker = registry.useExtensions(clientContext, null, "net.sf.basedb.util.overview.validator");
+      Settings settings = Application.getExtensionsManager().getSettings();
+      ExtensionsInvoker invoker = registry.useExtensions(clientContext, settings, "net.sf.basedb.util.overview.validator");
       
       xtValidators = IteratorUtils.toList(invoker.iterator());