aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java8
-rw-r--r--pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java2
2 files changed, 4 insertions, 6 deletions
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java b/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java
index ede596a..8332a18 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java
@@ -50,12 +50,9 @@ public abstract class AbstractExtensionFinder implements ExtensionFinder, Plugin
Map<String, Set<String>> entries = getEntries();
List<ExtensionWrapper<T>> result = new ArrayList<>();
- // add extensions found in classpath
- List<ExtensionWrapper<T>> classpathExtensions = find(type, null);
- result.addAll(classpathExtensions);
-
- // add extensions found in each plugin
+ // add extensions found in classpath and plugins
for (String pluginId : entries.keySet()) {
+ // classpath's extensions <=> pluginId = null
List<ExtensionWrapper<T>> pluginExtensions = find(type, pluginId);
result.addAll(pluginExtensions);
}
@@ -78,6 +75,7 @@ public abstract class AbstractExtensionFinder implements ExtensionFinder, Plugin
log.debug("Finding extensions of extension point '{}' for plugin '{}'", type.getName(), pluginId);
List<ExtensionWrapper<T>> result = new ArrayList<>();
+ // classpath's extensions <=> pluginId = null
Set<String> classNames = findClassNames(pluginId);
if (classNames.isEmpty()) {
return result;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java b/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java
index 44ddcb5..eb8234f 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java
@@ -32,6 +32,6 @@ import java.lang.annotation.Target;
@Documented
public @interface Extension {
- int ordinal() default 0;
+ int ordinal() default 0;
}