Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2015-04-09 06:55:48 +0000
committerLars Vogel2015-04-09 07:43:10 +0000
commit20f0171850697bbd54191846f4b1523289117444 (patch)
treee6a46e561946e1b82c0a5aa2039ccf5c2628405e
parente16dc1674bf4fd5c05b02bdc813553a58f5b66be (diff)
downloadeclipse.platform.swt-20f0171850697bbd54191846f4b1523289117444.tar.gz
eclipse.platform.swt-20f0171850697bbd54191846f4b1523289117444.tar.xz
eclipse.platform.swt-20f0171850697bbd54191846f4b1523289117444.zip
Bug 462666 - Remove references to Photon in SWT code and comments
Change-Id: I68a8b79c32413067be38ba17ed89eea8d4f6639f Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.swt.tools/JavadocBasher/org/eclipse/swt/tools/internal/JavadocBasher.java11
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Transfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/emulated/org/eclipse/swt/dnd/Transfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java1
6 files changed, 4 insertions, 16 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 0027f17f2a..ef6c70478e 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
@@ -105,17 +105,14 @@ public class JavadocBasher {
// "common_j2me",
// "common_j2se",
"emulated", "emulated/bidi", // used by carbon, cocoa, dojo,
- // flex, gtk, photon
- "emulated/coolbar", // used by carbon, cocoa, flex, gtk,
- // photon
- "emulated/expand", // used by carbon, cocoa, flex, photon
- "emulated/taskbar", // used by carbon, gtk, photon
- "emulated/tooltip", // used by cocoa (?!), photon
+ "emulated/coolbar", // used by carbon, cocoa, flex, gtk
+ "emulated/expand", // used by carbon, cocoa, flex
+ "emulated/taskbar", // used by carbon, gtk
+ "emulated/tooltip", // used by cocoa (?!)
"gnome", // used by gtk
"glx", // used by gtk
"gtk",
"mozilla", // used by carbon, cocoa, gtk, win32
- // "photon", // we are no longer maintaining photon
// "qt", // folder should be deleted
};
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Transfer.java
index 3d942179f4..85115a89cd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Transfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Transfer.java
@@ -80,7 +80,6 @@ abstract protected String[] getTypeNames();
* <ul>
* <li>Windows: COM.S_OK
* <li>GTK: 1
- * <li>Photon: 1
* </ul></p>
*
* <p>If this transfer agent is unable to perform the conversion, the transferData.result
@@ -88,7 +87,6 @@ abstract protected String[] getTypeNames();
* <ul>
* <li>Windows: COM.DV_E_TYMED or COM.E_FAIL
* <li>GTK: 0
- * <li>Photon: 0
* </ul></p>
*
* @param object a java representation of the data to be converted; the type of
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/emulated/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/emulated/org/eclipse/swt/dnd/Transfer.java
index 66338cbea4..02b36a2c1a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/emulated/org/eclipse/swt/dnd/Transfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/emulated/org/eclipse/swt/dnd/Transfer.java
@@ -78,7 +78,6 @@ abstract protected int[] getTypeIds();
* <ul>
* <li>Windows: COM.S_OK
* <li>GTK: 1
- * <li>Photon: 1
* </ul></p>
*
* <p>If this transfer agent is unable to perform the conversion, the transferData.result
@@ -86,7 +85,6 @@ abstract protected int[] getTypeIds();
* <ul>
* <li>Windows: COM.DV_E_TYMED or COM.E_FAIL
* <li>GTK: 0
- * <li>Photon: 0
* </ul></p>
*
* @param object a java representation of the data to be converted; the type of
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java
index 33e0648feb..905df4406e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Transfer.java
@@ -81,7 +81,6 @@ abstract protected int[] getTypeIds();
* <ul>
* <li>Windows: COM.S_OK
* <li>GTK: 1
- * <li>Photon: 1
* </ul></p>
*
* <p>If this transfer agent is unable to perform the conversion, the transferData.result
@@ -89,7 +88,6 @@ abstract protected int[] getTypeIds();
* <ul>
* <li>Windows: COM.DV_E_TYMED or COM.E_FAIL
* <li>GTK: 0
- * <li>Photon: 0
* </ul></p>
*
* @param object a java representation of the data to be converted; the type of
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java
index ad42a724d9..738973c43f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java
@@ -104,7 +104,6 @@ abstract protected String[] getTypeNames();
* <ul>
* <li>Windows: COM.S_OK
* <li>GTK: 1
- * <li>Photon: 1
* </ul></p>
*
* <p>If this transfer agent is unable to perform the conversion, the transferData.result
@@ -112,7 +111,6 @@ abstract protected String[] getTypeNames();
* <ul>
* <li>Windows: COM.DV_E_TYMED or COM.E_FAIL
* <li>GTK: 0
- * <li>Photon: 0
* </ul></p>
*
* @param object a java representation of the data to be converted; the type of
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
index 5540ba0cb3..52c69f73a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
@@ -27,7 +27,6 @@ public final class FontMetrics {
/**
* On Windows, handle is a Win32 TEXTMETRIC struct
- * On Photon, handle is a Photon FontQueryInfo struct
* (Warning: This field is platform dependent)
* <p>
* <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT

Back to the top