Author: max.andersen(a)jboss.com Date: 2007-10-24 06:09:20 -0400 (Wed, 24 Oct 2007) New Revision: 4451 Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamProjectPreferences.java Removed: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeampProjectPreferences.java Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 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/wizard/SeamProjectWizard.java Log: fix spelling error in SeamProjectPreferences class Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java 2007-10-23 18:40:58 UTC (rev 4450) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -31,7 +31,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.seam.core.project.facet.SeampProjectPreferences; +import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; /** Copied: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamProjectPreferences.java (from rev 4450, trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeampProjectPreferences.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamProjectPreferences.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamProjectPreferences.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.seam.core.project.facet; + +import org.jboss.tools.seam.core.SeamCorePlugin; + +/** + * @author eskimo + * + */ +public class SeamProjectPreferences { + public static final String SEAM_DEFAULT_RUNTIME_NAME + = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.runtime.name"; //$NON-NLS-1$ + public static final String SEAM_DEFAULT_CONNECTION_PROFILE + = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.conn.profile"; //$NON-NLS-1$ + public static final String RUNTIME_CONFIG_FORMAT_VERSION + = SeamCorePlugin.PLUGIN_ID + ".runtime.config.format.version"; //$NON-NLS-1$ + public static final String RUNTIME_LIST + = SeamCorePlugin.PLUGIN_ID+".runtime.list"; //$NON-NLS-1$ + public static final String RUNTIME_DEFAULT + = SeamCorePlugin.PLUGIN_ID+".runtime.default"; //$NON-NLS-1$ + public static final String JBOSS_AS_DEFAULT_DEPLOY_AS + = SeamCorePlugin.PLUGIN_ID + ".project.default.deployment.type"; //$NON-NLS-1$ + public static final String HIBERNATE_DEFAULT_DB_TYPE + = SeamCorePlugin.PLUGIN_ID + ".hibernate.default.db.type"; //$NON-NLS-1$ + public static final String SEAM_LAST_SERVER_NAME + = SeamCorePlugin.PLUGIN_ID + ".project.facet.last.server.name"; //$NON-NLS-1$ + + public static String getStringPreference(final String name) { + return SeamCorePlugin.getDefault().getPreferenceStore().getString(name); + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2007-10-23 18:40:58 UTC (rev 4450) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -60,10 +60,10 @@ * */ private SeamRuntimeManager() { - String configVersion = SeampProjectPreferences.getStringPreference( - SeampProjectPreferences.RUNTIME_CONFIG_FORMAT_VERSION); - String runtimeListString = SeampProjectPreferences.getStringPreference( - SeampProjectPreferences.RUNTIME_LIST); + String configVersion = SeamProjectPreferences.getStringPreference( + SeamProjectPreferences.RUNTIME_CONFIG_FORMAT_VERSION); + String runtimeListString = SeamProjectPreferences.getStringPreference( + SeamProjectPreferences.RUNTIME_LIST); runtimes = converter.getMap(runtimeListString); } @@ -160,7 +160,7 @@ */ public void save() { SeamCorePlugin.getDefault().getPluginPreferences().setValue( - SeampProjectPreferences.RUNTIME_LIST, converter.getString(runtimes)); + SeamProjectPreferences.RUNTIME_LIST, converter.getString(runtimes)); IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore(); if(store instanceof IPersistentPreferenceStore) { try { Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeampProjectPreferences.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeampProjectPreferences.java 2007-10-23 18:40:58 UTC (rev 4450) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeampProjectPreferences.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.seam.core.project.facet; - -import org.jboss.tools.seam.core.SeamCorePlugin; - -/** - * @author eskimo - * - */ -public class SeampProjectPreferences { - public static final String SEAM_DEFAULT_RUNTIME_NAME - = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.runtime.name"; //$NON-NLS-1$ - public static final String SEAM_DEFAULT_CONNECTION_PROFILE - = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.conn.profile"; //$NON-NLS-1$ - public static final String RUNTIME_CONFIG_FORMAT_VERSION - = SeamCorePlugin.PLUGIN_ID + ".runtime.config.format.version"; //$NON-NLS-1$ - public static final String RUNTIME_LIST - = SeamCorePlugin.PLUGIN_ID+".runtime.list"; //$NON-NLS-1$ - public static final String RUNTIME_DEFAULT - = SeamCorePlugin.PLUGIN_ID+".runtime.default"; //$NON-NLS-1$ - public static final String JBOSS_AS_DEFAULT_DEPLOY_AS - = SeamCorePlugin.PLUGIN_ID + ".project.default.deployment.type"; //$NON-NLS-1$ - public static final String HIBERNATE_DEFAULT_DB_TYPE - = SeamCorePlugin.PLUGIN_ID + ".hibernate.default.db.type"; //$NON-NLS-1$ - public static final String SEAM_LAST_SERVER_NAME - = SeamCorePlugin.PLUGIN_ID + ".project.facet.last.server.name"; //$NON-NLS-1$ - - public static String getStringPreference(final String name) { - return SeamCorePlugin.getDefault().getPreferenceStore().getString(name); - } -} Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-10-23 18:40:58 UTC (rev 4450) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -53,7 +53,7 @@ import org.jboss.tools.seam.core.event.Change; import org.jboss.tools.seam.core.event.ISeamProjectChangeListener; import org.jboss.tools.seam.core.event.SeamProjectChangeEvent; -import org.jboss.tools.seam.core.project.facet.SeampProjectPreferences; +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.internal.core.scanner.LoadedDeclarations; @@ -263,7 +263,7 @@ } SeamCorePlugin.getDefault().getPluginPreferences().addPropertyChangeListener(new Preferences.IPropertyChangeListener() { public void propertyChange(Preferences.PropertyChangeEvent event) { - if(SeampProjectPreferences.RUNTIME_LIST.equals(event.getProperty())) { + if(SeamProjectPreferences.RUNTIME_LIST.equals(event.getProperty())) { SeamRuntime d = SeamRuntimeManager.getInstance().getDefaultRuntime(); if(d != null && d.getName().equals(runtimeName)) { // runtimeName = null; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-10-23 18:40:58 UTC (rev 4450) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.preferences.IScopeContext; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamPreferences; -import org.jboss.tools.seam.core.project.facet.SeampProjectPreferences; +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.SeamRuntimeListConverter; import org.jboss.tools.seam.core.project.facet.SeamVersion; @@ -54,10 +54,10 @@ .node(DefaultScope.SCOPE) .node(SeamCorePlugin.PLUGIN_ID); - node.put(SeampProjectPreferences.RUNTIME_CONFIG_FORMAT_VERSION, RUNTIME_CONFIG_FORMAT_VERSION); - node.put(SeampProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$ - node.put(SeampProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$ - node.put(SeampProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$ + node.put(SeamProjectPreferences.RUNTIME_CONFIG_FORMAT_VERSION, RUNTIME_CONFIG_FORMAT_VERSION); + node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$ + node.put(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$ + node.put(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$ initializeDefault(node,getSeamGenBuildPath()); try { node.flush(); @@ -101,6 +101,6 @@ rt.setVersion(SeamVersion.SEAM_1_2); map.put(rt.getName(), rt); } - node.put(SeampProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map)); + node.put(SeamProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map)); } } 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 2007-10-23 18:40:58 UTC (rev 4450) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -53,7 +53,7 @@ import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard; import org.hibernate.eclipse.console.utils.DriverClassHelpers; import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.core.project.facet.SeampProjectPreferences; +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; @@ -190,24 +190,24 @@ */ private String getDefaultDbType() { // TODO Auto-generated method stub - return SeampProjectPreferences.getStringPreference( - SeampProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE); + return SeamProjectPreferences.getStringPreference( + SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE); } /** * @return */ private Object getDeployAsDefaultValue() { - return SeampProjectPreferences.getStringPreference( - SeampProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS); + return SeamProjectPreferences.getStringPreference( + SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS); } /** * @return */ private Object getConnectionProfileDefaultValue() { - String defaultDs = SeampProjectPreferences.getStringPreference( - SeampProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE); + String defaultDs = SeamProjectPreferences.getStringPreference( + SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE); return getProfileNameList().contains(defaultDs)?defaultDs:""; //$NON-NLS-1$ } @@ -216,12 +216,12 @@ * @return */ private Object getSeamRuntimeDefaultValue() { - return ("".equals(SeampProjectPreferences //$NON-NLS-1$ - .getStringPreference(SeampProjectPreferences.SEAM_DEFAULT_RUNTIME_NAME)) ? + return ("".equals(SeamProjectPreferences //$NON-NLS-1$ + .getStringPreference(SeamProjectPreferences.SEAM_DEFAULT_RUNTIME_NAME)) ? (SeamRuntimeManager.getInstance().getDefaultRuntime()==null? "":SeamRuntimeManager.getInstance().getDefaultRuntime().getName()) : //$NON-NLS-1$ - SeampProjectPreferences - .getStringPreference(SeampProjectPreferences.SEAM_DEFAULT_RUNTIME_NAME)); + SeamProjectPreferences + .getStringPreference(SeamProjectPreferences.SEAM_DEFAULT_RUNTIME_NAME)); } /** @@ -252,19 +252,19 @@ public void transferStateToConfig() { SeamCorePlugin.getDefault().getPluginPreferences().setValue( - SeampProjectPreferences.SEAM_DEFAULT_RUNTIME_NAME, + SeamProjectPreferences.SEAM_DEFAULT_RUNTIME_NAME, jBossSeamHomeEditor.getValueAsString()); SeamCorePlugin.getDefault().getPluginPreferences().setValue( - SeampProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, + SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, connProfileSelEditor.getValueAsString()); SeamCorePlugin.getDefault().getPluginPreferences().setValue( - SeampProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, + SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, this.jBossAsDeployAsEditor.getValueAsString()); SeamCorePlugin.getDefault().getPluginPreferences().setValue( - SeampProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, + SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, this.jBossHibernateDbTypeEditor.getValueAsString()); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-23 18:40:58 UTC (rev 4450) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-24 10:09:20 UTC (rev 4451) @@ -38,7 +38,7 @@ import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; import org.eclipse.wst.server.ui.ServerUIUtil; import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.core.project.facet.SeampProjectPreferences; +import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.internal.core.project.facet.SeamFacetProjectCreationDataModelProvider; import org.jboss.tools.seam.ui.SeamUIMessages; @@ -245,8 +245,8 @@ public void restoreDefaultSettings() { super.restoreDefaultSettings(); - String lastServerName = SeampProjectPreferences - .getStringPreference(SeampProjectPreferences.SEAM_LAST_SERVER_NAME); + String lastServerName = SeamProjectPreferences + .getStringPreference(SeamProjectPreferences.SEAM_LAST_SERVER_NAME); if (lastServerName != null && lastServerName.length() > 0) { SeamFacetProjectCreationDataModelProvider.setServerName(model,lastServerName); @@ -258,7 +258,7 @@ String serverName = SeamFacetProjectCreationDataModelProvider.getServerName(model); if (serverName != null && serverName.length() > 0) { SeamCorePlugin.getDefault().getPluginPreferences().setValue( - SeampProjectPreferences.SEAM_LAST_SERVER_NAME, + SeamProjectPreferences.SEAM_LAST_SERVER_NAME, serverName); } }