Author: akazakov Date: 2008-04-08 13:24:50 -0400 (Tue, 08 Apr 2008) New Revision: 7430 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java Log: http://jira.jboss.com/jira/browse/JBIDE-1992 Fixed 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-04-08 17:20:44 UTC (rev 7429) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-04-08 17:24:50 UTC (rev 7430) @@ -217,7 +217,7 @@ IFieldEditorFactory.INSTANCE.createBrowsePackageEditor( ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"", - getPrefValue(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "")); + getModelPackageName()); modelSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){ public void propertyChange(PropertyChangeEvent evt) { @@ -243,7 +243,7 @@ IFieldEditorFactory.INSTANCE.createBrowsePackageEditor( ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"", - getPrefValue(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "")); + getActionPackageName()); actionSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){ public void propertyChange(PropertyChangeEvent evt) { @@ -285,7 +285,7 @@ IFieldEditorFactory.INSTANCE.createBrowsePackageEditor( ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"", - getPrefValue(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "")); + getTestPackageName()); testSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){ public void propertyChange(PropertyChangeEvent evt) { @@ -351,6 +351,39 @@ return folder; } + private String getModelPackageName() { + String name = null; + if(preferences!=null) { + name = preferences.get(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, null); + } + if(name==null) { + name = "org.domain." + getSeamProjectName() + ".entity"; + } + return name; + } + + private String getActionPackageName() { + String name = null; + if(preferences!=null) { + name = preferences.get(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, null); + } + if(name==null) { + name = "org.domain." + getSeamProjectName() + ".session"; + } + return name; + } + + private String getTestPackageName() { + String name = null; + if(preferences!=null) { + name = preferences.get(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, null); + } + if(name==null) { + name = "org.domain." + getSeamProjectName() + ".test"; + } + return name; + } + private String getActionSourceFolder() { String folder = null; if(preferences!=null) { @@ -503,6 +536,9 @@ private boolean validateJavaPackageName(String errorMessageKey, String warningMessageKey, String editorName) { if(editorRegistry.get(editorName).isEnabled()) { String packageName = getValue(editorName).trim(); + if(packageName.length()==0) { + return true; + } IStatus status = JavaConventions.validatePackageName(packageName, CompilerOptions.VERSION_1_5, CompilerOptions.VERSION_1_5); if(status.getSeverity()==IStatus.ERROR) { if(!error) { Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-04-08 17:20:44 UTC (rev 7429) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-04-08 17:24:50 UTC (rev 7430) @@ -43,7 +43,6 @@ suite.addTestSuite(SeamELContentAssistTest.class); suite.addTestSuite(SeamELContentAssistJbide1676Test.class); suite.addTestSuite(SeamELContentAssistJbide1645Test.class); - suite.addTestSuite(SeamSettingsPreferencesPageTest.class); suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamSettingsPreferencesPageTest.class), "org.jboss.tools.seam.ui.test", "projects/TestSeamSettingsPreferencesPage", "TestSeamSettingsPreferencesPage")); return suite; } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-04-08 17:20:44 UTC (rev 7429) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-04-08 17:24:50 UTC (rev 7430) @@ -44,9 +44,9 @@ IProject project = null; static String PROJECT_NAME = "TestSeamSettingsPreferencesPage"; - static String MODEL_PACKAGE_NAME = "org.jboss.model"; - static String ACTION_PACKAGE_NAME = "org.jboss.action"; - static String TEST_PACKAGE_NAME = "org.jboss.test"; + static String MODEL_PACKAGE_NAME = "org.domain." + PROJECT_NAME + ".entity"; + static String ACTION_PACKAGE_NAME = "org.domain." + PROJECT_NAME + ".session"; + static String TEST_PACKAGE_NAME = "org.domain." + PROJECT_NAME + ".test"; static String RUNTIME_NAME = "Seam 1.2.0 Seam Settings Page Test"; public SeamSettingsPreferencesPageTest() { @@ -90,18 +90,9 @@ IFieldEditor viewFolder = page.getEditor(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER); viewFolder.setValue("/" + PROJECT_NAME); - IFieldEditor modelPackageName = page.getEditor(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME); - modelPackageName.setValue(MODEL_PACKAGE_NAME); - - IFieldEditor sessionPackageName = page.getEditor(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME); - sessionPackageName.setValue(ACTION_PACKAGE_NAME); - IFieldEditor createTest = page.getEditor(ISeamFacetDataModelProperties.TEST_CREATING); createTest.setValue(Boolean.TRUE); - IFieldEditor testPackageName = page.getEditor(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME); - testPackageName.setValue(TEST_PACKAGE_NAME); - assertTrue("Settings page is not valid: " + page.getErrorMessage(), page.okToLeave()); page.performOk(); } finally { Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java 2008-04-08 17:20:44 UTC (rev 7429) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java 2008-04-08 17:24:50 UTC (rev 7430) @@ -54,7 +54,6 @@ * @return */ public static IWorkbenchPage getWorkbenchActivePage() { - // TODO Auto-generated method stub return getWorkbench().getActiveWorkbenchWindow().getActivePage(); } @@ -73,16 +72,13 @@ } public static PreferenceDialog createPreferenceDialog(String pageId) { - return PreferencesUtil.createPreferenceDialogOn(WorkbenchUtils .getActiveShell(), pageId, new String[] {pageId}, null); } public static PreferenceDialog createPropertyDialog(String pageId, IProject project) { - - return PreferencesUtil.createPreferenceDialogOn(WorkbenchUtils - .getActiveShell(), pageId, new String[] {pageId}, project); + return PreferencesUtil.createPropertyDialogOn(WorkbenchUtils + .getActiveShell(), project, pageId, new String[] {pageId}, null); } - -} +} \ No newline at end of file