-
Notifications
You must be signed in to change notification settings - Fork 188
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Change the classes with shortcut #2413
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,14 +12,14 @@ | |
* IBM Corporation - initial API and implementation | ||
*******************************************************************************/ | ||
package org.eclipse.ui.internal.handlers; | ||
|
||
import java.lang.reflect.Method; | ||
import org.eclipse.core.commands.ExecutionEvent; | ||
import org.eclipse.swt.SWT; | ||
import org.eclipse.swt.custom.CTabFolder; | ||
import org.eclipse.swt.custom.CTabItem; | ||
import org.eclipse.swt.widgets.Control; | ||
import org.eclipse.swt.widgets.Display; | ||
import org.eclipse.swt.widgets.Shell; | ||
|
||
/** | ||
* This handler is an adaptation of the widget method handler that implements | ||
* page traversal via {@link SWT#TRAVERSE_PAGE_NEXT} and | ||
|
@@ -28,30 +28,84 @@ | |
* @since 3.5 | ||
*/ | ||
public class TraversePageHandler extends WidgetMethodHandler { | ||
|
||
/** | ||
* The parameters for traverse(int). | ||
*/ | ||
private static final Class<?>[] METHOD_PARAMETERS = { int.class }; | ||
|
||
@Override | ||
public final Object execute(final ExecutionEvent event) { | ||
Control focusControl = Display.getCurrent().getFocusControl(); | ||
if (focusControl != null) { | ||
int traversal = "next".equals(methodName) ? SWT.TRAVERSE_PAGE_NEXT : SWT.TRAVERSE_PAGE_PREVIOUS; //$NON-NLS-1$ | ||
boolean forward = "next".equals(methodName); //$NON-NLS-1$ | ||
int traversal = getTraversalDirection(forward); | ||
Control control = focusControl; | ||
|
||
do { | ||
if (control instanceof CTabFolder folder && isFinalItemInCTabFolder(folder, forward) | ||
&& !areHiddenItems(folder)) { | ||
loopToSecondToFirstItemInCTabFolder(folder, forward); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "loopToSecondToFirstItemInCTabFolder" is not a desirable name. Are you referring to the "second to last" item or to the "second" item? |
||
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)) | ||
return null; | ||
if (control instanceof Shell) | ||
return null; | ||
control = control.getParent(); | ||
} while (control != null); | ||
} | ||
|
||
return null; | ||
} | ||
|
||
private boolean areHiddenItems(CTabFolder folder) { | ||
CTabItem[] items = folder.getItems(); | ||
for (CTabItem i : items) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
if (!i.isShowing()) { | ||
return true; | ||
} | ||
} | ||
|
||
return false; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. by convention, please add a line here |
||
private int getTraversalDirection(boolean direction) { | ||
return direction ? SWT.TRAVERSE_PAGE_NEXT : SWT.TRAVERSE_PAGE_PREVIOUS; | ||
} | ||
|
||
/** | ||
* Sets the current selection to the second-to-last item in the given direction. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. second to last? or second to first? |
||
* | ||
* @param folder the CTabFolder which we want to inspect | ||
* @param forward whether we want to traverse forwards of backwards | ||
*/ | ||
private void loopToSecondToFirstItemInCTabFolder(CTabFolder folder, boolean forward) { | ||
if (forward) { | ||
folder.showItem(folder.getItem(0)); | ||
folder.setSelection(1); | ||
} else { | ||
int itemCount = folder.getItemCount(); | ||
folder.setSelection(itemCount - 2); | ||
} | ||
} | ||
|
||
/**https://github.com/jannisCode/eclipse.jdt.ui.git | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. By convention, the first line of javadoc comments is empty (atleast that's what I have seen everywhere else) |
||
* {@return Returns whether the folder has currently selected the final item in | ||
* the given direction.} | ||
* | ||
* @param folder the CTabFolder which we want to inspect | ||
* @param forward whether we want to traverse forwards of backwards | ||
*/ | ||
private boolean isFinalItemInCTabFolder(CTabFolder folder, boolean forward) { | ||
CTabItem currentFolder = folder.getSelection(); | ||
CTabItem lastFolder = null; | ||
if (forward) { | ||
int itemCount = folder.getItemCount(); | ||
lastFolder = folder.getItem(itemCount - 1); | ||
} else { | ||
lastFolder = folder.getItem(0); | ||
} | ||
return currentFolder.equals(lastFolder); | ||
} | ||
|
||
/** | ||
* Looks up the traverse(int) method on the given focus control. | ||
* | ||
|
@@ -70,5 +124,4 @@ protected Method getMethodToExecute() { | |
} | ||
return null; | ||
} | ||
|
||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please keep the diff clean |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
empty diff