From: <jc...@us...> - 2011-05-17 15:45:49
|
Revision: 19537 http://jedit.svn.sourceforge.net/jedit/?rev=19537&view=rev Author: jchoyt Date: 2011-05-17 15:45:40 +0000 (Tue, 17 May 2011) Log Message: ----------- Reviewed and accepted merge request #2949473 - View#getEditPanes() could be wrong after setSplitConfig() Modified Paths: -------------- jEdit/branches/4.3.x/doc/CHANGES.txt jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java Property Changed: ---------------- jEdit/branches/4.3.x/ Property changes on: jEdit/branches/4.3.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/4.3.x-fix-view-leak:17061 /jEdit/branches/4.3.x-merge-request-2980833:17593 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16751,16754-16755,16805,16846,17145,17163,17219,17242,17388,17395,17408,17443,17479,17499,17545,17561-17562,17653,17723,17762,17836,17838,18030,19353 + /jEdit/branches/4.3.x-fix-view-leak:17061 /jEdit/branches/4.3.x-merge-request-2980833:17593 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:16591-16592,16597,16600,16624,16631,16724,16731,16737-16738,16751,16754-16755,16805,16846,17145,17163,17219,17242,17249-17256,17388,17395,17408,17443,17479,17499,17545,17561-17562,17653,17723,17762,17836,17838,18030,19353 Modified: jEdit/branches/4.3.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.3.x/doc/CHANGES.txt 2011-05-17 07:23:38 UTC (rev 19536) +++ jEdit/branches/4.3.x/doc/CHANGES.txt 2011-05-17 15:45:40 UTC (rev 19537) @@ -2,7 +2,7 @@ {{{ Version 4.3.3 -Thanks to Eric Le Lay, Bj\xF6rn "Vampire" Kautler and Seph Soliman +Thanks to Eric Le Lay, Bj\xF6rn "Vampire" Kautler, Seph Soliman, and Dale Anson for contributing to this release. {{{ Bug Fixes @@ -32,6 +32,11 @@ MOVE drops. It prevents ftp explorer from deleting dropped files (#1208598 - Matthieu Casanova) +- View#getEditPane() could return wrong value after a call of setSplitConfig(), + or resplit() which uses the formar. This could cause some problems including + wrong title of View. + (SF.net Plugin Bug #2939615 - Dale Anson) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java =================================================================== --- jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java 2011-05-17 07:23:38 UTC (rev 19536) +++ jEdit/branches/4.3.x/org/gjt/sp/jedit/View.java 2011-05-17 15:45:40 UTC (rev 19537) @@ -911,6 +911,7 @@ { Component comp = restoreSplitConfig(buffer,splitConfig); setMainContent(comp); + updateTitle(); } catch(IOException e) { @@ -1578,6 +1579,14 @@ mainPanel.remove(mainContent); mainContent = c; mainPanel.add(mainContent, BorderLayout.CENTER); + if (c instanceof JSplitPane) { + splitPane = (JSplitPane)c; + editPane = null; + } + else { + splitPane = null; + editPane = (EditPane)c; + } mainPanel.revalidate(); mainPanel.repaint(); } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |