diff options
22 files changed, 91 insertions, 74 deletions
diff --git a/examples/org.eclipse.swt.examples.browser/.project b/examples/org.eclipse.swt.examples.browser/.project index 25919d4052..6fd5ee59c9 100644 --- a/examples/org.eclipse.swt.examples.browser/.project +++ b/examples/org.eclipse.swt.examples.browser/.project @@ -3,9 +3,6 @@ <name>org.eclipse.swt.examples.browser</name> <comment></comment> <projects> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.swt</project> - <project>org.eclipse.swt.examples</project> </projects> <buildSpec> <buildCommand> diff --git a/examples/org.eclipse.swt.examples.browser/plugin.xml b/examples/org.eclipse.swt.examples.browser/plugin.xml index db5767e1fd..ed246e65ca 100644 --- a/examples/org.eclipse.swt.examples.browser/plugin.xml +++ b/examples/org.eclipse.swt.examples.browser/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.swt.examples.browser" name="%plugin.SWTBrowserExample.name" @@ -14,6 +15,11 @@ </runtime> <!-- Required plugins --> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.swt"/> diff --git a/examples/org.eclipse.swt.examples.browser/src/org/eclipse/swt/examples/browserexample/BrowserPlugin.java b/examples/org.eclipse.swt.examples.browser/src/org/eclipse/swt/examples/browserexample/BrowserPlugin.java index 5e8245566c..cb61fa3454 100644 --- a/examples/org.eclipse.swt.examples.browser/src/org/eclipse/swt/examples/browserexample/BrowserPlugin.java +++ b/examples/org.eclipse.swt.examples.browser/src/org/eclipse/swt/examples/browserexample/BrowserPlugin.java @@ -11,7 +11,6 @@ package org.eclipse.swt.examples.browserexample; -import org.eclipse.core.runtime.*; import org.eclipse.ui.plugin.*; /** @@ -21,14 +20,7 @@ public class BrowserPlugin extends AbstractUIPlugin { /** * The constructor. */ - public BrowserPlugin(IPluginDescriptor descriptor) { - super(descriptor); - } - - /** - * Clean up - */ - public void shutdown() throws CoreException { - super.shutdown(); + public BrowserPlugin() { + super(); } } diff --git a/examples/org.eclipse.swt.examples.controls/.project b/examples/org.eclipse.swt.examples.controls/.project index 6dd25a0fdf..f8c68eb6b4 100644 --- a/examples/org.eclipse.swt.examples.controls/.project +++ b/examples/org.eclipse.swt.examples.controls/.project @@ -3,8 +3,6 @@ <name>org.eclipse.swt.examples.controls</name> <comment></comment> <projects> - <project>org.eclipse.swt</project> - <project>org.eclipse.swt.examples</project> </projects> <buildSpec> <buildCommand> diff --git a/examples/org.eclipse.swt.examples.controls/plugin.xml b/examples/org.eclipse.swt.examples.controls/plugin.xml index f993e682d8..1a110307c1 100755 --- a/examples/org.eclipse.swt.examples.controls/plugin.xml +++ b/examples/org.eclipse.swt.examples.controls/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.swt.examples.controls" name="%plugin.SWTControlsExample.name" @@ -15,6 +16,11 @@ </runtime> <!-- Required plugins --> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.swt"/> diff --git a/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java b/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java index 11469ba3ab..d0a2a3a583 100755 --- a/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java +++ b/examples/org.eclipse.swt.examples.controls/src/org/eclipse/swt/examples/controls/ControlPlugin.java @@ -11,7 +11,6 @@ package org.eclipse.swt.examples.controls; -import org.eclipse.core.runtime.*; import org.eclipse.ui.plugin.*; /** @@ -21,14 +20,7 @@ public class ControlPlugin extends AbstractUIPlugin { /** * The constructor. */ - public ControlPlugin(IPluginDescriptor descriptor) { - super(descriptor); - } - - /** - * Clean up - */ - public void shutdown() throws CoreException { - super.shutdown(); + public ControlPlugin() { + super(); } } diff --git a/examples/org.eclipse.swt.examples.launcher/.project b/examples/org.eclipse.swt.examples.launcher/.project index bcb6941eaa..08cc7ff241 100644 --- a/examples/org.eclipse.swt.examples.launcher/.project +++ b/examples/org.eclipse.swt.examples.launcher/.project @@ -3,8 +3,6 @@ <name>org.eclipse.swt.examples.launcher</name> <comment></comment> <projects> - <project>org.eclipse.swt</project> - <project>org.eclipse.swt.examples</project> </projects> <buildSpec> <buildCommand> diff --git a/examples/org.eclipse.swt.examples.launcher/plugin.xml b/examples/org.eclipse.swt.examples.launcher/plugin.xml index 700d64f1c4..9cb2d6fea3 100755 --- a/examples/org.eclipse.swt.examples.launcher/plugin.xml +++ b/examples/org.eclipse.swt.examples.launcher/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.swt.examples.launcher" name="%plugin.SWTLauncherExample.name" @@ -17,6 +18,11 @@ </runtime> <!-- Required plugins --> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java index 2d6abb35f5..c5e1f316b6 100755 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java @@ -19,6 +19,7 @@ import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.swt.graphics.*; import org.eclipse.ui.plugin.*; +import org.osgi.framework.*; /** * The main plugin class to be used in the desktop. @@ -59,18 +60,22 @@ public class LauncherPlugin extends AbstractUIPlugin { /** * Constructs the LauncherPlugin. */ - public LauncherPlugin(IPluginDescriptor descriptor) { - super(descriptor); + public LauncherPlugin() { + super(); plugin = this; - resourceBundle = descriptor.getResourceBundle(); } + public void start(BundleContext context) throws Exception { + super.start(context); + resourceBundle = Platform.getResourceBundle(getBundle()); + } + /** * Clean up */ - public void shutdown() throws CoreException { - super.shutdown(); + public void stop(BundleContext context) throws Exception { freeResources(); + super.stop(context); } /** @@ -88,7 +93,7 @@ public class LauncherPlugin extends AbstractUIPlugin { images = new Image[imageLocations.length]; for (int i = 0; i < imageLocations.length; ++i) { - images[i] = getImageFromPlugin(plugin.getDescriptor(), imageLocations[i]); + images[i] = getImageFromPlugin(plugin.getBundle(), imageLocations[i]); if (images[i] == null) { freeResources(); logError(getResourceString("error.CouldNotLoadResources"), null); @@ -118,8 +123,8 @@ public class LauncherPlugin extends AbstractUIPlugin { * @param exception the associated exception, or null */ public static void logError(String message, Throwable exception) { - plugin.getLog().log(new Status(IStatus.ERROR, plugin.getDescriptor().getUniqueIdentifier(), - 0, message, exception)); + plugin.getLog().log(new Status( + IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, message, exception)); } /** @@ -162,10 +167,10 @@ public class LauncherPlugin extends AbstractUIPlugin { new ItemTreeNode(new ItemDescriptor("<<Root>>", "<<Root>>", null, null, null, null, null)); // get the platform's public plugin registry - IPluginRegistry pluginRegistry = Platform.getPluginRegistry(); + IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); // retrieve all configuration elements registered at our launchItems extension-point IConfigurationElement[] configurationElements = - pluginRegistry.getConfigurationElementsFor(LAUNCH_ITEMS_POINT_ID); + extensionRegistry.getConfigurationElementsFor(LAUNCH_ITEMS_POINT_ID); if (configurationElements == null || configurationElements.length == 0) { logError(getResourceString("error.CouldNotFindRegisteredExtensions"), null); @@ -348,8 +353,9 @@ public class LauncherPlugin extends AbstractUIPlugin { private static Image getItemIcon(IConfigurationElement ce) { String iconPath = getItemAttribute(ce, LAUNCH_ITEMS_XML_ITEM_ICON, ""); if (iconPath.length() != 0) { - Image icon = getImageFromPlugin(ce.getDeclaringExtension().getDeclaringPluginDescriptor(), - iconPath); + String symbolicName = ce.getDeclaringExtension().getNamespace(); + Bundle bundle = Platform.getBundle(symbolicName); + Image icon = getImageFromPlugin(bundle, iconPath); if (icon != null) { Image[] newImages = new Image[images.length + 1]; System.arraycopy(images, 0, newImages, 0, images.length); @@ -364,14 +370,14 @@ public class LauncherPlugin extends AbstractUIPlugin { /** * Gets an image from a path relative to the plugin install directory. * - * @param pd the plugin descriptor for the plugin with the image + * @param bundle the plugin descriptor for the plugin with the image * @param iconPath the path relative to the install directory * @return the image, or null if not found */ - private static Image getImageFromPlugin(IPluginDescriptor pd, String iconPath) { + private static Image getImageFromPlugin(Bundle bundle, String iconPath) { InputStream is = null; try { - URL installUrl = pd.getInstallURL(); + URL installUrl = bundle.getEntry("/"); URL url = new URL(installUrl, iconPath); is = url.openConnection().getInputStream(); ImageData source = new ImageData(is); diff --git a/examples/org.eclipse.swt.examples.layouts/.project b/examples/org.eclipse.swt.examples.layouts/.project index e5d7079d5d..a6fc2cb975 100644 --- a/examples/org.eclipse.swt.examples.layouts/.project +++ b/examples/org.eclipse.swt.examples.layouts/.project @@ -3,8 +3,6 @@ <name>org.eclipse.swt.examples.layouts</name> <comment></comment> <projects> - <project>org.eclipse.swt</project> - <project>org.eclipse.swt.examples</project> </projects> <buildSpec> <buildCommand> diff --git a/examples/org.eclipse.swt.examples.layouts/plugin.xml b/examples/org.eclipse.swt.examples.layouts/plugin.xml index b94a1a2cde..3cac276945 100644 --- a/examples/org.eclipse.swt.examples.layouts/plugin.xml +++ b/examples/org.eclipse.swt.examples.layouts/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.swt.examples.layouts" name="%plugin.SWTLayoutExample.name" @@ -15,6 +16,11 @@ </runtime> <!-- Required plugins --> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.swt"/> diff --git a/examples/org.eclipse.swt.examples.layouts/src/org/eclipse/swt/examples/layouts/LayoutPlugin.java b/examples/org.eclipse.swt.examples.layouts/src/org/eclipse/swt/examples/layouts/LayoutPlugin.java index d207dfdfc0..2f9763335f 100644 --- a/examples/org.eclipse.swt.examples.layouts/src/org/eclipse/swt/examples/layouts/LayoutPlugin.java +++ b/examples/org.eclipse.swt.examples.layouts/src/org/eclipse/swt/examples/layouts/LayoutPlugin.java @@ -11,7 +11,6 @@ package org.eclipse.swt.examples.layouts; -import org.eclipse.core.runtime.*; import org.eclipse.ui.plugin.*; /** @@ -21,14 +20,7 @@ public class LayoutPlugin extends AbstractUIPlugin { /** * The constructor. */ - public LayoutPlugin(IPluginDescriptor descriptor) { - super(descriptor); - } - - /** - * Clean up - */ - public void shutdown() throws CoreException { - super.shutdown(); + public LayoutPlugin() { + super(); } } diff --git a/examples/org.eclipse.swt.examples.ole.win32/.project b/examples/org.eclipse.swt.examples.ole.win32/.project index 9ea059d7d5..ff00f68d20 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/.project +++ b/examples/org.eclipse.swt.examples.ole.win32/.project @@ -3,7 +3,6 @@ <name>org.eclipse.swt.examples.ole.win32</name> <comment></comment> <projects> - <project>org.eclipse.swt</project> </projects> <buildSpec> <buildCommand> diff --git a/examples/org.eclipse.swt.examples.ole.win32/plugin.xml b/examples/org.eclipse.swt.examples.ole.win32/plugin.xml index 551c966c29..d7a9dcc973 100755 --- a/examples/org.eclipse.swt.examples.ole.win32/plugin.xml +++ b/examples/org.eclipse.swt.examples.ole.win32/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <!-- File written by PDE 1.0 --> <plugin id="org.eclipse.swt.examples.ole.win32" @@ -8,6 +9,11 @@ class="org.eclipse.swt.examples.ole.win32.OlePlugin"> <!-- Required plugins --> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java index e70dc54d00..88c8dc65d4 100755 --- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java +++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.*; import org.eclipse.swt.*; import org.eclipse.swt.graphics.*; import org.eclipse.ui.plugin.*; +import org.osgi.framework.*; /** * The main plugin class to be used in the desktop. @@ -49,18 +50,22 @@ public class OlePlugin extends AbstractUIPlugin { /** * Constructs an OLE plugin. */ - public OlePlugin(IPluginDescriptor descriptor) { - super(descriptor); + public OlePlugin() { + super(); plugin = this; - resourceBundle = descriptor.getResourceBundle(); } + public void start(BundleContext context) throws Exception { + super.start(context); + resourceBundle = Platform.getResourceBundle(getBundle()); + } + /** * Clean up */ - public void shutdown() throws CoreException { - super.shutdown(); + public void stop(BundleContext context) throws Exception { freeResources(); + super.stop(context); } /** @@ -107,8 +112,8 @@ public class OlePlugin extends AbstractUIPlugin { * @param exception the associated exception, or null */ public static void logError(String message, Throwable exception) { - plugin.getLog().log(new Status(IStatus.ERROR, plugin.getDescriptor().getUniqueIdentifier(), - 0, message, exception)); + plugin.getLog().log(new Status( + IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, message, exception)); } /** @@ -119,7 +124,7 @@ public class OlePlugin extends AbstractUIPlugin { images = new Image[imageLocations.length]; for (int i = 0; i < imageLocations.length; ++i) { - images[i] = getImageFromPlugin(plugin.getDescriptor(), imageLocations[i]); + images[i] = getImageFromPlugin(plugin.getBundle(), imageLocations[i]); if (images[i] == null) { freeResources(); logError(getResourceString("error.CouldNotLoadResources"), null); @@ -162,10 +167,10 @@ public class OlePlugin extends AbstractUIPlugin { * @param iconPath the path relative to the install directory * @return the image, or null if not found */ - private static Image getImageFromPlugin(IPluginDescriptor pd, String iconPath) { + private static Image getImageFromPlugin(Bundle bundle, String iconPath) { InputStream is = null; try { - URL installUrl = pd.getInstallURL(); + URL installUrl = bundle.getEntry("/"); URL url = new URL(installUrl, iconPath); is = url.openConnection().getInputStream(); ImageData source = new ImageData(is); diff --git a/examples/org.eclipse.swt.examples.paint/.project b/examples/org.eclipse.swt.examples.paint/.project index be659d3d57..8d39af0053 100644 --- a/examples/org.eclipse.swt.examples.paint/.project +++ b/examples/org.eclipse.swt.examples.paint/.project @@ -3,7 +3,6 @@ <name>org.eclipse.swt.examples.paint</name> <comment></comment> <projects> - <project>org.eclipse.swt</project> </projects> <buildSpec> <buildCommand> diff --git a/examples/org.eclipse.swt.examples.paint/plugin.xml b/examples/org.eclipse.swt.examples.paint/plugin.xml index 9e2614aad2..97b37506fc 100755 --- a/examples/org.eclipse.swt.examples.paint/plugin.xml +++ b/examples/org.eclipse.swt.examples.paint/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.swt.examples.paint" name="%plugin.SWTPaintExample.name" @@ -14,6 +15,11 @@ </runtime> <!-- Required plugins --> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> diff --git a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java index d2f314ef74..5dc3ec57b3 100755 --- a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java +++ b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintPlugin.java @@ -13,6 +13,7 @@ package org.eclipse.swt.examples.paint; import org.eclipse.core.runtime.*; import org.eclipse.ui.plugin.*; +import org.osgi.framework.BundleContext; import java.text.*; import java.util.*; @@ -28,10 +29,9 @@ public class PaintPlugin extends AbstractUIPlugin { /** * Constructs the Paint plugin. */ - public PaintPlugin(IPluginDescriptor descriptor) { - super(descriptor); + public PaintPlugin() { + super(); plugin = this; - resourceBundle = descriptor.getResourceBundle(); } /** @@ -48,8 +48,8 @@ public class PaintPlugin extends AbstractUIPlugin { * @param exception the associated exception, or null */ public static void logError(String message, Throwable exception) { - plugin.getLog().log(new Status(IStatus.ERROR, plugin.getDescriptor().getUniqueIdentifier(), - 0, message, exception)); + plugin.getLog().log( + new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, message, exception)); } /** @@ -81,4 +81,9 @@ public class PaintPlugin extends AbstractUIPlugin { return "!" + key + "!"; } } + + public void start(BundleContext context) throws Exception { + super.start(context); + resourceBundle = Platform.getResourceBundle(getBundle()); + } } diff --git a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java index 5fb8970b6f..b194b52449 100755 --- a/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java +++ b/examples/org.eclipse.swt.examples.paint/src/org/eclipse/swt/examples/paint/PaintView.java @@ -445,7 +445,7 @@ public class PaintView extends ViewPart { setId(id); try { - final URL installUrl = PaintPlugin.getDefault().getDescriptor().getInstallURL(); + final URL installUrl = PaintPlugin.getDefault().getBundle().getEntry("/"); final URL imageUrl = new URL(installUrl, PaintPlugin.getResourceString(id + ".image")); setImageDescriptor(ImageDescriptor.createFromURL(imageUrl)); } catch (MalformedURLException e) { diff --git a/examples/org.eclipse.swt.examples/.project b/examples/org.eclipse.swt.examples/.project index 069b3a1b00..7277259e47 100644 --- a/examples/org.eclipse.swt.examples/.project +++ b/examples/org.eclipse.swt.examples/.project @@ -3,7 +3,6 @@ <name>org.eclipse.swt.examples</name> <comment></comment> <projects> - <project>org.eclipse.swt</project> </projects> <buildSpec> <buildCommand> diff --git a/examples/org.eclipse.swt.examples/plugin.xml b/examples/org.eclipse.swt.examples/plugin.xml index f56d1dfb2b..019f7497b2 100755 --- a/examples/org.eclipse.swt.examples/plugin.xml +++ b/examples/org.eclipse.swt.examples/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <!-- File written by PDE 1.0 --> <plugin id="org.eclipse.swt.examples" diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java index 423571d927..214b6323ca 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java @@ -235,7 +235,7 @@ class CTabFolderTab extends Tab { */ void hookCustomListener (final String eventName) { if (eventName == "CTabFolderEvent") { - tabFolder1.addCTabFolderListener (new CTabFolderAdapter () { + tabFolder1.addCTabFolder2Listener (new CTabFolder2Adapter () { public void itemClosed (CTabFolderEvent event) { log (eventName, event); } |