Skip to content

Commit cae8cf7

Browse files
committed
Fixup : Testing and fixing CI
1 parent 2ecc887 commit cae8cf7

File tree

2 files changed

+3
-14
lines changed
  • bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt
  • tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt

2 files changed

+3
-14
lines changed

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@
8989
import org.eclipse.swt.custom.CTabItem;
9090
import org.eclipse.swt.dnd.DND;
9191
import org.eclipse.swt.dnd.DropTarget;
92-
import org.eclipse.swt.dnd.TextTransfer;
93-
import org.eclipse.swt.dnd.Transfer;
9492
import org.eclipse.swt.events.ControlEvent;
9593
import org.eclipse.swt.events.ControlListener;
9694
import org.eclipse.swt.events.MouseAdapter;
@@ -723,21 +721,12 @@ public Object createWidget(MUIElement element, Object parent) {
723721
int styleOverride = getStyleOverride(pStack);
724722
int style = styleOverride == -1 ? SWT.BORDER : styleOverride;
725723
CTabFolder tabFolder = new CTabFolder(parentComposite, style);
726-
// if (PartStackUtil.isEditorStack(element)) {
727-
// createOnboardingControls(tabFolder);
728-
// initializeOnboardingInformationInEditorStack(tabFolder);
729-
// Shell shell = Display.getCurrent().getActiveShell();
730-
// new DropTarget(shell, DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
731-
// }
732-
733724
if (PartStackUtil.isEditorStack(element)) {
734725
createOnboardingControls(tabFolder);
735726
initializeOnboardingInformationInEditorStack(tabFolder);
736727
Label dropLabel = new Label(tabFolder, SWT.NONE);
737-
dropLabel.setText("Drop here"); //$NON-NLS-1$
738728
int drop = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
739-
DropTarget target = new DropTarget(dropLabel, drop);
740-
target.setTransfer(new Transfer[] { TextTransfer.getInstance() }); // or FileTransfer, etc.
729+
new DropTarget(dropLabel, drop);
741730
}
742731
tabFolder.setMRUVisible(getMRUValue());
743732
// Adjust the minimum chars based on the location

tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public void testOnboardingRenderedWithCorrectSizeForEditorStack() {
417417
Composite uiContainer = (Composite) ((StackRenderer) partStack.getRenderer()).getUIContainer(partStack);
418418
CTabFolder tabFolder = (CTabFolder) ((Composite) uiContainer.getChildren()[0]).getChildren()[0];
419419
assertNotNull(tabFolder.getChildren());
420-
assertEquals(3, tabFolder.getChildren().length);
420+
assertEquals(4, tabFolder.getChildren().length);
421421

422422
Composite outerOnboardingComposite = (Composite) tabFolder.getChildren()[2];
423423
Rectangle expected = new Rectangle(StackRenderer.ONBOARDING_SPACING, StackRenderer.ONBOARDING_TOP_SPACING,
@@ -526,7 +526,7 @@ public void testOnboardingIsHiddenWhenEditorOpened() {
526526
Composite uiContainer = (Composite) ((StackRenderer) partStack.getRenderer()).getUIContainer(partStack);
527527
CTabFolder tabFolder = (CTabFolder) ((Composite) uiContainer.getChildren()[0]).getChildren()[0];
528528
assertNotNull(tabFolder.getChildren());
529-
assertEquals(3, tabFolder.getChildren().length);
529+
assertEquals(4, tabFolder.getChildren().length);
530530

531531
Composite outerOnboardingComposite = (Composite) tabFolder.getChildren()[2];
532532
Rectangle expected = new Rectangle(StackRenderer.ONBOARDING_SPACING, StackRenderer.ONBOARDING_TOP_SPACING,

0 commit comments

Comments
 (0)