# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: E:\sources\netbeans.org\trunk\java\j2seproject
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: src/org/netbeans/modules/java/j2seproject/api/J2SEPropertyEvaluator.java
*** E:\sources\netbeans.org\trunk\java\j2seproject\src\org\netbeans\modules\java\j2seproject\api\J2SEPropertyEvaluator.java No Base Revision
--- E:\sources\netbeans.org\trunk\java\j2seproject\src\org\netbeans\modules\java\j2seproject\api\J2SEPropertyEvaluator.java Locally New
***************
*** 1,0 ****
--- 1,40 ----
+ /*
+  * The contents of this file are subject to the terms of the Common Development
+  * and Distribution License (the License). You may not use this file except in
+  * compliance with the License.
+  *
+  * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
+  * or http://www.netbeans.org/cddl.txt.
+  *
+  * When distributing Covered Code, include this CDDL Header Notice in each file
+  * and include the License file at http://www.netbeans.org/cddl.txt.
+  * If applicable, add the following below the CDDL Header, with the fields
+  * enclosed by brackets [] replaced by your own identifying information:
+  * "Portions Copyrighted [year] [name of copyright owner]"
+  *
+  * The Original Software is NetBeans. The Initial Developer of the Original
+  * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+  * Microsystems, Inc. All Rights Reserved.
+  */
+ 
+ package org.netbeans.modules.java.j2seproject.api;
+ 
+ import org.netbeans.spi.project.support.ant.PropertyEvaluator;
+ 
+ /**
+  * Readonly access to project properties through PropertyEvaluator,
+  * an instance will be in lookup of the j2seproject.
+  * 
+  * @author Milan Kubec
+  * @since 1.10
+  */
+ public interface J2SEPropertyEvaluator {
+     /**
+      * Gives PropertyEvaluator for resolving properties defined in
+      * project.properties and private.properties files
+      *
+      * @see org.netbeans.spi.project.support.ant.PropertyEvaluator
+      * @return PropertyEvaluator for given project
+      */
+     PropertyEvaluator evaluator();
+ }
Index: nbproject/project.xml
*** E:\sources\netbeans.org\trunk\java\j2seproject\nbproject\project.xml Base (1.38)
--- E:\sources\netbeans.org\trunk\java\j2seproject\nbproject\project.xml Locally Modified (Based On 1.38)
***************
*** 349,355 ****
                      </test-dependency>
                  </test-type>
              </test-dependencies>
!             <public-packages/>
          </data>
      </configuration>
  </project>
--- 349,358 ----
                      </test-dependency>
                  </test-type>
              </test-dependencies>
!             <friend-packages>
!                 <friend>org.netbeans.modules.javawebstart</friend>
!                 <package>org.netbeans.modules.java.j2seproject.api</package>
!             </friend-packages>
          </data>
      </configuration>
  </project>
Index: nbproject/project.properties
*** E:\sources\netbeans.org\trunk\java\j2seproject\nbproject\project.properties Base (1.35)
--- E:\sources\netbeans.org\trunk\java\j2seproject\nbproject\project.properties Locally Modified (Based On 1.35)
***************
*** 17,28 ****
  
  javac.compilerargs=-Xlint -Xlint:-serial
  javac.source=1.5
! spec.version.base=1.9.0
  
  javadoc.arch=${basedir}/arch.xml
  
  # For XMLSerializer, needed for XMLUtil.write to work w/ namespaces:
--- 17,26 ----
  
  javac.compilerargs=-Xlint -Xlint:-serial
  javac.source=1.5
! spec.version.base=1.10.0
  
  javadoc.arch=${basedir}/arch.xml
+ javadoc.apichanges=${basedir}/apichanges.xml
  
  # For XMLSerializer, needed for XMLUtil.write to work w/ namespaces:
  test.unit.run.cp.extra=${tools.jar}
Index: arch.xml
*** E:\sources\netbeans.org\trunk\java\j2seproject\arch.xml Base (1.17)
--- E:\sources\netbeans.org\trunk\java\j2seproject\arch.xml Locally Modified (Based On 1.17)
***************
*** 513,524 ****
          </question>
  -->
   <answer id="deploy-packages">
    <p>
!    No public packages.
    </p>
   </answer>
  
--- 513,524 ----
          </question>
  -->
   <answer id="deploy-packages">
+   <api group="java" name="J2SEPropertyEvaluator" type="export" category="friend">
       <p>
!       Module provides public package <code>org.netbeans.modules.java.j2seproject.api</code> with 
!       interface for resolving values of project properties defined in project.properties and private.properties files.
       </p>
