This revision includes some minor bug fixes including a concurrency

bug in ReaderWriterLockTest and a index-out-bounds-bug in
ConcreteRegionManager.

The following files were modified:

M    src/edu/rice/cs/util/ReaderWriterLockTest.java
M    src/edu/rice/cs/drjava/model/ConcreteRegionManager.java
M    src/edu/rice/cs/drjava/ui/RegionsListPanel.java
M    src/edu/rice/cs/drjava/ui/FindResultsPanel.java
M    src/edu/rice/cs/drjava/ui/BreakpointsPanel.java
M    src/edu/rice/cs/drjava/ui/RegionsTreePanel.java


git-svn-id: file:///tmp/test-svn/trunk@5680 fe72c1cf-3628-48e9-8b72-1c46755d3cff

Author: rcartwright

drjava/src/edu/rice/cs/drjava/model/ConcreteRegionManager.java

@@ -138,7 +138,7 @@ public R getRegionAt(OpenDefinitionsDocument odd, int offset) {
 
   /** Finds the interval of regions in odd such that the line label (excerpt) for the region contains offset. */
   public Pair<R, R> getRegionInterval(OpenDefinitionsDocument odd, int offset) {
-/* */ assert Utilities.TEST_MODE || EventQueue.isDispatchThread();
+    assert Utilities.TEST_MODE || EventQueue.isDispatchThread();
 
 //    System.err.println("getRegionsNear(" + odd + ", " + offset + ") called");
 
@@ -147,8 +147,9 @@ public Pair<R, R> getRegionInterval(OpenDefinitionsDocument odd, int offset) {
      * Since empty regions are ignore (and deleted as soon as they are found), the end of a containing region must be 
      * less than 120 characters from offset.  Find the tail set of all regions [start, end) where offset - 120 < end.
      */
-    @SuppressWarnings("unchecked")
-    SortedSet<R> tail = getTailSet((R) new DocumentRegion(odd, 0, offset - 119));
+    @SuppressWarnings("unchecked") // max operator inserted to ensure that [start,end) interval is non-degenerate.
+    SortedSet<R> tail = getTailSet((R) new DocumentRegion(odd, 0, Math.max(0, offset - 119)));  
+    
 
     /* Search tail, selecting first and last regions r such that r.getLineEnd() >= offset and r.getLineStart <= offset.
      * The tail is totally order on BOTH getLineStart() and getLineEnd() because the functions mapping start to lineStart

drjava/src/edu/rice/cs/drjava/ui/BreakpointsPanel.java

@@ -94,7 +94,7 @@ public void regionChanged(final Breakpoint bp) {
         */
       public void regionRemoved(final Breakpoint bp) { removeRegion(bp); }
     });
-    _debugger = _model.getDebugger();
+    _debugger = getGlobalModel().getDebugger();
   }
 
   /** Action performed when the Enter key is pressed. Should be overridden. */

drjava/src/edu/rice/cs/drjava/ui/FindResultsPanel.java

