diff options
| author | Markus Keller | 2015-11-02 18:07:26 +0000 |
|---|---|---|
| committer | Markus Keller | 2015-11-02 18:07:26 +0000 |
| commit | 7082dd9c9ab28760ad0148f50b8dd66bdb6622f7 (patch) | |
| tree | c4eed60ca49fe8cf50949d5ad7db6f5da98e8499 /bundles/org.eclipse.swt/Eclipse SWT/emulated | |
| parent | 7b95e78e991bc71e9e2b321efd5d25434257ad44 (diff) | |
| download | eclipse.platform.swt-7082dd9c9ab28760ad0148f50b8dd66bdb6622f7.tar.gz eclipse.platform.swt-7082dd9c9ab28760ad0148f50b8dd66bdb6622f7.tar.xz eclipse.platform.swt-7082dd9c9ab28760ad0148f50b8dd66bdb6622f7.zip | |
Bug 462633: Enable save actions for annotations
Added missing @Override/@Deprecated in cocoa
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/emulated')
2 files changed, 9 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java index fc2e9dc3fc..9bf32060d4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java @@ -151,10 +151,12 @@ static int checkStyle (int style) { return style & ~SWT.H_SCROLL; } +@Override protected void checkSubclass () { if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS); } +@Override public Point computeSize (int wHint, int hHint, boolean changed) { checkWidget (); int height = 0, width = 0; @@ -226,6 +228,7 @@ int getBandHeight () { return Math.max (ExpandItem.CHEVRON_SIZE, metrics.getHeight ()); } +@Override public Color getForeground () { checkWidget (); if (foreground == null) { @@ -379,6 +382,7 @@ public void removeExpandListener (ExpandListener listener) { eventTable.unhook (SWT.Collapse, listener); } +@Override void reskinChildren (int flags) { if (items != null) { for (int i=0; i<items.length; i++) { @@ -389,12 +393,14 @@ void reskinChildren (int flags) { super.reskinChildren (flags); } +@Override public void setFont(Font font) { super.setFont (font); this.font = font; layoutItems (0, true); } +@Override public void setForeground (Color color) { super.setForeground (color); foreground = color; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandItem.java index a8fca05283..f39154e3d6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandItem.java @@ -115,6 +115,7 @@ static ExpandBar checkNull (ExpandBar control) { return control; } +@Override public void dispose () { if (isDisposed ()) return; //if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS); @@ -349,6 +350,7 @@ public void setExpanded (boolean expanded) { parent.showItem (this); } +@Override public void setImage (Image image) { super.setImage (image); int oldImageHeight = imageHeight; @@ -384,6 +386,7 @@ public void setHeight (int height) { if (expanded) parent.layoutItems (parent.indexOf (this) + 1, true); } +@Override public void setText (String string) { super.setText (string); redraw (); |