+     </api>
   </answer>
  
  
***************
*** 1181,1184 ****
--- 1184,1213 ----
    </p>
   </answer>
  
+ 
+ 
+ 
+ <!--
+         <question id="resources-preferences" when="final">
+             Does your module uses preferences via Preferences API? Does your module use NbPreferences or
+             or regular JDK Preferences ? Does it read, write or both ? 
+             Does it share preferences with other modules ? If so, then why ?
+             <hint>
+                 You may use
+                     &lt;api type="export" group="preferences"
+                     name="preference node name" category="private"&gt;
+                     description of individual keys, where it is used, what it
+                     influences, whether the module reads/write it, etc.
+                     &lt;/api&gt;
+                 Due to XML ID restrictions, rather than /org/netbeans/modules/foo give the "name" as org.netbeans.modules.foo.
+                 Note that if you use NbPreferences this name will then be the same as the code name base of the module.
+             </hint>
+         </question>
+ -->
+  <answer id="resources-preferences">
+   <p>
+    XXX no answer for resources-preferences
+   </p>
+  </answer>
+ 
  </api-answers>
Index: manifest.mf
*** E:\sources\netbeans.org\trunk\java\j2seproject\manifest.mf Base (1.7)
--- E:\sources\netbeans.org\trunk\java\j2seproject\manifest.mf Locally Modified (Based On 1.7)
***************
*** 1,5 ****
  Manifest-Version: 1.0
! OpenIDE-Module: org.netbeans.modules.java.j2seproject
  OpenIDE-Module-Layer: org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/j2seproject/Bundle.properties
  OpenIDE-Module-Implementation-Version: 42
--- 1,5 ----
  Manifest-Version: 1.0
! OpenIDE-Module: org.netbeans.modules.java.j2seproject/1
  OpenIDE-Module-Layer: org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/j2seproject/Bundle.properties
  OpenIDE-Module-Implementation-Version: 42
