# HG changeset patch # User Jaroslav Tulach # Date 1213429987 -7200 # Node ID a2de5429d581b23681fb7eebc40b52cb77b364e6 # Parent b029a28df444bf8dd52947a7c2d2dc6968495d2b Using code snippets from real sources to demonstrate the subclassing vs. delegation diff -r b029a28df444 -r a2de5429d581 samples/delegatingwriterfinal/src-api1.0/api/Writer.java --- a/samples/delegatingwriterfinal/src-api1.0/api/Writer.java Sat Jun 14 09:53:07 2008 +0200 +++ b/samples/delegatingwriterfinal/src-api1.0/api/Writer.java Sat Jun 14 09:53:07 2008 +0200 @@ -7,6 +7,7 @@ * * @author Jaroslav Tulach */ +// BEGIN: writer.final.1.0 public final class Writer { private final Impl impl; @@ -72,7 +73,5 @@ public void write(String str, int off, int len) throws IOException; public void write(char[] arr, int off, int len) throws IOException; } - - - } +// END: writer.final.1.0 diff -r b029a28df444 -r a2de5429d581 samples/delegatingwriterfinal/src-api2.0/api/Writer.java --- a/samples/delegatingwriterfinal/src-api2.0/api/Writer.java Sat Jun 14 09:53:07 2008 +0200 +++ b/samples/delegatingwriterfinal/src-api2.0/api/Writer.java Sat Jun 14 09:53:07 2008 +0200 @@ -1,6 +1,5 @@ package api; -import java.io.BufferedWriter; import java.io.IOException; /** Fixing the problem caused by mixing subclassing and delegation in @@ -8,6 +7,7 @@ * * @author Jaroslav Tulach */ +// BEGIN: writer.final.2.0 public final class Writer implements Appendable { private final Impl impl; private final ImplSeq seq; @@ -130,7 +130,5 @@ public void flush() throws IOException; public void write(CharSequence seq) throws IOException; } - - - } +// END: writer.final.2.0 \ No newline at end of file