JBoss Tools SVN: r12290 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-04 15:55:58 -0500 (Thu, 04 Dec 2008)
New Revision: 12290
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
Log:
JBIDE-3344 - regression fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2008-12-04 20:03:04 UTC (rev 12289)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2008-12-04 20:55:58 UTC (rev 12290)
@@ -3,4 +3,5 @@
public interface IPreferenceKeys {
public static final String ENABLED_DECORATORS = "org.jboss.ide.eclipse.as.ui.preferences.enabledDecorators.1";
+ public static final String DISABLE_SHOW_SERVER_VIEW = "org.jboss.ide.eclipse.as.ui.preferences.disabled.automatic.server.view";
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2008-12-04 20:03:04 UTC (rev 12289)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2008-12-04 20:55:58 UTC (rev 12290)
@@ -32,6 +32,8 @@
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.decorators.DecoratorDefinition;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
+import org.eclipse.wst.server.ui.internal.ServerUIPreferences;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.osgi.framework.BundleContext;
@@ -70,8 +72,14 @@
manager.setEnabled("org.jboss.tools.as.wst.server.ui.navigatorDecorator", true);
manager.setEnabled("org.jboss.ide.eclipse.as.ui.extensions.xml.decorator", true);
prefs.setValue(IPreferenceKeys.ENABLED_DECORATORS, true);
- savePluginPreferences();
}
+
+ if( !prefs.getBoolean(IPreferenceKeys.DISABLE_SHOW_SERVER_VIEW)) {
+ new ServerUIPreferences().setShowOnActivity(false);
+ prefs.setValue(IPreferenceKeys.DISABLE_SHOW_SERVER_VIEW, true);
+ }
+
+ savePluginPreferences();
}
/**
17 years, 1 month
JBoss Tools SVN: r12289 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-04 15:03:04 -0500 (Thu, 04 Dec 2008)
New Revision: 12289
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
Log:
JBIDE-3308
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2008-12-04 19:19:55 UTC (rev 12288)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2008-12-04 20:03:04 UTC (rev 12289)
@@ -261,8 +261,9 @@
protected void ensureDeployLocationAdded(MBeanServerConnection connection) throws Exception {
IDeployableServer ds = ServerConverter.getDeployableServer(getServer());
String deployFolder = ds.getDeployFolder();
+ String asURL = new File(deployFolder).toURL().toString();
ObjectName name = new ObjectName("jboss.deployment:flavor=URL,type=DeploymentScanner");
- connection.invoke(name, "addURL", new Object[] { "file:" + deployFolder }, new String[] {String.class.getName()});
+ connection.invoke(name, "addURL", new Object[] { asURL }, new String[] {String.class.getName()});
}
protected boolean shouldSuspendScanner() {
17 years, 1 month
JBoss Tools SVN: r12288 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-04 14:19:55 -0500 (Thu, 04 Dec 2008)
New Revision: 12288
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
Log:
JBIDE-3342
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2008-12-04 18:43:02 UTC (rev 12287)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2008-12-04 19:19:55 UTC (rev 12288)
@@ -2,5 +2,5 @@
public interface IPreferenceKeys {
- public static final String ENABLED_DECORATORS = "org.jboss.ide.eclipse.as.ui.preferences.enabledDecorators.3.0.0.CR1";
+ public static final String ENABLED_DECORATORS = "org.jboss.ide.eclipse.as.ui.preferences.enabledDecorators.1";
}
17 years, 1 month
JBoss Tools SVN: r12287 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-04 13:43:02 -0500 (Thu, 04 Dec 2008)
New Revision: 12287
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
Log:
JBIDE-3350 Ear project has bogus src folder created
Create Source Folder procedure is fixed for EAR projects
The issue is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-12-04 18:25:40 UTC (rev 12286)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-12-04 18:43:02 UTC (rev 12287)
@@ -476,7 +476,7 @@
} else {
// In case of EAR configuration
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "messages_en.properties"), srcFolder, false); //$NON-NLS-1$
- WtpUtils.createSourceFolder(project, source.getFullPath(), source.getFullPath().removeFirstSegments(1), webRootFolder.getFullPath().removeFirstSegments(1).append("WEB-INF/dev")); //$NON-NLS-1$
+ WtpUtils.createSourceFolder(project, source.getFullPath().removeFirstSegments(1), source.getFullPath().removeFirstSegments(1), webRootFolder.getFullPath().removeFirstSegments(1).append("WEB-INF/dev")); //$NON-NLS-1$
}
}
17 years, 1 month
JBoss Tools SVN: r12286 - in trunk/hibernatetools/tests: org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-04 13:25:40 -0500 (Thu, 04 Dec 2008)
New Revision: 12286
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java
Log:
Fix JUnitErrors in JDTuiAllTests - "org.eclipse.core.internal.resources.ResourceException: Problems encountered while deleting resources."
new method deleteIProject( boolean) was added to SimpleTestProject class to control content deletion for test projects.
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java 2008-12-04 18:00:56 UTC (rev 12285)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java 2008-12-04 18:25:40 UTC (rev 12286)
@@ -85,6 +85,15 @@
}
+ public void deleteIProject(boolean deleteContent) {
+ try {
+ project.delete(deleteContent, true, null);
+ } catch (CoreException ce) {
+ throw new RuntimeException(ce);
+ }
+
+ }
+
protected void buildSimpleTestProject() throws JavaModelException, CoreException, IOException {
project = buildNewProject(projectName);
javaProject = buildJavaProject(project);
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java 2008-12-04 18:00:56 UTC (rev 12285)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java 2008-12-04 18:25:40 UTC (rev 12286)
@@ -20,6 +20,8 @@
import org.eclipse.jdt.core.dom.ASTParser;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
import org.hibernate.HibernateException;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
@@ -126,8 +128,18 @@
@Override
protected void tearDown() throws Exception {
ccfg.reset();
- super.tearDown();
waitForJobs();
+
+ // This code overrides super method to handle error during deleting project with contents.
+ // A deletion of content isn't really necessary because project name is unique
+ IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeEditor(editorPart, false);
+
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective(
+ PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId("org.eclipse.ui.resourcePerspective")); //$NON-NLS-1$
+
+ getProject().deleteIProject(false);
+ waitForJobs();
}
public void testHQLDetector() throws JavaModelException {
17 years, 1 month
JBoss Tools SVN: r12285 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-12-04 13:00:56 -0500 (Thu, 04 Dec 2008)
New Revision: 12285
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3324
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-12-04 17:03:03 UTC (rev 12284)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-12-04 18:00:56 UTC (rev 12285)
@@ -97,46 +97,63 @@
private IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE
.createRadioEditor(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS,
- Arrays.asList(new String[] { ISeamFacetDataModelProperties.DEPLOY_AS_WAR.toUpperCase(), ISeamFacetDataModelProperties.DEPLOY_AS_EAR.toUpperCase() }),
- Arrays.asList(new Object[] { ISeamFacetDataModelProperties.DEPLOY_AS_WAR, ISeamFacetDataModelProperties.DEPLOY_AS_EAR }),
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS, Arrays
+ .asList(new String[] {
+ ISeamFacetDataModelProperties.DEPLOY_AS_WAR
+ .toUpperCase(),
+ ISeamFacetDataModelProperties.DEPLOY_AS_EAR
+ .toUpperCase() }),
+ Arrays.asList(new Object[] {
+ ISeamFacetDataModelProperties.DEPLOY_AS_WAR,
+ ISeamFacetDataModelProperties.DEPLOY_AS_EAR }),
getDeployAsDefaultValue());
// Database group
- private IFieldEditor connProfileSelEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfileDefaultValue(), new IValidator() {
- public Map<String, IStatus> validate(Object value, Object context) {
- SeamInstallWizardPage.this.validate();
- return ValidatorFactory.NO_ERRORS;
- }
- });
+ private IFieldEditor connProfileSelEditor = SeamWizardFactory
+ .createConnectionProfileSelectionFieldEditor(
+ getConnectionProfileDefaultValue(), new IValidator() {
+ public Map<String, IStatus> validate(Object value,
+ Object context) {
+ SeamInstallWizardPage.this.validate();
+ return ValidatorFactory.NO_ERRORS;
+ }
+ });
private IFieldEditor jBossHibernateDbTypeEditor = IFieldEditorFactory.INSTANCE
.createComboEditor(ISeamFacetDataModelProperties.DB_TYPE,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE, Arrays.asList(HIBERNATE_HELPER
- .getDialectNames()), getDefaultDbType(), false);
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE,
+ Arrays.asList(HIBERNATE_HELPER.getDialectNames()),
+ getDefaultDbType(), false);
- private IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE.createTextEditor(
- ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME, ""); //$NON-NLS-1$
+ private IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE
+ .createTextEditor(
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME,
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME,
+ ""); //$NON-NLS-1$
- private IFieldEditor dbCatalogName = IFieldEditorFactory.INSTANCE.createTextEditor(
- ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME, ""); //$NON-NLS-1$
+ private IFieldEditor dbCatalogName = IFieldEditorFactory.INSTANCE
+ .createTextEditor(
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME,
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME,
+ ""); //$NON-NLS-1$
private IFieldEditor dbTablesExists = IFieldEditorFactory.INSTANCE
.createCheckboxEditor(
ISeamFacetDataModelProperties.DB_ALREADY_EXISTS,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS, false);
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS,
+ false);
private IFieldEditor recreateTablesOnDeploy = IFieldEditorFactory.INSTANCE
.createCheckboxEditor(
ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY, false);
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY,
+ false);
private IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE
.createTextEditor(
ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME, ""); //$NON-NLS-1$
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME,
+ ""); //$NON-NLS-1$
private IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE
.createTextEditor(
@@ -147,7 +164,8 @@
private IFieldEditor testsPkgNameditor = IFieldEditorFactory.INSTANCE
.createTextEditor(
ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME, "com.mydomain.projectname.test"); //$NON-NLS-1$
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME,
+ "com.mydomain.projectname.test"); //$NON-NLS-1$
/**
*
@@ -164,35 +182,45 @@
* @return
*/
private String getDefaultDbType() {
- return SeamProjectPreferences.getStringPreference(
- SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE);
+ return SeamProjectPreferences
+ .getStringPreference(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE);
}
/**
* @return
*/
private Object getDeployAsDefaultValue() {
- String result = SeamProjectPreferences.getStringPreference(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS);
- if(!isNewProjectWizard()) {
- ISelection sel = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
+ String result = SeamProjectPreferences
+ .getStringPreference(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS);
+ if (!isNewProjectWizard()) {
+ ISelection sel = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getSelectionService()
+ .getSelection();
IProject project = SeamWizardUtils.getInitialProject(sel);
- if(project == null) {
- SeamCorePlugin.getPluginLog().logError("Can't get project name to initialize SeamInstallWizardPage for ModifyFacetedProjectWizard");
+ if (project == null) {
+ SeamCorePlugin
+ .getPluginLog()
+ .logError(
+ "Can't get project name to initialize SeamInstallWizardPage for ModifyFacetedProjectWizard");
return result;
}
IFacetedProject facetedProject;
try {
facetedProject = ProjectFacetsManager.create(project);
- if(facetedProject==null) {
- SeamCorePlugin.getPluginLog().logError("Can't get faceted project to initialize SeamInstallWizardPage for ModifyFacetedProjectWizard");
+ if (facetedProject == null) {
+ SeamCorePlugin
+ .getPluginLog()
+ .logError(
+ "Can't get faceted project to initialize SeamInstallWizardPage for ModifyFacetedProjectWizard");
return result;
}
} catch (CoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
return result;
}
- IProjectFacetVersion webVersion = facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.DYNAMIC_WEB_FACET);
- if(webVersion!=null) {
+ IProjectFacetVersion webVersion = facetedProject
+ .getProjectFacetVersion(IJ2EEFacetConstants.DYNAMIC_WEB_FACET);
+ if (webVersion != null) {
return ISeamFacetDataModelProperties.DEPLOY_AS_WAR;
} else {
return ISeamFacetDataModelProperties.DEPLOY_AS_EAR;
@@ -205,14 +233,16 @@
* @return
*/
private Object getConnectionProfileDefaultValue() {
- String defaultDs = SeamProjectPreferences.getStringPreference(
- SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE);
- return getConnectionProfileNameList().contains(defaultDs)?defaultDs:""; //$NON-NLS-1$
+ String defaultDs = SeamProjectPreferences
+ .getStringPreference(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE);
+ return getConnectionProfileNameList().contains(defaultDs) ? defaultDs
+ : ""; //$NON-NLS-1$
}
private static List<String> getConnectionProfileNameList() {
IConnectionProfile[] profiles = ProfileManager.getInstance()
- .getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$
+ .getProfilesByCategory(
+ "org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$
List<String> names = new ArrayList<String>();
for (IConnectionProfile connectionProfile : profiles) {
names.add(connectionProfile.getName());
@@ -236,7 +266,8 @@
public void setConfig(Object config) {
model = (IDataModel) config;
model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_DIALECT,
- HIBERNATE_HELPER.getDialectClass(jBossHibernateDbTypeEditor.getValueAsString()));
+ HIBERNATE_HELPER.getDialectClass(jBossHibernateDbTypeEditor
+ .getValueAsString()));
}
/**
@@ -252,22 +283,23 @@
*/
public void transferStateToConfig() {
String seamRuntimeName = jBossSeamHomeEditor.getValueAsString();
- SeamRuntime seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(seamRuntimeName);
- if(seamRuntime!=null) {
+ SeamRuntime seamRuntime = SeamRuntimeManager.getInstance()
+ .findRuntimeByName(seamRuntimeName);
+ if (seamRuntime != null) {
SeamRuntimeManager.getInstance().setDefaultRuntime(seamRuntime);
}
SeamCorePlugin.getDefault().getPluginPreferences().setValue(
- SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE,
- connProfileSelEditor.getValueAsString());
+ SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE,
+ connProfileSelEditor.getValueAsString());
SeamCorePlugin.getDefault().getPluginPreferences().setValue(
- SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS,
- this.jBossAsDeployAsEditor.getValueAsString());
+ SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS,
+ this.jBossAsDeployAsEditor.getValueAsString());
SeamCorePlugin.getDefault().getPluginPreferences().setValue(
- SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE,
- this.jBossHibernateDbTypeEditor.getValueAsString());
+ SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE,
+ this.jBossHibernateDbTypeEditor.getValueAsString());
}
/**
@@ -285,9 +317,10 @@
}
public List<String> getRuntimeNames(String version) {
- SeamRuntime[] rts = SeamRuntimeManager.getInstance().getRuntimes(SeamVersion.parseFromString(version));
+ SeamRuntime[] rts = SeamRuntimeManager.getInstance().getRuntimes(
+ SeamVersion.parseFromString(version));
List<String> result = new ArrayList<String>();
- for(SeamRuntime seamRuntime : rts) {
+ for (SeamRuntime seamRuntime : rts) {
result.add(seamRuntime.getName());
}
return result;
@@ -298,7 +331,11 @@
*/
public void createControl(Composite parent) {
sync = new DataModelSynchronizer(model);
- jBossSeamHomeEditor = SeamWizardFactory.createSeamRuntimeSelectionFieldEditor(new SeamVersion[0], SeamFacetInstallDataModelProvider.getSeamRuntimeDefaultValue(model), new NewSeamRuntimeAction());
+ jBossSeamHomeEditor = SeamWizardFactory
+ .createSeamRuntimeSelectionFieldEditor(new SeamVersion[0],
+ SeamFacetInstallDataModelProvider
+ .getSeamRuntimeDefaultValue(model),
+ new NewSeamRuntimeAction());
initializeDialogUnits(parent);
@@ -348,7 +385,8 @@
gd.grabExcessVerticalSpace = false;
generationGroup.setLayoutData(gd);
- generationGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION);
+ generationGroup
+ .setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION);
gridLayout = new GridLayout(3, false);
generationGroup.setLayout(gridLayout);
registerEditor(sessionBeanPkgNameditor, generationGroup, 3);
@@ -360,11 +398,9 @@
if (validatorDelegate == null) {
validatorDelegate = new DataModelValidatorDelegate(this.model, this);
validatorDelegate.addValidatorForProperty(jBossSeamHomeEditor
- .getName(),
- ValidatorFactory.SEAM_RUNTIME_NAME_VALIDATOR);
+ .getName(), ValidatorFactory.SEAM_RUNTIME_NAME_VALIDATOR);
validatorDelegate.addValidatorForProperty(connProfileSelEditor
- .getName(),
- ValidatorFactory.CONNECTION_PROFILE_VALIDATOR);
+ .getName(), ValidatorFactory.CONNECTION_PROFILE_VALIDATOR);
validatorDelegate.addValidatorForProperty(testsPkgNameditor
.getName(), new PackageNameValidator(testsPkgNameditor
.getName(), "tests")); //$NON-NLS-1$
@@ -374,45 +410,51 @@
validatorDelegate.addValidatorForProperty(sessionBeanPkgNameditor
.getName(), new PackageNameValidator(
sessionBeanPkgNameditor.getName(), "session beans")); //$NON-NLS-1$
- if(isNewProjectWizard()) {
+ if (isNewProjectWizard()) {
validatorDelegate.addValidatorForProperty(
- IFacetDataModelProperties.FACET_PROJECT_NAME,
+ IFacetDataModelProperties.FACET_PROJECT_NAME,
new ProjectNamesDuplicationValidator(
IFacetDataModelProperties.FACET_PROJECT_NAME));
}
validatorDelegate.addValidatorForProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
getDeploymentTypeValidator(getWizard()));
- if(!isNewSeamProjectWizard()) {
- validatorDelegate.addValidatorForProperty(IFacetDataModelProperties.FACET_PROJECT_NAME,
- new ProjectNameValidator(IFacetDataModelProperties.FACET_PROJECT_NAME));
+ if (!isNewSeamProjectWizard()) {
+ validatorDelegate.addValidatorForProperty(
+ IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNameValidator(
+ IFacetDataModelProperties.FACET_PROJECT_NAME));
}
}
jBossHibernateDbTypeEditor
.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
- SeamInstallWizardPage.this.model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_DIALECT,
- HIBERNATE_HELPER.getDialectClass(evt.getNewValue().toString()));
+ SeamInstallWizardPage.this.model
+ .setProperty(
+ ISeamFacetDataModelProperties.HIBERNATE_DIALECT,
+ HIBERNATE_HELPER.getDialectClass(evt
+ .getNewValue().toString()));
}
- }
- );
+ });
- Dialog.applyDialogFont(parent);
- initDefaultWizardProperties();
- Object parentDm = model.getProperty(FacetInstallDataModelProvider.MASTER_PROJECT_DM);
- if(parentDm!=null) {
- ((IDataModel)parentDm).addListener(this);
- }
+ Dialog.applyDialogFont(parent);
+ initDefaultWizardProperties();
+ Object parentDm = model
+ .getProperty(FacetInstallDataModelProvider.MASTER_PROJECT_DM);
+ if (parentDm != null) {
+ ((IDataModel) parentDm).addListener(this);
+ }
}
private boolean isNewSeamProjectWizard() {
- return getWizard()==null || getWizard() instanceof SeamProjectWizard;
+ return getWizard() == null || getWizard() instanceof SeamProjectWizard;
}
private boolean isNewProjectWizard() {
// ModifyFacetedProjectWizard or NewProjectDataModelFacetWizard
- return getWizard()==null || getWizard() instanceof NewProjectDataModelFacetWizard;
+ return getWizard() == null
+ || getWizard() instanceof NewProjectDataModelFacetWizard;
}
/**
@@ -424,10 +466,21 @@
model.setStringProperty(
ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, event
.getProperty().toString());
- } else if(event.getPropertyName().equals(IFacetDataModelProperties.FACET_PROJECT_NAME)) {
+ } else if (event.getPropertyName().equals(
+ IFacetDataModelProperties.FACET_PROJECT_NAME)) {
+ String p = event.getProperty().toString();
+
model.setStringProperty(
- ISeamFacetDataModelProperties.SEAM_PROJECT_NAME, event
- .getProperty().toString());
+ ISeamFacetDataModelProperties.SEAM_PROJECT_NAME, p);
+ model.setStringProperty(
+ ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
+ getSessionPkgName(p));
+ model.setStringProperty(
+ ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME,
+ getEntityPkgName(p));
+ model.setStringProperty(
+ ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME,
+ getTestPkgName(p));
}
}
@@ -437,8 +490,8 @@
*/
@Override
public void setVisible(boolean visible) {
-
- if(visible) {
+
+ if (visible) {
setCodeGenerationProperties();
setDefaultSeamRuntime();
validate();
@@ -456,21 +509,28 @@
* Fills Code Generation group with the default package names.
*/
private void setCodeGenerationProperties() {
- String p = (String)model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME);
- sessionBeanPkgNameditor
- .setValue("org.domain." //$NON-NLS-1$
- + SeamUtil.getSeamPackageName(p)
- + ".session"); //$NON-NLS-1$
- entityBeanPkgNameditor
- .setValue("org.domain." //$NON-NLS-1$
- + SeamUtil.getSeamPackageName(p)
- + ".entity"); //$NON-NLS-1$
- testsPkgNameditor
- .setValue("org.domain." //$NON-NLS-1$
- + SeamUtil.getSeamPackageName(p)
- + ".test"); //$NON-NLS-1$
+ String p = (String) model
+ .getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME);
+ sessionBeanPkgNameditor.setValue(getSessionPkgName(p));
+ entityBeanPkgNameditor.setValue(getEntityPkgName(p));
+ testsPkgNameditor.setValue(getTestPkgName(p));
}
+ private String getSessionPkgName(String projectName) {
+ return "org.domain." //$NON-NLS-1$
+ + SeamUtil.getSeamPackageName(projectName) + ".session"; //$NON-NLS-1$
+ }
+
+ private String getEntityPkgName(String projectName) {
+ return "org.domain." //$NON-NLS-1$
+ + SeamUtil.getSeamPackageName(projectName) + ".entity"; //$NON-NLS-1$
+ }
+
+ private String getTestPkgName(String projectName) {
+ return "org.domain." //$NON-NLS-1$
+ + SeamUtil.getSeamPackageName(projectName) + ".test"; //$NON-NLS-1$
+ }
+
/*
* Sets seam runtime field in default value.
*/
@@ -482,7 +542,8 @@
List<String> runtimes = getRuntimeNames(model.getProperty(
IFacetDataModelProperties.FACET_VERSION_STR).toString());
if (oldValue == null || !runtimes.contains(oldValue)) {
- Object defaultRnt = SeamFacetInstallDataModelProvider.getSeamRuntimeDefaultValue(model);
+ Object defaultRnt = SeamFacetInstallDataModelProvider
+ .getSeamRuntimeDefaultValue(model);
if (defaultRnt != null && runtimes.contains(defaultRnt)) {
newValue = defaultRnt;
} else if (runtimes.size() > 0) {
@@ -499,13 +560,13 @@
final IStatus message = validatorDelegate.getFirstValidationError();
Display.getDefault().syncExec(new Runnable() {
public void run() {
- if(message==null) {
+ if (message == null) {
setMessage(null);
setErrorMessage(null);
setPageComplete(true);
return;
}
- if(message.getSeverity()==IStatus.ERROR) {
+ if (message.getSeverity() == IStatus.ERROR) {
setErrorMessage(message.getMessage());
setPageComplete(false);
return;
@@ -539,12 +600,26 @@
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
- if (status.getSeverity()==IStatus.ERROR) {
- return ValidatorFactory.createErrormessage(fieldName,
- new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
- } else if (status.getSeverity()==IStatus.WARNING) {
- return ValidatorFactory.createErrormessage(fieldName,
- new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
+ if (status.getSeverity() == IStatus.ERROR) {
+ return ValidatorFactory
+ .createErrormessage(
+ fieldName,
+ new Status(
+ IStatus.ERROR,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR
+ + targetName
+ + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
+ } else if (status.getSeverity() == IStatus.WARNING) {
+ return ValidatorFactory
+ .createErrormessage(
+ fieldName,
+ new Status(
+ IStatus.WARNING,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR
+ + targetName
+ + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
}
return ValidatorFactory.NO_ERRORS;
}
@@ -558,13 +633,15 @@
}
public Map<String, IStatus> validate(Object value, Object context) {
- if(value==null) {
+ if (value == null) {
return ValidatorFactory.NO_ERRORS;
}
- final String projectName = (String)value;
- IStatus status = SeamFacetProjectCreationDataModelProvider.validateUpperCaseInProjectName(projectName);
- if(!status.isOK()) {
- return ValidatorFactory.createErrormessage(propertyName, status);
+ final String projectName = (String) value;
+ IStatus status = SeamFacetProjectCreationDataModelProvider
+ .validateUpperCaseInProjectName(projectName);
+ if (!status.isOK()) {
+ return ValidatorFactory
+ .createErrormessage(propertyName, status);
}
return ValidatorFactory.NO_ERRORS;
}
@@ -575,7 +652,7 @@
/**
*/
- public ProjectNamesDuplicationValidator (String propertyName) {
+ public ProjectNamesDuplicationValidator(String propertyName) {
this.propertyName = propertyName;
}
@@ -583,50 +660,83 @@
* @see IValidator#validate(Object, Object)
*/
public Map<String, IStatus> validate(Object value, Object context) {
- final String projectName = (String)value;
- final String deployAs = model.getStringProperty(
- ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
+ final String projectName = (String) value;
+ final String deployAs = model
+ .getStringProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
final String testProjectName = projectName + "-test"; //$NON-NLS-1$
- IStatus status = ProjectCreationDataModelProviderNew.validateName(testProjectName);
- if (status.getSeverity()==IStatus.ERROR) {
- return ValidatorFactory.createErrormessage(propertyName,
- new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
- testProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
- } else if (status.getSeverity()==IStatus.WARNING) {
- return ValidatorFactory.createErrormessage(propertyName,
- new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
- testProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ IStatus status = ProjectCreationDataModelProviderNew
+ .validateName(testProjectName);
+ if (status.getSeverity() == IStatus.ERROR) {
+ return ValidatorFactory
+ .createErrormessage(
+ propertyName,
+ new Status(
+ IStatus.ERROR,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT
+ + testProjectName
+ + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity() == IStatus.WARNING) {
+ return ValidatorFactory
+ .createErrormessage(
+ propertyName,
+ new Status(
+ IStatus.WARNING,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT
+ + testProjectName
+ + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
}
if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs)) {
final String earProjectName = projectName + "-ear"; //$NON-NLS-1$
- status = ProjectCreationDataModelProviderNew.validateName(earProjectName);
- if (status.getSeverity()==IStatus.ERROR) {
- return ValidatorFactory.createErrormessage(propertyName,
- new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
- earProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
- } else if (status.getSeverity()==IStatus.WARNING) {
- return ValidatorFactory.createErrormessage(propertyName,
- new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
- earProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ status = ProjectCreationDataModelProviderNew
+ .validateName(earProjectName);
+ if (status.getSeverity() == IStatus.ERROR) {
+ return ValidatorFactory
+ .createErrormessage(
+ propertyName,
+ new Status(
+ IStatus.ERROR,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT
+ + earProjectName
+ + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity() == IStatus.WARNING) {
+ return ValidatorFactory
+ .createErrormessage(
+ propertyName,
+ new Status(
+ IStatus.WARNING,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT
+ + earProjectName
+ + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
}
final String ejbProjectName = projectName + "-ejb"; //$NON-NLS-1$
- status = ProjectCreationDataModelProviderNew.validateName(ejbProjectName);
- if (status.getSeverity()==IStatus.ERROR) {
- return ValidatorFactory.createErrormessage(propertyName,
- new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
- ejbProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
- } else if (status.getSeverity()==IStatus.WARNING) {
- return ValidatorFactory.createErrormessage(propertyName,
- new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
- ejbProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ status = ProjectCreationDataModelProviderNew
+ .validateName(ejbProjectName);
+ if (status.getSeverity() == IStatus.ERROR) {
+ return ValidatorFactory
+ .createErrormessage(
+ propertyName,
+ new Status(
+ IStatus.ERROR,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT
+ + ejbProjectName
+ + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity() == IStatus.WARNING) {
+ return ValidatorFactory
+ .createErrormessage(
+ propertyName,
+ new Status(
+ IStatus.WARNING,
+ SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT
+ + ejbProjectName
+ + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
}
}
return ValidatorFactory.NO_ERRORS;
@@ -634,11 +744,14 @@
}
IValidator getDeploymentTypeValidator(IWizard wizard) {
- if(wizard instanceof NewProjectDataModelFacetWizard) {
- return new DeploymentTypeValidator(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ((NewProjectDataModelFacetWizard)wizard).getDataModel());
+ if (wizard instanceof NewProjectDataModelFacetWizard) {
+ return new DeploymentTypeValidator(
+ ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
+ ((NewProjectDataModelFacetWizard) wizard).getDataModel());
}
-// return new DeploymentTypeValidator(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, model);
- return new IValidator() {
+ // return new DeploymentTypeValidator(ISeamFacetDataModelProperties.
+ // JBOSS_AS_DEPLOY_AS, model);
+ return new IValidator() {
public Map<String, IStatus> validate(Object value, Object context) {
return ValidatorFactory.NO_ERRORS;
}
@@ -651,11 +764,13 @@
IDataModel model;
- static final IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE);
+ static final IProjectFacet EJB_FACET = ProjectFacetsManager
+ .getProjectFacet(IModuleConstants.JST_EJB_MODULE);
static final IProjectFacetVersion EJB_30 = EJB_FACET.getVersion("3.0"); //$NON-NLS-1$
- static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE);
+ static final IProjectFacet EAR_FACET = ProjectFacetsManager
+ .getProjectFacet(IModuleConstants.JST_EAR_MODULE);
static final IProjectFacetVersion EAR_50 = EAR_FACET.getVersion("5.0"); //$NON-NLS-1$
@@ -671,37 +786,61 @@
*/
public Map<String, IStatus> validate(Object value, Object context) {
final String deploymentType = value.toString();
- if(!ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(deploymentType)) {
- Object runtimeName = model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- if(runtimeName!=null) {
- IRuntime rt = RuntimeManager.getRuntime(runtimeName.toString());
- if(!rt.supports(EJB_30) || !rt.supports(EAR_50)) {
- return ValidatorFactory.createErrormessage(
- propertyName,
- new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()})));
+ if (!ISeamFacetDataModelProperties.DEPLOY_AS_WAR
+ .equals(deploymentType)) {
+ Object runtimeName = model
+ .getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
+ if (runtimeName != null) {
+ IRuntime rt = RuntimeManager.getRuntime(runtimeName
+ .toString());
+ if (!rt.supports(EJB_30) || !rt.supports(EAR_50)) {
+ return ValidatorFactory
+ .createErrormessage(
+ propertyName,
+ new Status(
+ IStatus.ERROR,
+ SeamCorePlugin.PLUGIN_ID,
+ NLS
+ .bind(
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6,
+ new String[] {
+ deploymentType
+ .toUpperCase(),
+ runtimeName
+ .toString() })));
}
}
- }
+ }
return ValidatorFactory.NO_ERRORS;
}
- }
+ }
- private class NewSeamRuntimeAction extends SeamWizardFactory.NewSeamRuntimeAction {
- /* (non-Javadoc)
- * @see org.jboss.tools.seam.ui.wizard.SeamWizardFactory.NewSeamRuntimeAction#getRuntimeSelectionEditor()
+ private class NewSeamRuntimeAction extends
+ SeamWizardFactory.NewSeamRuntimeAction {
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.seam.ui.wizard.SeamWizardFactory.NewSeamRuntimeAction
+ * #getRuntimeSelectionEditor()
*/
@Override
protected IFieldEditor getRuntimeSelectionEditor() {
return jBossSeamHomeEditor;
}
- /* (non-Javadoc)
- * @see org.jboss.tools.seam.ui.wizard.SeamWizardFactory.NewSeamRuntimeAction#getSeamVersions()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.seam.ui.wizard.SeamWizardFactory.NewSeamRuntimeAction
+ * #getSeamVersions()
*/
@Override
protected SeamVersion[] getSeamVersions() {
- String seamVersion = model.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString();
- return new SeamVersion[]{SeamVersion.parseFromString(seamVersion)};
+ String seamVersion = model.getProperty(
+ IFacetDataModelProperties.FACET_VERSION_STR).toString();
+ return new SeamVersion[] { SeamVersion.parseFromString(seamVersion) };
}
}
@@ -711,26 +850,25 @@
public void finishPressed() {
model.removeListener(validatorDelegate);
};
-
-
+
/*
* test method
*/
- public String getSessionBeanPkgName(){
- return (String)sessionBeanPkgNameditor.getValue();
+ public String getSessionBeanPkgName() {
+ return (String) sessionBeanPkgNameditor.getValue();
}
-
+
/*
* test method
*/
- public String getEntityBeanPkgName(){
- return (String)entityBeanPkgNameditor.getValue();
+ public String getEntityBeanPkgName() {
+ return (String) entityBeanPkgNameditor.getValue();
}
-
+
/*
* test method
*/
- public String getTestsPkgName(){
- return (String)testsPkgNameditor.getValue();
+ public String getTestsPkgName() {
+ return (String) testsPkgNameditor.getValue();
}
}
\ No newline at end of file
17 years, 1 month
JBoss Tools SVN: r12284 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-12-04 12:03:03 -0500 (Thu, 04 Dec 2008)
New Revision: 12284
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
JBIDE-3351
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2008-12-04 16:00:25 UTC (rev 12283)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2008-12-04 17:03:03 UTC (rev 12284)
@@ -93,6 +93,9 @@
JspEditorPlugin.getPluginLog().logError(e);
}
+ if(this.document != viewer.getDocument()) {
+ wtpKbConnector = null;
+ }
document = viewer.getDocument();
//added by Max Areshkau JBIDE-788
updateActiveContentAssistProcessor(document);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-04 16:00:25 UTC (rev 12283)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-04 17:03:03 UTC (rev 12284)
@@ -98,7 +98,12 @@
//Added by Max Areshkau JBIDE-788
public static final KbTldResource faceletHtmlResource = new KbTldResource(faceletHtmlUri, "", faceletHtmlPrefix, null);
+ public FaceletsHtmlContentAssistProcessor() {}
+
public ICompletionProposal[] computeCompletionProposals(ITextViewer textViewer, int documentPosition) {
+ if(this.document != textViewer.getDocument()) {
+ wtpKbConnector = null;
+ }
document = textViewer.getDocument();
editorInput = JspEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorInput();
//added by Max Areshkau JBIDE-788
@@ -778,4 +783,8 @@
return sdRegion;
}
+ public void release() {
+ super.release();
+ wtpKbConnector = null;
+ }
}
\ No newline at end of file
17 years, 1 month
JBoss Tools SVN: r12283 - trunk/seam/docs/reference/en/images/seam_preferences.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-04 11:00:25 -0500 (Thu, 04 Dec 2008)
New Revision: 12283
Modified:
trunk/seam/docs/reference/en/images/seam_preferences/seam_preferences1.png
trunk/seam/docs/reference/en/images/seam_preferences/seam_preferences1_2.png
Log:
https://jira.jboss.org/jira/browse/JBDS-472 - updating the screens;
Modified: trunk/seam/docs/reference/en/images/seam_preferences/seam_preferences1.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/seam_preferences/seam_preferences1_2.png
===================================================================
(Binary files differ)
17 years, 1 month
JBoss Tools SVN: r12282 - trunk/seam/docs/reference/en/images/crud_database_application.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-04 11:00:00 -0500 (Thu, 04 Dec 2008)
New Revision: 12282
Modified:
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_15.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_16.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_17.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_19.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_20.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_21.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_22.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_23.png
Log:
https://jira.jboss.org/jira/browse/JBDS-472 - updating the screens according to the Seam Generate Entities wizard redesign;
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_15.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_16.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_17.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_19.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_20.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_21.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_22.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_23.png
===================================================================
(Binary files differ)
17 years, 1 month
JBoss Tools SVN: r12281 - trunk/seam/docs/reference/en/images/crud_database_application.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-04 10:59:04 -0500 (Thu, 04 Dec 2008)
New Revision: 12281
Added:
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18a.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18b.png
Log:
https://jira.jboss.org/jira/browse/JBDS-472 - adding new screens according to the Seam Generate Entities wizard redesign;
Added: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18a.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18a.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18b.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_18b.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 1 month