# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430176 -7200
# Node ID 50bf1b976c0d8f1b7306f16757fd1cb9aceb214c
# Parent  3bc4c54f4bcc3e964b868738d4771b348a2c893a
Truncating to 75 characters

diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/apifest1/boolcircuit/test/org/netbeans/apifest/boolcircuit/CircuitTest.java
--- a/samples/apifest1/boolcircuit/test/org/netbeans/apifest/boolcircuit/CircuitTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/apifest1/boolcircuit/test/org/netbeans/apifest/boolcircuit/CircuitTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -1,31 +1,5 @@
-/*
- * The contents of this file are subject to the terms of the Common Development
- * and Distribution License (the License). You may not use this file except in
- * compliance with the License.
- *
- * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
- * or http://www.netbeans.org/cddl.txt.
- *
- * When distributing Covered Code, include this CDDL Header Notice in each file
- * and include the License file at http://www.netbeans.org/cddl.txt.
- * If applicable, add the following below the CDDL Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- */
-
 package org.netbeans.apifest.boolcircuit;
 
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Policy;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
 import junit.framework.TestCase;
 import junit.framework.*;
 
@@ -41,20 +15,24 @@
  *          on output 1 and 1 to 0
  *   <li>and - has two inputs and one output. The output is 1 only if both 
  *          inputs are 1, otherwise it is 0
- *   <li>or - has two inputs and one output. The output is 1 always, except
- *          in the case when both inputs are 0
+ *   <li>or - has two inputs and one output. The output is 1 always, 
+ *          except in the case when both inputs are 0
  * </ul>
  *
  * <p>
- * The boolean circuit can be used to represent boolean formulas and compute
- * the results for certain values of its inputs. The individual tasks described
- * as tests bellow.
+ * The boolean circuit can be used to represent boolean formulas and 
+ * compute the results for certain values of its inputs. The individual
+ * tasks described as tests bellow.
  *
  * <p>
  * Links of interest:
  * <ul>
