Author: akazakov Date: 2009-10-06 06:52:40 -0400 (Tue, 06 Oct 2009) New Revision: 17919 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4974 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java 2009-10-06 10:33:25 UTC (rev 17918) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java 2009-10-06 10:52:40 UTC (rev 17919) @@ -277,10 +277,10 @@ INVALID_TEST_SRC, INVALID_TEST_PACKAGE_NAME); } - String connectionProfile = pref.get(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, null); - if(!isConnectionProfileValid(connectionProfile, true)) { - errorManager.addError(INVALID_CONNECTION_NAME, SeamPreferences.INVALID_PROJECT_SETTINGS, new String[]{connectionProfile!=null?connectionProfile:"", project.getName()}, project); - } +// String connectionProfile = pref.get(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, null); +// if(!isConnectionProfileValid(connectionProfile, true)) { +// errorManager.addError(INVALID_CONNECTION_NAME, SeamPreferences.INVALID_PROJECT_SETTINGS, new String[]{connectionProfile!=null?connectionProfile:"", project.getName()}, project); +// } } return; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2009-10-06 10:33:25 UTC (rev 17918) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2009-10-06 10:52:40 UTC (rev 17919) @@ -12,7 +12,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -63,7 +62,6 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamProjectsSet; import org.jboss.tools.seam.core.SeamUtil; -import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.core.project.facet.SeamVersion; @@ -183,8 +181,8 @@ }); registerEditor(projectNameEditor, generalGroup); - IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), ValidatorFactory.NO_ERRORS_VALIDATOR, true); - registerEditor(connProfileEditor, generalGroup); +// IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), ValidatorFactory.NO_ERRORS_VALIDATOR, true); +// registerEditor(connProfileEditor, generalGroup); Group deploymentGroup = createGroup( root, @@ -507,6 +505,7 @@ return names; } + /* private String getConnectionProfile() { String ds = preferences.get(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, null); if(ds==null) { @@ -519,6 +518,7 @@ List<String> names = getProfileNameList(); return !names.isEmpty()?names.get(0):""; } + */ private String getEjbProjectName() { if(preferences!=null) { @@ -796,8 +796,8 @@ getValue(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)); prefs.put(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, getValue(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME)); - prefs.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, - getValue(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE)); +// prefs.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, +// getValue(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE)); prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, getValue(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME)); prefs.put(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, @@ -912,7 +912,7 @@ getEditor(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS).setValue(seamProjectSet.getDefaultDeployType()); getEditor(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT).setValue(seamProjectSet.getEjbProject()==null?project.getName():seamProjectSet.getEjbProject().getName()); getEditor(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER).setValue(getDefaultViewFolder()); - getEditor(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE).setValue(getDefaultConnectionProfile()); +// getEditor(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE).setValue(getDefaultConnectionProfile()); getEditor(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER).setValue(getDefaultModelSourceFolder()); getEditor(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME).setValue(getDefaultModelPackageName()); getEditor(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER).setValue(getDefaultActionSourceFolder()); Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java 2009-10-06 10:33:25 UTC (rev 17918) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java 2009-10-06 10:52:40 UTC (rev 17919) @@ -56,7 +56,7 @@ pref.put(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, "invalidTestProjectName"); pref.put(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, "invalidTestSrcFolderPath"); pref.put(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "invalid test package name"); - pref.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "invalidConnectionName"); +// pref.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "invalidConnectionName"); pref.flush(); JobUtils.waitForIdle(); @@ -88,9 +88,11 @@ assertMarkerIsCreated(warProject, null, ".*invalidRuntimeName.*"); } + /* public void testConnectionProfileNameValidation() throws CoreException { assertMarkerIsCreated(warProject, null, ".*invalidConnectionName.*"); } + */ public static void main(String[] args) { String errorMarker = "Model package name \"invalid model package name\" specified for Seam project \"RefactoringTestProject-war\" is not valid. Please correct this property in \"Seam settings\" page (Project->Properties->Seam Settings).";