Skip to content

Commit ff4e256

Browse files
elsazacvogella
authored andcommitted
remove deprecated CSS element
1 parent d0e7dd9 commit ff4e256

File tree

4 files changed

+0
-271
lines changed

4 files changed

+0
-271
lines changed

bundles/org.eclipse.e4.ui.css.swt/plugin.xml

-11
Original file line numberDiff line numberDiff line change
@@ -290,17 +290,6 @@
290290
name="font-weight">
291291
</property-name>
292292
</handler>
293-
<handler
294-
adapter="org.eclipse.e4.ui.css.swt.dom.CTabItemElement"
295-
composite="false"
296-
handler="org.eclipse.e4.ui.css.swt.properties.custom.CSSPropertyShowCloseHandler">
297-
<property-name
298-
name="swt-show-close">
299-
</property-name>
300-
<property-name
301-
name="show-close" deprecated="renamed as swt-show-close">
302-
</property-name>
303-
</handler>
304293
<handler
305294
adapter="org.eclipse.e4.ui.css.swt.dom.CTabFolderElement"
306295
composite="false"

bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyShowCloseHandler.java

-150
This file was deleted.

tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ void testRetrievePropertyNull() {
286286
assertEquals(null, engine.retrieveCSSProperty(shell, "swt-maximized", null));
287287
assertEquals(null, engine.retrieveCSSProperty(shell, "swt-maximize-visible", null));
288288
assertEquals(null, engine.retrieveCSSProperty(shell, "swt-minimize-visible", null));
289-
assertEquals(null, engine.retrieveCSSProperty(shell, "show-close", null));
290289
assertEquals(null, engine.retrieveCSSProperty(shell, "swt-simple", null));
291290
assertEquals(null, engine.retrieveCSSProperty(shell, "swt-single", null));
292291
assertEquals(null, engine.retrieveCSSProperty(shell, "swt-unselected-close-visible", null));

tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java

-109
Original file line numberDiff line numberDiff line change
@@ -248,115 +248,6 @@ void testSelectedFontMerged3() {
248248
}
249249
}
250250

251-
private void testShowClose(boolean showClose) {
252-
CTabFolder folder = createTestTabFolder("CTabItem { show-close: " + showClose + " }");
253-
for (CTabItem item : folder.getItems()) {
254-
assertEquals(showClose, item.getShowClose());
255-
assertEquals(Boolean.toString(showClose), engine.retrieveCSSProperty(item, "show-close", null));
256-
}
257-
}
258-
259-
@Test
260-
void testShowCloseFalse() {
261-
testShowClose(false);
262-
}
263-
264-
@Test
265-
void testShowCloseTrue() {
266-
testShowClose(true);
267-
}
268-
269-
@Test
270-
void testShowClose() {
271-
CTabFolder folder = createTestTabFolder("CTabItem { show-close: true }");
272-
for (CTabItem item : folder.getItems()) {
273-
assertTrue(item.getShowClose());
274-
}
275-
276-
engine = createEngine("CTabItem { show-close: false }", folder.getDisplay());
277-
engine.applyStyles(folder.getShell(), true);
278-
for (CTabItem item : folder.getItems()) {
279-
assertFalse(item.getShowClose());
280-
}
281-
}
282-
283-
@Test
284-
void testShowClose2() {
285-
CTabFolder folder = createTestTabFolder();
286-
CTabFolder folder2 = createFolder(folder.getShell());
287-
engine = createEngine("CTabItem { swt-show-close: true }", folder.getDisplay());
288-
engine.applyStyles(folder.getShell(), true);
289-
290-
for (CTabItem item : folder.getItems()) {
291-
assertTrue(item.getShowClose());
292-
}
293-
for (CTabItem item : folder2.getItems()) {
294-
assertTrue(item.getShowClose());
295-
}
296-
297-
engine = createEngine("CTabItem { show-close: false }", folder.getDisplay());
298-
engine.applyStyles(folder.getShell(), true);
299-
for (CTabItem item : folder.getItems()) {
300-
assertFalse(item.getShowClose());
301-
}
302-
for (int i = 0; i < folder.getItemCount(); i++) {
303-
assertFalse(folder2.getItem(i).getShowClose());
304-
}
305-
}
306-
307-
private void testSelectedShowClose(CTabFolder folder, int index) {
308-
CTabItem[] items = folder.getItems();
309-
folder.setSelection(index);
310-
spinEventLoop();
311-
312-
for (int i = 0; i < items.length; i++) {
313-
if (i == index) {
314-
assertTrue(items[i].getShowClose());
315-
assertEquals("true", engine.retrieveCSSProperty(items[i], "show-close", null));
316-
} else {
317-
assertFalse(items[i].getShowClose());
318-
assertEquals("false", engine.retrieveCSSProperty(items[i], "show-close", null));
319-
}
320-
}
321-
}
322-
323-
@Test
324-
void testSelectedShowClose() {
325-
CTabFolder folder = createTestTabFolder("CTabItem:selected { show-close: true }");
326-
for (int i = 0; i < folder.getItemCount(); i++) {
327-
testSelectedShowClose(folder, i);
328-
}
329-
330-
engine = createEngine("CTabItem:selected { show-close: false }", folder.getDisplay());
331-
engine.applyStyles(folder.getShell(), true);
332-
for (CTabItem item : folder.getItems()) {
333-
assertFalse(item.getShowClose());
334-
}
335-
}
336-
337-
@Test
338-
void testSelectedShowClose2() {
339-
CTabFolder folder = createTestTabFolder("CTabItem { show-close: false }\n"
340-
+ "CTabItem:selected { show-close: true }");
341-
for (int i = 0; i < folder.getItemCount(); i++) {
342-
testSelectedShowClose(folder, i);
343-
}
344-
}
345-
346-
@Disabled("test was commented before bug 443094")
347-
@Test
348-
void testClassSelectedShowClose() {
349-
CTabFolder folder = createTestTabFolder();
350-
WidgetElement.setCSSClass(folder, "editorStack");
351-
352-
CSSEngine engine = createEngine("CTabFolder.editorStack CTabItem { show-close: true }", folder.getDisplay());
353-
engine.applyStyles(folder.getShell(), true);
354-
355-
for (CTabItem item : folder.getItems()) {
356-
assertTrue(item.getShowClose());
357-
}
358-
}
359-
360251
@Disabled("test was commented before bug 443094")
361252
@Test
362253
void testFontsEditorStackClass() {

0 commit comments

Comments
 (0)