diff options
| author | Simeon Andreev | 2018-06-18 14:35:26 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2018-06-29 20:31:00 +0000 |
| commit | dc5f0644d583806129e33ac522473dee132cc8ab (patch) | |
| tree | b3cf31436768cbe8ccc80569886a20a158f813f9 | |
| parent | e523c6c0267c1c721c4c99e1d64b05623522e257 (diff) | |
| download | eclipse.platform.swt-dc5f0644d583806129e33ac522473dee132cc8ab.tar.gz eclipse.platform.swt-dc5f0644d583806129e33ac522473dee132cc8ab.tar.xz eclipse.platform.swt-dc5f0644d583806129e33ac522473dee132cc8ab.zip | |
Bug 536001 - Debug View expand after collapse doesn't show all threads
Due to caching introduced for bug 497882, TreeItem.setText(int, String)
will call Tree.checkData(TreeItem) via TreeItem.getText(). This appears
to break the Debug View expansion of items, likely due to being called
"too early" if called by TreeItem.setText.
This change avoids the cal to Tree.checkData, since this is not relevant
to the caching mechanism.
Change-Id: Iaf48a3d653d9332887cdcf6ba9e915f77e42a1e8
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java | 5 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java index d33c49fb3f..a0c37b4563 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java @@ -1361,7 +1361,10 @@ public void setImageIndent (int indent) { public void setText (int index, String string) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); - if (getText (index).equals (string)) return; + if (strings == null) { + if (_getText (index).equals (string)) return; + } + else if ( getText (index).equals (string)) return; int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java index edd09b039c..dde34ab1c2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java @@ -1724,7 +1724,10 @@ public void setItemCount (int count) { public void setText (int index, String string) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); - if (getText (index).equals (string)) return; + if (strings == null) { + if (_getText (index).equals (string)) return; + } + else if ( getText (index).equals (string)) return; int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return; |