/[classpath]/classpath/javax/swing/text/PlainView.java
ViewVC logotype

Diff of /classpath/javax/swing/text/PlainView.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1.2.10 by gnu_andrew, Wed Nov 2 00:44:03 2005 UTC revision 1.1.2.11 by gnu_andrew, Sun Nov 27 21:00:42 2005 UTC
# Line 46  import java.awt.Graphics; Line 46  import java.awt.Graphics;
46  import java.awt.Rectangle;  import java.awt.Rectangle;
47  import java.awt.Shape;  import java.awt.Shape;
48    
49    import javax.swing.SwingConstants;
50  import javax.swing.event.DocumentEvent;  import javax.swing.event.DocumentEvent;
51  import javax.swing.event.DocumentEvent.ElementChange;  import javax.swing.event.DocumentEvent.ElementChange;
52    
# Line 184  public class PlainView extends View impl Line 185  public class PlainView extends View impl
185            
186      JTextComponent textComponent = (JTextComponent) getContainer();      JTextComponent textComponent = (JTextComponent) getContainer();
187    
     g.setFont(textComponent.getFont());  
188      selectedColor = textComponent.getSelectedTextColor();      selectedColor = textComponent.getSelectedTextColor();
189      unselectedColor = textComponent.getForeground();      unselectedColor = textComponent.getForeground();
190      disabledColor = textComponent.getDisabledTextColor();      disabledColor = textComponent.getDisabledTextColor();
# Line 325  public class PlainView extends View impl Line 325  public class PlainView extends View impl
325            
326      Element line = root.getElement(lineClicked);      Element line = root.getElement(lineClicked);
327      Segment s = getLineBuffer();      Segment s = getLineBuffer();
   
328      int start = line.getStartOffset();      int start = line.getStartOffset();
329      int end = line.getEndOffset();      // We don't want the \n at the end of the line.
330        int end = line.getEndOffset() - 1;
331      try      try
332      {        {
333        doc.getText(start, end - start, s);          doc.getText(start, end - start, s);
334      }        }
335      catch (BadLocationException ble)      catch (BadLocationException ble)
336      {        {
337        AssertionError ae = new AssertionError("Unexpected bad location");          AssertionError ae = new AssertionError("Unexpected bad location");
338        ae.initCause(ble);          ae.initCause(ble);
339        throw ae;          throw ae;
340      }        }
341            
342      int pos = Utilities.getTabbedTextOffset(s, metrics, rec.x, (int)x, this, start);      int pos = Utilities.getTabbedTextOffset(s, metrics, rec.x, (int)x, this, start);
343      return Math.max (0, pos);      return Math.max (0, pos);
# Line 512  public class PlainView extends View impl Line 512  public class PlainView extends View impl
512      else      else
513        {        {
514          Rectangle repaintRec = rec0.union(rec1);          Rectangle repaintRec = rec0.union(rec1);
515          host.repaint();          host.repaint(repaintRec.x, repaintRec.y, repaintRec.width,
516                         repaintRec.height);
517        }            }    
518    }    }
519    

Legend:
Removed from v.1.1.2.10  
changed lines
  Added in v.1.1.2.11

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26