Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-02-28 06:57:00 -0500
committerLakshmi Shanmugam2019-04-23 04:41:48 -0400
commitf3e53cf7e6d2794b089e6cbe972dc0caae4a2ea1 (patch)
tree5702e0724da2dd8a455fbd478bf1f9b362045045
parent36a626a59ddfe0f2ba474c7f55b532e132b626b7 (diff)
downloadeclipse.platform.swt-f3e53cf7e6d2794b089e6cbe972dc0caae4a2ea1.tar.gz
eclipse.platform.swt-f3e53cf7e6d2794b089e6cbe972dc0caae4a2ea1.tar.xz
eclipse.platform.swt-f3e53cf7e6d2794b089e6cbe972dc0caae4a2ea1.zip
Bug 462665 - Remove references to Carbon in SWT Java code and comments
Change-Id: I5f6a558564239e64db2aae3c504df604ebb884bb Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.swt.tools/JavadocBasher/org/eclipse/swt/tools/internal/JavadocBasher.java7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java2
-rw-r--r--tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java1
7 files changed, 8 insertions, 10 deletions
diff --git a/bundles/org.eclipse.swt.tools/JavadocBasher/org/eclipse/swt/tools/internal/JavadocBasher.java b/bundles/org.eclipse.swt.tools/JavadocBasher/org/eclipse/swt/tools/internal/JavadocBasher.java
index f8dc4c1d09..0e055fc1e4 100644
--- a/bundles/org.eclipse.swt.tools/JavadocBasher/org/eclipse/swt/tools/internal/JavadocBasher.java
+++ b/bundles/org.eclipse.swt.tools/JavadocBasher/org/eclipse/swt/tools/internal/JavadocBasher.java
@@ -98,15 +98,14 @@ public class JavadocBasher {
"Eclipse SWT Theme", "Eclipse SWT WebKit", };
String sourceSubdir = "win32";
String[] targetSubdirs = new String[] { "cairo", // used by gtk
- // "carbon", // we are no longer maintaining carbon
"cocoa",
// "common",
// "common_j2me",
// "common_j2se",
"emulated", "emulated/bidi", // used by carbon, cocoa
- "emulated/coolbar", // used by carbon, cocoa, gtk
- "emulated/expand", // used by carbon, cocoa
- "emulated/taskbar", // used by carbon, gtk
+ "emulated/coolbar", // used by cocoa, gtk
+ "emulated/expand", // used by cocoa
+ "emulated/taskbar", // used by gtk
"emulated/tooltip", // used by cocoa (?!)
"glx", // used by gtk
"gtk"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java
index d7bfbe4f38..768619dc73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java
@@ -220,7 +220,7 @@ public final class PrinterData extends DeviceData {
* returned from the <code>PrintDialog</code>.
* On GTK, this contains a copy of the print_settings and page_setup
* returned from the <code>PrintDialog</code>.
- * On OS X Carbon, this contains a copy of the PrintSettings and PageFormat
+ * On OS X Cocoa, this contains a copy of the PrintSettings and PageFormat
* returned from the <code>PrintDialog</code>.
* This field is not currently used on the X/Window System.
*/
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
index 1e644731b8..612af9ebb6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
@@ -3928,7 +3928,7 @@ void setPatternPhase(Pattern pattern) {
* is replaced with the source color value.
* <p>
* Note that this mode in fundamentally unsupportable on certain
- * platforms, notably Carbon (Mac OS X). Clients that want their
+ * platforms. Clients that want their
* code to run on all platforms need to avoid this method.
* </p>
*
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index e5d25cc582..cba8bccc1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -78,7 +78,7 @@ public abstract class Control extends Widget implements Drawable {
final static int VISIBLE_REGION = 1 << 12;
/**
- * Magic number comes from experience. There's no API for this value in Cocoa or Carbon.
+ * Magic number comes from experience. There's no API for this value in Cocoa.
*/
static final int DEFAULT_DRAG_HYSTERESIS = 5;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index 14c4d64d9a..61386eda38 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -3791,7 +3791,7 @@ public void setTransform(Transform transform) {
* is replaced with the source color value.
* <p>
* Note that this mode in fundamentally unsupportable on certain
- * platforms, notably Carbon (Mac OS X). Clients that want their
+ * platforms. Clients that want their
* code to run on all platforms need to avoid this method.
* </p>
*
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
index d803d32e2a..240a90995c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
@@ -4729,7 +4729,7 @@ void setLineWidthInPixels(int lineWidth) {
* is replaced with the source color value.
* <p>
* Note that this mode in fundamentally unsupportable on certain
- * platforms, notably Carbon (Mac OS X). Clients that want their
+ * platforms. Clients that want their
* code to run on all platforms need to avoid this method.
* </p>
*
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
index 26589badd2..46870a0956 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
@@ -719,7 +719,6 @@ public void test_setImageILorg_eclipse_swt_graphics_Image() {
@Test
public void test_setImageIndentI() {
if (SwtTestUtil.isCocoa || SwtTestUtil.isGTK) {
- //setImageIndent not implemented on Carbon
tableItem.setImageIndent(1);
return;
}

Back to the top