- *   <li><a href="http://en.wikipedia.org/wiki/Truth_table">Truth table</a>
- *   <li><a href="http://en.wikipedia.org/wiki/Tautology_(logic)">Taugology</a>
+ *   <li>
+ *      <a href="http://en.wikipedia.org/wiki/Truth_table">
+ *          Truth table</a>
+ *   <li>
+ *      <a href="http://en.wikipedia.org/wiki/Tautology_(logic)">
+ *          Taugology</a>
  * </ul>
  */
 public class CircuitTest extends TestCase {
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/apifest1/day1/parsingsolution/src/org/netbeans/apifest/boolcircuit/Circuit.java
--- a/samples/apifest1/day1/parsingsolution/src/org/netbeans/apifest/boolcircuit/Circuit.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/apifest1/day1/parsingsolution/src/org/netbeans/apifest/boolcircuit/Circuit.java	Sat Jun 14 09:56:16 2008 +0200
@@ -22,10 +22,11 @@
 // BEGIN: apifest.day1.parsingsolution.Circuit
 /**
  * Usage:
- * First method parse must be called with valid logical expression on input.
- * If it returns zero then it is possible to call method evaluate with array
- * of input values as parameter. Method evaluate can be invoked many time with
- * different input values.
+ * First method parse must be called with valid logical expression on 
+ * input.
+ * If it returns zero then it is possible to call method evaluate with 
+ * array of input values as parameter. Method evaluate can be invoked 
+ * many time with different input values.
  * Method parse can be called anytime to change logical expression.
  */
 public class Circuit {
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/apifest1/day2/RealTest.java
--- a/samples/apifest1/day2/RealTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/apifest1/day2/RealTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -24,7 +24,7 @@
  *             and(false,true)=0*1=0=false
  *   <li>or - or(x,y) = 1 - (1 - x) * (1 - y) and this is also ok as
  *            or(false,false) = 1 - (1 - 0) * (1 - 0) = 1 - 1 = 0 = false
- *            or(true,false) = 1 - (1 - 1) * (1 - 0) = 1 - 0 * 1 = 1 = true
+ *            or(true,false) = 1 - (1 - 1)*(1 - 0) = 1 - 0 * 1 = 1 = true
  * </ul>
  * <p>
  * However as the circuits with doubles are more rich than plain boolean 
@@ -48,7 +48,8 @@
      *
      * Feed this circuit with x1=true, x2=false, assert result is false
      *
-     * Feed the same circuit with x1=false, x2=true, assert result is true
+     * Feed the same circuit with x1=false, x2=true, assert result is 
+     * true
      *
      * Feed the same circuit with x1=0.0, x2=1.0, assert result is 1.0
      *
@@ -61,12 +62,12 @@
         fail("testX1andX2orNotX1");
     }
     
-    /** Ensure that one variable cannot be filled with two different values.
-     * Create a circuit for x1 and x1. Make sure that for any usage of your
-     * API that would not lead to x1 * x1 result, an exception is thrown.
-     * For example if there was a way to feed the circuit with two different 
-     * values 0.3 and 0.5 an exception is thrown indicating that this is 
-     * improper use of the circuit.
+    /** Ensure that one variable cannot be filled with two different 
+     * values. Create a circuit for x1 and x1. Make sure that for any 
+     * usage of your API that would not lead to x1 * x1 result, an 
+     * exception is thrown. For example if there was a way to feed the 
+     * circuit with two different values 0.3 and 0.5 an exception is 
+     * thrown indicating that this is improper use of the circuit.
      */
     public void testImproperUseOfTheCircuit() {
         fail("testImproperUseOfTheCircuit");
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java
--- a/samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java	Sat Jun 14 09:56:16 2008 +0200
@@ -1,22 +1,3 @@
-/*
- * The contents of this file are subject to the terms of the Common Development
- * and Distribution License (the License). You may not use this file except in
- * compliance with the License.
- *
- * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
- * or http://www.netbeans.org/cddl.txt.
- *
- * When distributing Covered Code, include this CDDL Header Notice in each file
- * and include the License file at http://www.netbeans.org/cddl.txt.
- * If applicable, add the following below the CDDL Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- */
-
 package org.netbeans.apifest.boolcircuit;
 
 import java.util.Stack;
@@ -25,6 +6,7 @@
  */ 
 //BEGIN: apifest.day2.stackbasedsolution.Circuit2
 public interface Circuit2 extends Circuit {
-    public double evaluate (double ... input) throws IllegalArgumentException;
+    public double evaluate (double ... input) 
+    throws IllegalArgumentException;
 }
 //END: apifest.day2.stackbasedsolution.Circuit2
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/apifest1/day2/welltestedsolution/test/org/netbeans/apifest/boolcircuit/RealTest.java
--- a/samples/apifest1/day2/welltestedsolution/test/org/netbeans/apifest/boolcircuit/RealTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/apifest1/day2/welltestedsolution/test/org/netbeans/apifest/boolcircuit/RealTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -51,7 +51,8 @@
      *
      * Feed this circuit with x1=true, x2=false, assert result is false
      *
-     * Feed the same circuit with x1=false, x2=true, assert result is true
+     * Feed the same circuit with x1=false, x2=true, assert result is 
+     * true
      *
      * Feed the same circuit with x1=0.0, x2=1.0, assert result is 1.0
      *
@@ -71,12 +72,12 @@
         assertEquals("0.0, 1.0", 1.0, c.evaluateFuzzy(0.0, 1.0), 0.0);
     }
     
-    /** Ensure that one variable cannot be filled with two different values.
-     * Create a circuit for x1 and x1. Make sure that for any usage of your
-     * API that would not lead to x1 * x1 result, an exception is thrown.
-     * For example if there was a way to feed the circuit with two different 
-     * values 0.3 and 0.5 an exception is thrown indicating that this is 
-     * improper use of the circuit.
+    /** Ensure that one variable cannot be filled with two different 
+     * values. Create a circuit for x1 and x1. Make sure that for any 
+     * usage of your API that would not lead to x1 * x1 result, an 
+     * exception is thrown. For example if there was a way to feed the 
+     * circuit with two different values 0.3 and 0.5 an exception is 
+     * thrown indicating that this is improper use of the circuit.
      */
     public void testImproperUseOfTheCircuit() {
         // does not apply
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/apifest1/day3-intermezzo/pnejedly/against-elementbasedsolution/test/apifest/CircuitTest.java
--- a/samples/apifest1/day3-intermezzo/pnejedly/against-elementbasedsolution/test/apifest/CircuitTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/apifest1/day3-intermezzo/pnejedly/against-elementbasedsolution/test/apifest/CircuitTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -1,43 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
 package apifest;
 
 import junit.framework.TestCase;
@@ -52,8 +12,8 @@
         super(n);
     }
     /**
-     * OK, elementbasedsolution looked bulletproof. Every code path was exactly
-     * the same as in the initial version. Except one.     
+     * OK, elementbasedsolution looked bulletproof. Every code path 
+     * was exactly the same as in the initial version. Except one.     
      */
     public void testEvaluateWithoutAssign() throws Exception {
         Circuit.Variable var = Circuit.var();
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/aserverinfo/test/org/apidesign/aserverinfo/AServerInfoTest.java
--- a/samples/aserverinfo/test/org/apidesign/aserverinfo/AServerInfoTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/aserverinfo/test/org/apidesign/aserverinfo/AServerInfoTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -23,17 +23,17 @@
 
     @Test
     public void showUseOfCumulativeFactory() throws Exception {
-        Prov prov = new Prov();
-        AServerInfo info;
+        Prov p = new Prov();
+        AServerInfo inf;
         
         // BEGIN: aserverinfo.cumulative.creation
-        info = AServerInfo.empty().nameProvider(prov).urlProvider(prov).reset(prov);
+        inf = AServerInfo.empty().nameProvider(p).urlProvider(p).reset(p);
         // END: aserverinfo.cumulative.creation
         
-        assertEquals("API Design Server", info.getName());
-        assertEquals("http://www.apidesign.org", info.getURL().toExternalForm());
-        info.reset();
-        assertEquals("Once reset", 1, prov.resets);
+        assertEquals("API Design Server", inf.getName());
+        assertEquals("http://www.apidesign.org", inf.getURL().toExternalForm());
+        inf.reset();
+        assertEquals("Once reset", 1, p.resets);
         
     }
     
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/deadlock/src/org/apidesign/deadlock/startuplock/CLIHandler.java
--- a/samples/deadlock/src/org/apidesign/deadlock/startuplock/CLIHandler.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/deadlock/src/org/apidesign/deadlock/startuplock/CLIHandler.java	Sat Jun 14 09:56:16 2008 +0200
@@ -19,7 +19,9 @@
         }
         // otherwise try to create the file yourself
         lockFile.createNewFile();
-        DataOutputStream os = new DataOutputStream(new FileOutputStream(lockFile));
+        DataOutputStream os = new DataOutputStream(
+            new FileOutputStream(lockFile)
+        );
         ServerSocket server = new ServerSocket();
         int p = server.getLocalPort();
         os.writeInt(p);
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/deadlock/src/org/apidesign/deadlock/startuplock/CLIHandlerBlocking.java
--- a/samples/deadlock/src/org/apidesign/deadlock/startuplock/CLIHandlerBlocking.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/deadlock/src/org/apidesign/deadlock/startuplock/CLIHandlerBlocking.java	Sat Jun 14 09:56:16 2008 +0200
@@ -24,7 +24,9 @@
         // otherwise try to create the file yourself
         enterState(20);
         lockFile.createNewFile();
-        DataOutputStream os = new DataOutputStream(new FileOutputStream(lockFile));
+        DataOutputStream os = new DataOutputStream(
+            new FileOutputStream(lockFile)
+        );
         ServerSocket server = new ServerSocket();
         enterState(21);
         int p = server.getLocalPort();
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/deadlock/test/org/apidesign/deadlock/DeadlockTest.java
--- a/samples/deadlock/test/org/apidesign/deadlock/DeadlockTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/deadlock/test/org/apidesign/deadlock/DeadlockTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -36,9 +36,10 @@
                 JLabel sampleLabel = createLabel();
                 return sampleLabel.getPreferredSize();
             } catch (InterruptedException ex) {
-                Logger.getLogger(
-                    DeadlockTest.class.getName()).log(Level.SEVERE, null, ex
+                Logger l = Logger.getLogger(
+                    DeadlockTest.class.getName()
                 );
+                l.log(Level.SEVERE, null, ex);
                 return super.getPreferredSize();
             }
         }
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/deadlock/test/org/apidesign/deadlock/logs/ParallelSortedTest.java
--- a/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelSortedTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelSortedTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -37,7 +37,8 @@
             if (!record.getMessage().startsWith("cnt")) {
                 return;
             }