Index: apichanges.xml
*** E:\sources\netbeans.org\trunk\java\j2seproject\apichanges.xml No Base Revision
--- E:\sources\netbeans.org\trunk\java\j2seproject\apichanges.xml Locally New
***************
*** 1,0 ****
--- 1,124 ----
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ The contents of this file are subject to the terms of the Common Development
+ and Distribution License (the License). You may not use this file except in
+ compliance with the License.
+ 
+ You can obtain a copy of the License at http://www.netbeans.org/cddl.html
+ or http://www.netbeans.org/cddl.txt.
+ 
+ When distributing Covered Code, include this CDDL Header Notice in each file
+ and include the License file at http://www.netbeans.org/cddl.txt.
+ If applicable, add the following below the CDDL Header, with the fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+ 
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ Microsystems, Inc. All Rights Reserved.
+ -->
+ <?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
+ <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+ 
+ <!--
+ 
+ INFO FOR PEOPLE ADDING CHANGES:
+ 
+ Check the DTD (apichanges.dtd) for details on the syntax. You do not
+ need to regenerate the HTML, as this is part of Javadoc generation; just
+ change the XML. Rough syntax of a change (several parts optional):
+ 
+ <change>
+     <api name="compiler"/>
+     <summary>Some brief description here, can use <b>XHTML</b></summary>
+     <version major="1" minor="99"/>
+     <date day="13" month="6" year="2001"/>
+     <author login="jrhacker"/>
+     <compatibility addition="yes"/>
+     <description>
+         The main description of the change here.
+         Again can use full <b>XHTML</b> as needed.
+     </description>
+     <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+     <issue number="14309"/>
+ </change>
+ 
+ Also permitted elements: <package>, <branch>. <version> is API spec
+ version, recommended for all new changes. <compatibility> should say
+ if things were added/modified/deprecated/etc. and give all information
+ related to upgrading old code. List affected top-level classes and
+ link to issue numbers if applicable. See the DTD for more details.
+ 
+ Changes need not be in any particular order, they are sorted in various
+ ways by the stylesheet anyway.
+ 
+ Dates are assumed to mean "on the trunk". If you *also* make the same
+ change on a stabilization branch, use the <branch> tag to indicate this
+ and explain why the change was made on a branch in the <description>.
+ 
+ Please only change this file on the trunk! Rather: you can change it
+ on branches if you want, but these changes will be ignored; only the
+ trunk version of this file is important.
+ 
+ Deprecations do not count as incompatible, assuming that code using the
+ deprecated calls continues to see their documented behavior. But do
+ specify deprecation="yes" in <compatibility>.
+ 
+ This file is not a replacement for Javadoc: it is intended to list changes,
+ not describe the complete current behavior, for which ordinary documentation
+ is the proper place.
+ 
+ -->
+ 
+ <apichanges>
+ 
+     <!-- First, a list of API names you may use: -->
+     <apidefs>
+         <apidef name="jseprojects">Java SE Projects API</apidef>
+     </apidefs>
+ 
+     <!-- ACTUAL CHANGES BEGIN HERE: -->
+ 
+     <changes>
+ 
+         <change>
+             <api name="jseprojects"/>
+             <summary>Added class for accessing PropertyEvaluator for given JSE Project</summary>
+             <version major="1" minor="10"/>
+             <date day="4" month="1" year="2007"/>
+             <author login="mkubec"/>
+             <compatibility addition="yes"/>
+             <description>
+                 Added class <code>J2SEPropertyEvaluator</code> with method <code>evaluator()</code> for 
+                 accessing PropertyEvaluator for given JSE Project. PropertyEvaluator resolves property 
+                 values for properties defined in project.properties and private.properties.
+             </description>
+             <class package="org.netbeans.modules.java.j2seproject.api" name="J2SEPropertyEvaluator"/>
+             <issue number="89457"/>
+         </change>
+ 
+     </changes>
+ 
+     <!-- Now the surrounding HTML text and document structure: -->
+ 
+     <htmlcontents>
+         
+     <!-- Generated from apichanges.xml -->
+     <head>
+         <title>Change History for the Java SE Projects API</title>
+         <link rel="stylesheet" href="prose.css" type="text/css"/>
+     </head>
+     <body>
+         <p class="overviewlink"><a href="@TOP@/overview-summary.html">Overview</a></p>
+         <h1>Introduction</h1>
+         <p>This document lists changes made to the <a href="@TOP@/overview-summary.html">Java SE Projects API</a>.</p>
+         <!-- The actual lists of changes, as summaries and details: -->
+         <hr/>
+         <standard-changelists module-code-name="org.netbeans.modules.java.j2seproject/1"/>
+         <hr/>
+         <p>@FOOTER@</p>
+     </body>
+     
+     </htmlcontents>
+ 
+ </apichanges>
Index: src/org/netbeans/modules/java/j2seproject/J2SEProject.java
*** E:\sources\netbeans.org\trunk\java\j2seproject\src\org\netbeans\modules\java\j2seproject\J2SEProject.java Base (1.70)
--- E:\sources\netbeans.org\trunk\java\j2seproject\src\org\netbeans\modules\java\j2seproject\J2SEProject.java Locally Modified (Based On 1.70)
***************
*** 34,39 ****
--- 34,40 ----
  import org.netbeans.api.project.ProjectInformation;
  import org.netbeans.api.project.ProjectManager;
  import org.netbeans.api.project.ant.AntArtifact;
+ import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
  import org.netbeans.modules.java.j2seproject.classpath.ClassPathProviderImpl;
  import org.netbeans.modules.java.j2seproject.classpath.J2SEProjectClassPathExtender;
  import org.netbeans.modules.java.j2seproject.classpath.J2SEProjectClassPathModifier;
***************
*** 247,253 ****
              jaxWsModel,
              UILookupMergerSupport.createPrivilegedTemplatesMerger(),
              UILookupMergerSupport.createRecommendedTemplatesMerger(),
!             LookupProviderSupport.createSourcesMerger()
          });
          return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-java-j2seproject/Lookup"); //NOI18N
      }
--- 248,255 ----
              jaxWsModel,
              UILookupMergerSupport.createPrivilegedTemplatesMerger(),
              UILookupMergerSupport.createRecommendedTemplatesMerger(),
!             LookupProviderSupport.createSourcesMerger(),
!             new J2SEPropertyEvaluatorImpl(evaluator())
          });
          return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-java-j2seproject/Lookup"); //NOI18N
      }
***************
*** 575,580 ****
--- 577,592 ----
          
      }
      
+     private static final class J2SEPropertyEvaluatorImpl implements J2SEPropertyEvaluator {
+         private PropertyEvaluator evaluator;
+         public J2SEPropertyEvaluatorImpl (PropertyEvaluator eval) {
+             evaluator = eval;
+         }
+         public PropertyEvaluator evaluator() {
+             return evaluator;
+         }
+     }
+     
      private FileObject getJaxWsFileObject() throws IOException {
          if (jaxWsFo==null) {
              jaxWsFo = findJaxWsFileObject();