Skip to content

Better lazy resolution #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ctrueden wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Better lazy resolution #91

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4dce23
ObjectIndexTest: improve getAll() test coverage
ctrueden Jul 1, 2014
5ef3f68
AbstractSingletonService: use more specific type
ctrueden Jul 1, 2014
8bbb47a
LazyObjects: add getType() method
ctrueden Jul 6, 2014
29ff80b
ObjectIndex: only resolve relevant pending objects
ctrueden Jul 1, 2014
843f863
ObjectIndexTest: add a lazy object resolution test
ctrueden Jul 1, 2014
05b1537
AbstractSingletonService: fix helper method
hinerm Jul 31, 2014
d6a7eba
Lean on object service for singleton retrieval
hinerm Jul 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
AbstractSingletonService: fix helper method 
The filterInstances method should not alter the return type of the input
list. The purpose of that method is to potentially remove some elements
from the input list -- nothing more -- so it should still return a
List<PT>, not something else.
  • Loading branch information
@hinerm @ctrueden
hinerm authored and ctrueden committed May 12, 2015
commit 05b15376bb9a38fe813092390dae834326ec0d53
2 changes: 1 addition & 1 deletion src/main/java/org/scijava/platform/DefaultPlatformService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public boolean registerAppMenus(final Object menus) {
}

@Override
public List<? extends Platform> filterInstances(final List<Platform> list) {
public List<Platform> filterInstances(final List<Platform> list) {
final Iterator<Platform> iter = list.iterator();
while (iter.hasNext()) {
if (!iter.next().isTarget()) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/scijava/plugin/AbstractSingletonService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void initialize() {
objectService.getIndex().addLater(new LazyObjects<PT>() {

@Override
public ArrayList<PT> get() {
public List<PT> get() {
return new ArrayList<PT>(getInstances());
}

Expand All @@ -108,7 +108,7 @@ public Class<?> getType() {
* @param list the initial list of instances
* @return the filtered list of instances
*/
protected List<? extends PT> filterInstances(final List<PT> list) {
protected List<PT> filterInstances(final List<PT> list) {
return list;
}

Expand Down