Changeset 902

Show
Ignore:
Timestamp:
11/04/07 15:01:43 (1 year ago)
Author:
asterite
Message:

Preparing to release 0.4.4

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/descent.core/META-INF/MANIFEST.MF

    r891 r902  
    33Bundle-Name: %pluginName 
    44Bundle-SymbolicName: descent.core;singleton:=true 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Activator: descent.core.JavaCore 
    77Bundle-Vendor: %providerName 

  • trunk/descent.core/src/descent/core/dom/CompilationUnitResolver.java

    r837 r902  
    3737public class CompilationUnitResolver extends descent.internal.compiler.Compiler { 
    3838     
    39     private final static boolean RESOLVE = true; 
     39    private final static boolean RESOLVE = false; 
    4040    private final static boolean SYSOUT = false; 
    4141     

  • trunk/descent.core/src/descent/internal/compiler/parser/Id.java

    r814 r902  
    207207    static final char[] TIMESTAMP_DUMMY = { 'F', 'r', 'i', ' ', 'J', 'u', 'n', ' ', '2', '6', ' ', '2', '1', ':', '0', '0', ':', '0', '0', ' ', '1', '9', '8', '1' }; 
    208208    static final char[] VENDOR_DUMMY = { 'D', 'e', 's', 'c', 'e', 'n', 't' }; 
     209     
     210    static final char[] isSame = { 'i', 's', 'S', 'a', 'm', 'e' }; 
     211    static final char[] compiles = { 'c', 'o', 'm', 'p', 'i', 'l', 'e', 's' }; 
    209212 
    210213} 

  • trunk/descent.core/src/descent/internal/compiler/parser/Parser.java

    r900 r902  
    129129        Id.isVirtualFunction, Id.isFinalFunction,  
    130130        Id.hasMember, Id.getMember, Id.getVirtualFunctions, 
    131         Id.classInstanceSize, Id.allMembers, Id.derivedMembers 
     131        Id.classInstanceSize, Id.allMembers, Id.derivedMembers, 
     132        Id.isSame, Id.compiles 
    132133    }; 
    133134    private final static char[][] scopeArgsExpectations = {  

  • trunk/descent.core/src/descent/internal/compiler/util/SuffixConstants.java

    r586 r902  
    1515    public final static String EXTENSION_CLASS = "OBJ"; //$NON-NLS-1$ 
    1616    public final static String EXTENSION_java = "d"; //$NON-NLS-1$ 
     17    public final static String EXTENSION_JAVA = "D"; //$NON-NLS-1$ 
    1718    public final static String EXTENSION_di = "di"; //$NON-NLS-1$ 
    18     public final static String EXTENSION_JAVA = "D"; //$NON-NLS-1$ 
     19    public final static String EXTENSION_DI = "DI"; //$NON-NLS-1$ 
    1920     
    2021    public final static String SUFFIX_STRING_class = "." + EXTENSION_class; //$NON-NLS-1$ 
    …… 
    2223    public final static String SUFFIX_STRING_java = "." + EXTENSION_java; //$NON-NLS-1$ 
    2324    public final static String SUFFIX_STRING_JAVA = "." + EXTENSION_JAVA; //$NON-NLS-1$ 
     25    public final static String SUFFIX_STRING_di = "." + EXTENSION_di; //$NON-NLS-1$ 
     26    public final static String SUFFIX_STRING_DI = "." + EXTENSION_DI; //$NON-NLS-1$ 
    2427     
    2528    public final static char[] SUFFIX_class = SUFFIX_STRING_class.toCharArray(); 
    …… 
    2730    public final static char[] SUFFIX_java = SUFFIX_STRING_java.toCharArray(); 
    2831    public final static char[] SUFFIX_JAVA = SUFFIX_STRING_JAVA.toCharArray(); 
     32    public final static char[] SUFFIX_di = SUFFIX_STRING_di.toCharArray(); 
     33    public final static char[] SUFFIX_DI = SUFFIX_STRING_DI.toCharArray(); 
    2934     
    3035    public final static String EXTENSION_jar = "jar"; //$NON-NLS-1$ 
    …… 
    4348    public final static char[] SUFFIX_ZIP = SUFFIX_STRING_ZIP.toCharArray(); 
    4449} 
     50 

  • trunk/descent.core/src/descent/internal/compiler/util/Util.java

    r437 r902  
    392392     */ 
    393393    public final static boolean isJavaFileName(String name) { 
     394        return hasSuffix(name, SUFFIX_JAVA) || hasSuffix(name, SUFFIX_DI); 
     395    } 
     396     
     397    private final static boolean hasSuffix(String name, char[] suffix) { 
    394398        int nameLength = name == null ? 0 : name.length(); 
    395         int suffixLength = SUFFIX_JAVA.length; 
     399        int suffixLength = suffix.length; 
    396400        if (nameLength < suffixLength) return false; 
    397401 
    …… 
    399403            char c = name.charAt(nameLength - i - 1); 
    400404            int suffixIndex = suffixLength - i - 1; 
    401             if (c != SUFFIX_java[suffixIndex] && c != SUFFIX_JAVA[suffixIndex]) return false; 
    402         } 
    403         return true;        
     405            if (c != suffix[suffixIndex] && c != suffix[suffixIndex]) return false; 
     406        } 
     407        return true;     
    404408    } 
    405409 

  • trunk/descent.core/src/descent/internal/core/util/Util.java

    r897 r902  
    281281            // TODO (jerome) reenable once JDT UI supports other file extensions (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=71460) 
    282282            if (!ENABLE_JAVA_LIKE_EXTENSIONS) 
    283                 JAVA_LIKE_EXTENSIONS = new char[][] {SuffixConstants.EXTENSION_java.toCharArray()}; 
     283                JAVA_LIKE_EXTENSIONS = new char[][] {SuffixConstants.EXTENSION_java.toCharArray(), SuffixConstants.EXTENSION_di.toCharArray()}; 
    284284            else { 
    285285                IContentType javaContentType = Platform.getContentTypeManager().getContentType(JavaCore.JAVA_SOURCE_CONTENT_TYPE); 

  • trunk/descent.debug.core/META-INF/MANIFEST.MF

    r732 r902  
    33Bundle-Name: Descent Launching Plug-in 
    44Bundle-SymbolicName: descent.debug.core;singleton:=true 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Activator: descent.debug.core.DescentDebugPlugin 
    77Bundle-Localization: plugin 

  • trunk/descent.debug.ui/META-INF/MANIFEST.MF

    r732 r902  
    33Bundle-Name: Descent Launching Ui Plug-in 
    44Bundle-SymbolicName: descent.debug.ui;singleton:=true 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Activator: descent.debug.ui.DescentDebugUI 
    77Bundle-Localization: plugin 

  • trunk/descent.launching/META-INF/MANIFEST.MF

    r732 r902  
    33Bundle-Name: Descent Launching Plug-in 
    44Bundle-SymbolicName: descent.launching;singleton:=true 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Activator: descent.internal.launching.LaunchingPlugin 
    77Bundle-Localization: plugin 

  • trunk/descent.launching/src/descent/internal/launching/dmd/DmdCompilerType.java

    r559 r902  
    2626        File phobosFile = new File(installLocation, "src/phobos"); 
    2727        File phobosSrcFile = new File(installLocation, "src/phobos"); 
     28        File object = new File(phobosSrcFile, "object.d"); 
    2829         
    29         Path phobosPath = new Path(phobosFile.getAbsolutePath()); 
    30         Path phobosSrcPath = new Path(phobosSrcFile.getAbsolutePath()); 
    31          
    32         LibraryLocation phobos = new LibraryLocation(phobosPath, phobosSrcPath, Path.EMPTY); 
    33         return new LibraryLocation[] { phobos }; 
     30        if (phobosSrcFile.exists() && phobosSrcFile.isDirectory() && object.exists()) { 
     31            Path phobosPath = new Path(phobosFile.getAbsolutePath()); 
     32            Path phobosSrcPath = new Path(phobosSrcFile.getAbsolutePath()); 
     33             
     34            LibraryLocation phobos = new LibraryLocation(phobosPath, phobosSrcPath, Path.EMPTY); 
     35            return new LibraryLocation[] { phobos }; 
     36        } else { 
     37            return new LibraryLocation[0]; 
     38        } 
    3439    } 
    3540 

  • trunk/descent.launching/src/descent/internal/launching/gdc/GdcCompilerType.java

    r559 r902  
    3636        File phobosFile = new File(installLocation, "include/d/" + gdcVersion); 
    3737        File phobosSrcFile = new File(installLocation, "include/d/" + gdcVersion); 
     38        File object = new File(phobosSrcFile, "object.d"); 
    3839         
    39         Path phobosPath = new Path(phobosFile.getAbsolutePath()); 
    40         Path phobosSrcPath = new Path(phobosSrcFile.getAbsolutePath()); 
    41          
    42         LibraryLocation phobos = new LibraryLocation(phobosPath, phobosSrcPath, Path.EMPTY); 
    43         return new LibraryLocation[] { phobos }; 
     40        if (phobosSrcFile.exists() && phobosSrcFile.isDirectory() && object.exists()) { 
     41            Path phobosPath = new Path(phobosFile.getAbsolutePath()); 
     42            Path phobosSrcPath = new Path(phobosSrcFile.getAbsolutePath()); 
     43             
     44            LibraryLocation phobos = new LibraryLocation(phobosPath, phobosSrcPath, Path.EMPTY); 
     45            return new LibraryLocation[] { phobos }; 
     46        } else { 
     47            return new LibraryLocation[0]; 
     48        } 
    4449    } 
    4550 

  • trunk/descent.tests/META-INF/MANIFEST.MF

    r732 r902  
    33Bundle-Name: Tests 
    44Bundle-SymbolicName: descent.tests 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Localization: plugin 
    77Require-Bundle: org.eclipse.core.runtime, 

  • trunk/descent.ui-feature/feature.xml

    r732 r902  
    33      id="descent.ui" 
    44      label="Descent" 
    5       version="0.4.3.20070907" 
     5      version="0.4.4.20071104" 
    66      provider-name="Descent"> 
    77 
    …… 
    1212 
    1313   <license url="http://opensource.org/licenses/eclipse-1.0.txt"> 
    14       Eclipse Public License - v 1.0 
     14      The &quot;Artistic License&quot; 
    1515 
    16 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT. 
     16                Preamble 
    1717 
    18 1. DEFINITIONS 
     18The intent of this document is to state the conditions under which a 
     19Package may be copied, such that the Copyright Holder maintains some 
     20semblance of artistic control over the development of the package, 
     21while giving the users of the package the right to use and distribute 
     22the Package in a more-or-less customary fashion, plus the right to make 
     23reasonable modifications. 
    1924 
    20 &quot;Contribution&quot; means: 
     25Definitions: 
    2126 
    22 a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and 
    23 b) in the case of each subsequent Contributor: 
     27    &quot;Package&quot; refers to the collection of files distributed by the 
     28    Copyright Holder, and derivatives of that collection of files 
     29    created through textual modification. 
    2430 
    25 i) changes to the Program, and 
     31    &quot;Standard Version&quot; refers to such a Package if it has not been 
     32    modified, or has been modified in accordance with the wishes 
     33    of the Copyright Holder as specified below. 
    2634 
    27 ii) additions to the Program; 
     35    &quot;Copyright Holder&quot; is whoever is named in the copyright or 
     36    copyrights for the package. 
    2837 
    29 where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
     38    &quot;You&quot; is you, if you&apos;re thinking about copying or distributing 
     39    this Package. 
    3040 
    31 &quot;Contributor&quot; means any person or entity that distributes the Program. 
     41    &quot;Reasonable copying fee&quot; is whatever you can justify on the 
     42    basis of media cost, duplication charges, time of people involved, 
     43    and so on.  (You will not be required to justify it to the 
     44    Copyright Holder, but only to the computing community at large 
     45    as a market that must bear the fee.) 
    3246 
    33 &quot;Licensed Patents &quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. 
     47    &quot;Freely Available&quot; means that no fee is charged for the item 
     48    itself, though there may be fees involved in handling the item. 
     49    It also means that recipients of the item may redistribute it 
     50    under the same conditions they received it. 
    3451 
    35 &quot;Program&quot; means the Contributions distributed in accordance with this Agreement. 
     521. You may make and give away verbatim copies of the source form of the 
     53Standard Version of this Package without restriction, provided that you 
     54duplicate all of the original copyright notices and associated disclaimers. 
    3655 
    37 &quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors. 
     562. You may apply bug fixes, portability fixes and other modifications 
     57derived from the Public Domain or from the Copyright Holder.  A Package 
     58modified in such a way shall still be considered the Standard Version. 
    3859 
    39 2. GRANT OF RIGHTS 
     603. You may otherwise modify your copy of this Package in any way, provided 
     61that you insert a prominent notice in each changed file stating how and 
     62when you changed that file, and provided that you do at least ONE of the 
     63following: 
    4064 
    41 a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. 
     65    a) place your modifications in the Public Domain or otherwise make them 
     66    Freely Available, such as by posting said modifications to Usenet or 
     67    an equivalent medium, or placing the modifications on a major archive 
     68    site such as uunet.uu.net, or by allowing the Copyright Holder to include 
     69    your modifications in the Standard Version of the Package. 
    4270 
    43 b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
     71    b) use the modified Package only within your corporation or organization. 
    4472 
    45 c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program. 
     73    c) rename any non-standard executables so the names do not conflict 
     74    with standard executables, which must also be provided, and provide 
     75    a separate manual page for each non-standard executable that clearly 
     76    documents how it differs from the Standard Version. 
    4677 
    47 d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
     78    d) make other distribution arrangements with the Copyright Holder. 
    4879 
    49 3. REQUIREMENTS 
     804. You may distribute the programs of this Package in object code or 
     81executable form, provided that you do at least ONE of the following: 
    5082 
    51 A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: 
     83    a) distribute a Standard Version of the executables and library files, 
     84    together with instructions (in the manual page or equivalent) on where 
     85    to get the Standard Version. 
    5286 
    53 a) it complies with the terms and conditions of this Agreement; and 
     87    b) accompany the distribution with the machine-readable source of 
     88    the Package with your modifications. 
    5489 
    55 b) its license agreement: 
     90    c) give non-standard executables non-standard names, and clearly 
     91    document the differences in manual pages (or equivalent), together 
     92    with instructions on where to get the Standard Version. 
    5693 
    57 i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
     94    d) make other distribution arrangements with the Copyright Holder. 
    5895 
    59 ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
     965. You may charge a reasonable copying fee for any distribution of this 
     97Package.  You may charge any fee you choose for support of this 
     98Package.  You may not charge a fee for this Package itself.  However, 
     99you may distribute this Package in aggregate with other (possibly 
     100commercial) programs as part of a larger (possibly commercial) software 
     101distribution provided that you do not advertise this Package as a 
     102product of your own.  You may embed this Package&apos;s interpreter within 
     103an executable of yours (by linking); this shall be construed as a mere 
     104form of aggregation, provided that the complete Standard Version of the 
     105interpreter is so embedded. 
    60106 
    61 iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and 
     1076. The source code and object code supplied as input to or produced as 
     108output from the programs of this Package do not automatically fall 
     109under the copyright of this Package, but belong to whoever generated 
     110them, and may be sold commercially, and may be aggregated with this 
     111Package. 
    62112 
    63 iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
     1137. Aggregation of this Package with a commercial distribution is always 
     114permitted provided that the use of this Package is embedded; that is, 
     115when no overt attempt is made to make this Package&apos;s interfaces visible 
     116to the end user of the commercial distribution.  Such use shall not be 
     117construed as a distribution of this Package. 
    64118 
    65 When the Program is made available in source code form: 
     1198. The name of the Copyright Holder may not be used to endorse or promote 
     120products derived from this software without specific prior written permission. 
    66121 
    67 a) it must be made available under this Agreement; and 
     1229. THIS PACKAGE IS PROVIDED &quot;AS IS&quot; AND WITHOUT ANY EXPRESS OR 
     123IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED 
     124WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. 
    68125 
    69 b) a copy of this Agreement must be included with each copy of the Program. 
    70  
    71 Contributors may not remove or alter any copyright notices contained within the Program. 
    72  
    73 Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. 
    74  
    75 4. COMMERCIAL DISTRIBUTION 
    76  
    77 Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. 
    78  
    79 For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 
    80  
    81 5. NO WARRANTY 
    82  
    83 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 
    84  
    85 6. DISCLAIMER OF LIABILITY 
    86  
    87 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
    88  
    89 7. GENERAL 
    90  
    91 If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
    92  
    93 If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed. 
    94  
    95 All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. 
    96  
    97 Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. 
    98  
    99 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
     126                The End 
    100127   </license> 
    101128 

  • trunk/descent.ui.astviewer/META-INF/MANIFEST.MF

    r732 r902  
    33Bundle-Name: %pluginName 
    44Bundle-SymbolicName: descent.astview;singleton:=true 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Activator: descent.astview.ASTViewPlugin 
    77Bundle-Vendor: %providerName 

  • trunk/descent.ui.metrics/META-INF/MANIFEST.MF

    r732 r902  
    33Bundle-Name: Descent Metrics Plug-in 
    44Bundle-SymbolicName: descent.ui.metrics; singleton:=true 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Localization: plugin 
    77Bundle-Activator: descent.ui.metrics.MetricsPlugin 

  • trunk/descent.ui/META-INF/MANIFEST.MF

    r732 r902  
    33Bundle-Name: Descent UI Plug-in 
    44Bundle-SymbolicName: descent.ui;singleton:=true 
    5 Bundle-Version: 0.4.3.20070907 
     5Bundle-Version: 0.4.4.20071104 
    66Bundle-Activator: descent.internal.ui.JavaPlugin 
    77Bundle-Localization: plugin 

  • trunk/descent.ui/plugin.xml

    r891 r902  
    663663            <keywordReference id="descent.ui.formatter"/> 
    664664      </page> 
    665       <!-- 
    666665      <page 
    667666            name="%buildPathPrefName" 
    …… 
    670669            id="descent.ui.preferences.BuildPathPreferencePage"> 
    671670            <keywordReference id="descent.ui.buildpathoptions"/> 
    672       </page>       
     671      </page> 
     672      <!-- 
    673673      <page 
    674674            name="%classPathVarPrefName" 
    …… 
    748748            <keywordReference id="descent.ui.templates"/> 
    749749      </page> 
    750       <!-- 
    751750      <page 
    752751            name="%contentAssistPageName" 
    …… 
    756755            <keywordReference id="descent.ui.contentassist"/> 
    757756      </page> 
     757      <!-- 
    758758      <page 
    759759            name="%contentAssistAdvancedName" 

  • trunk/descent.ui/src/descent/internal/debug/ui/jres/AddVMDialog.java

    r559 r902  
    88import org.eclipse.core.resources.IResource; 
    99import org.eclipse.core.resources.ResourcesPlugin; 
    10 import org.eclipse.core.runtime.IPath; 
    1110import org.eclipse.core.runtime.IStatus; 
    12 import org.eclipse.core.runtime.Path; 
    1311import org.eclipse.jface.dialogs.IDialogConstants; 
    1412import org.eclipse.jface.dialogs.IDialogSettings; 

  • trunk/descent.ui/src/descent/internal/debug/ui/jres/JREMessages.properties

    r559 r902  
    8383VMLibraryBlock_0=Source attachment: 
    8484VMLibraryBlock_1=(none) 
    85 VMLibraryBlock_10=Jar Selection 
     85VMLibraryBlock_10=Include Path Selection 
    8686VMDetailsDialog_0=Compiler Details 
    8787VMLibraryBlock_2=Ddoc location: 
    …… 
    9090VMLibraryBlock_5=&Down 
    9191VMLibraryBlock_6=Re&move 
    92 VMLibraryBlock_7=Add E&xternal JARs... 
     92VMLibraryBlock_7=Add Include Path... 
    9393VMLibraryBlock_8=Ed&it... 
    9494VMLibraryBlock_9=&Restore Default 

  • trunk/descent.ui/src/descent/internal/debug/ui/jres/LibraryContentProvider.java

    r559 r902  
    216216            Object element= selection.getFirstElement(); 
    217217            LibraryStandin firstLib; 
    218             if (element instanceof LibraryLocation) { 
     218            if (element instanceof LibraryStandin) { 
    219219                firstLib= (LibraryStandin) element; 
    220220            } else { 

  • trunk/descent.ui/src/descent/internal/debug/ui/jres/VMLibraryBlock.java

    r559 r902  
    2626import org.eclipse.swt.widgets.Composite; 
    2727import org.eclipse.swt.widgets.Control; 
    28 import org.eclipse.swt.widgets.FileDialog; 
     28import org.eclipse.swt.widgets.DirectoryDialog; 
    2929import org.eclipse.swt.widgets.Label; 
    3030 
    …… 
    337337            lastUsedPath= ""; //$NON-NLS-1$ 
    338338        } 
    339         FileDialog dialog= new FileDialog(fLibraryViewer.getControl().getShell(), SWT.MULTI); 
     339         
     340        DirectoryDialog dialog = new DirectoryDialog(fLibraryViewer.getControl().getShell(), SWT.SINGLE); 
     341        //FileDialog dialog= new FileDialog(fLibraryViewer.getControl().getShell(), SWT.MULTI); 
    340342        dialog.setText(JREMessages.VMLibraryBlock_10); 
    341         dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$ 
    342         dialog.setFilterPath(lastUsedPath); 
     343        //dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$ 
     344        //dialog.setFilterPath(lastUsedPath); 
    343345        String res= dialog.open(); 
    344346        if (res == null) { 
    345347            return; 
    346348        } 
    347         String[] fileNames= dialog.getFileNames(); 
    348         int nChosen= fileNames.length; 
    349              
    350         IPath filterPath= new Path(dialog.getFilterPath()); 
    351         LibraryLocation[] libs= new LibraryLocation[nChosen]; 
    352         for (int i= 0; i < nChosen; i++) { 
    353             libs[i]= new LibraryLocation(filterPath.append(fileNames[i]).makeAbsolute(), Path.EMPTY, Path.EMPTY); 
    354         } 
    355         dialogSettings.put(LAST_PATH_SETTING, filterPath.toOSString()); 
     349        IPath path = new Path(res); 
     350         
     351        LibraryLocation[] libs = new LibraryLocation[] { 
     352            new LibraryLocation(path, Path.EMPTY, Path.EMPTY) 
     353        }; 
    356354         
    357355        fLibraryContentProvider.add(libs, selection); 

  • trunk/descent.ui/src/descent/internal/ui/navigator/PackageExplorerActionProvider.java

    r364 r902  
    2222import descent.internal.ui.JavaPlugin; 
    2323import descent.internal.ui.navigator.IExtensionStateConstants.Values; 
     24import descent.internal.ui.wizards.buildpaths.newsourcepage.GenerateBuildPathActionGroup; 
    2425import descent.ui.actions.GenerateActionGroup; 
    2526import descent.ui.actions.OpenViewActionGroup; 
    …… 
    4243    //private JavaSearchActionGroup fSearchGroup; 
    4344 
    44     //private GenerateBuildPathActionGroup fBuildPathGroup; 
     45    private GenerateBuildPathActionGroup fBuildPathGroup; 
    4546 
    4647    private GenerateActionGroup fGenerateGroup; 
    …… 
    5657        if (fInViewPart) { 
    5758            fOpenViewGroup.fillActionBars(actionBars);  
    58             //fBuildPathGroup.fillActionBars(actionBars); 
     59            fBuildPathGroup.fillActionBars(actionBars); 
    5960            fGenerateGroup.fillActionBars(actionBars);  
    6061            //fSearchGroup.fillActionBars(actionBars); 
    …… 
    6768        if (fInViewPart) { 
    6869            fOpenViewGroup.fillContextMenu(menu);  
    69             //fBuildPathGroup.fillContextMenu(menu); 
     70            fBuildPathGroup.fillContextMenu(menu); 
    7071            fGenerateGroup.fillContextMenu(menu);  
    7172            //fSearchGroup.fillContextMenu(menu); 
    …… 
    9495                fGenerateGroup = new GenerateActionGroup(viewPart); 
    9596                //fSearchGroup = new JavaSearchActionGroup(viewPart); 
    96                 //fBuildPathGroup = new GenerateBuildPathActionGroup(viewPart); 
     97                fBuildPathGroup = new GenerateBuildPathActionGroup(viewPart); 
    9798                 
    9899                fInViewPart = true; 
    …… 
    109110            fGenerateGroup.setContext(context); 
    110111            //fSearchGroup.setContext(context); 
    111             //fBuildPathGroup.setContext(context); 
     112            fBuildPathGroup.setContext(context); 
    112113        } 
    113114    } 

  • trunk/descent.ui/src/descent/internal/ui/wizards/NewWizardMessages.properties

    r559 r902  
    343343# ------- LibrariesWorkbookPage------- 
    344344 
    345 LibrariesWorkbookPage_libraries_label=JARs &and class folders on the build path: 
     345LibrariesWorkbookPage_libraries_label=Folders on the build path: 
    346346LibrariesWorkbookPage_libraries_remove_button=&Remove 
    347347LibrariesWorkbookPage_libraries_replace_button=Migrate JAR &File... 
    348348 
    349 LibrariesWorkbookPage_libraries_addjar_button=Add &JARs... 
    350 LibrariesWorkbookPage_libraries_addextjar_button=Add E&xternal JARs... 
     349LibrariesWorkbookPage_libraries_addjar_button=Add &folder... 
     350LibrariesWorkbookPage_libraries_addextjar_button=Add E&xternal folder... 
    351351LibrariesWorkbookPage_libraries_addvariable_button=Add &Variable... 
    352352LibrariesWorkbookPage_libraries_addlibrary_button=Add Li&brary... 
    …… 
    376376BuildPathDialogAccess_ExistingClassFolderDialog_new_description=&Choose class folders to be added to the build path: 
    377377 
    378 BuildPathDialogAccess_JARArchiveDialog_new_title=JAR Selection 
     378BuildPathDialogAccess_JARArchiveDialog_new_title=Include Path Selection 
    379379BuildPathDialogAccess_JARArchiveDialog_new_description=&Choose jar archives to be added to the build path: 
    380380 

  • trunk/descent.update-site/site.xml

    r732 r902  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<site> 
    3    <feature url="features/descent.ui_0.4.3.20070907.jar" id="descent.ui" version="0.4.3.20070907"> 
     3   <feature url="features/descent.ui_0.4.4.20071104.jar" id="descent.ui" version="0.4.4.20071104"> 
    44      <category name="Descent plugin for Eclipse"/> 
    55   </feature>