Browse Source

Move trim handling to IRCDocument.

Change-Id: Ifdb80c4888932f7e0d169db9756edb85c23faa3d
Reviewed-on: http://gerrit.dmdirc.com/1094
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.4
Greboid 14 years ago
parent
commit
d02f514fb0

+ 0
- 10
src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java View File

61
 import com.dmdirc.ui.core.util.URLHandler;
61
 import com.dmdirc.ui.core.util.URLHandler;
62
 import com.dmdirc.ui.interfaces.InputWindow;
62
 import com.dmdirc.ui.interfaces.InputWindow;
63
 import com.dmdirc.ui.interfaces.Window;
63
 import com.dmdirc.ui.interfaces.Window;
64
-import com.dmdirc.ui.messages.Formatter;
65
 
64
 
66
 import java.awt.Container;
65
 import java.awt.Container;
67
 import java.awt.Dimension;
66
 import java.awt.Dimension;
76
 import java.nio.charset.Charset;
75
 import java.nio.charset.Charset;
77
 import java.nio.charset.IllegalCharsetNameException;
76
 import java.nio.charset.IllegalCharsetNameException;
78
 import java.nio.charset.UnsupportedCharsetException;
77
 import java.nio.charset.UnsupportedCharsetException;
79
-import java.util.Date;
80
-import java.util.LinkedList;
81
-import java.util.List;
82
 import java.util.concurrent.atomic.AtomicBoolean;
78
 import java.util.concurrent.atomic.AtomicBoolean;
83
 import javax.swing.BorderFactory;
79
 import javax.swing.BorderFactory;
84
 import javax.swing.JComponent;
80
 import javax.swing.JComponent;
124
     private SwingSearchBar searchBar;
120
     private SwingSearchBar searchBar;
125
     /** String transcoder. */
121
     /** String transcoder. */
126
     private StringTranscoder transcoder;
122
     private StringTranscoder transcoder;
127
-    /** Frame buffer size. */
128
-    private int frameBufferSize;
129
     /** Are we closing? */
123
     /** Are we closing? */
130
     private boolean closing = false;
124
     private boolean closing = false;
131
     /** Input window for popup commands. */
125
     /** Input window for popup commands. */
150
         frameParent = owner;
144
         frameParent = owner;
151
 
145
 
152
         final ConfigManager config = owner.getConfigManager();
146
         final ConfigManager config = owner.getConfigManager();
153
-        frameBufferSize = config.getOptionInt("ui", "frameBufferSize");
154
 
147
 
155
         setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
148
         setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
156
 
149
 
985
                     != null) {
978
                     != null) {
986
                 getTextPane().setBackground(getConfigManager().
979
                 getTextPane().setBackground(getConfigManager().
987
                         getOptionColour("ui", "backgroundcolour"));
980
                         getOptionColour("ui", "backgroundcolour"));
988
-            } else if ("frameBufferSize".equals(key)) {
989
-                frameBufferSize = getContainer().getConfigManager().
990
-                        getOptionInt("ui", "frameBufferSize");
991
             }
981
             }
992
         }
982
         }
993
     }
983
     }

+ 15
- 27
src/com/dmdirc/addons/ui_swing/textpane/TextPane.java View File

355
         canvas.clearSelection();
355
         canvas.clearSelection();
356
     }
356
     }
357
 
357
 
358
-    /**
359
-     * Trims the document to the specified number of lines.
360
-     *
361
-     * @param numLines Number of lines to trim the document to
362
-     */
363
-    public void trim(final int numLines) {
364
-        if (document.getNumLines() < numLines) {
365
-            return;
366
-        }
367
-        final int trimmedLines = document.getNumLines() - numLines;
368
-        final LinePosition selectedRange = getSelectedRange();
369
-
370
-        selectedRange.setStartLine(selectedRange.getStartLine() - trimmedLines);
371
-        selectedRange.setEndLine(selectedRange.getEndLine() - trimmedLines);
372
-
373
-        if (selectedRange.getStartLine() < 0) {
374
-            selectedRange.setStartLine(0);
375
-        }
376
-        if (selectedRange.getEndLine() < 0) {
377
-            selectedRange.setEndLine(0);
378
-        }
379
-
380
-        setSelectedTexT(selectedRange);
381
-        document.trim(numLines);
382
-    }
383
-
384
     /** Scrolls one page up in the textpane. */
358
     /** Scrolls one page up in the textpane. */
385
     public void pageDown() {
359
     public void pageDown() {
386
         scrollModel.setValue(scrollModel.getValue() + 10);
360
         scrollModel.setValue(scrollModel.getValue() + 10);
409
 
383
 
410
     /** {@inheritDoc}. */
384
     /** {@inheritDoc}. */
411
     @Override
385
     @Override
412
-    public void trimmed(final int numLines) {
386
+    public void trimmed(final int newSize, final int numTrimmed) {
387
+        final LinePosition selectedRange = getSelectedRange();
388
+
389
+        selectedRange.setStartLine(selectedRange.getStartLine() - numTrimmed);
390
+        selectedRange.setEndLine(selectedRange.getEndLine() - numTrimmed);
391
+
392
+        if (selectedRange.getStartLine() < 0) {
393
+            selectedRange.setStartLine(0);
394
+        }
395
+        if (selectedRange.getEndLine() < 0) {
396
+            selectedRange.setEndLine(0);
397
+        }
398
+
399
+        setSelectedTexT(selectedRange);
400
+        
413
         setScrollBarMax(1);
401
         setScrollBarMax(1);
414
     }
402
     }
415
 
403
 

Loading…
Cancel
Save