Author: snjeza
Date: 2010-01-17 18:33:54 -0500 (Sun, 17 Jan 2010)
New Revision: 19788
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5656 Empty Artifact Id when Maven Integration is
added before project name
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-01-17
18:36:40 UTC (rev 19787)
+++
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2010-01-17
23:33:54 UTC (rev 19788)
@@ -210,8 +210,8 @@
}
boolean hasMavenNature = MavenCoreActivator.addMavenNature(project, monitor);
-
- if (!hasMavenNature) {
+ boolean hasJavaNature = project.hasNature(JavaCore.NATURE_ID);
+ if (!hasMavenNature && hasJavaNature) {
IClasspathAttribute attribute = JavaCore.newClasspathAttribute(
MavenCoreActivator.OWNER_PROJECT_FACETS_ATTR,
IJBossMavenConstants.M2_FACET_ID);
@@ -240,11 +240,15 @@
description.setNatureIds(newNatures);
project.setDescription(description, monitor);
}
- IJavaProject javaProject = JavaCore.create(project);
- IClasspathContainer mavenContainer =
BuildPathManager.getMaven2ClasspathContainer(javaProject);
- if (mavenContainer == null) {
- IPath path = new Path(BuildPathManager.CONTAINER_ID);
- setContainerPath(monitor, javaProject, path);
+ boolean hasJavaNature = project.hasNature(JavaCore.NATURE_ID);
+ if (hasJavaNature) {
+ IJavaProject javaProject = JavaCore.create(project);
+ IClasspathContainer mavenContainer = BuildPathManager
+ .getMaven2ClasspathContainer(javaProject);
+ if (mavenContainer == null) {
+ IPath path = new Path(BuildPathManager.CONTAINER_ID);
+ setContainerPath(monitor, javaProject, path);
+ }
}
return hasMavenNature;
}
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java 2010-01-17
18:36:40 UTC (rev 19787)
+++
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java 2010-01-17
23:33:54 UTC (rev 19788)
@@ -5,6 +5,11 @@
public class Messages extends NLS {
private static final String BUNDLE_NAME =
"org.jboss.tools.maven.core.messages"; //$NON-NLS-1$
public static String
MavenFacetInstallDelegate_Internal_Error_creating_JBoss_Maven_Facet;
+ public static String MavenFacetInstallPage_The_artifactId_field_is_required;
+ public static String MavenFacetInstallPage_The_groupId_field_is_required;
+ public static String MavenFacetInstallPage_The_packaging_field_is_required;
+ public static String MavenFacetInstallPage_The_version_field_is_required;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java 2010-01-17
18:36:40 UTC (rev 19787)
+++
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java 2010-01-17
23:33:54 UTC (rev 19788)
@@ -12,8 +12,11 @@
import java.util.Set;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
import org.jboss.tools.maven.core.IJBossMavenConstants;
+import org.jboss.tools.maven.core.MavenCoreActivator;
import org.jboss.tools.maven.core.Messages;
/**
@@ -73,4 +76,35 @@
return propertyNames;
}
+ @Override
+ public IStatus validate(String propertyName) {
+ IStatus status = OK_STATUS;
+ if(propertyName.equals(IJBossMavenConstants.GROUP_ID)){
+ String groupId = getStringProperty(IJBossMavenConstants.GROUP_ID);
+ if (groupId == null || groupId.trim().length() <= 0) {
+ status = new Status(IStatus.ERROR, MavenCoreActivator.PLUGIN_ID ,
Messages.MavenFacetInstallPage_The_groupId_field_is_required);
+ }
+ }
+ if(propertyName.equals(IJBossMavenConstants.ARTIFACT_ID)){
+ String groupId = getStringProperty(IJBossMavenConstants.ARTIFACT_ID);
+ if (groupId == null || groupId.trim().length() <= 0) {
+ status = new Status(IStatus.ERROR, MavenCoreActivator.PLUGIN_ID ,
Messages.MavenFacetInstallPage_The_artifactId_field_is_required);
+ }
+ }
+ if(propertyName.equals(IJBossMavenConstants.VERSION)){
+ String groupId = getStringProperty(IJBossMavenConstants.VERSION);
+ if (groupId == null || groupId.trim().length() <= 0) {
+ status = new Status(IStatus.ERROR, MavenCoreActivator.PLUGIN_ID ,
Messages.MavenFacetInstallPage_The_version_field_is_required);
+ }
+ }
+ if(propertyName.equals(IJBossMavenConstants.PACKAGING)){
+ String groupId = getStringProperty(IJBossMavenConstants.PACKAGING);
+ if (groupId == null || groupId.trim().length() <= 0) {
+ status = new Status(IStatus.ERROR, MavenCoreActivator.PLUGIN_ID ,
Messages.MavenFacetInstallPage_The_packaging_field_is_required);
+ }
+ }
+ return status;
+ }
+
+
}
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties 2010-01-17
18:36:40 UTC (rev 19787)
+++
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties 2010-01-17
23:33:54 UTC (rev 19788)
@@ -1 +1,6 @@
MavenFacetInstallDelegate_Internal_Error_creating_JBoss_Maven_Facet=Internal Error
creating JBoss Maven Facet. Missing configuration
+MavenFacetInstallPage_The_artifactId_field_is_required=The artifactId field is required.
+MavenFacetInstallPage_The_groupId_field_is_required=The groupId field is required.
+MavenFacetInstallPage_The_packaging_field_is_required=The packaging field is required.
+MavenFacetInstallPage_The_version_field_is_required=The version field is required.
+
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2010-01-17
18:36:40 UTC (rev 19787)
+++
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2010-01-17
23:33:54 UTC (rev 19788)
@@ -14,10 +14,6 @@
public static String MavenFacetInstallPage_Packaging;
public static String MavenFacetInstallPage_Remove_WTP_Classpath_containers;
public static String MavenFacetInstallPage_Seam_Maven_version;
- public static String MavenFacetInstallPage_The_artifactId_field_is_required;
- public static String MavenFacetInstallPage_The_groupId_field_is_required;
- public static String MavenFacetInstallPage_The_packaging_field_is_required;
- public static String MavenFacetInstallPage_The_version_field_is_required;
public static String MavenFacetInstallPage_Version;
public static String MavenUserLibraryProviderInstallPanel_Add;
public static String
MavenUserLibraryProviderInstallPanel_Are_you_sure_you_want_to_remove_the_artifact;
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2010-01-17
18:36:40 UTC (rev 19787)
+++
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2010-01-17
23:33:54 UTC (rev 19788)
@@ -23,8 +23,10 @@
import
org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import
org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
@@ -172,25 +174,22 @@
description.setEditable(false);
packaging.setEnabled(false);
}
- validatePage();
+ getDataModel().addListener(new IDataModelListener() {
+
+ public void propertyChanged(DataModelEvent event) {
+ String propertyName = event.getPropertyName();
+ if (IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME.equals(propertyName))
{
+ String projectName =
getDataModel().getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
+ if (projectName != null) {
+ artifactId.setText(projectName);
+ }
+ }
+ }
+ });
+
return composite;
}
- @Override
- protected void validatePage() {
- setErrorMessage(null);
- if (groupId.getText().trim().length() <= 0) {
- setErrorMessage(Messages.MavenFacetInstallPage_The_groupId_field_is_required);
- } else if (artifactId.getText().trim().length() <= 0) {
- setErrorMessage(Messages.MavenFacetInstallPage_The_artifactId_field_is_required);
- } else if (version.getText().trim().length() <= 0) {
- setErrorMessage(Messages.MavenFacetInstallPage_The_version_field_is_required);
- } else if (packaging.getText().trim().length() <= 0) {
- setErrorMessage(Messages.MavenFacetInstallPage_The_packaging_field_is_required);
- }
-
- }
-
private Text createField(Composite composite, String labelText,String property) {
Label label = new Label(composite, SWT.NONE);
label.setText(labelText);
@@ -203,7 +202,10 @@
@Override
protected String[] getValidationPropertyNames() {
- return new String[0];
+ return new String[] { IJBossMavenConstants.GROUP_ID,
+ IJBossMavenConstants.ARTIFACT_ID,
+ IJBossMavenConstants.VERSION,
+ IJBossMavenConstants.PACKAGING };
}
public void setConfig(Object config) {
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2010-01-17
18:36:40 UTC (rev 19787)
+++
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2010-01-17
23:33:54 UTC (rev 19788)
@@ -8,13 +8,9 @@
MavenFacetInstallPage_Packaging=Packaging:
MavenFacetInstallPage_Remove_WTP_Classpath_containers=Remove WTP Classpath containers
MavenFacetInstallPage_Seam_Maven_version=Seam Maven version:
-MavenFacetInstallPage_The_artifactId_field_is_required=The artifactId field is required.
-MavenFacetInstallPage_The_groupId_field_is_required=The groupId field is required.
-MavenFacetInstallPage_The_packaging_field_is_required=The packaging field is required.
-MavenFacetInstallPage_The_version_field_is_required=The version field is required.
MavenFacetInstallPage_Version=Version:
MavenUserLibraryProviderInstallPanel_Add=Add
-MavenUserLibraryProviderInstallPanel_Are_you_sure_you_want_to_remove_the_artifact=Are you
sure you want to remove the \'{0}\:{1} artifact?
+MavenUserLibraryProviderInstallPanel_Are_you_sure_you_want_to_remove_the_artifact=Are you
sure you want to remove the '{0}\:{1} artifact?
MavenUserLibraryProviderInstallPanel_ArtifactId=ArtifactId
MavenUserLibraryProviderInstallPanel_Dependencies=Dependencies:
MavenUserLibraryProviderInstallPanel_Exclusions=Exclusions: