GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Lean on object service for singleton retrieval · scijava/scijava-common@cbc827c

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src/main/java/org/scijava/plugin
- AbstractSingletonService.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/main/java/org/scijava/plugin/AbstractSingletonService.java‎`

Copy file name to clipboardExpand all lines: src/main/java/org/scijava/plugin/AbstractSingletonService.java

+8-13Lines changed: 8 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@`
`31`	`31`
`32`	`32`	`package org.scijava.plugin;`
`33`	`33`
`34`		`-import java.util.ArrayList;`
`35`	`34`	`import java.util.Collections;`
`36`	`35`	`import java.util.List;`
`37`	`36`
`@@ -58,15 +57,12 @@ public abstract class AbstractSingletonService<PT extends SingletonPlugin>`
`58`	`57`	`// TODO: Listen for PluginsAddedEvent and PluginsRemovedEvent`
`59`	`58`	`// and update the list of singletons accordingly.`
`60`	`59`
`61`		`- /** List of singleton plugin instances. */`
`62`		`- private List<PT> instances;`
`63`		`-`
`64`	`60`	`// -- SingletonService methods --`
`65`	`61`
`66`	`62`	`@Override`
`67`	`63`	`public List<PT> getInstances() {`
`68`		`- if (instances == null) initInstances();`
`69`		`- return instances;`
	`64`	`+ final List<PT> plugins = objectService.getObjects(getPluginType());`
	`65`	`+ return Collections.unmodifiableList(plugins);`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`@Override`
`@@ -84,7 +80,7 @@ public void initialize() {`
`84`	`80`
`85`	`81`	`@Override`
`86`	`82`	`public List<PT> get() {`
`87`		`- return new ArrayList<PT>(getInstances());`
	`83`	`+ return createInstances();`
`88`	`84`	`}`
`89`	`85`
`90`	`86`	`@Override`
`@@ -97,15 +93,14 @@ public Class<?> getType() {`
`97`	`93`
`98`	`94`	`// -- Helper methods --`
`99`	`95`
`100`		`- private synchronized void initInstances() {`
`101`		`- if (instances != null) return;`
`102`		`-`
`103`		`- instances =`
`104`		`- Collections.unmodifiableList(filterInstances(getPluginService()`
`105`		`- .createInstancesOfType(getPluginType())));`
	`96`	`+ private List<PT> createInstances() {`
	`97`	`+ final List<PT> instances =`
	`98`	`+ filterInstances(getPluginService().createInstancesOfType(getPluginType()));`
`106`	`99`
`107`	`100`	`log.info("Found " + instances.size() + " " +`
`108`	`101`	`getPluginType().getSimpleName() + " plugins.");`
	`102`	`+`
	`103`	`+ return instances;`
`109`	`104`	`}`
`110`	`105`
`111`	`106`	`/**`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.