new functionality

Author: jannisCode

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/TraversePageHandler.java

@@ -39,27 +39,27 @@ public class TraversePageHandler extends WidgetMethodHandler {
 	@Override
 	public final Object execute(final ExecutionEvent event) {
 		Control focusControl = Display.getCurrent().getFocusControl();
-		System.out.println(1);
 		if (focusControl != null) {
 			boolean forward = "next".equals(methodName); //$NON-NLS-1$
-			System.out.println(methodName);
+//			System.out.println(methodName);
 			int traversal = "next".equals(methodName) ? SWT.TRAVERSE_PAGE_NEXT : SWT.TRAVERSE_PAGE_PREVIOUS; //$NON-NLS-1$
 //			int traversal = getTraversalDirection(forward);
 			Control control = focusControl;
 			do {
-				if (control instanceof CTabFolder folder && isFinalItemInCTabFolder(folder, forward)) {
-					System.out.println(isFinalItemInCTabFolder(folder, forward));
+				if (control instanceof CTabFolder folder && isFinalItemInCTabFolder(folder, forward)
+						&& !areHiddenItems(folder)) {
+//					System.out.println(isFinalItemInCTabFolder(folder, forward));
 
 					loopToSecondToFirstItemInCTabFolder(folder, forward);
 					traversal = getTraversalDirection(!forward); // we are in the second-to-last item in the given
 					// direction. Now, use the Traverse-event to move back by one
 				}
 				if (control.traverse(traversal)) {
-					System.out.println("here"); //$NON-NLS-1$
+//					System.out.println("here"); //$NON-NLS-1$
 					return null;
 				}
 				if (control instanceof Shell) {
-					System.out.println("there"); //$NON-NLS-1$
+//					System.out.println("there"); //$NON-NLS-1$
 					return null;
 				}
 				control = control.getParent();
@@ -97,17 +97,41 @@ private void loopToSecondToFirstItemInCTabFolder(CTabFolder folder, boolean forw
 	 * @param forward whether we want to traverse forwards of backwards
 	 */
 	private boolean isFinalItemInCTabFolder(CTabFolder folder, boolean forward) {
+		folder.update();
+
+//		System.out.println("Amount of Items:  " + items); //$NON-NLS-1$
 		CTabItem currentFolder = folder.getSelection();
 		CTabItem lastFolder = null;
 		if (forward) {
 			int itemCount = folder.getItemCount();
+			currentFolder.isShowing();
+//			System.out.println("Item Count:  " + itemCount); //$NON-NLS-1$
+//			System.out.println("Current folder:  " + currentFolder.getText()); //$NON-NLS-1$
+
 			lastFolder = folder.getItem(itemCount - 1);
+//			System.out.println("Last folder:  " + lastFolder.getText()); //$NON-NLS-1$
+//			for (CTabItem i : folder.getItems()) {
+//				System.out.println(i.getText() + " is shown:  " + i.isShowing()); //$NON-NLS-1$
+
+//			}
+
 		} else {
 			lastFolder = folder.getItem(0);
 		}
+//		System.out.println("Current == Last:  " + currentFolder.equals(lastFolder)); //$NON-NLS-1$
+
 		return currentFolder.equals(lastFolder);
 	}
 
+	private boolean areHiddenItems(CTabFolder folder) {
+		for (CTabItem i : folder.getItems()) {
+			if (!i.isShowing()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Looks up the traverse(int) method on the given focus control.
 	 *