WBBRenderer does not need to dispose colors when switching
themes
It is not necessary to dispose colors anymore.
Change-Id: I179052899a85f4fd2d06d4c14512ea909ec3905f
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java
index 797efbc..a575241 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java
@@ -74,7 +74,6 @@
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.events.ShellListener;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Rectangle;
@@ -879,8 +878,7 @@
if (registry instanceof SWTResourcesRegistry) {
return ((SWTResourcesRegistry) registry)
.removeResourcesByKeyTypeAndType(
- ResourceByDefinitionKey.class, Font.class,
- Color.class);
+ ResourceByDefinitionKey.class, Font.class);
}
return Collections.emptyList();
}
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
index 0aa3802..15ae430 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
@@ -38,7 +38,6 @@
import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
import org.eclipse.e4.ui.workbench.renderers.swt.WBWRenderer.ThemeDefinitionChangedHandler;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Resource;
import org.junit.Test;
@@ -79,8 +78,7 @@
SWTResourcesRegistry registry = mock(SWTResourcesRegistry.class);
doReturn(removedResources).when(registry)
- .removeResourcesByKeyTypeAndType(ResourceByDefinitionKey.class,
- Font.class, Color.class);
+ .removeResourcesByKeyTypeAndType(ResourceByDefinitionKey.class, Font.class);
CSSEngine engine = mock(CSSEngine.class);
doReturn(registry).when(engine).getResourcesRegistry();
