Changeset 90:7ffeace6c47f

Show
Ignore:
Timestamp:
07/06/08 17:30:07 (5 months ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

Update 3.4M7 to 3.4

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwtx/core/commands/Command.d

    r71 r90  
    4646import dwt.dwthelper.utils; 
    4747import tango.text.convert.Format; 
     48import tango.io.Stdout; 
    4849 
    4950/** 
    …… 
    863864        } 
    864865 
    865         return handler.isEnabled(); 
     866        try { 
     867            return handler.isEnabled(); 
     868        } catch (Exception e) { 
     869            if (DEBUG_HANDLERS) { 
     870                // since this has the ability to generate megs of logs, only 
     871                // provide information if tracing 
     872                Tracing.printTrace("HANDLERS", "Handler " ~ (cast(Object)handler).toString()  ~ " for "  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ 
     873                        ~ id ~ " threw unexpected exception"); //$NON-NLS-1$ 
     874                ExceptionPrintStackTrace( e, Stdout ); 
     875            } 
     876        } 
     877        return false; 
    866878    } 
    867879 

  • dwtx/core/commands/CommandManager.d

    r70 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2004, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2004, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 

  • dwtx/core/commands/common/CommandException.d

    r70 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2004, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2004, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 

  • dwtx/core/runtime/Path.d

    r72 r90  
    1919import dwt.dwthelper.utils; 
    2020 
    21 import tango.io.FileConst; 
     21import tango.io.model.IFile; 
    2222 
    2323static import tango.text.Text; 

  • dwtx/jface/action/AbstractGroupMarker.d

    r43 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    2424 * This class is not intended to be subclassed outside the framework. 
    2525 * </p> 
     26 * @noextend This class is not intended to be subclassed by clients. 
    2627 */ 
    2728public abstract class AbstractGroupMarker : ContributionItem { 

  • dwtx/jface/action/ActionContributionItem.d

    r72 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    6060 * This class may be instantiated; it is not intended to be subclassed. 
    6161 * </p> 
     62 * @noextend This class is not intended to be subclassed by clients. 
    6263 */ 
    6364public class ActionContributionItem : ContributionItem { 

  • dwtx/jface/action/ContributionManager.d

    r72 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 

  • dwtx/jface/action/CoolBarManager.d

    r70 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2003, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2003, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 

  • dwtx/jface/action/ExternalActionManager.d

    r72 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    437437        } 
    438438 
     439        /** 
     440         * @since 3.4 
     441         */ 
    439442        public void preExecute(IAction action, Event event) { 
    440443            String actionDefinitionId = action.getActionDefinitionId(); 
    …… 
    450453        } 
    451454 
     455        /** 
     456         * @since 3.4 
     457         */ 
    452458        public void postExecuteSuccess(IAction action, Object returnValue) { 
    453459            String actionDefinitionId = action.getActionDefinitionId(); 
    …… 
    459465        } 
    460466 
     467        /** 
     468         * @since 3.4 
     469         */ 
    461470        public void postExecuteFailure(IAction action, 
    462471                ExecutionException exception) { 
    …… 
    469478        } 
    470479 
     480        /** 
     481         * @since 3.4 
     482         */ 
    471483        public void notDefined(IAction action, NotDefinedException exception) { 
    472484            String actionDefinitionId = action.getActionDefinitionId(); 
    …… 
    478490        } 
    479491 
     492        /** 
     493         * @since 3.4 
     494         */ 
    480495        public void notEnabled(IAction action, NotEnabledException exception) { 
    481496            String actionDefinitionId = action.getActionDefinitionId(); 

  • dwtx/jface/action/GroupMarker.d

    r43 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    2727 * subclassed outside the framework. 
    2828 * </p> 
     29 * @noextend This class is not intended to be subclassed by clients. 
    2930 */ 
    3031public class GroupMarker : AbstractGroupMarker { 

  • dwtx/jface/action/IAction.d

    r70 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2005 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    4646 * 
    4747 * @see Action 
     48 * @noimplement This interface is not intended to be implemented by clients. 
    4849 */ 
    4950public interface IAction { 

  • dwtx/jface/action/IContributionItem.d

    r16 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    4242 * 
    4343 * @see IContributionManager 
     44 * @noimplement This interface is not intended to be implemented by clients. 
    4445 */ 
    4546public interface IContributionItem { 

  • dwtx/jface/action/IContributionManager.d

    r70 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 

  • dwtx/jface/action/IContributionManagerOverrides.d

    r70 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    2727 * 
    2828 * @since 2.0 
     29 * @noimplement This interface is not intended to be implemented by clients. 
    2930 */ 
    3031public interface IContributionManagerOverrides { 

  • dwtx/jface/action/IMenuManager.d

    r28 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2005 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    3232 * {@link MenuManager <code>MenuManager</code>}. 
    3333 * </p> 
     34 * @noimplement This interface is not intended to be implemented by clients. 
    3435 */ 
    3536public interface IMenuManager : IContributionManager, IContributionItem { 

  • dwtx/jface/action/MenuManager.d

    r71 r90  
    610610     * @return <code>true</code> if the control is created 
    611611     *  and not disposed, <code>false</code> otherwise 
     612     * @since 3.4 protected, was added in 3.1 as private method 
    612613     */ 
    613614    protected bool menuExist() { 

  • dwtx/jface/action/Separator.d

    r43 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    3232 * subclassed outside the framework. 
    3333 * </p> 
     34 * @noextend This class is not intended to be subclassed by clients. 
    3435 */ 
    3536public class Separator : AbstractGroupMarker { 

  • dwtx/jface/action/SubContributionItem.d

    r16 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    3030 * This class is not intended to be subclassed. 
    3131 * </p> 
     32 * @noextend This class is not intended to be subclassed by clients. 
    3233 */ 
    3334public class SubContributionItem : IContributionItem { 

  • dwtx/jface/action/ToolBarContributionItem.d

    r43 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    6060 * 
    6161 * @since 3.0 
     62 * @noextend This class is not intended to be subclassed by clients. 
    6263 */ 
    6364public class ToolBarContributionItem : ContributionItem, IToolBarContributionItem { 

  • dwtx/jface/bindings/BindingManager.d

    r71 r90  
    12821282     * @param command 
    12831283     * @return 
    1284      *      blah 
     1284     *      a trigger sequence, or <code>null</code> 
     1285     * @since 3.4 
    12851286     */ 
    12861287    public final TriggerSequence getBestActiveBindingFor(ParameterizedCommand command) { 

  • dwtx/jface/dialogs/DialogSettings.d

    r40 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    6464 * </code> 
    6565 * </pre> 
     66 * @noextend This class is not intended to be subclassed by clients. 
    6667 */ 
    6768 

  • dwtx/jface/dialogs/PopupDialog.d

    r72 r90  
    295295     * Image registry key for menu image. 
    296296     * 
    297      * @since 3.3 
     297     * @since 3.4 
    298298     */ 
    299299    public static const String POPUP_IMG_MENU = "popup_menu_image"; //$NON-NLS-1$ 
    …… 
    302302     * Image registry key for disabled menu image. 
    303303     * 
    304      * @since 3.3 
     304     * @since 3.4 
    305305     */ 
    306306    public static const String POPUP_IMG_MENU_DISABLED = "popup_menu_image_diabled"; //$NON-NLS-1$ 

  • dwtx/jface/fieldassist/ComboContentAdapter.d

    r72 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2005, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2005, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    133133    } 
    134134 
    135     /* 
    136      * (non-Javadoc) 
    137      * 
     135    /** 
    138136     * @see dwtx.jface.fieldassist.IControlContentAdapter2#getSelection(dwt.widgets.Control) 
    139137     * 
    …… 
    144142    } 
    145143 
    146     /* 
    147      * (non-Javadoc) 
    148      * 
     144    /** 
    149145     * @see dwtx.jface.fieldassist.IControlContentAdapter2#setSelection(dwt.widgets.Control, 
    150146     *      dwt.graphics.Point) 

  • dwtx/jface/fieldassist/TextContentAdapter.d

    r72 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2005, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2005, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    105105    } 
    106106 
    107     /* 
    108      * (non-Javadoc) 
    109      * 
     107    /** 
    110108     * @see dwtx.jface.fieldassist.IControlContentAdapter2#getSelection(dwt.widgets.Control) 
    111109     * 
    …… 
    116114    } 
    117115 
    118     /* 
    119      * (non-Javadoc) 
    120      * 
     116    /** 
    121117     * @see dwtx.jface.fieldassist.IControlContentAdapter2#setSelection(dwt.widgets.Control, 
    122118     *      dwt.graphics.Point) 

  • dwtx/jface/internal/ConfigureColumnsDialog.d

    r72 r90  
    205205 
    206206        table = new Table(composite, DWT.BORDER | DWT.SINGLE | DWT.V_SCROLL 
    207                 | DWT.H_SCROLL | DWT.FULL_SELECTION /* 
     207                | DWT.H_SCROLL /* 
    208208                                                     * | DWT.CHECK 
    209209                                                     */); 
    …… 
    281281        }); 
    282282 
     283        Dialog.applyDialogFont(composite); 
     284 
    283285        return composite; 
    284286    } 

  • dwtx/jface/operation/ModalContext.d

    r72 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    4141 * This class is not intended to be subclassed. 
    4242 * </p> 
     43 * @noinstantiate This class is not intended to be instantiated by clients. 
     44 * @noextend This class is not intended to be subclassed by clients. 
    4345 */ 
    4446public class ModalContext { 

  • dwtx/jface/preference/PathEditor.d

    r50 r90  
    1616 
    1717import tango.io.FilePath; 
    18 import tango.io.FileConst; 
     18import tango.io.model.IFile; 
    1919// import java.util.ArrayList; 
    2020// import java.util.StringTokenizer; 

  • dwtx/jface/preference/PreferenceConverter.d

    r34 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    4848 * </p> 
    4949 * Note: touching this class has the side effect of creating a display (static initializer). 
     50 * @noinstantiate This class is not intended to be instantiated by clients. 
    5051 */ 
    5152public class PreferenceConverter { 

  • dwtx/jface/preference/PreferenceDialog.d

    r72 r90  
    738738                Object selection = cast(Object) getSingleSelection(event.getSelection()); 
    739739                if (cast(IPreferenceNode)selection ) { 
    740                     if (!isCurrentPageValid()) { 
    741                         handleError(); 
    742                     } else if (!showPage(cast(IPreferenceNode) selection)) { 
    743                         // Page flipping wasn't successful 
    744                         handleError(); 
    745                     } else { 
    746                         // Everything went well 
    747                         lastSuccessfulNode = cast(IPreferenceNode) selection; 
    748                     } 
     740                    BusyIndicator.showWhile(getShell().getDisplay(), new class(selection) Runnable { 
     741                        Object selection_; 
     742                        this(Object o){ selection_=o; } 
     743                        public void run() { 
     744                            if (!isCurrentPageValid()) { 
     745                                handleError(); 
     746                            } else if (!showPage(cast(IPreferenceNode) selection_)) { 
     747                                // Page flipping wasn't successful 
     748                                handleError(); 
     749                            } else { 
     750                                // Everything went well 
     751                                lastSuccessfulNode = cast(IPreferenceNode) selection_; 
     752                            } 
     753                        } 
     754                    }); 
    749755                } 
    750756            } 

  • dwtx/jface/preference/PreferenceStore.d

    r47 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2006 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    299299 * 
    300300 * @see IPreferenceStore 
     301 * @noextend This class is not intended to be subclassed by clients. 
    301302 */ 
    302303public class PreferenceStore : EventManager, 

  • dwtx/jface/resource/ColorRegistry.d

    r78 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2003, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2003, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    5252 * 
    5353 * @since 3.0 
     54 * @noextend This class is not intended to be subclassed by clients. 
    5455 */ 
    5556public class ColorRegistry : ResourceRegistry { 
    …… 
    106107    } 
    107108 
     109    private final bool cleanOnDisplayDisposal; 
     110 
    108111    /** 
    109112     * Create a new instance of the receiver that is hooked to the current 
    …… 
    142145        Assert.isNotNull(display); 
    143146        this.display = display; 
     147        this.cleanOnDisplayDisposal = cleanOnDisplayDisposal; 
    144148        if (cleanOnDisplayDisposal) { 
    145149            hookDisplayDispose(); 
    …… 
    156160     */ 
    157161    private Color createColor(RGB rgb) { 
     162        if (this.display is null) { 
     163            Display display = Display.getCurrent(); 
     164            if (display is null) { 
     165                throw new IllegalStateException(); 
     166            } 
     167            this.display = display; 
     168            if (cleanOnDisplayDisposal) { 
     169                hookDisplayDispose(); 
     170            } 
     171        } 
    158172        return new Color(display, rgb); 
    159173    } 
    …… 
    276290        stringToColor.clear(); 
    277291        staleColors.clear(); 
     292        display = null; 
    278293    } 
    279294 

  • dwtx/jface/resource/FileImageDescriptor.d

    r73 r90  
    2626import dwt.graphics.Image; 
    2727import dwt.graphics.ImageData; 
    28 import dwtx.core.runtime.Path; 
     28// import dwtx.core.runtime.FileLocator; 
     29// import dwtx.core.runtime.Path; 
    2930 
    3031import dwt.dwthelper.utils; 
    …… 
    222223//         if (resource is null) 
    223224//             return null; 
    224 //      try { 
    225 //          if (JFaceActivator.getBundleContext() is null) {// Stand-alone case 
     225//         try { 
     226//             if (JFaceActivator.getBundleContext() is null) {// Stand-alone case 
    226227// 
    227 //              return new Path(resource.getFile()).toOSString(); 
    228 //          } 
    229 //          return new Path(FileLocator.toFileURL(resource).getPath()).toOSString(); 
     228//                 return new Path(resource.getFile()).toOSString(); 
     229//             } 
     230//             return new Path(FileLocator.toFileURL(resource).getPath()).toOSString(); 
     231//         } catch (IOException e) { 
     232//             Policy.logException(e); 
    230233            return null; 
    231 //      } catch (IOException e) { 
    232 //          Policy.logException(e); 
    233 //          return null; 
    234 //      } 
     234//         } 
    235235    } 
    236236} 

  • dwtx/jface/resource/FontRegistry.d

    r63 r90  
    11/******************************************************************************* 
    2  * Copyright (c) 2000, 2007 IBM Corporation and others. 
     2 * Copyright (c) 2000, 2008 IBM Corporation and others. 
    33 * All rights reserved. This program and the accompanying materials 
    44 * are made available under the terms of the Eclipse Public License v1.0 
    …… 
    7171 * 
    7272 * Since 3.0 this class extends ResourceRegistry. 
     73 * @noextend This class is not intended to be subclassed by clients. 
    7374 */ 
    7475public class FontRegistry : ResourceRegistry { 
    …… 
    217218     */ 
    218219    protected Runnable displayRunnable; 
     220 
     221    private bool displayDisposeHooked; 
     222 
     223    private final bool cleanOnDisplayDisposal; 
    219224 
    220225    /** 
    …… 
    293298        readResourceBundle(location); 
    294299 
     300        cleanOnDisplayDisposal = true; 
    295301        hookDisplayDispose(display); 
    296302    } 
    …… 
    411417        initInstance(); 
    412418        Assert.isNotNull(display); 
     419        this.cleanOnDispla