1.1 --- a/samples/singletons/src/org/apidesign/singletons/api/DialogDisplayer.java Wed Jan 27 19:04:13 2010 +0100
1.2 +++ b/samples/singletons/src/org/apidesign/singletons/api/DialogDisplayer.java Wed Jan 27 20:49:32 2010 +0100
1.3 @@ -43,7 +43,6 @@
1.4
1.5 // BEGIN: singletons.injectable.serviceloader
1.6 private static DialogDisplayer initializeServiceLoader() {
1.7 - // see http://singletons.apidesign.org
1.8 Iterator<DialogDisplayer> it = null;
1.9 it = ServiceLoader.load(DialogDisplayer.class).iterator();
1.10 return it != null && it.hasNext() ? it.next() : new Impl();
2.1 --- a/samples/singletons/src/org/apidesign/singletons/impl/DefaultDialogDisplayer.java Wed Jan 27 19:04:13 2010 +0100
2.2 +++ b/samples/singletons/src/org/apidesign/singletons/impl/DefaultDialogDisplayer.java Wed Jan 27 20:49:32 2010 +0100
2.3 @@ -4,6 +4,7 @@
2.4 import org.apidesign.singletons.api.DialogDisplayer;
2.5 import org.openide.util.lookup.ServiceProvider;
2.6
2.7 +// BEGIN: singletons.injectable.implement
2.8 @ServiceProvider(service=DialogDisplayer.class)
2.9 public final class DefaultDialogDisplayer extends DialogDisplayer {
2.10 @Override
2.11 @@ -12,3 +13,4 @@
2.12 return res == JOptionPane.OK_OPTION;
2.13 }
2.14 }
2.15 +// END: singletons.injectable.implement
3.1 --- a/samples/singletons/src/org/apidesign/singletons/usage/Main.java Wed Jan 27 19:04:13 2010 +0100
3.2 +++ b/samples/singletons/src/org/apidesign/singletons/usage/Main.java Wed Jan 27 20:49:32 2010 +0100
3.3 @@ -1,5 +1,6 @@
3.4 package org.apidesign.singletons.usage;
3.5
3.6 +// BEGIN: singletons.injectable.usage
3.7 import org.apidesign.singletons.api.DialogDisplayer;
3.8
3.9 public class Main {
3.10 @@ -13,3 +14,4 @@
3.11 }
3.12 }
3.13 }
3.14 +// END: singletons.injectable.usage
4.1 --- a/samples/singletons/test/org/apidesign/singletons/usage/MainTest.java Wed Jan 27 19:04:13 2010 +0100
4.2 +++ b/samples/singletons/test/org/apidesign/singletons/usage/MainTest.java Wed Jan 27 20:49:32 2010 +0100
4.3 @@ -6,11 +6,8 @@
4.4 import org.netbeans.junit.MockServices;
4.5 import static org.junit.Assert.*;
4.6
4.7 +// BEGIN: singletons.injectable.test
4.8 public class MainTest {
4.9 -
4.10 - public MainTest() {
4.11 - }
4.12 -
4.13 @BeforeClass
4.14 public static void setUpClass() throws Exception {
4.15 MockServices.setServices(MockDialogDisplayer.class);
4.16 @@ -18,9 +15,14 @@
4.17
4.18 @Test
4.19 public void testMainAsksAQuestion() {
4.20 - assertNull("No question asked yet", MockDialogDisplayer.askedQuery);
4.21 + assertNull(
4.22 + "No question asked yet", MockDialogDisplayer.askedQuery
4.23 + );
4.24 Main.main(new String[0]);
4.25 - assertNotNull("main code asked our Mock displayer", MockDialogDisplayer.askedQuery);
4.26 + assertNotNull(
4.27 + "main code asked our Mock displayer",
4.28 + MockDialogDisplayer.askedQuery
4.29 + );
4.30 }
4.31
4.32 public static final class MockDialogDisplayer extends DialogDisplayer {
4.33 @@ -31,6 +33,6 @@
4.34 askedQuery = query;
4.35 return false;
4.36 }
4.37 -
4.38 }
4.39 -}
4.40 \ No newline at end of file
4.41 +}
4.42 +// END: singletons.injectable.test