-            if (runSecond == Thread.currentThread().getName().equals("2nd")) {
+            boolean snd = Thread.currentThread().getName().equals("2nd");
+            if (runSecond == snd) {
                 notify();
                 runSecond = !runSecond;
             }
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java
--- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 09:56:16 2008 +0200
@@ -13,7 +13,9 @@
     public CryptoWriter(Writer out) {
         super(out);
     }
-    public CryptoWriter(Writer out, AltBufferedWriter.Behaviour behaviour) {
+    public CryptoWriter(
+        Writer out, AltBufferedWriter.Behaviour behaviour
+    ) {
         super(out, behaviour);
     }
 /* The above code is here to let us simulate different behaviours of the append
@@ -24,15 +26,15 @@
         super(out);
     }
     
-    /* We need to override all known methods of BufferedWriter and do conversion
-    * of the argument char, string or char array.
+    /* We need to override all known methods of BufferedWriter 
+    * and do conversion of the argument char, string or char array.
     */
     
     @Override
-    public void write(char[] cbuf, int off, int len) throws IOException {
+    public void write(char[] buf, int off, int len) throws IOException {
         char[] arr = new char[len];
         for (int i = 0; i < len; i++) {
-            arr[i] = convertChar(cbuf[off + i]);
+            arr[i] = convertChar(buf[off + i]);
         }
         super.write(arr, 0, len);
     }
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/delegatingwriterfinal/src-api1.0/api/Writer.java
--- a/samples/delegatingwriterfinal/src-api1.0/api/Writer.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/delegatingwriterfinal/src-api1.0/api/Writer.java	Sat Jun 14 09:56:16 2008 +0200
@@ -22,13 +22,15 @@
     public final void write(char cbuf[]) throws IOException {
 	impl.write(cbuf, 0, cbuf.length);
     }
-    public final void write(char cbuf[], int off, int len) throws IOException {
+    public final void write(char cbuf[], int off, int len) 
+    throws IOException {
         impl.write(cbuf, off, len);
     }
     public final void write(String str) throws IOException {
 	impl.write(str, 0, str.length());
     }
-    public final void write(String str, int off, int len) throws IOException {
+    public final void write(String str, int off, int len) 
+    throws IOException {
         impl.write(str, off, len);
     }
     public final void flush() throws IOException {
@@ -44,11 +46,13 @@
     
     public static Writer create(final java.io.Writer w) {
         return new Writer(new Impl() {
-            public void write(String str, int off, int len) throws IOException {
+            public void write(String str, int off, int len) 
+            throws IOException {
                 w.write(str, off, len);
             }
 
-            public void write(char[] arr, int off, int len) throws IOException {
+            public void write(char[] arr, int off, int len) 
+            throws IOException {
                 w.write(arr, off, len);
             }
 
@@ -70,8 +74,8 @@
     public static interface Impl {
         public void close() throws IOException;
         public void flush() throws IOException;
-        public void write(String str, int off, int len) throws IOException;
-        public void write(char[] arr, int off, int len) throws IOException;
+        public void write(String s, int off, int len) throws IOException;
+        public void write(char[] a, int off, int len) throws IOException;
     }
 }
 // END: writer.final.1.0
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/friendpackage/src/apipkg/Item.java
--- a/samples/friendpackage/src/apipkg/Item.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/friendpackage/src/apipkg/Item.java	Sat Jun 14 09:56:16 2008 +0200
@@ -1,16 +1,3 @@
-/*
- *                 Sun Public License Notice
- * 
- * The contents of this file are subject to the Sun Public License
- * Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. A copy of the License is available at
- * http://www.sun.com/
- * 
- * The Original Code is NetBeans. The Initial Developer of the Original
- * Code is Jaroslav Tulach. Portions Copyright 2007 Jaroslav Tulach. 
- * All Rights Reserved.
- */
-
 package apipkg;
 
 import implpkg.Accessor;
@@ -36,7 +23,8 @@
     Item() {
     }
     
-    /** Anyone can value of the item. At least if it can get a reference to it.
+    /** Anyone can value of the item. At least if it 
+     * can get a reference to it.
      */
     public void setValue(int x) {
         value = x;
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/gc/test/org/apidesign/gc/SizeTest.java
--- a/samples/gc/test/org/apidesign/gc/SizeTest.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/gc/test/org/apidesign/gc/SizeTest.java	Sat Jun 14 09:56:16 2008 +0200
@@ -12,14 +12,18 @@
     public void measureIsDataLowerThan8No() {
         Data d = new Data();
         
-        NbTestCase.assertSize("The size of the data instance is higher than 8, fail", 8, d);
+        NbTestCase.assertSize(
+            "The size of the data instance is higher than 8, fail", 8, d
+        );
     }
 
     @Test
     public void measureIsDataLowerThan16Yes() {
         // BEGIN: size.measure
         Data d = new Data();
-        NbTestCase.assertSize("The size of the data instance is higher than 16", 16, d);
+        NbTestCase.assertSize(
+            "The size of the data instance is higher than 16", 16, d
+        );
         // END: size.measure
     }
     
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/javabeans/src/org/apidesign/javabeans/with/HighlightsContainer.java
--- a/samples/javabeans/src/org/apidesign/javabeans/with/HighlightsContainer.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/javabeans/src/org/apidesign/javabeans/with/HighlightsContainer.java	Sat Jun 14 09:56:16 2008 +0200
@@ -2,8 +2,8 @@
 
 // BEGIN: javabeans.with.HighlightsContainer
 public interface HighlightsContainer {        
-  public void addHighlightsChangeListener(HighlightsChangeListener listener);
-  public HighlightsSequence getHighlights(int startOffset, int endOffset);
-  public void removeHighlightsChangeListener(HighlightsChangeListener listener);
+  public void addHighlightsChangeListener(HighlightsChangeListener l);
+  public HighlightsSequence getHighlights(int start, int end);
+  public void removeHighlightsChangeListener(HighlightsChangeListener l);
 }
 // END: javabeans.with.HighlightsContainer
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/javabeans/src/org/apidesign/javabeans/without/HighlightsContainer.java
--- a/samples/javabeans/src/org/apidesign/javabeans/without/HighlightsContainer.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/javabeans/src/org/apidesign/javabeans/without/HighlightsContainer.java	Sat Jun 14 09:56:16 2008 +0200
@@ -3,7 +3,7 @@
 // BEGIN: javabeans.without
 public interface HighlightsContainer {        
     public void initialize(Callback callback);
-    public HighlightsSequence getHighlights(int startOffset, int endOffset);
+    public HighlightsSequence getHighlights(int start, int end);
 
     public static final class Callback {
         Callback() { /* only for the infastructure */ }
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java
--- a/samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java	Sat Jun 14 09:56:16 2008 +0200
@@ -22,7 +22,7 @@
     ) {
         if (listener == l) listener = null;
     }
-    public HighlightsSequence getHighlights(int startOffset, int endOffset) {
+    public HighlightsSequence getHighlights(int start, int end) {
         return null; // implement
     }
 // END: javabeans.with.MyHighlightsContainer
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/messagedigest/src-bridge/org/apidesign/impl/security/extension/BridgeToOld.java
--- a/samples/messagedigest/src-bridge/org/apidesign/impl/security/extension/BridgeToOld.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/messagedigest/src-bridge/org/apidesign/impl/security/extension/BridgeToOld.java	Sat Jun 14 09:56:16 2008 +0200
@@ -56,7 +56,9 @@
             String type, String algorithm, String className, 
             List<String> aliases, Map<String, String> attributes
         ) {
-            super(provider, type, algorithm, className, aliases, attributes);
+            super(
+                provider, type, algorithm, className, aliases, attributes
+            );
             this.dig = dig;
         }
 
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/preventcyclicdependencies/src-acyclic1/org/apidesign/cycles/array/MutableArray.java
--- a/samples/preventcyclicdependencies/src-acyclic1/org/apidesign/cycles/array/MutableArray.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/preventcyclicdependencies/src-acyclic1/org/apidesign/cycles/array/MutableArray.java	Sat Jun 14 09:56:16 2008 +0200
@@ -17,7 +17,7 @@
 
     public void encrypt(OutputStream os) throws IOException {
         DoEncode en = Lookup.getDefault().lookup(DoEncode.class);
-        assert en != null : "We need org.netbeans.example.crypt to be enabled!";
+        assert en != null : "org.netbeans.example.crypt missing!";
         byte[] clone = (byte[]) arr.clone();
         en.encode(clone);
         os.write(clone);
diff -r 3bc4c54f4bcc -r 50bf1b976c0d samples/primitiveconstants/src-impl/impl/Impl.java
--- a/samples/primitiveconstants/src-impl/impl/Impl.java	Sat Jun 14 09:56:12 2008 +0200
+++ b/samples/primitiveconstants/src-impl/impl/Impl.java	Sat Jun 14 09:56:16 2008 +0200
@@ -5,7 +5,7 @@
 public class Impl extends API {
     protected void init(int version) throws IllegalStateException {
         if (version != API.VERSION) {
-          throw new IllegalStateException("Not the right API version error!");
+          throw new IllegalStateException("Wrong API version error!");
         }
     }
 // END: theory.binary.constants.impl