diff -r bd8aef593115 ant.freeform/nbproject/project.xml --- a/ant.freeform/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/ant.freeform/nbproject/project.xml Mon Feb 02 16:47:33 2009 +0100 @@ -61,7 +61,7 @@ 1 - 1.15 + 1.30 diff -r bd8aef593115 ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProject.java --- a/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProject.java Mon Feb 02 16:47:33 2009 +0100 @@ -56,6 +56,7 @@ import org.netbeans.modules.ant.freeform.ui.View; import org.netbeans.spi.project.AuxiliaryConfiguration; import org.netbeans.spi.project.support.LookupProviderSupport; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.PropertyEvaluator; import org.netbeans.spi.project.support.ant.PropertyUtils; @@ -64,7 +65,6 @@ import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.Mutex; -import org.openide.util.Utilities; import org.openide.util.lookup.Lookups; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -73,6 +73,14 @@ * One freeform project. * @author Jesse Glick */ +@AntBasedProjectRegistration( + type=FreeformProjectType.TYPE, + iconResource="org/netbeans/modules/ant/freeform/resources/freeform-project.png", + sharedName=FreeformProjectType.NAME_SHARED, + privateName=FreeformProjectType.NAME_SHARED, + sharedNamespace=FreeformProjectType.NS_GENERAL_1, + privateNamespace=FreeformProjectType.NS_GENERAL_PRIVATE +) public final class FreeformProject implements Project { public static final Lookup.Result PROJECT_NATURES = Lookup.getDefault().lookupResult(ProjectNature.class); @@ -146,6 +154,7 @@ return eval; } + @Override public String toString() { return "FreeformProject[" + getProjectDirectory() + "]"; // NOI18N } diff -r bd8aef593115 ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectType.java --- a/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectType.java Mon Feb 02 16:47:33 2009 +0100 @@ -41,42 +41,14 @@ package org.netbeans.modules.ant.freeform; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Freeform project type. * @author Jesse Glick */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class FreeformProjectType implements AntBasedProjectType { - +public final class FreeformProjectType { public static final String TYPE = "org.netbeans.modules.ant.freeform"; public static final String NS_GENERAL_1 = "http://www.netbeans.org/ns/freeform-project/1"; // NOI18N public static final String NS_GENERAL = org.netbeans.modules.ant.freeform.spi.support.Util.NAMESPACE; public static final String NAME_SHARED = "general-data"; // NOI18N - private static final String NS_GENERAL_PRIVATE = "http://www.netbeans.org/ns/freeform-project-private/1"; // NOI18N - - /** Default constructor for lookup. */ - public FreeformProjectType() {} - - public Project createProject(AntProjectHelper helper) throws IOException { - return new FreeformProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return NAME_SHARED; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - // No private.xml defined anyway. - return shared ? /* old! for FreeformProjectGenerator */ NS_GENERAL_1 : NS_GENERAL_PRIVATE; - } - - public String getType() { - return TYPE; // NOI18N - } - + static final String NS_GENERAL_PRIVATE = "http://www.netbeans.org/ns/freeform-project-private/1"; // NOI18N } diff -r bd8aef593115 apisupport.project/nbproject/project.xml --- a/apisupport.project/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/apisupport.project/nbproject/project.xml Mon Feb 02 16:47:33 2009 +0100 @@ -196,7 +196,7 @@ 1 - 1.28 + 1.30 diff -r bd8aef593115 apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java --- a/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java Mon Feb 02 16:47:34 2009 +0100 @@ -112,6 +112,7 @@ import org.netbeans.modules.apisupport.project.universe.LocalizedBundleInfo; import org.netbeans.modules.apisupport.project.universe.ModuleEntry; import org.netbeans.spi.project.support.LookupProviderSupport; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.ui.RecommendedTemplates; import org.netbeans.spi.project.ui.support.UILookupMergerSupport; import org.openide.modules.SpecificationVersion; @@ -121,6 +122,14 @@ * A NetBeans module project. * @author Jesse Glick */ +@AntBasedProjectRegistration( + type=NbModuleProjectType.TYPE, + iconResource="org/netbeans/modules/apisupport/project/resources/module.png", // NOI18N + sharedName=NbModuleProjectType.NAME_SHARED, + sharedNamespace= NbModuleProjectType.NAMESPACE_SHARED, + privateName=NbModuleProjectType.NAME_PRIVATE, + privateNamespace= NbModuleProjectType.NAMESPACE_PRIVATE +) public final class NbModuleProject implements Project { public static final String NB_PROJECT_ICON_PATH = @@ -139,7 +148,7 @@ private final GeneratedFilesHelper genFilesHelper; private final NbModuleProviderImpl typeProvider; - NbModuleProject(AntProjectHelper helper) throws IOException { + public NbModuleProject(AntProjectHelper helper) throws IOException { AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration(); for (int v = 4; v < 10; v++) { if (aux.getConfigurationFragment("data", "http://www.netbeans.org/ns/nb-module-project/" + v, true) != null) { // NOI18N diff -r bd8aef593115 apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProjectType.java --- a/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProjectType.java Mon Feb 02 16:47:34 2009 +0100 @@ -41,48 +41,18 @@ package org.netbeans.modules.apisupport.project; -import java.io.IOException; -import javax.swing.Icon; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType2; -import org.netbeans.spi.project.support.ant.AntProjectHelper; -import org.openide.util.ImageUtilities; - /** - * Factory for NetBeans module projects. + * Constants. * @author Jesse Glick */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class NbModuleProjectType implements AntBasedProjectType2 { +public final class NbModuleProjectType { static final String TYPE = "org.netbeans.modules.apisupport.project"; // NOI18N static final String NAME_SHARED = "data"; // NOI18N public static final String NAMESPACE_SHARED = "http://www.netbeans.org/ns/nb-module-project/3"; // NOI18N public static final String NAMESPACE_SHARED_2 = "http://www.netbeans.org/ns/nb-module-project/2"; // NOI18N - private static final String NAME_PRIVATE = "data"; // NOI18N - private static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-project-private/1"; // NOI18N + static final String NAME_PRIVATE = "data"; // NOI18N + static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-project-private/1"; // NOI18N - /** Default constructor for lookup. */ - public NbModuleProjectType() {} - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - return new NbModuleProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? NAME_SHARED : NAME_PRIVATE; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? NAMESPACE_SHARED : NAMESPACE_PRIVATE; - } - - public Icon getIcon() { - return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/apisupport/project/resources/module.png", true)); - } - + private NbModuleProjectType() {} } diff -r bd8aef593115 apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java --- a/apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java Mon Feb 02 16:47:34 2009 +0100 @@ -67,6 +67,7 @@ import org.netbeans.modules.apisupport.project.ui.customizer.SuiteProperties; import org.netbeans.modules.apisupport.project.universe.NbPlatform; import org.netbeans.spi.project.support.LookupProviderSupport; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectEvent; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.AntProjectListener; @@ -93,6 +94,14 @@ * Represents one module suite project. * @author Jesse Glick */ +@AntBasedProjectRegistration( + type=SuiteProjectType.TYPE, + iconResource="org/netbeans/modules/apisupport/project/suite/resources/suite.png", // NOI18N + sharedName=SuiteProjectType.NAME_SHARED, + sharedNamespace= SuiteProjectType.NAMESPACE_SHARED, + privateName=SuiteProjectType.NAME_PRIVATE, + privateNamespace= SuiteProjectType.NAMESPACE_PRIVATE +) public final class SuiteProject implements Project { public static final String SUITE_ICON_PATH = diff -r bd8aef593115 apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectType.java --- a/apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProjectType.java Mon Feb 02 16:47:34 2009 +0100 @@ -41,47 +41,18 @@ package org.netbeans.modules.apisupport.project.suite; -import java.io.IOException; -import javax.swing.Icon; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType2; -import org.netbeans.spi.project.support.ant.AntProjectHelper; -import org.openide.util.ImageUtilities; - /** * Factory for NetBeans module suite projects. * @author Jesse Glick */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class SuiteProjectType implements AntBasedProjectType2 { +public final class SuiteProjectType { public static final String TYPE = "org.netbeans.modules.apisupport.project.suite"; // NOI18N static final String NAME_SHARED = "data"; // NOI18N public static final String NAMESPACE_SHARED = "http://www.netbeans.org/ns/nb-module-suite-project/1"; // NOI18N - private static final String NAME_PRIVATE = "data"; // NOI18N - private static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-suite-project-private/1"; // NOI18N + static final String NAME_PRIVATE = "data"; // NOI18N + static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-suite-project-private/1"; // NOI18N /** Default constructor for lookup. */ - public SuiteProjectType() {} - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - return new SuiteProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? NAME_SHARED : NAME_PRIVATE; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? NAMESPACE_SHARED : NAMESPACE_PRIVATE; - } - - public Icon getIcon() { - return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/apisupport/project/suite/resources/suite.png", true)); - } - + private SuiteProjectType() {} } diff -r bd8aef593115 bpel.project/nbproject/project.xml --- a/bpel.project/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/bpel.project/nbproject/project.xml Mon Feb 02 16:47:34 2009 +0100 @@ -156,7 +156,7 @@ 1 - 1.12.1 + 1.30 diff -r bd8aef593115 bpel.project/src/org/netbeans/modules/bpel/project/BpelproProject.java --- a/bpel.project/src/org/netbeans/modules/bpel/project/BpelproProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/bpel.project/src/org/netbeans/modules/bpel/project/BpelproProject.java Mon Feb 02 16:47:34 2009 +0100 @@ -87,6 +87,7 @@ import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModel; import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModelFactory; import org.netbeans.modules.xml.xam.locator.CatalogModelException; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.PropertyUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -96,6 +97,12 @@ /** * @author Chris Webster */ +@AntBasedProjectRegistration( + type=BpelproProjectType.TYPE, + iconResource="org/netbeans/modules/bpel/project/resources/bpelProject.png", + sharedNamespace=BpelproProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=BpelproProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class BpelproProject implements Project, AntProjectListener, ProjectPropertyProvider { private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/bpel/project/resources/bpelProject.png")); // NOI18N diff -r bd8aef593115 bpel.project/src/org/netbeans/modules/bpel/project/BpelproProjectType.java --- a/bpel.project/src/org/netbeans/modules/bpel/project/BpelproProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/bpel.project/src/org/netbeans/modules/bpel/project/BpelproProjectType.java Mon Feb 02 16:47:34 2009 +0100 @@ -18,42 +18,14 @@ */ package org.netbeans.modules.bpel.project; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for EJB Module projects * @author Chris Webster */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public class BpelproProjectType implements AntBasedProjectType { +public class BpelproProjectType { public static final String TYPE = "org.netbeans.modules.bpel.project"; public static final String PROJECT_CONFIGURATION_NAME = "data"; public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro/1"; public static final String PRIVATE_CONFIGURATION_NAME = "data"; public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro-private/1"; - - public BpelproProjectType() { - int i = 0; - } - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - if (null == helper) - throw new IllegalArgumentException("helper"); - return new BpelproProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } } diff -r bd8aef593115 bpel.project/src/org/netbeans/modules/bpel/project/IcanproProject.java --- a/bpel.project/src/org/netbeans/modules/bpel/project/IcanproProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/bpel.project/src/org/netbeans/modules/bpel/project/IcanproProject.java Mon Feb 02 16:47:34 2009 +0100 @@ -59,6 +59,7 @@ import org.openide.util.Utilities; import org.openide.util.lookup.Lookups; import org.netbeans.spi.project.AuxiliaryConfiguration; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.EditableProperties; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -72,6 +73,12 @@ * Represents one ejb module project * @author Chris Webster */ +@AntBasedProjectRegistration( + type=IcanproProjectType.TYPE, + iconResource="org/netbeans/modules/bpel/project/ui/resources/icanproProjectIcon.gif", + sharedNamespace=IcanproProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=IcanproProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class IcanproProject implements Project, AntProjectListener { private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/bpel/project/ui/resources/icanproProjectIcon.gif")); // NOI18N diff -r bd8aef593115 bpel.project/src/org/netbeans/modules/bpel/project/IcanproProjectType.java --- a/bpel.project/src/org/netbeans/modules/bpel/project/IcanproProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/bpel.project/src/org/netbeans/modules/bpel/project/IcanproProjectType.java Mon Feb 02 16:47:34 2009 +0100 @@ -20,43 +20,12 @@ package org.netbeans.modules.bpel.project; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for EJB Module projects * @author Chris Webster */ -public class IcanproProjectType implements AntBasedProjectType, IcanproConstants { +public class IcanproProjectType implements IcanproConstants { public static final String TYPE = " org.netbeans.modules.bpel.project"; - private static final String PROJECT_CONFIGURATION_NAME = "data"; public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro/1"; - private static final String PRIVATE_CONFIGURATION_NAME = "data"; - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1"; - - - public IcanproProjectType() { - int i = 0; - } - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - if (null == helper) - throw new IllegalArgumentException("helper"); - return new IcanproProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1"; } diff -r bd8aef593115 cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java Mon Feb 02 16:47:34 2009 +0100 @@ -77,6 +77,7 @@ import org.netbeans.modules.cnd.utils.MIMENames; import org.netbeans.spi.project.AuxiliaryConfiguration; import org.netbeans.spi.project.SubprojectProvider; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectEvent; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.AntProjectListener; @@ -108,6 +109,12 @@ /** * Represents one plain Make project. */ +@AntBasedProjectRegistration( + iconResource=MakeConfigurationDescriptor.ICON, + type=MakeProjectType.TYPE, + sharedNamespace=MakeProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=MakeProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class MakeProject implements Project, AntProjectListener { // private static final Icon MAKE_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/cnd/makeproject/ui/resources/makeProject.gif")); // NOI18N @@ -129,7 +136,7 @@ private Set cppExtensions = MakeProject.createExtensionSet(); private String sourceEncoding = null; - MakeProject(AntProjectHelper helper) throws IOException { + public MakeProject(AntProjectHelper helper) throws IOException { this.helper = helper; eval = createEvaluator(); AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration(); diff -r bd8aef593115 cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProjectType.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProjectType.java Mon Feb 02 16:47:34 2009 +0100 @@ -41,43 +41,15 @@ package org.netbeans.modules.cnd.makeproject; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for simple Make projects. */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class MakeProjectType implements AntBasedProjectType { +public final class MakeProjectType { public static final String TYPE = "org.netbeans.modules.cnd.makeproject"; // NOI18N - private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project/1"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project-private/1"; // NOI18N + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project-private/1"; // NOI18N public static final String MAKE_DEP_PROJECTS = "make-dep-projects"; // NOI18N public static final String MAKE_DEP_PROJECT = "make-dep-project"; // NOI18N public static final String SOURCE_ENCODING_TAG = "sourceEncoding"; // NOI18N - - /** Do nothing, just a service. */ - public MakeProjectType() {} - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - return new MakeProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - } diff -r bd8aef593115 compapp.projects.base/nbproject/project.xml --- a/compapp.projects.base/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/compapp.projects.base/nbproject/project.xml Mon Feb 02 16:47:34 2009 +0100 @@ -101,7 +101,7 @@ 1 - 1.12.1 + 1.30 diff -r bd8aef593115 compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProject.java --- a/compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProject.java Mon Feb 02 16:47:34 2009 +0100 @@ -62,6 +62,7 @@ import org.openide.util.Utilities; import org.openide.util.lookup.Lookups; import org.netbeans.spi.project.AuxiliaryConfiguration; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.EditableProperties; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -72,6 +73,12 @@ * Represents one ejb module project * @author Chris Webster */ +@AntBasedProjectRegistration( + type=IcanproProjectType.TYPE, + iconResource="org/netbeans/modules/compapp/projects/base/ui/resources/icanproProjectIcon.gif", + sharedNamespace=IcanproProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=IcanproProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class IcanproProject implements Project, AntProjectListener { private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/compapp/projects/base/ui/resources/icanproProjectIcon.gif")); // NOI18N diff -r bd8aef593115 compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProjectType.java --- a/compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProjectType.java Mon Feb 02 16:47:34 2009 +0100 @@ -20,44 +20,12 @@ package org.netbeans.modules.compapp.projects.base; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for EJB Module projects * @author Chris Webster */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public class IcanproProjectType implements AntBasedProjectType, IcanproConstants { +public class IcanproProjectType implements IcanproConstants { public static final String TYPE = "org.netbeans.modules.compapp.projects.base"; - private static final String PROJECT_CONFIGURATION_NAME = "data"; public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro/1"; - private static final String PRIVATE_CONFIGURATION_NAME = "data"; - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1"; - - - public IcanproProjectType() { - int i = 0; - } - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - if (null == helper) - throw new IllegalArgumentException("helper"); - return new IcanproProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1"; } diff -r bd8aef593115 compapp.projects.jbi/nbproject/project.xml --- a/compapp.projects.jbi/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/compapp.projects.jbi/nbproject/project.xml Mon Feb 02 16:47:34 2009 +0100 @@ -201,7 +201,7 @@ 1 - 1.11.1 + 1.30 diff -r bd8aef593115 compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProject.java --- a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProject.java Mon Feb 02 16:47:34 2009 +0100 @@ -103,6 +103,12 @@ * * @author Chris Webster */ +@AntBasedProjectRegistration( + type=JbiProjectType.TYPE, + iconResource="org/netbeans/modules/compapp/projects/jbi/ui/resources/composite_application_project.png", + sharedNamespace=JbiProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=JbiProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class JbiProject implements Project, AntProjectListener, ProjectPropertyProvider { private static final Icon PROJECT_ICON = new ImageIcon( ImageUtilities.loadImage( @@ -163,7 +169,6 @@ private final ReferenceHelper refHelper; private final GeneratedFilesHelper genFilesHelper; private final Lookup lookup; - private AntBasedProjectType abpt; private JbiLogicalViewProvider lvp; private FileChangeListener casaFileListener; @@ -178,10 +183,9 @@ * * @throws IOException DOCUMENT ME! */ - public JbiProject(final AntProjectHelper helper, AntBasedProjectType abpt) + public JbiProject(final AntProjectHelper helper) throws IOException { this.helper = helper; - this.abpt = abpt; eval = createEvaluator(); AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration(); @@ -196,15 +200,6 @@ // CasaHelper.registerCasaFileListener(JbiProject.this); // } // }); - } - - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public AntBasedProjectType getAntBasedProjectType() { - return abpt; } /** diff -r bd8aef593115 compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProjectType.java --- a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProjectType.java Mon Feb 02 16:47:34 2009 +0100 @@ -41,90 +41,20 @@ package org.netbeans.modules.compapp.projects.jbi; -import org.netbeans.api.project.Project; - -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; -import org.netbeans.modules.compapp.projects.jbi.JbiProject; -import org.openide.util.NbBundle; - -import java.io.IOException; - - /** * Factory for EJB Module projects * * @author Chris Webster */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class JbiProjectType implements AntBasedProjectType { +public final class JbiProjectType { /** * DOCUMENT ME! */ public static final String TYPE = "org.netbeans.modules.compapp.projects.jbi"; // NOI18N - private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N /** * DOCUMENT ME! */ public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-jbi/1"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-jbi-private/1"; // NOI18N - - /** - * Creates a new JbiProjectType object. - */ - public JbiProjectType() { - int i = 0; - } - - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public String getType() { - return TYPE; - } - - /** - * DOCUMENT ME! - * - * @param helper DOCUMENT ME! - * - * @return DOCUMENT ME! - * - * @throws IOException DOCUMENT ME! - * @throws IllegalArgumentException DOCUMENT ME! - */ - public Project createProject(AntProjectHelper helper) - throws IOException { - if (null == helper) { - throw new IllegalArgumentException(NbBundle.getMessage(JbiProjectType.class, "MSG_helper")); // NOI18N - } - - return new JbiProject(helper, this); - } - - /** - * DOCUMENT ME! - * - * @param shared DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - /** - * DOCUMENT ME! - * - * @param shared DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-jbi-private/1"; // NOI18N } diff -r bd8aef593115 compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/customizer/JbiProjectProperties.java --- a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/customizer/JbiProjectProperties.java Thu Jan 29 17:56:55 2009 +0100 +++ b/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/customizer/JbiProjectProperties.java Mon Feb 02 16:47:34 2009 +0100 @@ -585,7 +585,6 @@ private HashMap properties; private AntProjectHelper antProjectHelper; private ReferenceHelper refHelper; - private AntBasedProjectType abpt; private List bindingList = new Vector(); private List sunresourceProjs; javax.swing.text.Document DIST_JAR_MODEL; @@ -604,7 +603,6 @@ this.properties = new HashMap(); this.antProjectHelper = antProjectHelper; this.refHelper = refHelper; - this.abpt = project.getAntBasedProjectType(); read(); PropertyEvaluator evaluator = antProjectHelper.getStandardPropertyEvaluator(); diff -r bd8aef593115 j2ee.archive/nbproject/project.xml --- a/j2ee.archive/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.archive/nbproject/project.xml Mon Feb 02 16:47:34 2009 +0100 @@ -169,7 +169,7 @@ 1 - 1.12.1 + 1.30 diff -r bd8aef593115 j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProject.java --- a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProject.java Mon Feb 02 16:47:35 2009 +0100 @@ -77,6 +77,7 @@ import org.netbeans.spi.project.AuxiliaryConfiguration; import org.netbeans.spi.project.ant.AntArtifactProvider; import org.netbeans.spi.project.support.LookupProviderSupport; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.GeneratedFilesHelper; import org.netbeans.spi.project.support.ant.PropertyEvaluator; @@ -102,6 +103,12 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Text; +@AntBasedProjectRegistration( + iconResource="org/netbeans/modules/j2ee/archive/project/resources/packaged_archive_16.png", + type=ArchiveProjectType.TYPE, + sharedNamespace=ArchiveProjectType.PROJECT_CONFIGURATION_NS, + privateNamespace=ArchiveProjectType.PRIVATE_CONFIGURATION_NS +) public class ArchiveProject implements org.netbeans.api.project.Project { private final AuxiliaryConfiguration aux; diff -r bd8aef593115 j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProjectType.java --- a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProjectType.java Mon Feb 02 16:47:35 2009 +0100 @@ -41,37 +41,8 @@ package org.netbeans.modules.j2ee.archive.project; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntProjectHelper; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; - -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public class ArchiveProjectType implements AntBasedProjectType { - - private static final String CONFIGURATION_NAME ="data"; //NOI18N +public class ArchiveProjectType { public static final String PROJECT_CONFIGURATION_NS ="http://www.netbeans.org/ns/archive-project/1"; //NOI18N - private static final String PRIVATE_CONFIGURATION_NS = "http://www.netbeans.org/ns/archive-project-private/1"; //NOI18N - + static final String PRIVATE_CONFIGURATION_NS = "http://www.netbeans.org/ns/archive-project-private/1"; //NOI18N public static final String TYPE = "org.netbeans.modules.j2ee.archive.project"; //NOI18N - - /** Creates a new instance of DeployableArchive */ - public ArchiveProjectType() { - } - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - return new ArchiveProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NS : PRIVATE_CONFIGURATION_NS; - } } diff -r bd8aef593115 j2ee.clientproject/nbproject/project.xml --- a/j2ee.clientproject/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.clientproject/nbproject/project.xml Mon Feb 02 16:47:35 2009 +0100 @@ -236,7 +236,7 @@ 1 - 1.23 + 1.30 diff -r bd8aef593115 j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java Mon Feb 02 16:47:35 2009 +0100 @@ -105,6 +105,7 @@ import org.netbeans.spi.project.ant.AntBuildExtenderFactory; import org.netbeans.spi.project.ant.AntBuildExtenderImplementation; import org.netbeans.spi.project.support.LookupProviderSupport; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectEvent; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.AntProjectListener; @@ -147,6 +148,12 @@ * Represents one plain Application Client project. * @author Jesse Glick, et al. */ +@AntBasedProjectRegistration( + iconResource="org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif", + type=AppClientProjectType.TYPE, + sharedNamespace=AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=AppClientProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class AppClientProject implements Project, AntProjectListener, FileChangeListener { private static final Icon CAR_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif")); // NOI18N @@ -181,7 +188,7 @@ // use AntBuildExtender to enable Ant Extensibility private AntBuildExtender buildExtender; - AppClientProject(AntProjectHelper helper) throws IOException { + public AppClientProject(AntProjectHelper helper) throws IOException { this.helper = helper; eval = createEvaluator(); aux = helper.createAuxiliaryConfiguration(); diff -r bd8aef593115 j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java Mon Feb 02 16:47:35 2009 +0100 @@ -41,41 +41,14 @@ package org.netbeans.modules.j2ee.clientproject; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for simple J2SE projects. * @author Jesse Glick */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class AppClientProjectType implements AntBasedProjectType { - +public final class AppClientProjectType { public static final String TYPE = "org.netbeans.modules.j2ee.clientproject"; // NOI18N private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project/1"; // NOI18N private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project-private/1"; // NOI18N - - /** Do nothing, just a service. */ - public AppClientProjectType() {} - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - return new AppClientProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project-private/1"; // NOI18N } diff -r bd8aef593115 j2ee.earproject/nbproject/project.xml --- a/j2ee.earproject/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.earproject/nbproject/project.xml Mon Feb 02 16:47:35 2009 +0100 @@ -210,7 +210,7 @@ 1 - 1.23 + 1.30 diff -r bd8aef593115 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java Mon Feb 02 16:47:35 2009 +0100 @@ -87,7 +87,7 @@ import org.netbeans.spi.project.ant.AntBuildExtenderFactory; import org.netbeans.spi.project.ant.AntBuildExtenderImplementation; import org.netbeans.spi.project.support.LookupProviderSupport; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectEvent; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.AntProjectListener; @@ -123,6 +123,12 @@ * * @author vince kraemer */ +@AntBasedProjectRegistration( + iconResource="org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif", + type=EarProjectType.TYPE, + sharedNamespace=EarProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=EarProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class EarProject implements Project, AntProjectListener { private static final Icon EAR_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif")); // NOI18N @@ -135,7 +141,6 @@ private final Lookup lookup; private final ProjectEar appModule; private final Ear ear; - private final AntBasedProjectType abpt; private final UpdateHelper updateHelper; private final UpdateProjectImpl updateProject; private final ClassPathProviderImpl cpProvider; @@ -144,9 +149,8 @@ private AntBuildExtender buildExtender; public ClassPathSupport cs; - EarProject(final AntProjectHelper helper, AntBasedProjectType abpt) throws IOException { + public EarProject(final AntProjectHelper helper) throws IOException { this.helper = helper; - this.abpt = abpt; eval = createEvaluator(); AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration(); refHelper = new ReferenceHelper(helper, aux, helper.getStandardPropertyEvaluator()); @@ -222,9 +226,9 @@ new ProjectEarProvider(), appModule, //implements J2eeModuleProvider new EarActionProvider(this, updateHelper), - new J2eeArchiveLogicalViewProvider(this, updateHelper, evaluator(), refHelper, abpt), + new J2eeArchiveLogicalViewProvider(this, updateHelper, evaluator(), refHelper), new MyIconBaseProvider(), - new CustomizerProviderImpl(this, helper, refHelper, abpt), + new CustomizerProviderImpl(this, helper, refHelper), LookupMergerSupport.createClassPathProviderMerger(cpProvider), new ProjectXmlSavedHookImpl(), UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()), diff -r bd8aef593115 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java Mon Feb 02 16:47:35 2009 +0100 @@ -41,44 +41,13 @@ package org.netbeans.modules.j2ee.earproject; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; /** * Factory for Enterprise Applications * @see WebProjectType * @author vince kraemer */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class EarProjectType implements AntBasedProjectType { - +public final class EarProjectType { public static final String TYPE = "org.netbeans.modules.j2ee.earproject"; - private static final String PROJECT_CONFIGURATION_NAME = "data"; public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject/2"; - private static final String PRIVATE_CONFIGURATION_NAME = "data"; - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject-private/1"; - - /** Do nothing, just a service. */ - public EarProjectType() {} - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - if (null == helper) { - throw new IllegalArgumentException("helper"); - } - return new EarProject(helper, this); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject-private/1"; } diff -r bd8aef593115 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java Mon Feb 02 16:47:35 2009 +0100 @@ -81,7 +81,6 @@ import org.netbeans.spi.java.project.support.ui.BrokenReferencesSupport; import org.netbeans.spi.java.project.support.ui.PackageView; import org.netbeans.spi.project.ActionProvider; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; import org.netbeans.spi.project.support.ant.PropertyEvaluator; @@ -123,12 +122,10 @@ protected final ReferenceHelper resolver; private final List specialActions = Collections.singletonList(SystemAction.get(AddModuleAction.class)); - private final AntBasedProjectType abpt; private final ChangeSupport changeSupport = new ChangeSupport(this); public J2eeArchiveLogicalViewProvider(EarProject project, UpdateHelper helper, - PropertyEvaluator evaluator, ReferenceHelper resolver, - AntBasedProjectType abpt) { + PropertyEvaluator evaluator, ReferenceHelper resolver) { this.project = project; assert project != null; this.helper = helper; @@ -136,7 +133,6 @@ this.evaluator = evaluator; assert evaluator != null; this.resolver = resolver; - this.abpt = abpt; } public Node createLogicalView() { diff -r bd8aef593115 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerProviderImpl.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerProviderImpl.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerProviderImpl.java Mon Feb 02 16:47:35 2009 +0100 @@ -52,7 +52,6 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.modules.j2ee.earproject.EarProject; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.ReferenceHelper; import org.netbeans.spi.project.ui.CustomizerProvider; @@ -71,17 +70,15 @@ private final EarProject project; private final AntProjectHelper antProjectHelper; private final ReferenceHelper refHelper; - private final AntBasedProjectType abpt; private static Map project2Dialog = new HashMap(); public static final String CUSTOMIZER_FOLDER_PATH = "Projects/org-netbeans-modules-j2ee-earproject/Customizer"; //NO18N - public CustomizerProviderImpl(EarProject project, AntProjectHelper antProjectHelper, ReferenceHelper refHelper, AntBasedProjectType abpt) { + public CustomizerProviderImpl(EarProject project, AntProjectHelper antProjectHelper, ReferenceHelper refHelper) { this.project = project; this.antProjectHelper = antProjectHelper; this.refHelper = refHelper; - this.abpt = abpt; } public void showCustomizer() { diff -r bd8aef593115 j2ee.ejbjarproject/nbproject/project.xml --- a/j2ee.ejbjarproject/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.ejbjarproject/nbproject/project.xml Mon Feb 02 16:47:35 2009 +0100 @@ -280,7 +280,7 @@ 1 - 1.23 + 1.30 diff -r bd8aef593115 j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java Mon Feb 02 16:47:35 2009 +0100 @@ -159,6 +159,7 @@ import org.netbeans.spi.java.project.support.ExtraSourceJavadocSupport; import org.netbeans.spi.java.project.support.LookupMergerSupport; import org.netbeans.spi.project.support.LookupProviderSupport; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.PropertyUtils; import org.netbeans.spi.project.ui.support.UILookupMergerSupport; import org.netbeans.spi.queries.FileEncodingQueryImplementation; @@ -175,6 +176,12 @@ * Represents one ejb module project * @author Chris Webster */ +@AntBasedProjectRegistration( + iconResource="org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjarProjectIcon.gif", + type=EjbJarProjectType.TYPE, + sharedNamespace=EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=EjbJarProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public class EjbJarProject implements Project, AntProjectListener, FileChangeListener { private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjarProjectIcon.gif")); // NOI18N @@ -268,7 +275,7 @@ } };*/ - EjbJarProject(final AntProjectHelper helper) throws IOException { + public EjbJarProject(final AntProjectHelper helper) throws IOException { this.helper = helper; eval = createEvaluator(); aux = helper.createAuxiliaryConfiguration(); diff -r bd8aef593115 j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectType.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectType.java Mon Feb 02 16:47:35 2009 +0100 @@ -41,41 +41,12 @@ package org.netbeans.modules.j2ee.ejbjarproject; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for EJB Module projects * @author Chris Webster */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class EjbJarProjectType implements AntBasedProjectType { - +public final class EjbJarProjectType { public static final String TYPE = "org.netbeans.modules.j2ee.ejbjarproject"; // NOI18N - private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject/3"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject-private/1"; // NOI18N - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - if (null == helper) { - throw new IllegalArgumentException("helper"); // NOI18N - } - return new EjbJarProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject-private/1"; // NOI18N } diff -r bd8aef593115 java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java Mon Feb 02 16:47:35 2009 +0100 @@ -98,6 +98,7 @@ import org.netbeans.spi.project.ant.AntBuildExtenderFactory; import org.netbeans.spi.project.support.LookupProviderSupport; import org.netbeans.spi.project.ant.AntBuildExtenderImplementation; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectEvent; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.AntProjectListener; @@ -139,6 +140,14 @@ * Represents one plain J2SE project. * @author Jesse Glick, et al. */ +@AntBasedProjectRegistration( + type=J2SEProjectType.TYPE, + iconResource="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png", // NOI18N + sharedName=J2SEProjectType.PROJECT_CONFIGURATION_NAME, + sharedNamespace= J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateName=J2SEProjectType.PRIVATE_CONFIGURATION_NAME, + privateNamespace= J2SEProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class J2SEProject implements Project, AntProjectListener { private static final Icon J2SE_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png")); // NOI18N @@ -159,7 +168,7 @@ private AntBuildExtender buildExtender; - J2SEProject(AntProjectHelper helper) throws IOException { + public J2SEProject(AntProjectHelper helper) throws IOException { this.helper = helper; eval = createEvaluator(); aux = helper.createAuxiliaryConfiguration(); diff -r bd8aef593115 java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectType.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectType.java Mon Feb 02 16:47:35 2009 +0100 @@ -41,47 +41,13 @@ package org.netbeans.modules.java.j2seproject; -import java.io.IOException; -import javax.swing.Icon; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType2; -import org.netbeans.spi.project.support.ant.AntProjectHelper; -import org.openide.util.ImageUtilities; - /** - * Factory for simple J2SE projects. - * @author Jesse Glick + * Constants. */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class J2SEProjectType implements AntBasedProjectType2 { - +public final class J2SEProjectType { public static final String TYPE = "org.netbeans.modules.java.j2seproject"; // NOI18N - private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N + static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project/3"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project-private/1"; // NOI18N - - /** Do nothing, just a service. */ - public J2SEProjectType() {} - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - return new J2SEProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - - public Icon getIcon() { - return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png", true)); - } - + static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project-private/1"; // NOI18N } diff -r bd8aef593115 mobility.project/nbproject/project.xml --- a/mobility.project/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/mobility.project/nbproject/project.xml Mon Feb 02 16:47:35 2009 +0100 @@ -163,7 +163,7 @@ 1 - 1.6.1 + 1.30 diff -r bd8aef593115 mobility.project/src/org/netbeans/modules/mobility/project/J2MEProject.java --- a/mobility.project/src/org/netbeans/modules/mobility/project/J2MEProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/mobility.project/src/org/netbeans/modules/mobility/project/J2MEProject.java Mon Feb 02 16:47:36 2009 +0100 @@ -143,6 +143,12 @@ * Represents one plain J2ME project. * @author Jesse Glick, Adam Sotona, Tim Boudreau */ +@AntBasedProjectRegistration( + type=J2MEProjectType.TYPE, + iconResource="org/netbeans/modules/mobility/project/ui/resources/mobile-project.png", + sharedNamespace=J2MEProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=J2MEProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class J2MEProject implements Project, AntProjectListener { final Icon J2ME_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage( "org/netbeans/modules/mobility/project/ui/resources/mobile-project.png" )); // NOI18N @@ -396,7 +402,7 @@ } - J2MEProject(AntProjectHelper helper) { + public J2MEProject(AntProjectHelper helper) { rp = new RequestProcessor ("RP for " + helper.getProjectDirectory().getPath(), 2, true); this.helper = helper; diff -r bd8aef593115 mobility.project/src/org/netbeans/modules/mobility/project/J2MEProjectType.java --- a/mobility.project/src/org/netbeans/modules/mobility/project/J2MEProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/mobility.project/src/org/netbeans/modules/mobility/project/J2MEProjectType.java Mon Feb 02 16:47:36 2009 +0100 @@ -40,37 +40,13 @@ */ package org.netbeans.modules.mobility.project; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for simple J2ME projects. * @author Jesse Glick, Adam Sotona */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class, position=100) -public final class J2MEProjectType implements AntBasedProjectType { +public final class J2MEProjectType { public static final String TYPE = "org.netbeans.modules.kjava.j2meproject"; //NOI18N - private static final String PROJECT_CONFIGURATION_NAME = "data"; //NOI18N public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project"; //NOI18N - private static final String PRIVATE_CONFIGURATION_NAME = "data"; //NOI18N - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project-private"; //NOI18N - - public String getType() { - return TYPE; - } - - public Project createProject(final AntProjectHelper helper) { - return new J2MEProject(helper); - } - - public String getPrimaryConfigurationDataElementName(final boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(final boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project-private"; //NOI18N } diff -r bd8aef593115 php.project/nbproject/project.xml --- a/php.project/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/php.project/nbproject/project.xml Mon Feb 02 16:47:36 2009 +0100 @@ -141,7 +141,7 @@ 1 - 1.21 + 1.30 diff -r bd8aef593115 php.project/src/org/netbeans/modules/php/project/PhpProject.java --- a/php.project/src/org/netbeans/modules/php/project/PhpProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/php.project/src/org/netbeans/modules/php/project/PhpProject.java Mon Feb 02 16:47:36 2009 +0100 @@ -61,6 +61,7 @@ import org.netbeans.modules.php.project.ui.customizer.CustomizerProviderImpl; import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties; import org.netbeans.spi.project.AuxiliaryConfiguration; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.FilterPropertyProvider; import org.netbeans.spi.project.support.ant.ProjectXmlSavedHook; @@ -89,6 +90,12 @@ /** * @author ads, Tomas Mysik */ +@AntBasedProjectRegistration( + type=PhpProjectType.TYPE, + iconResource="org/netbeans/modules/php/project/ui/resources/phpProject.png", + sharedNamespace=PhpProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=PhpProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public class PhpProject implements Project { public static final String USG_LOGGER_NAME = "org.netbeans.ui.metrics.php"; //NOI18N @@ -112,7 +119,7 @@ // @GuardedBy(this) private FileObject seleniumDirectory; - PhpProject(AntProjectHelper helper) { + public PhpProject(AntProjectHelper helper) { assert helper != null; this.helper = helper; diff -r bd8aef593115 php.project/src/org/netbeans/modules/php/project/PhpProjectType.java --- a/php.project/src/org/netbeans/modules/php/project/PhpProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/php.project/src/org/netbeans/modules/php/project/PhpProjectType.java Mon Feb 02 16:47:36 2009 +0100 @@ -40,46 +40,13 @@ */ package org.netbeans.modules.php.project; -import java.io.IOException; - -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - - /** * @author ads */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class PhpProjectType implements AntBasedProjectType { +public final class PhpProjectType { - public static final String TYPE = PhpProjectType.class.getPackage().getName(); + public static final String TYPE = "org.netbeans.modules.php.project"; // NOI18N public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project/1"; // NOI18N - private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N + static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project-private/1"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project-private/1"; // NOI18N - private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N - - public Project createProject(AntProjectHelper helper) throws IOException { - assert helper != null; - return new PhpProject(helper); - } - - public String getPrimaryConfigurationDataElementName( boolean shared ) { - /* - * Copied from MakeProjectType. - */ - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace( boolean shared ) { - /* - * Copied from MakeProjectType. - */ - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - - public String getType() { - return TYPE; - } } diff -r bd8aef593115 project.ant/apichanges.xml --- a/project.ant/apichanges.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/project.ant/apichanges.xml Mon Feb 02 16:47:36 2009 +0100 @@ -105,22 +105,22 @@ - + - Provide project icon without actually loading the project type - - - + Register Ant based projects with @annotation + + +

- Introducing AntBasedProjectType2 that extends AntBasedProjectType - and adds geticon() method to allow showing the icon without actually loading the - project. Related to org.netbeans.spi.project.ProjectFactory2 changes in the Project API module. + Introducing AntBasedProjectRegistration to + simplify registering Ant based projects. Just write the + project class and annotate it.

- - + + diff -r bd8aef593115 project.ant/manifest.mf --- a/project.ant/manifest.mf Thu Jan 29 17:56:55 2009 +0100 +++ b/project.ant/manifest.mf Mon Feb 02 16:47:36 2009 +0100 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.project.ant/1 -OpenIDE-Module-Specification-Version: 1.28 +OpenIDE-Module-Specification-Version: 1.30 OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties OpenIDE-Module-Install: org/netbeans/modules/project/ant/AntProjectModule.class diff -r bd8aef593115 project.ant/nbproject/project.properties --- a/project.ant/nbproject/project.properties Thu Jan 29 17:56:55 2009 +0100 +++ b/project.ant/nbproject/project.properties Mon Feb 02 16:47:36 2009 +0100 @@ -46,6 +46,7 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.5 +cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml diff -r bd8aef593115 project.ant/src/org/netbeans/modules/project/ant/AntBasedProjectFactorySingleton.java --- a/project.ant/src/org/netbeans/modules/project/ant/AntBasedProjectFactorySingleton.java Thu Jan 29 17:56:55 2009 +0100 +++ b/project.ant/src/org/netbeans/modules/project/ant/AntBasedProjectFactorySingleton.java Mon Feb 02 16:47:36 2009 +0100 @@ -69,7 +69,6 @@ import org.netbeans.spi.project.ProjectFactory2; import org.netbeans.spi.project.ProjectState; import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntBasedProjectType2; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; @@ -187,8 +186,8 @@ if (type != null) { AntBasedProjectType provider = findAntBasedProjectType(type); if (provider != null) { - if (provider instanceof AntBasedProjectType2) { - return new ProjectManager.Result(((AntBasedProjectType2)provider).getIcon()); + if (provider instanceof AntBasedGenericType) { + return new ProjectManager.Result(((AntBasedGenericType)provider).getIcon()); } else { //put special icon? return new ProjectManager.Result(null); @@ -385,5 +384,10 @@ } assert HELPER_CALLBACK != null; } - + + public static AntBasedProjectType create(Map map) { + return new AntBasedGenericType(map); + } + + } diff -r bd8aef593115 project.ant/test/unit/src/org/netbeans/spi/project/support/ant/AntBasedTestUtil.java --- a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/AntBasedTestUtil.java Thu Jan 29 17:56:55 2009 +0100 +++ b/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/AntBasedTestUtil.java Mon Feb 02 16:47:36 2009 +0100 @@ -157,14 +157,14 @@ } - private static final class TestAntBasedProject implements Project { + public static class TestAntBasedProject implements Project { private final AntProjectHelper helper; private final ReferenceHelper refHelper; private final GeneratedFilesHelper genFilesHelper; private final Lookup l; - TestAntBasedProject(AntProjectHelper helper, AntBuildExtenderImplementation ext) throws IOException { + protected TestAntBasedProject(AntProjectHelper helper, AntBuildExtenderImplementation ext) throws IOException { if (helper.getProjectDirectory().getFileObject("nbproject/broken") != null) { throw new IOException("broken"); } diff -r bd8aef593115 sql.project/nbproject/project.xml --- a/sql.project/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/sql.project/nbproject/project.xml Mon Feb 02 16:47:36 2009 +0100 @@ -115,7 +115,7 @@ 1 - 1.12.21 + 1.30 diff -r bd8aef593115 sql.project/src/org/netbeans/modules/sql/project/SQLproProject.java --- a/sql.project/src/org/netbeans/modules/sql/project/SQLproProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/sql.project/src/org/netbeans/modules/sql/project/SQLproProject.java Mon Feb 02 16:47:36 2009 +0100 @@ -44,7 +44,6 @@ import org.netbeans.modules.compapp.projects.base.ui.IcanproCustomizerProvider; import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties; import org.netbeans.modules.compapp.projects.base.queries.IcanproProjectEncodingQueryImpl; -import org.netbeans.modules.sql.project.SQLproConstants; import org.netbeans.modules.sql.project.ui.SQLproLogicalViewProvider; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -80,7 +79,6 @@ import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.Mutex; -import org.openide.util.Utilities; import org.openide.util.lookup.Lookups; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -91,6 +89,7 @@ import java.nio.charset.UnsupportedCharsetException; import java.util.logging.Logger; import org.netbeans.api.queries.FileEncodingQuery; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; @@ -98,6 +97,12 @@ * Represents one sql module project * @author Chris Webster */ +@AntBasedProjectRegistration( + type=SQLproProjectType.TYPE, + iconResource="org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif", + sharedNamespace=SQLproProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=SQLproProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public final class SQLproProject implements Project, AntProjectListener { private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif")); // NOI18N diff -r bd8aef593115 sql.project/src/org/netbeans/modules/sql/project/SQLproProjectType.java --- a/sql.project/src/org/netbeans/modules/sql/project/SQLproProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/sql.project/src/org/netbeans/modules/sql/project/SQLproProjectType.java Mon Feb 02 16:47:36 2009 +0100 @@ -32,44 +32,14 @@ package org.netbeans.modules.sql.project; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for EJB Module projects * @author Chris Webster */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public class SQLproProjectType implements AntBasedProjectType { +public class SQLproProjectType { public static final String TYPE = "org.netbeans.modules.sql.project"; public static final String PROJECT_CONFIGURATION_NAME = "data"; public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro/1"; public static final String PRIVATE_CONFIGURATION_NAME = "data"; public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro-private/1"; - - - public SQLproProjectType() { - int i = 0; - } - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - if (null == helper) - throw new IllegalArgumentException("helper"); - return new SQLproProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - } diff -r bd8aef593115 web.project/nbproject/project.xml --- a/web.project/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/web.project/nbproject/project.xml Mon Feb 02 16:47:36 2009 +0100 @@ -275,7 +275,7 @@ 1 - 1.25 + 1.30 diff -r bd8aef593115 web.project/src/org/netbeans/modules/web/project/WebProjectType.java --- a/web.project/src/org/netbeans/modules/web/project/WebProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/web.project/src/org/netbeans/modules/web/project/WebProjectType.java Mon Feb 02 16:47:36 2009 +0100 @@ -43,16 +43,13 @@ import java.io.IOException; import java.util.Collection; -import javax.swing.Icon; import org.netbeans.api.project.Project; import org.netbeans.modules.web.project.spi.WebProjectImplementationFactory; -import org.netbeans.spi.project.support.ant.AntBasedProjectType2; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectHelper; -import org.openide.util.ImageUtilities; import org.openide.util.Lookup; -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public final class WebProjectType implements AntBasedProjectType2 { +public final class WebProjectType { public static final String TYPE = "org.netbeans.modules.web.project"; private static final String PROJECT_CONFIGURATION_NAME = "data"; @@ -66,13 +63,20 @@ "http://www.netbeans.org/ns/web-project/3"}; /** Do nothing, just a service. */ - public WebProjectType() {} + private WebProjectType() {} public String getType() { return TYPE; } - - public Project createProject(AntProjectHelper helper) throws IOException { + @AntBasedProjectRegistration( + iconResource="org/netbeans/modules/web/project/ui/resources/webProjectIcon.gif", // NOI18N + type=TYPE, + sharedName=PROJECT_CONFIGURATION_NAME, + sharedNamespace=PROJECT_CONFIGURATION_NAMESPACE, + privateName=PRIVATE_CONFIGURATION_NAME, + privateNamespace=PRIVATE_CONFIGURATION_NAMESPACE + ) + public static Project createProject(AntProjectHelper helper) throws IOException { for(WebProjectImplementationFactory factory : getProjectFactories()) { if (factory.acceptProject(helper)) { //delegate project completely to another implementation @@ -82,19 +86,7 @@ return new WebProject(helper); } - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - - private Collection getProjectFactories() { + private static Collection getProjectFactories() { return Lookup.getDefault().lookupAll(WebProjectImplementationFactory.class); } - - public Icon getIcon() { - return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/web/project/ui/resources/webProjectIcon.gif", true)); - } } diff -r bd8aef593115 xslt.project/nbproject/project.xml --- a/xslt.project/nbproject/project.xml Thu Jan 29 17:56:55 2009 +0100 +++ b/xslt.project/nbproject/project.xml Mon Feb 02 16:47:36 2009 +0100 @@ -90,7 +90,7 @@ 1 - 1.12.22 + 1.30 diff -r bd8aef593115 xslt.project/src/org/netbeans/modules/xslt/project/XsltproProject.java --- a/xslt.project/src/org/netbeans/modules/xslt/project/XsltproProject.java Thu Jan 29 17:56:55 2009 +0100 +++ b/xslt.project/src/org/netbeans/modules/xslt/project/XsltproProject.java Mon Feb 02 16:47:36 2009 +0100 @@ -51,6 +51,7 @@ import org.netbeans.spi.java.project.support.ui.BrokenReferencesSupport; import org.netbeans.spi.project.AuxiliaryConfiguration; import org.netbeans.spi.project.SubprojectProvider; +import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration; import org.netbeans.spi.project.support.ant.AntProjectEvent; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.AntProjectListener; @@ -73,7 +74,6 @@ import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.Mutex; -import org.openide.util.Utilities; import org.openide.util.lookup.Lookups; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -86,6 +86,12 @@ * @author Vitaly Bychkov * @version 1.0 */ +@AntBasedProjectRegistration( + type=XsltproProjectType.TYPE, + iconResource=XSLT_PROJECT_ICON, + sharedNamespace=XsltproProjectType.PROJECT_CONFIGURATION_NAMESPACE, + privateNamespace=XsltproProjectType.PRIVATE_CONFIGURATION_NAMESPACE +) public class XsltproProject implements Project, AntProjectListener { private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage(XSLT_PROJECT_ICON)); // NOI18N diff -r bd8aef593115 xslt.project/src/org/netbeans/modules/xslt/project/XsltproProjectType.java --- a/xslt.project/src/org/netbeans/modules/xslt/project/XsltproProjectType.java Thu Jan 29 17:56:55 2009 +0100 +++ b/xslt.project/src/org/netbeans/modules/xslt/project/XsltproProjectType.java Mon Feb 02 16:47:36 2009 +0100 @@ -18,45 +18,16 @@ */ package org.netbeans.modules.xslt.project; -import java.io.IOException; -import org.netbeans.api.project.Project; -import org.netbeans.spi.project.support.ant.AntBasedProjectType; -import org.netbeans.spi.project.support.ant.AntProjectHelper; - /** * Factory for EJB Module projects * @author Chris Webster * @author Vitaly Bychkov * @version 1.0 */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class) -public class XsltproProjectType implements AntBasedProjectType { +public class XsltproProjectType { public static final String TYPE = "org.netbeans.modules.xslt.project"; public static final String PROJECT_CONFIGURATION_NAME = "data"; public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro/1"; public static final String PRIVATE_CONFIGURATION_NAME = "data"; public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro-private/1"; - - public XsltproProjectType() { - } - - public String getType() { - return TYPE; - } - - public Project createProject(AntProjectHelper helper) throws IOException { - if (helper == null) { - throw new IllegalArgumentException("AntProjectHelper shouldn't be null"); - } - return new XsltproProject(helper); - } - - public String getPrimaryConfigurationDataElementName(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME; - } - - public String getPrimaryConfigurationDataElementNamespace(boolean shared) { - return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE; - } - }