| CODENOTIFIER | HelpYou are not signed inSign in |
Project: jEdit
Revision: 13529
Author: kpouer
Date: 04 Sep 2008 18:16:04
Changes:When a bufferSet is not used, it should be empty so a buffer is closed when it is in no bufferSet, but no need to close it if the bufferSets do not have listeners (it can happens when creating new view)
Files:| ...... | @@ -311,14 +311,15 @@ | |
| 311 | 311 | Set<BufferSet> bufferSets = bufferBufferSetMap.get(buffer); |
| 312 | 312 | if (bufferSets == null) |
| 313 | 313 | return false; |
| 314 | for (BufferSet bs: bufferSets) | |
| 314 | return !bufferSets.isEmpty(); | |
| 315 | /*for (BufferSet bs: bufferSets) | |
| 315 | 316 | { |
| 316 | 317 | if (bs.hasListeners()) |
| 317 | 318 | { |
| 318 | 319 | return true; |
| 319 | 320 | } |
| 320 | 321 | } |
| 321 | return false; | |
| 322 | return false;*/ | |
| 322 | 323 | } //}}} |
| 323 | 324 | |
| 324 | 325 | //{{{ removeBuffer() method |
| ...... | @@ -726,7 +726,7 @@ | |
| 726 | 726 | // the recent buffer is not in the bufferSet |
| 727 | 727 | recentBuffer = null; |
| 728 | 728 | } |
| 729 | if (bufferSet.size() != 0 && bufferSet.indexOf(buffer) == -1) | |
| 729 | if (bufferSet.indexOf(buffer) == -1) | |
| 730 | 730 | { |
| 731 | 731 | // the current buffer is not contained in the bufferSet, we must change the current buffer |
| 732 | 732 | if (recentBuffer != null) |
| ...... | @@ -869,11 +869,8 @@ | |
| 869 | 869 | this.buffer = null; |
| 870 | 870 | if(buffer == null) |
| 871 | 871 | { |
| 872 | Buffer b = bufferSet.getBuffer(0); | |
| 873 | if (b == null) | |
| 872 | if (this.buffer == null) | |
| 874 | 873 | setBuffer(jEdit.getFirstBuffer()); |
| 875 | else | |
| 876 | setBuffer(b); | |
| 877 | 874 | } |
| 878 | 875 | else |
| 879 | 876 | setBuffer(buffer); |