FCL/sf/app/jrt: comparison javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/org/eclipse/swt/internal/qt/CommandArranger.java

equal deleted inserted replaced

-:71ad690e91f5
+:d6dafc5d983f
 *     Nokia Corporation - initial implementation
 *******************************************************************************/
 package org.eclipse.swt.internal.qt;
 import org.eclipse.ercp.swt.mobile.Command;
+import org.eclipse.ercp.swt.mobile.Internal_MobilePackageSupport;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Decorations;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Internal_PackageSupport;
 import org.eclipse.swt.widgets.Menu;
 *
 * @see Command
 * @see CommandCollection
 * @see CommandPresentationStrategy
 */
-public class CommandArranger {
+public class CommandArranger
+{
-/**
-* A helper for keeping an ordered list of {@link Command}s in the current focus
+/**
-* context. The Commands are ordered according to their proximity to the
+* A helper for keeping an ordered list of {@link Command}s in the current
-* currently focused control. The ordered list starts with Commands from the
+* focus context. The Commands are ordered according to their proximity to
-* currently focused Control if any and ends with the active Shell and includes
+* the currently focused control. The ordered list starts with Commands from
-* all the Commands in between. If a Control has more than one Command they are
+* the currently focused Control if any and ends with the active Shell and
-* ordered among themselves according to creation order.
+* includes all the Commands in between. If a Control has more than one
-*/
+* Command they are ordered among themselves according to creation order.
-public class CommandCollection {
+*/
+public class CommandCollection
+{
 private Command[] fCommands;
 CommandCollection() {
 super();
 }
 /**
-* Adds the command to the collection. Warning: This does not make duplicate
+* Adds the command to the collection. Warning: This does not make
-* control.
+* duplicate control.
 *
 * @param command
 */
 void addCommand(Command command) {
 if (command == null)
 // find the insertion point so that the order is correct
 int insertPoint = 0;
 Shell activeShell = display.getActiveShell();
 Control ctrl = display.getFocusControl();
 while (ctrl != null && ctrl != activeShell) {
-if (ctrl == command.control) {
+if (ctrl == Internal_MobilePackageSupport.control(command)) {
 // Adding a command to focused control increment by one.
 // adding Command.internal_getCommands(ctrl).length will
 // just duplicate the count for Commands already in array.
 insertPoint++;
 break;
 }
-insertPoint += Command.internal_getCommands(ctrl).length;
+insertPoint += Internal_PackageSupport.getCommands(ctrl).length;
 ctrl = ctrl.getParent();
 }
 System.arraycopy(fCommands, 0, newList, 0, insertPoint);
 System.arraycopy(fCommands, insertPoint, newList, insertPoint + 1, fCommands.length
 - insertPoint);
 size = fCommands.length;
 return size;
 }
 /**
-* Retrieves the Commands of the types indicated by the commandTypes array. The
+* Retrieves the Commands of the types indicated by the commandTypes
-* order of the commandTypes array has no significance. Passing a null parameter
+* array. The order of the commandTypes array has no significance.
-* or an empty array retrieves all the available Commands.
+* Passing a null parameter or an empty array retrieves all the
+* available Commands.
 *
 * @param commandTypes
 * @return Command list
 */
 Command[] getCommands(int[] commandTypes) {
 int size = getSize();
 Command[] filteredCommands = new Command[size];
 int index = 0;
 for (int i = 0; i < fCommands.length; i++) {
 for (int j = 0; j < commandTypes.length; j++) {
-if (fCommands[i].type == commandTypes[j]) {
+if (Internal_MobilePackageSupport.type(fCommands[i]) == commandTypes[j]) {
 filteredCommands[index] = fCommands[i];
 index++;
 break;
 }
 }
 Control focusedControl;
 Shell lastKnownActiveShell;
 private Command[] positiveKeyCommands;
 private Command negativeKeyCommand;
 public CommandArranger(Display display) {
 super();
 this.display = display;
 currentCommands = new CommandCollection();
 }
 /**
-* Called when the application changes the QMenuBar. This method does not handle
+* Called when the application changes the QMenuBar. This method does not
-* the cases when the QMenuBar may change when the active top-level Shell
+* handle the cases when the QMenuBar may change when the active top-level
-* changes. Since this does not cause a menu bar change on all platforms.
+* Shell changes. Since this does not cause a menu bar change on all
+* platforms.
 *
 * @see org.eclipse.swt.widgets.Decorations#setMenuBar(Menu)
 *
 **/
 public void menuBarChanged(Decorations decorations) {
 if (display == null) {
 return;
 }
 Shell activeShell = display.getActiveShell();
 if (activeShell == lastKnownActiveShell) {
 return;
 }
 lastKnownActiveShell = activeShell;
 cleanPositiveCommands();
 cleanNegativeCommand();
 currentCommands = new CommandCollection();
-if (activeShell != null && Command.internal_getCommands(activeShell).length > 0) {
+if (activeShell != null && Internal_PackageSupport.getCommands(activeShell).length > 0) {
-currentCommands.addCommand(Command.internal_getCommands(activeShell));
+currentCommands.addCommand(Internal_PackageSupport.getCommands(activeShell));
 }
 // Determine where the commands go
 if (currentCommands.getSize() > 0) {
 Command[] add = currentCommands.getCommands(null);
 * Called when a new Command is created
 *
 * @param command
 */
 public void commandAdded(Command command) {
-if (isInFocusContext(command.control)) {
+if (isInFocusContext(Internal_MobilePackageSupport.control(command))) {
 currentCommands.addCommand(command);
 handleCommandListChange(command, null, currentCommands);
 }
 }
 * @param command
 */
 public void commandRemoved(Command command) {
 if (command == defaultCommand)
 defaultCommand = null;
-if (isInFocusContext(command.control)) {
+if (isInFocusContext(Internal_MobilePackageSupport.control(command))) {
 currentCommands.removeCommand(command);
 handleCommandListChange(null, command, currentCommands);
 }
 }
 * @param command
 * @see Command#setDefaultCommand();
 */
 public void setDefaultCommand(Command command) {
 defaultCommand = command;
-if (isInFocusContext(command.control)) {
+if (isInFocusContext(Internal_MobilePackageSupport.control(command))) {
 handleDefaultCommandChange(command);
 }
 }
 /**
 * @see Command#isDefaultCommand()
 */
 public Command getDefaultCommand() {
 return defaultCommand;
 }
 private boolean isInFocusContext(Control control) {
 Display display = control.getDisplay();
 Shell activeShell = display.getActiveShell();
 return control == activeShell;
 Command cmd = commands[i];
 if (cmd.isDefaultCommand()) {
 defaultCommand = cmd;
 continue;
 }
-if (CommandUtils.isNegativeType(cmd.type)) {
+if (CommandUtils.isNegativeType(Internal_MobilePackageSupport.type(cmd))) {
 if (negativeKeyCommand == null || negativeKeyCommand.isDisposed()) {
 negativeKeyCommand = cmd;
-} else if (negativeKeyCommand.getPriority() <= cmd.getPriority()) {
+}
+else if (negativeKeyCommand.getPriority() <= cmd.getPriority()) {
 positiveKeyCommands[positiveKeyIndex] = negativeKeyCommand;
 positiveKeyIndex++;
 negativeKeyCommand = cmd;
-} else {
+}
+else {
 positiveKeyCommands[positiveKeyIndex] = cmd;
 positiveKeyIndex++;
 }
 continue;
 }
 if ((positiveKeyCommands != null && positiveKeyCommands.length > 1)
 || (defaultCommand != null && positiveKeyCommands != null)) {
 useBar = true;
 }
 if (defaultCommand != null && !defaultCommand.isDisposed()
-&& !defaultCommand.control.isDisposed()) {
+&& !Internal_MobilePackageSupport.control(defaultCommand).isDisposed()) {
 if (useBar) {
-OS.QWidget_removeAction(defaultCommand.control.getShell().internal_getOwnMenuBar(),
+OS.QWidget_removeAction(Internal_MobilePackageSupport.control(defaultCommand)
+.getShell().internal_getOwnMenuBar(), topHandle(defaultCommand));
+}
+else {
+OS.QWidget_removeAction(
+topHandle(Internal_MobilePackageSupport.control(defaultCommand)),
 topHandle(defaultCommand));
-} else {
-OS.QWidget_removeAction(topHandle(defaultCommand.control), topHandle(defaultCommand));
 }
 }
 if (positiveKeyCommands != null) {
 for (int i = 0; i < positiveKeyCommands.length; i++) {
 Command cmd = positiveKeyCommands[i];
-if (cmd == null || cmd.isDisposed() || cmd.control.isDisposed()) {
+if (cmd == null || cmd.isDisposed()
+|| Internal_MobilePackageSupport.control(cmd).isDisposed()) {
 continue;
 }
 int handle = 0;
 if (useBar) {
-handle = cmd.control.getShell().internal_getOwnMenuBar();
+handle = Internal_MobilePackageSupport.control(cmd).getShell()
-} else {
+.internal_getOwnMenuBar();
-handle = topHandle(positiveKeyCommands[0].control);
+}
+else {
+handle = topHandle(Internal_MobilePackageSupport
+.control(positiveKeyCommands[0]));
 }
 OS.QWidget_removeAction(handle, topHandle(cmd));
 }
 }
 }
 private void cleanNegativeCommand() {
 if (negativeKeyCommand != null && !negativeKeyCommand.isDisposed()
-&& !negativeKeyCommand.control.isDisposed()) {
+&& !Internal_MobilePackageSupport.control(negativeKeyCommand).isDisposed()) {
-OS.QWidget_removeAction(topHandle(negativeKeyCommand.control),
+OS.QWidget_removeAction(
+topHandle(Internal_MobilePackageSupport.control(negativeKeyCommand)),
 topHandle(negativeKeyCommand));
 }
 }
 private void placeNegativeCommand() {
 if (negativeKeyCommand != null) {
-OS.QWidget_addAction(Internal_PackageSupport.topHandle(negativeKeyCommand.control),
+OS.QWidget_addAction(Internal_PackageSupport.topHandle(Internal_MobilePackageSupport
-topHandle(negativeKeyCommand));
+.control(negativeKeyCommand)), topHandle(negativeKeyCommand));
 }
 }
 private void placePositiveCommands() {
 if (defaultCommand != null) {
 int defaultCmdHandle = topHandle(defaultCommand);
 if (positiveKeyCommands != null) {
-OS.QMenuBar_addAction(defaultCommand.control.getShell().internal_getOwnMenuBar(),
+OS.QMenuBar_addAction(Internal_MobilePackageSupport.control(defaultCommand)
-defaultCmdHandle);
+.getShell().internal_getOwnMenuBar(), defaultCmdHandle);
-} else {
+}
-OS.QWidget_addAction(Internal_PackageSupport.topHandle(defaultCommand.control),
+else {
+OS.QWidget_addAction(Internal_PackageSupport
+.topHandle(Internal_MobilePackageSupport.control(defaultCommand)),
 defaultCmdHandle);
 }
 }
 if (positiveKeyCommands != null) {
 if (positiveKeyCommands.length == 1 && defaultCommand == null) {
-OS.QWidget_addAction(Internal_PackageSupport.topHandle(positiveKeyCommands[0].control),
+OS.QWidget_addAction(Internal_PackageSupport
+.topHandle(Internal_MobilePackageSupport.control(positiveKeyCommands[0])),
 topHandle(positiveKeyCommands[0]));
-} else {
+}
+else {
 CommandUtils.sort(positiveKeyCommands);
 for (int i = 0; i < positiveKeyCommands.length; i++) {
-OS.QMenuBar_addAction(positiveKeyCommands[i].control.getShell()
+OS.QMenuBar_addAction(
-.internal_getOwnMenuBar(), topHandle(positiveKeyCommands[i]));
+Internal_MobilePackageSupport.control(positiveKeyCommands[i]).getShell()
+.internal_getOwnMenuBar(), topHandle(positiveKeyCommands[i]));
 }
 }
 }
 }

changeset 80	d6dafc5d983f
parent 78	71ad690e91f5