@@ -67,26 +67,26 @@ public class FindResultsPanel extends RegionsTreePanel<MovingDocumentRegion> {
 
   // The following field has been hoisted into RegionsTreePanel
 //  protected final RegionManager<MovingDocumentRegion> _regionManager;
-  protected final String _searchString;
-  protected final boolean _searchAll;
-  protected final boolean _searchSelectionOnly;
-  protected final boolean _matchCase;
-  protected final boolean _wholeWord;
-  protected final boolean _noComments;
-  protected final boolean _noTestCases;
-  protected final WeakReference<OpenDefinitionsDocument> _doc;
-  protected final FindReplacePanel _findReplace;
-  protected final MovingDocumentRegion _region; //document region used for search limited selection function
+  private final String _searchString;
+  private final boolean _searchAll;
+  private final boolean _searchSelectionOnly;
+  private final boolean _matchCase;
+  private final boolean _wholeWord;
+  private final boolean _noComments;
+  private final boolean _noTestCases;
+  private final WeakReference<OpenDefinitionsDocument> _doc;
+  private final FindReplacePanel _findReplace;
+  private final MovingDocumentRegion _region; //document region used for search limited selection function
 
-  protected JButton _findAgainButton;
-  protected JButton _goToButton;
-  protected JButton _bookmarkButton;
-  protected JButton _removeButton;
-  protected JComboBox<Color> _colorBox;
-  protected int _lastIndex;
+  private volatile JButton _findAgainButton;
+  private volatile JButton _goToButton;
+  private volatile JButton _bookmarkButton;
+  private volatile JButton _removeButton;
+  private volatile JComboBox<Color> _colorBox;
+  private volatile int _lastIndex;
 
   /** Saved option listeners kept in this field so they can be removed for garbage collection  */
-  private LinkedList<Pair<Option<Color>, OptionListener<Color>>> _colorOptionListeners = 
+  private final LinkedList<Pair<Option<Color>, OptionListener<Color>>> _colorOptionListeners = 
     new LinkedList<Pair<Option<Color>, OptionListener<Color>>>();
 
   /** Constructs a new find results panel. This is swing class which should only be accessed from the event thread.
@@ -152,8 +152,8 @@ public void regionChanged(MovingDocumentRegion r) {
   }
 
   class ColorComboRenderer extends JPanel implements ListCellRenderer<Color> {
-    private Color _color = DrJava.getConfig().getSetting(OptionConstants.FIND_RESULTS_COLORS[_colorBox.getSelectedIndex()]);
-    private DefaultListCellRenderer _defaultRenderer = new DefaultListCellRenderer();
+    private volatile Color _color = DrJava.getConfig().getSetting(OptionConstants.FIND_RESULTS_COLORS[_colorBox.getSelectedIndex()]);
+    private final DefaultListCellRenderer _defaultRenderer = new DefaultListCellRenderer();
     private final Dimension _size = new Dimension(0, 20);  
     private final CompoundBorder _compoundBorder = 
       new CompoundBorder(new MatteBorder(2, 10, 2, 10, Color.white), new LineBorder(Color.black));

drjava/src/edu/rice/cs/drjava/ui/RegionsListPanel.java

@@ -59,11 +59,11 @@
   * @version $Id$
   */
 public abstract class RegionsListPanel<R extends IDocumentRegion> extends TabbedPanel {
-  protected volatile JPanel _leftPane;
+  private volatile JPanel _leftPane;
 
-  protected volatile JList<RegionListUserObj<R>> _list;
-  protected volatile DefaultListModel<RegionListUserObj<R>> _listModel;
-  protected String _title;
+  private volatile JList<RegionListUserObj<R>> _list;
+  private volatile DefaultListModel<RegionListUserObj<R>> _listModel;
+  protected volatile String _title;
 
   protected final SingleDisplayModel _model;
   protected final MainFrame _frame;

drjava/src/edu/rice/cs/drjava/ui/RegionsTreePanel.java

@@ -75,8 +75,8 @@ public abstract class RegionsTreePanel<R extends OrderedDocumentRegion> extends
 
   private volatile String _title;
   private volatile RegionManager<R> _regionManager;
-  protected volatile JPopupMenu _regionPopupMenu;
-  protected final SingleDisplayModel _model;
+  private volatile JPopupMenu _regionPopupMenu;
+  private final SingleDisplayModel _model;
   protected final MainFrame _frame;
   protected volatile JPanel _buttonPanel;
 

drjava/src/edu/rice/cs/util/ReaderWriterLockTest.java

@@ -76,7 +76,7 @@ private void _notify() {
   /** Tests that multiple readers can run without causing deadlock. We can't really impose any ordering on their output.
     */
   public void testMultipleReaders() throws InterruptedException {
-    final StringBuilder buf = new StringBuilder();
+    final StringBuffer buf = new StringBuffer();  // StringBuffer is designed for concurrent access
 
     // Create three threads
     ReaderThread r1 = new PrinterReaderThread("r1 ", buf);
@@ -102,7 +102,7 @@ public void testMultipleReaders() throws InterruptedException {
 
   /** Tests that multiple writers run in mutually exclusive intervals without causing deadlock. */
   public void testMultipleWriters() throws InterruptedException {
-    final StringBuilder buf = new StringBuilder();
+    final StringBuffer buf = new StringBuffer();  // StringBuffer is designed for concurrent access
 
     // Create three threads
     WriterThread w1 = new PrinterWriterThread("w1 ", buf);
@@ -226,7 +226,7 @@ public void testCannotReadInAWrite() {
    * enforce that no one interferes with output from a writer.
    */
   public void testMultipleReadersAndWriters() throws InterruptedException {
-    final StringBuilder buf = new StringBuilder();
+    final StringBuffer buf = new StringBuffer();  // StringBuffer is designed for concurrent access
 
     // Create threads
     WriterThread w1 = new PrinterWriterThread("w1 ", buf);
@@ -298,14 +298,14 @@ public void run() {
   /** A ReaderThread which repeatedly prints to a buffer. */
   public class PrinterReaderThread extends ReaderThread {
     PrintCommand _command;
-    public PrinterReaderThread(String msg, final StringBuilder buf) { _command = new PrintCommand(msg, buf); }
+    public PrinterReaderThread(String msg, final StringBuffer buf) { _command = new PrintCommand(msg, buf); }
     public void read() { _command.print(); }
   }
 
   /** A WriterThread which repeatedly prints to a buffer. */
   public class PrinterWriterThread extends WriterThread {
     PrintCommand _command;
-    public PrinterWriterThread(String msg, final StringBuilder buf) { _command = new PrintCommand(msg, buf); }
+    public PrinterWriterThread(String msg, final StringBuffer buf) { _command = new PrintCommand(msg, buf); }
     public void write() { _command.print(); }
   }
 
@@ -316,11 +316,11 @@ public class PrintCommand {
     /** Number of milliseconds to wait between iterations */
     volatile int _waitMillis = 5;
     /** Buffer to print to */
-    final StringBuilder _buf;
+    final StringBuffer _buf;  // StringBuffer is designed for concurrent access
     /** Message to print */
     final String _msg;
     /** Creates a new command to print to a buffer during a read or write. */
-    public PrintCommand(String msg, StringBuilder buf) {
+    public PrintCommand(String msg, StringBuffer buf) {
       _msg = msg;
       _buf = buf;
     }