Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java,v
retrieving revision 1.71
diff -u -r1.71 J2SEProject.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java 9 Jan 2007 12:39:43 -0000 1.71
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java 15 Jan 2007 14:30:14 -0000
@@ -36,6 +36,7 @@
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;
@@ -252,7 +253,8 @@
jaxWsModel,
UILookupMergerSupport.createPrivilegedTemplatesMerger(),
UILookupMergerSupport.createRecommendedTemplatesMerger(),
- LookupProviderSupport.createSourcesMerger()
+ LookupProviderSupport.createSourcesMerger(),
+ new J2SEPropertyEvaluatorImpl(evaluator())
});
return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-java-j2seproject/Lookup"); //NOI18N
}
@@ -590,6 +592,16 @@
return PRIVILEGED_NAMES;
}
+ }
+
+ 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 {
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEPropertyEvaluator.java
===================================================================
RCS file: java/j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEPropertyEvaluator.java
diff -N java/j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEPropertyEvaluator.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEPropertyEvaluator.java 15 Jan 2007 14:30:14 -0000
@@ -0,0 +1,38 @@
+/*
+ * 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 project properties
+ *
+ * @return PropertyEvaluator for given project
+ */
+ PropertyEvaluator evaluator();
+}
Index: java/j2seproject/nbproject/project.xml
===================================================================
RCS file: /cvs/java/j2seproject/nbproject/project.xml,v
retrieving revision 1.38
diff -u -r1.38 project.xml
--- java/j2seproject/nbproject/project.xml 3 Jan 2007 23:16:23 -0000 1.38
+++ java/j2seproject/nbproject/project.xml 15 Jan 2007 14:30:14 -0000
@@ -349,7 +349,10 @@
-
+
+ org.netbeans.modules.javawebstart
+ org.netbeans.modules.java.j2seproject.api
+
Index: java/j2seproject/nbproject/project.properties
===================================================================
RCS file: /cvs/java/j2seproject/nbproject/project.properties,v
retrieving revision 1.35
diff -u -r1.35 project.properties
--- java/j2seproject/nbproject/project.properties 20 Dec 2006 20:52:31 -0000 1.35
+++ java/j2seproject/nbproject/project.properties 15 Jan 2007 14:30:14 -0000
@@ -17,9 +17,10 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.5
-spec.version.base=1.9.0
+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: java/j2seproject/arch.xml
===================================================================
RCS file: /cvs/java/j2seproject/arch.xml,v
retrieving revision 1.17
diff -u -r1.17 arch.xml
--- java/j2seproject/arch.xml 16 Oct 2006 13:40:43 -0000 1.17
+++ java/j2seproject/arch.xml 15 Jan 2007 14:30:14 -0000
@@ -513,9 +513,12 @@
-->
-
- No public packages.
-
+
+
+ Module provides public package org.netbeans.modules.java.j2seproject.api with
+ interface for resolving values of project properties defined in project.properties and private.properties files.
+
+
@@ -1178,6 +1181,32 @@
XXX no answer for exec-ant-tasks
+
+
+
+
+
+
+
+
+
+ XXX no answer for resources-preferences
Index: java/j2seproject/apichanges.xml
===================================================================
RCS file: java/j2seproject/apichanges.xml
diff -N java/j2seproject/apichanges.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ java/j2seproject/apichanges.xml 15 Jan 2007 14:30:14 -0000
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+ Java SE Projects API
+
+
+
+
+
+
+
+
+ Added class for accessing PropertyEvaluator for given JSE Project
+
+
+
+
+
+ Added class J2SEPropertyEvaluator with method evaluator() for
+ accessing PropertyEvaluator for given JSE Project. PropertyEvaluator resolves property
+ values for properties defined in project.properties and private.properties.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Change History for the Java SE Projects API
+
+
+
+