# HG changeset patch # User Jaroslav Tulach # Date 1264621772 -3600 # Node ID f497cf8621b3c77fe3271f0ca61f8427fa6a994e # Parent 3ba131907351e4c379af1a032a18426078c24b1c More code snippets diff -r 3ba131907351 -r f497cf8621b3 samples/singletons/src/org/apidesign/singletons/api/DialogDisplayer.java --- a/samples/singletons/src/org/apidesign/singletons/api/DialogDisplayer.java Wed Jan 27 19:04:13 2010 +0100 +++ b/samples/singletons/src/org/apidesign/singletons/api/DialogDisplayer.java Wed Jan 27 20:49:32 2010 +0100 @@ -43,7 +43,6 @@ // BEGIN: singletons.injectable.serviceloader private static DialogDisplayer initializeServiceLoader() { - // see http://singletons.apidesign.org Iterator it = null; it = ServiceLoader.load(DialogDisplayer.class).iterator(); return it != null && it.hasNext() ? it.next() : new Impl(); diff -r 3ba131907351 -r f497cf8621b3 samples/singletons/src/org/apidesign/singletons/impl/DefaultDialogDisplayer.java --- a/samples/singletons/src/org/apidesign/singletons/impl/DefaultDialogDisplayer.java Wed Jan 27 19:04:13 2010 +0100 +++ b/samples/singletons/src/org/apidesign/singletons/impl/DefaultDialogDisplayer.java Wed Jan 27 20:49:32 2010 +0100 @@ -4,6 +4,7 @@ import org.apidesign.singletons.api.DialogDisplayer; import org.openide.util.lookup.ServiceProvider; +// BEGIN: singletons.injectable.implement @ServiceProvider(service=DialogDisplayer.class) public final class DefaultDialogDisplayer extends DialogDisplayer { @Override @@ -12,3 +13,4 @@ return res == JOptionPane.OK_OPTION; } } +// END: singletons.injectable.implement diff -r 3ba131907351 -r f497cf8621b3 samples/singletons/src/org/apidesign/singletons/usage/Main.java --- a/samples/singletons/src/org/apidesign/singletons/usage/Main.java Wed Jan 27 19:04:13 2010 +0100 +++ b/samples/singletons/src/org/apidesign/singletons/usage/Main.java Wed Jan 27 20:49:32 2010 +0100 @@ -1,5 +1,6 @@ package org.apidesign.singletons.usage; +// BEGIN: singletons.injectable.usage import org.apidesign.singletons.api.DialogDisplayer; public class Main { @@ -13,3 +14,4 @@ } } } +// END: singletons.injectable.usage diff -r 3ba131907351 -r f497cf8621b3 samples/singletons/test/org/apidesign/singletons/usage/MainTest.java --- a/samples/singletons/test/org/apidesign/singletons/usage/MainTest.java Wed Jan 27 19:04:13 2010 +0100 +++ b/samples/singletons/test/org/apidesign/singletons/usage/MainTest.java Wed Jan 27 20:49:32 2010 +0100 @@ -6,11 +6,8 @@ import org.netbeans.junit.MockServices; import static org.junit.Assert.*; +// BEGIN: singletons.injectable.test public class MainTest { - - public MainTest() { - } - @BeforeClass public static void setUpClass() throws Exception { MockServices.setServices(MockDialogDisplayer.class); @@ -18,9 +15,14 @@ @Test public void testMainAsksAQuestion() { - assertNull("No question asked yet", MockDialogDisplayer.askedQuery); + assertNull( + "No question asked yet", MockDialogDisplayer.askedQuery + ); Main.main(new String[0]); - assertNotNull("main code asked our Mock displayer", MockDialogDisplayer.askedQuery); + assertNotNull( + "main code asked our Mock displayer", + MockDialogDisplayer.askedQuery + ); } public static final class MockDialogDisplayer extends DialogDisplayer { @@ -31,6 +33,6 @@ askedQuery = query; return false; } - } -} \ No newline at end of file +} +// END: singletons.injectable.test