Author: akazakov
Date: 2008-03-11 11:53:54 -0400 (Tue, 11 Mar 2008)
New Revision: 6851
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1322
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java 2008-03-11
15:49:48 UTC (rev 6850)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java 2008-03-11
15:53:54 UTC (rev 6851)
@@ -47,6 +47,12 @@
public static String SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED;
+ public static String SEAM_SETTINGS_PREFERENCE_PAGE_EJB_PROJECT_DOES_NOT_EXIST;
+
+ public static String SEAM_SETTINGS_PREFERENCE_PAGE_VIEW_FOLDER_DOES_NOT_EXIST;
+
+ public static String SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT_DOES_NOT_EXIST;
+
public static String SEAM_VALIDATOR_CONFIGURATION_BLOCK_ERROR;
public static String SEAM_VALIDATOR_CONFIGURATION_BLOCK_IGNORE;
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties 2008-03-11
15:49:48 UTC (rev 6850)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties 2008-03-11
15:53:54 UTC (rev 6851)
@@ -84,4 +84,7 @@
SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED=Seam runtime is not selected
SEAM_SETTINGS_PREFERENCE_PAGE_ADD=Add
SEAM_PREFERENCE_PAGE_SEAM_RUNTIMES=Seam Runtimes
-SEAM_SETTINGS_PREFERENCE_PAGE_INSTALLED_RUNTIMES=Installed Runtimes
\ No newline at end of file
+SEAM_SETTINGS_PREFERENCE_PAGE_INSTALLED_RUNTIMES=Installed Runtimes
+SEAM_SETTINGS_PREFERENCE_PAGE_EJB_PROJECT_DOES_NOT_EXIST=
+SEAM_SETTINGS_PREFERENCE_PAGE_VIEW_FOLDER_DOES_NOT_EXIST=
+SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT_DOES_NOT_EXIST=
\ No newline at end of file
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 2008-03-11
15:49:48 UTC (rev 6850)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-11
15:53:54 UTC (rev 6851)
@@ -22,6 +22,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -183,7 +184,8 @@
ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_EJB_PROJECT,
getEjbProjectName(),
- true, false);
+ true,
+ false);
registerEditor(ejbProjectEditor, deploymentGroup);
Group viewGroup = createGroup(
@@ -263,7 +265,7 @@
registerEditor(createTestCheckBox, testGroup);
- IFieldEditor testProjectEditor =
SeamWizardFactory.createSeamProjectSelectionFieldEditor(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,
SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT,
getTestProjectName(),false, false);
+ IFieldEditor testProjectEditor =
SeamWizardFactory.createSeamProjectSelectionFieldEditor(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,
SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT, getTestProjectName(),
false, false);
registerEditor(testProjectEditor, testGroup);
sourceFolder = getTestSourceFolder();
@@ -433,6 +435,28 @@
}
}
+ boolean deployAsEar =
ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(getValue(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS));
+ if(deployAsEar) {
+ String ejbProjectName =
getValue(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT).trim();
+ if(ejbProjectName.length()>0) {
+ if(!ResourcesPlugin.getWorkspace().getRoot().getProject(ejbProjectName).exists()) {
+ setErrorMessage("Seam EJB project " + ejbProjectName + " does not
exist.");
+ setValid(false);
+ return;
+ }
+ }
+ }
+
+ String viewFolder =
getValue(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER).trim();
+ if(viewFolder.length()>0) {
+ IResource folder = ResourcesPlugin.getWorkspace().getRoot().findMember(viewFolder);
+ if(folder==null || !folder.exists()) {
+ setErrorMessage("View Folder " + viewFolder + " does not
exist.");
+ setValid(false);
+ return;
+ }
+ }
+
setValid(true);
setErrorMessage(null);
if(!warning) {