Bug 552751 - Remove deprecated CSS attributes
This removes all deprecated attributes except show-close as the
adjustment of the unit tests require more time than I have for this
unplanned task.
Change-Id: I4ff46faa93c98dd9623b28a3afedf58308ef11f2
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/bundles/org.eclipse.e4.ui.css.swt/plugin.xml b/bundles/org.eclipse.e4.ui.css.swt/plugin.xml
index 159a8e0..6120106 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/plugin.xml
+++ b/bundles/org.eclipse.e4.ui.css.swt/plugin.xml
@@ -79,9 +79,6 @@
<property-name
name="swt-corner-radius">
</property-name>
- <property-name
- name="corner-radius" deprecated="renamed as swt-corner-radius">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -90,9 +87,6 @@
<property-name
name="swt-tab-renderer">
</property-name>
- <property-name
- name="tab-renderer" deprecated="renamed as swt-tab-renderer">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.ControlElement"
@@ -123,9 +117,6 @@
<property-name
name="swt-unselected-tabs-color">
</property-name>
- <property-name
- name="unselected-tabs-color" deprecated="renamed as swt-unselected-tabs-color">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -150,9 +141,6 @@
<property-name
name="swt-outer-keyline-color">
</property-name>
- <property-name
- name="outer-keyline-color" deprecated="renamed as swt-outer-keyline-color">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -161,9 +149,6 @@
<property-name
name="swt-inner-keyline-color">
</property-name>
- <property-name
- name="inner-keyline-color" deprecated="renamed as swt-swt-inner-keyline-color">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.ControlElement"
@@ -205,9 +190,6 @@
<property-name
name="swt-alignment">
</property-name>
- <property-name
- name="alignment" deprecated="renamed as swt-alignment">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.ControlElement"
@@ -292,7 +274,7 @@
<property-name
name="swt-show-close">
</property-name>
- <property-name
+ <property-name
name="show-close" deprecated="renamed as swt-show-close">
</property-name>
</handler>
@@ -303,9 +285,6 @@
<property-name
name="swt-simple">
</property-name>
- <property-name
- name="simple" deprecated="renamed as swt-simple">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -314,9 +293,6 @@
<property-name
name="swt-maximize-visible">
</property-name>
- <property-name
- name="maximize-visible" deprecated="renamed as swt-maximize-visible">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -325,9 +301,6 @@
<property-name
name="swt-minimize-visible">
</property-name>
- <property-name
- name="minimize-visible" deprecated="renamed as swt-minimize-visible">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -336,9 +309,6 @@
<property-name
name="swt-mru-visible">
</property-name>
- <property-name
- name="mru-visible" deprecated="renamed as swt-mru-visible">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -347,9 +317,6 @@
<property-name
name="swt-maximized">
</property-name>
- <property-name
- name="maximized" deprecated="renamed as swt-maximized">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -358,9 +325,6 @@
<property-name
name="swt-minimized">
</property-name>
- <property-name
- name="minimized" deprecated="renamed as swt-minimized">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -369,9 +333,6 @@
<property-name
name="swt-tab-height">
</property-name>
- <property-name
- name="tab-height" deprecated="renamed as swt-tab-height">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -380,9 +341,6 @@
<property-name
name="swt-single">
</property-name>
- <property-name
- name="single" deprecated="renamed as swt-single">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -391,9 +349,6 @@
<property-name
name="swt-unselected-close-visible">
</property-name>
- <property-name
- name="unselected-close-visible" deprecated="renamed as swt-unselected-close-visible">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -402,9 +357,6 @@
<property-name
name="swt-unselected-image-visible">
</property-name>
- <property-name
- name="unselected-image-visible" deprecated="renamed as swt-unselected-image-visible">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -413,9 +365,6 @@
<property-name
name="swt-selected-tabs-background">
</property-name>
- <property-name
- name="selected-tabs-background" deprecated="renamed as swt-selected-tabs-background">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -424,9 +373,6 @@
<property-name
name="swt-shadow-visible">
</property-name>
- <property-name
- name="shadow-visible" deprecated="renamed as swt-shadow-visible">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -435,9 +381,6 @@
<property-name
name="swt-selected-tab-fill">
</property-name>
- <property-name
- name="selected-tab-fill" deprecated="renamed as selected-tab-fill">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -446,9 +389,6 @@
<property-name
name="swt-tab-outline">
</property-name>
- <property-name
- name="tab-outline" deprecated="renamed as swt-tab-outline">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -457,9 +397,6 @@
<property-name
name="swt-unselected-hot-tab-color-background">
</property-name>
- <property-name
- name="unselected-hot-tab-color-background" deprecated="renamed as swt-unselected-hot-tab-color-background">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
@@ -468,9 +405,6 @@
<property-name
name="swt-shadow-color">
</property-name>
- <property-name
- name="shadow-color" deprecated="renamed as swt-shadow-color">
- </property-name>
</handler>
<handler
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.java
index cf78259..e3857c5 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.java
+++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyTabRendererSWTHandler.java
@@ -29,7 +29,6 @@
public class CSSPropertyTabRendererSWTHandler extends AbstractCSSPropertySWTHandler {
- private boolean backwardsCompatURIsLogged = false;
@Override
protected void applyCSSProperty(Control control, String property,
@@ -40,15 +39,6 @@
if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
if (((CSSPrimitiveValue) value).getPrimitiveType() == CSSPrimitiveValue.CSS_URI) {
String rendURL = ((CSSPrimitiveValue) value).getStringValue();
- // translate old-style platform:/plugin/ class specifiers into new-style bundleclass:// URIs
- if (rendURL.startsWith("platform:/plugin/")) { //$NON-NLS-1$
- if(!backwardsCompatURIsLogged) {
- CSSActivator.getDefault().log(LogService.LOG_ERROR,
- "platform-style URIs deprecated for referencing types: use bundleclass://<bundlename>/<typename>"); //$NON-NLS-1$
- backwardsCompatURIsLogged = true;
- }
- rendURL = rendURL.replace("platform:/plugin/", "bundleclass://"); //$NON-NLS-1$ //$NON-NLS-2$
- }
URI uri = URI.createURI(rendURL);
Bundle bundle = Platform.getBundle(uri.authority());
if (bundle == null) {
diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.java
index 5b4e284..b7d8879 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.java
+++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectHotTabsColorBackgroundHandler.java
@@ -26,8 +26,6 @@
public static final String UNSELECTED_HOT_TAB_COLOR_BACKGROUND = "swt-unselected-hot-tab-color-background";
- public static final String DEPRECATED_UNSELECTED_HOT_TAB_COLOR_BACKGROUND = "unselected-hot-tab-color-background";
-
@Override
protected void applyCSSProperty(Control control, String property,
CSSValue value, String pseudo, CSSEngine engine) throws Exception {
@@ -35,8 +33,7 @@
return;
}
- if (UNSELECTED_HOT_TAB_COLOR_BACKGROUND.equals(property)
- || DEPRECATED_UNSELECTED_HOT_TAB_COLOR_BACKGROUND.equals(property)) {
+ if (UNSELECTED_HOT_TAB_COLOR_BACKGROUND.equals(property)) {
Color newColor = (Color) engine.convert(value, Color.class, control.getDisplay());
CTabFolderRenderer renderer = ((CTabFolder) control).getRenderer();
if (renderer instanceof ICTabRendering) {
diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.java
index 3f10381..f4ba3aa 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.java
+++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyUnselectedTabsSWTHandler.java
@@ -31,8 +31,6 @@
public class CSSPropertyUnselectedTabsSWTHandler extends AbstractCSSPropertySWTHandler {
private static final String UNSELECTED_TABS_COLOR_PROP = "swt-unselected-tabs-color";
- private static final String DEPRECATED_UNSELECTED_TABS_COLOR_PROP = "unselected-tabs-color";
-
private static final String RESIZE_LISTENER = "CSSPropertyUnselectedTabsSWTHandler.resizeListener";
@Override
@@ -84,8 +82,7 @@
}
private boolean isUnselectedTabsColorProp(String property) {
- return UNSELECTED_TABS_COLOR_PROP.equals(property)
- || DEPRECATED_UNSELECTED_TABS_COLOR_PROP.equals(property);
+ return UNSELECTED_TABS_COLOR_PROP.equals(property);
}
// TODO: It needs to be refactored when the Bug 33276 gets fixed
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/ButtonTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/ButtonTest.java
index f3e05c4..6007be7 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/ButtonTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/ButtonTest.java
@@ -120,37 +120,37 @@
@Test
public void testAlignment() {
- Button buttonToTest = createTestButton("Button { alignment: right; }");
+ Button buttonToTest = createTestButton("Button { swt-alignment: right; }");
assertEquals(SWT.RIGHT, buttonToTest.getAlignment());
- buttonToTest = createTestButton("Button { alignment: left; }");
+ buttonToTest = createTestButton("Button { swt-alignment: left; }");
assertEquals(SWT.LEFT, buttonToTest.getAlignment());
- buttonToTest = createTestButton("Button { alignment: center; }");
+ buttonToTest = createTestButton("Button { swt-alignment: center; }");
assertEquals(SWT.CENTER, buttonToTest.getAlignment());
}
@Test
public void testAlignment2() {
- Button buttonToTest = createTestButton("Button { alignment: trail; }");
+ Button buttonToTest = createTestButton("Button { swt-alignment: trail; }");
assertEquals(SWT.TRAIL, buttonToTest.getAlignment());
- buttonToTest = createTestButton("Button { alignment: lead; }");
+ buttonToTest = createTestButton("Button { swt-alignment: lead; }");
assertEquals(SWT.LEAD, buttonToTest.getAlignment());
}
@Test
public void testArrowAlignment() {
- Button buttonToTest = createTestArrowButton("Button { alignment: up; }");
+ Button buttonToTest = createTestArrowButton("Button { swt-alignment: up; }");
assertEquals(SWT.UP, buttonToTest.getAlignment());
- buttonToTest = createTestArrowButton("Button { alignment: down; }");
+ buttonToTest = createTestArrowButton("Button { swt-alignment: down; }");
assertEquals(SWT.DOWN, buttonToTest.getAlignment());
- buttonToTest = createTestArrowButton("Button { alignment: left; }");
+ buttonToTest = createTestArrowButton("Button { swt-alignment: left; }");
assertEquals(SWT.LEFT, buttonToTest.getAlignment());
- buttonToTest = createTestArrowButton("Button { alignment: right; }");
+ buttonToTest = createTestArrowButton("Button { swt-alignment: right; }");
assertEquals(SWT.RIGHT, buttonToTest.getAlignment());
}
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java
index 84ba88e..0dfd829 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java
@@ -188,13 +188,13 @@
}
@Test
public void testSimple() {
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { simple: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-simple: true}");
assertEquals(true, folderToTest.getSimple());
- assertEquals("true", engine.retrieveCSSProperty(folderToTest, "simple", null));
+ assertEquals("true", engine.retrieveCSSProperty(folderToTest, "swt-simple", null));
folderToTest.getShell().close();
- folderToTest = createTestCTabFolder("CTabFolder { simple: false}");
+ folderToTest = createTestCTabFolder("CTabFolder { swt-simple: false}");
assertEquals(false, folderToTest.getSimple());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "simple", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-simple", null));
}
@Test
@@ -205,18 +205,18 @@
folderToTest.getShell().close();
folderToTest = createTestCTabFolder("CTabFolder { swt-maximize-visible: false}");
assertEquals(false, folderToTest.getMaximizeVisible());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "maximize-visible", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-maximize-visible", null));
}
@Test
public void testMinimizeVisible() {
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { minimize-visible: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-minimize-visible: true}");
assertEquals(true, folderToTest.getMinimizeVisible());
- assertEquals("true", engine.retrieveCSSProperty(folderToTest, "minimize-visible", null));
+ assertEquals("true", engine.retrieveCSSProperty(folderToTest, "swt-minimize-visible", null));
folderToTest.getShell().close();
- folderToTest = createTestCTabFolder("CTabFolder { minimize-visible: false}");
+ folderToTest = createTestCTabFolder("CTabFolder { swt-minimize-visible: false}");
assertEquals(false, folderToTest.getMinimizeVisible());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "minimize-visible", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-minimize-visible", null));
}
@Test
@@ -224,12 +224,12 @@
final boolean mruControlledByCSSDefault = CSSPropertyMruVisibleSWTHandler.isMRUControlledByCSS();
try {
CSSPropertyMruVisibleSWTHandler.setMRUControlledByCSS(true);
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { mru-visible: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-mru-visible: true}");
assertEquals(true, folderToTest.getMRUVisible());
- assertEquals("true", engine.retrieveCSSProperty(folderToTest, "mru-visible", null));
+ assertEquals("true", engine.retrieveCSSProperty(folderToTest, "swt-mru-visible", null));
folderToTest.getShell().close();
- folderToTest = createTestCTabFolder("CTabFolder { mru-visible: false}");
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "mru-visible", null));
+ folderToTest = createTestCTabFolder("CTabFolder { swt-mru-visible: false}");
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-mru-visible", null));
assertEquals(false, folderToTest.getMRUVisible());
} finally {
CSSPropertyMruVisibleSWTHandler.setMRUControlledByCSS(mruControlledByCSSDefault);
@@ -241,12 +241,12 @@
final boolean mruControlledByCSSDefault = CSSPropertyMruVisibleSWTHandler.isMRUControlledByCSS();
try {
CSSPropertyMruVisibleSWTHandler.setMRUControlledByCSS(false);
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { mru-visible: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-mru-visible: true}");
assertEquals(false, folderToTest.getMRUVisible());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "mru-visible", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-mru-visible", null));
folderToTest.getShell().close();
- folderToTest = createTestCTabFolder("CTabFolder { mru-visible: false}");
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "mru-visible", null));
+ folderToTest = createTestCTabFolder("CTabFolder { swt-mru-visible: false}");
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-mru-visible", null));
assertEquals(false, folderToTest.getMRUVisible());
} finally {
CSSPropertyMruVisibleSWTHandler.setMRUControlledByCSS(mruControlledByCSSDefault);
@@ -255,22 +255,22 @@
@Test
public void testMaximized() {
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { maximized: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-maximized: true}");
assertEquals(true, folderToTest.getMaximized());
- assertEquals("true", engine.retrieveCSSProperty(folderToTest, "maximized", null));
- folderToTest = createTestCTabFolder("CTabFolder { maximized: false}");
+ assertEquals("true", engine.retrieveCSSProperty(folderToTest, "swt-maximized", null));
+ folderToTest = createTestCTabFolder("CTabFolder { swt-maximized: false}");
assertEquals(false, folderToTest.getMaximized());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "maximized", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-maximized", null));
}
@Test
public void testMinimized() {
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { minimized: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-minimized: true}");
assertEquals(true, folderToTest.getMinimized());
- assertEquals("true", engine.retrieveCSSProperty(folderToTest, "minimized", null));
- folderToTest = createTestCTabFolder("CTabFolder { minimized: false}");
+ assertEquals("true", engine.retrieveCSSProperty(folderToTest, "swt-minimized", null));
+ folderToTest = createTestCTabFolder("CTabFolder { swt-minimized: false}");
assertEquals(false, folderToTest.getMinimized());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "minimized", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-minimized", null));
}
@Test
@@ -303,37 +303,37 @@
@Test
public void testUnselectedCloseVisible() {
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { unselected-close-visible: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-unselected-close-visible true}");
assertEquals(true, folderToTest.getUnselectedCloseVisible());
- assertEquals("true", engine.retrieveCSSProperty(folderToTest, "unselected-close-visible", null));
- folderToTest = createTestCTabFolder("CTabFolder { unselected-close-visible: false}");
+ assertEquals("true", engine.retrieveCSSProperty(folderToTest, "swt-unselected-close-visible", null));
+ folderToTest = createTestCTabFolder("CTabFolder { swt-unselected-close-visible: false}");
assertEquals(false, folderToTest.getUnselectedCloseVisible());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "unselected-close-visible", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-unselected-close-visible", null));
}
@Test
public void testUnselectedImageVisible() {
- CTabFolder folderToTest = createTestCTabFolder("CTabFolder { unselected-image-visible: true}");
+ CTabFolder folderToTest = createTestCTabFolder("CTabFolder { swt-unselected-image-visible: true}");
assertEquals(true, folderToTest.getUnselectedImageVisible());
- assertEquals("true", engine.retrieveCSSProperty(folderToTest, "unselected-image-visible", null));
- folderToTest = createTestCTabFolder("CTabFolder { unselected-image-visible: false}");
+ assertEquals("true", engine.retrieveCSSProperty(folderToTest, "swt-unselected-image-visible", null));
+ folderToTest = createTestCTabFolder("CTabFolder { swt-unselected-image-visible: false}");
assertEquals(false, folderToTest.getUnselectedImageVisible());
- assertEquals("false", engine.retrieveCSSProperty(folderToTest, "unselected-image-visible", null));
+ assertEquals("false", engine.retrieveCSSProperty(folderToTest, "swt-unselected-image-visible", null));
}
@Test
public void testRetrievePropertyNull() {
Shell shell = createShell("Shell {color:red}");
assertEquals(null, engine.retrieveCSSProperty(shell, "border-visible", null));
- assertEquals(null, engine.retrieveCSSProperty(shell, "maximized", null));
+ assertEquals(null, engine.retrieveCSSProperty(shell, "swt-maximized", null));
assertEquals(null, engine.retrieveCSSProperty(shell, "swt-maximize-visible", null));
- assertEquals(null, engine.retrieveCSSProperty(shell, "minimize-visible", null));
- assertEquals(null, engine.retrieveCSSProperty(shell, "mru-visible", null));
+ assertEquals(null, engine.retrieveCSSProperty(shell, "swt-minimize-visible", null));
+ assertEquals(null, engine.retrieveCSSProperty(shell, "swt-mru-visible", null));
assertEquals(null, engine.retrieveCSSProperty(shell, "show-close", null));
- assertEquals(null, engine.retrieveCSSProperty(shell, "simple", null));
- assertEquals(null, engine.retrieveCSSProperty(shell, "single", null));
- assertEquals(null, engine.retrieveCSSProperty(shell, "unselected-close-visible", null));
- assertEquals(null, engine.retrieveCSSProperty(shell, "unselected-image-visible", null));
+ assertEquals(null, engine.retrieveCSSProperty(shell, "swt-simple", null));
+ assertEquals(null, engine.retrieveCSSProperty(shell, "swt-single", null));
+ assertEquals(null, engine.retrieveCSSProperty(shell, "swt-unselected-close-visible", null));
+ assertEquals(null, engine.retrieveCSSProperty(shell, "swt-unselected-image-visible", null));
}
@Test
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
index bd1b85d..dfe2a89 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
@@ -293,7 +293,7 @@
public void testShowClose2() {
CTabFolder folder = createTestTabFolder();
CTabFolder folder2 = createFolder(folder.getShell());
- engine = createEngine("CTabItem { show-close: true }", folder
+ engine = createEngine("CTabItem { swt-show-close: true }", folder
.getDisplay());
engine.applyStyles(folder.getShell(), true);
