diff options
author | Lakshmi Shanmugam | 2017-07-31 12:26:07 +0000 |
---|---|---|
committer | Lakshmi Shanmugam | 2017-07-31 12:38:44 +0000 |
commit | 197a4842258748125ba542759ab1f532f0720dd2 (patch) | |
tree | 0e17274b4e47b53b7dcdb0ded2bc47348ddcf5de /bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom | |
parent | eabbe2aceafc42f5063e41da3194d938a73459e0 (diff) | |
download | eclipse.platform.swt-197a4842258748125ba542759ab1f532f0720dd2.tar.gz eclipse.platform.swt-197a4842258748125ba542759ab1f532f0720dd2.tar.xz eclipse.platform.swt-197a4842258748125ba542759ab1f532f0720dd2.zip |
Revert "Bug 512159 - [CTabFolder] Several getter methods in CTabFolder do not use checkWidget()"
This reverts commit 2727c0c300cefda65f4e3ebfe86674dcc1e639d6.
Adding checkWidget() now would change API behavior and break clients.
Change-Id: Ib209260950b166b1930a35037fd34c6b9c4bed1f
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom')
6 files changed, 23 insertions, 23 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java index b5839cb6b8..daabafb454 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java @@ -191,7 +191,7 @@ char _findMnemonic (String string) { * @return SWT.LEFT, SWT.RIGHT or SWT.CENTER */ public int getAlignment() { - checkWidget(); + //checkWidget(); return align; } /** @@ -202,7 +202,7 @@ public int getAlignment() { * @since 3.6 */ public int getBottomMargin() { - checkWidget(); + //checkWidget(); return bottomMargin; } /** @@ -211,7 +211,7 @@ public int getBottomMargin() { * @return the image of the label or null */ public Image getImage() { - checkWidget(); + //checkWidget(); return image; } /** @@ -222,7 +222,7 @@ public Image getImage() { * @since 3.6 */ public int getLeftMargin() { - checkWidget(); + //checkWidget(); return leftMargin; } /** @@ -233,7 +233,7 @@ public int getLeftMargin() { * @since 3.6 */ public int getRightMargin() { - checkWidget(); + //checkWidget(); return rightMargin; } /** @@ -278,7 +278,7 @@ public int getStyle () { * @return the text of the label or null */ public String getText() { - checkWidget(); + //checkWidget(); return text; } @Override @@ -294,7 +294,7 @@ public String getToolTipText () { * @since 3.6 */ public int getTopMargin() { - checkWidget(); + //checkWidget(); return topMargin; } private void initAccessible() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java index bd847d312e..ecffcf52b8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java @@ -910,7 +910,7 @@ public Rectangle getClientArea() { * </ul> */ public CTabItem getItem (int index) { - checkWidget(); + //checkWidget(); if (index < 0 || index >= items.length) SWT.error(SWT.ERROR_INVALID_RANGE); return items [index]; @@ -927,7 +927,7 @@ public CTabItem getItem (int index) { * </ul> */ public CTabItem getItem (Point pt) { - checkWidget(); + //checkWidget(); if (items.length == 0) return null; runUpdate(); Point size = getSize(); @@ -951,7 +951,7 @@ public CTabItem getItem (Point pt) { * </ul> */ public int getItemCount(){ - checkWidget(); + //checkWidget(); return items.length; } /** @@ -965,7 +965,7 @@ public int getItemCount(){ * </ul> */ public CTabItem [] getItems() { - checkWidget(); + //checkWidget(); CTabItem[] tabItems = new CTabItem [items.length]; System.arraycopy(items, 0, tabItems, 0, items.length); return tabItems; @@ -1171,7 +1171,7 @@ int getRightItemEdge (GC gc){ * </ul> */ public CTabItem getSelection() { - checkWidget(); + //checkWidget(); if (selectedIndex == -1) return null; return items[selectedIndex]; } @@ -1219,7 +1219,7 @@ public Color getSelectionForeground() { * </ul> */ public int getSelectionIndex() { - checkWidget(); + //checkWidget(); return selectedIndex; } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java index 4485878ee7..0c2b5b6e20 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java @@ -145,7 +145,7 @@ public void dispose() { * </ul> */ public Rectangle getBounds () { - checkWidget(); + //checkWidget(); parent.runUpdate(); return new Rectangle(x, y, width, height); } @@ -208,7 +208,7 @@ public Font getFont() { * </ul> */ public CTabFolder getParent () { - checkWidget(); + //checkWidget(); return parent; } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java index 8ced0a81a0..8c2741263a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java @@ -112,7 +112,7 @@ Sash createSash() { */ @Override public int getOrientation() { - checkWidget(); + //checkWidget(); return (sashStyle & SWT.VERTICAL) != 0 ? SWT.HORIZONTAL : SWT.VERTICAL; } /** @@ -146,7 +146,7 @@ public int getStyle() { * @return the control that currently is maximized or null */ public Control getMaximizedControl(){ - checkWidget(); + //checkWidget(); return this.maxControl; } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java index 64f9216af8..e984826810 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java @@ -209,7 +209,7 @@ boolean contains(Control control) { * @return the Always Show Scrollbars flag value */ public boolean getAlwaysShowScrollBars() { - checkWidget(); + //checkWidget(); return alwaysShowScroll; } @@ -289,7 +289,7 @@ public int getMinHeight() { * @return the control displayed in the content area */ public Control getContent() { - checkWidget(); + //checkWidget(); return content; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java index 7e5f559f70..3cd10b832f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java @@ -211,7 +211,7 @@ public Rectangle getClientArea() { * @return the control in the content area of the pane or null */ public Control getContent() { - checkWidget(); + //checkWidget(); return content; } /** @@ -221,7 +221,7 @@ public Control getContent() { * @return the control in the top center of the pane or null */ public Control getTopCenter() { - checkWidget(); + //checkWidget(); return topCenter; } /** @@ -231,7 +231,7 @@ public Control getTopCenter() { * @return the control in the top left corner of the pane or null */ public Control getTopLeft() { - checkWidget(); + //checkWidget(); return topLeft; } /** @@ -241,7 +241,7 @@ public Control getTopLeft() { * @return the control in the top right corner of the pane or null */ public Control getTopRight() { - checkWidget(); + //checkWidget(); return topRight; } void onDispose(Event event) { |