From: Calixte DENIZET Date: Wed, 23 Nov 2011 09:07:41 +0000 (+0100) Subject: Desktop: remove a faulty tab entry in the xml X-Git-Tag: 5.4.0-alpha-1~96 X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=7a3794c9922fac94b32c73bcf65c9f9625f39002 Desktop: remove a faulty tab entry in the xml Change-Id: I2be944679a8979f70f1a19dab008af35e90dd9b3 --- diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/tabfactory/ScilabTabFactory.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/tabfactory/ScilabTabFactory.java index dc9b288..499ef78 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/tabfactory/ScilabTabFactory.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/tabfactory/ScilabTabFactory.java @@ -128,6 +128,7 @@ public class ScilabTabFactory extends DockableFactory.Stub { } } + WindowsConfigurationManager.removeNode(uuid); return makeEmptyTab(uuid); } diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java index dc3b915..1a087e2 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java @@ -575,6 +575,21 @@ public class WindowsConfigurationManager { } /** + * Remove a node with a given uuid + * @param nodeName the node name + * @param uuid the uuid + */ + public static final void removeNode(String uuid) { + if (uuid == null || uuid.isEmpty()) { + return; + } + Element e = getElementWithUUID(uuid); + if (e != null && e.getParentNode() != null) { + e.getParentNode().removeChild(e); + } + } + + /** * Save the tab properties * @param tab the tab * @param nullWin if true, the winuuid will be set to 0 (the tab is not docked)