[NOBUG] dm framework code impl for builder. Committing for DFH
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelFactory.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelFactory.java
index f8ef52b..760005a 100644
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelFactory.java
+++ b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/datamodel/DataModelFactory.java
@@ -59,7 +59,6 @@
}
private static List loadProviderForProviderKind(String providerKind) {
- reader = null;
if (null == reader) {
reader = new DataModelExtensionReader();
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java
index d1aab6a..101ceda 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java
@@ -22,7 +22,6 @@
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
@@ -163,7 +162,7 @@
String typeId = wbComponent.getComponentType().getComponentTypeId();
if (typeId == null)
break;
- builderType = getBuilderTypeFromComponentID(typeId);
+ builderType = typeId + ".builder";
dataModel = DataModelEnablementFactory.createDataModel(builderType, curProject);
if(dataModel != null) {
dataModel.setProperty(IWorkbenchComponentBuilderDataModelProperties.MODULE_CORE, moduleCore);
@@ -174,23 +173,6 @@
}
return moduleBuilderDataModelList;
}
-
- //TODO: remove and implement mechanism to register new builders for type
- private String getBuilderTypeFromComponentID(String id){
- if(id.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- return "AppClientComponentBuilder";
- if(id.equals(IModuleConstants.JST_EAR_MODULE))
- return "EARComponentBuilder";
- if(id.equals(IModuleConstants.JST_EJB_MODULE))
- return "EJBComponentBuilder";
- if(id.equals(IModuleConstants.JST_WEB_MODULE))
- return "WebComponentBuilder";
- if(id.equals(IModuleConstants.JST_CONNECTOR_MODULE))
- return "ConnectorComponentBuilder";
- if(id.equals(IModuleConstants.JST_UTILITY_MODULE))
- return "JavaUtilityComponentBuilder";
- return null;
- }
private List populateDeltaModuleBuilderDataModelList(ResourceDelta delta) {
//TODO: handle delta information correcty
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java
index 15a2130..bcb4cd5 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
@@ -24,8 +25,7 @@
public abstract class WorkbenchComponentBuilderDataModelProvider extends AbstractDataModelProvider implements IWorkbenchComponentBuilderDataModelProperties{
- public static final String REFERENCED_COMPONENT_BUILDER_ID = "referencedComponentBuilder";
- /* (non-Javadoc)
+ /* (non-Javadoc)
* @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
*/
public String[] getPropertyNames() {
@@ -50,7 +50,7 @@
StructureEdit moduleCore = (StructureEdit)model.getProperty(MODULE_CORE);
IProject project = (IProject)model.getProperty(PROJECT);
for(int i = 0; i<depModules.size(); i++){
- dependentDataModel = DataModelEnablementFactory.createDataModel(REFERENCED_COMPONENT_BUILDER_ID, project);
+ dependentDataModel = DataModelEnablementFactory.createDataModel(IModuleConstants.DEPENDENT_MODULE + ".builder", project);
if(dependentDataModel != null) {
dependentDataModel.setProperty(IReferencedComponentBuilderDataModelProperties.MODULE_CORE, moduleCore);
dependentDataModel.setProperty(IReferencedComponentBuilderDataModelProperties.CONTAINING_WBMODULE, getProperty(WORKBENCH_MODULE));
diff --git a/plugins/org.eclipse.wst.common.modulecore/plugin.xml b/plugins/org.eclipse.wst.common.modulecore/plugin.xml
index 56981af..1cfc262 100644
--- a/plugins/org.eclipse.wst.common.modulecore/plugin.xml
+++ b/plugins/org.eclipse.wst.common.modulecore/plugin.xml
@@ -90,7 +90,7 @@
class="org.eclipse.wst.common.componentcore.internal.builder.ReferencedComponentBuilderDataModelProvider"
id="org.eclipse.wst.common.componentcore.internal.builder.ReferencedComponentBuilderDataModelProvider"/>
<ProviderDefinesType
- providerType="referencedComponentBuilder"
+ providerType="dependent.builder"
providerID="org.eclipse.wst.common.componentcore.internal.builder.ReferencedComponentBuilderDataModelProvider"/>
</extension>
