October 2007 - jbosstools-commits

JBoss Tools SVN: r4426 - trunk/seam/plugins/org.jboss.tools.seam.ui.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2007-10-22 15:51:02 -0400 (Mon, 22 Oct 2007) New Revision: 4426 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml Log: RedHat mentioned WebDevelopment Perspective Factory was removed. All references were updated. Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-10-22 19:50:59 UTC (rev 4425) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-10-22 19:51:02 UTC (rev 4426) @@ -146,7 +146,22 @@ <newWizardShortcut id="org.jboss.tools.seam.ui.wizard.SeamGenerateEnitiesWizard"> </newWizardShortcut> - <actionSet id="org.hibernate.eclipse.launch.actionset"/> + <actionSet id="org.hibernate.eclipse.launch.actionset"/> + <perspectiveShortcut + id="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"> + </perspectiveShortcut> + <perspectiveShortcut + id="org.eclipse.jdt.ui.JavaPerspective"> + </perspectiveShortcut> + <perspectiveShortcut + id="org.eclipse.jdt.ui.JavaBrowsingPerspective"> + </perspectiveShortcut> + <perspectiveShortcut + id="org.eclipse.debug.ui.DebugPerspective"> + </perspectiveShortcut> + <perspectiveShortcut + id="org.hibernate.eclipse.console.HibernateConsolePerspective"> + </perspectiveShortcut> </perspectiveExtension> </extension>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4425 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2007-10-22 15:50:59 -0400 (Mon, 22 Oct 2007) New Revision: 4425 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java Log: RedHat mentioned WebDevelopment Perspective Factory was removed. All references were updated. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java 2007-10-22 19:50:57 UTC (rev 4424) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java 2007-10-22 19:50:59 UTC (rev 4425) @@ -88,7 +88,6 @@ public boolean isIncluded(String file) { int i = dir.getAbsolutePath().length()+1; String relatedPath = file.substring(i); - //if(new File(file).isDirectory())return true; for (Pattern pattern : include) { if(pattern.matcher(relatedPath.replace('\\', '/')).matches() ) { return !isExcluded(relatedPath); @@ -221,10 +220,14 @@ } public static void copyFiles(String[] files, File dest) { + copyFiles(files,dest, true); + } + + public static void copyFiles(String[] files, File dest,boolean override) { for (String fileName : files) { File file = new File(fileName); if(file.exists() && file.isFile()) { - copyFileToFolder(file, dest, null, true); + copyFileToFolder(file, dest, null, override); } else { try { SeamCorePlugin.getPluginLog().logError(SeamCoreMessages.getString("ANT_COPY_UTILS_CANNOT_COPY_JDBC_DRIVER_JAR") + file.getCanonicalPath() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-22 19:50:57 UTC (rev 4424) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-22 19:50:59 UTC (rev 4425) @@ -71,7 +71,7 @@ public static AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_WAR_CONFIG = new AntCopyUtils.FileSet() .include("ajax4jsf.*\\.jar") //$NON-NLS-1$ - .include("richfaces.*\\.jar") + .include("richfaces.*\\.jar") //$NON-NLS-1$ .include("antlr.*\\.jar") //$NON-NLS-1$ .include("commons-beanutils.*\\.jar") //$NON-NLS-1$ .include("commons-collections.*\\.jar") //$NON-NLS-1$

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4424 - trunk/jsf/plugins/org.jboss.tools.jsf.ui.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2007-10-22 15:50:57 -0400 (Mon, 22 Oct 2007) New Revision: 4424 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml Log: RedHat mentioned WebDevelopment Perspective Factory was removed. All references were updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-10-22 19:50:54 UTC (rev 4423) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-10-22 19:50:57 UTC (rev 4424) @@ -67,11 +67,26 @@ </category> <category id="org.jboss.tools.jsf" name="JSF" parentCategory="org.jboss.tools.jst.web"> </category> - <wizard category="org.jboss.tools.jst.web/org.jboss.tools.jsf" class="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" icon="images/xstudio/wizards/jsf-config.gif" id="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" name="Faces Config" project="false"> + <wizard + category="org.jboss.tools.jst.web/org.jboss.tools.jsf" + class="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" + finalPerspective="org.jboss.tools.jsf.ui.wizard.project.NewProjectWizard" + icon="images/xstudio/wizards/jsf-config.gif" + id="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" + name="Faces Config" + project="false"> <selection class="org.eclipse.core.resources.IResource"> </selection> </wizard> - <wizard category="org.jboss.tools.jst.web/org.jboss.tools.jsf" class="org.jboss.tools.jsf.ui.wizard.project.NewProjectWizard" finalPerspective="org.jboss.tools.jst.web.ui.RedHat4WebPerspective" icon="images/xstudio/wizards/new_jsf_project.gif" id="org.jboss.tools.jsf.ui.wizard.project.NewProjectWizard" name="%newProjectWizard.name" project="true"> + <wizard + category="org.jboss.tools.jst.web/org.jboss.tools.jsf" + class="org.jboss.tools.jsf.ui.wizard.project.NewProjectWizard" + finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + icon="images/xstudio/wizards/new_jsf_project.gif" + id="org.jboss.tools.jsf.ui.wizard.project.NewProjectWizard" + name="%newProjectWizard.name" + preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + project="true"> </wizard> </extension> @@ -286,5 +301,14 @@ <xclass id="org.jboss.tools.jsf.ui.editor.form.LocaleConfigForm" class="org.jboss.tools.jsf.ui.editor.form.LocaleConfigForm"/> </extension> + <extension + point="org.eclipse.ui.perspectiveExtensions"> + <perspectiveExtension + targetID="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"> + <newWizardShortcut + id="org.jboss.tools.jsf.ui.wizard.project.NewProjectWizard"> + </newWizardShortcut> + </perspectiveExtension> + </extension> -</plugin> \ No newline at end of file +</plugin>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4423 - trunk/struts/plugins/org.jboss.tools.struts.ui.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2007-10-22 15:50:54 -0400 (Mon, 22 Oct 2007) New Revision: 4423 Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml Log: RedHat mentioned WebDevelopment Perspective Factory was removed. All references were updated. Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2007-10-22 19:50:48 UTC (rev 4422) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2007-10-22 19:50:54 UTC (rev 4423) @@ -33,17 +33,55 @@ <extension point="org.eclipse.ui.newWizards"> <category id="org.jboss.tools.struts" name="Struts" parentCategory="org.jboss.tools.jst.web"> </category> - <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.project.NewProjectWizard" finalPerspective="org.jboss.tools.jst.web.ui.RedHat4WebPerspective" icon="images/xstudio/wizards/new_project.gif" id="org.jboss.tools.struts.ui.wizard.project.NewStrutsProjectWizard" name="%newProjectWizard.name" project="true"> + <wizard + category="org.jboss.tools.jst.web/org.jboss.tools.struts" + class="org.jboss.tools.struts.ui.wizard.project.NewProjectWizard" + finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + icon="images/xstudio/wizards/new_project.gif" + id="org.jboss.tools.struts.ui.wizard.project.NewStrutsProjectWizard" + name="%newProjectWizard.name" + preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + project="true"> </wizard> - <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFileWizard" icon="images/xstudio/wizards/new_struts.gif" id="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFileWizard" name="%strutsConfig.11" project="false"> + <wizard + category="org.jboss.tools.jst.web/org.jboss.tools.struts" + class="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFileWizard" + finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + icon="images/xstudio/wizards/new_struts.gif" + id="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFileWizard" + name="%strutsConfig.11" + preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + project="false"> <selection class="org.eclipse.core.resources.IResource"> </selection> </wizard> + <wizard + category="org.jboss.tools.jst.web/org.jboss.tools.struts" + class="org.jboss.tools.struts.ui.wizard.newfile.NewValidationFileWizard" + finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + icon="images/xstudio/wizards/new_validator_file.gif" + id="org.jboss.tools.struts.ui.wizard.newfile.NewValidationFileWizard" + name="%new.validation" + preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" + project="false"> + <selection + class="org.eclipse.core.resources.IResource"> + </selection> + </wizard>  </extension> + <extension + point="org.eclipse.ui.perspectiveExtensions"> + <perspectiveExtension + targetID="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"> + <newWizardShortcut + id="org.jboss.tools.struts.ui.wizard.project.NewStrutsProjectWizard"> + </newWizardShortcut> + </perspectiveExtension> + </extension> <extension point="org.eclipse.ui.importWizards"> <category id="org.jboss.tools.struts" @@ -216,14 +254,6 @@ /> </extension> - <extension point="org.eclipse.ui.newWizards"> - <category id="org.jboss.tools.struts" name="Struts" parentCategory="org.jboss.tools.jst.web"> - </category> - <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.newfile.NewValidationFileWizard" icon="images/xstudio/wizards/new_validator_file.gif" id="org.jboss.tools.struts.ui.wizard.newfile.NewValidationFileWizard" name="%new.validation" project="false"> - <selection class="org.eclipse.core.resources.IResource"> - </selection> - </wizard> - </extension> <extension point="org.eclipse.ui.preferencePages"> <page category="org.jboss.tools.common.xstudio.automation" class="org.jboss.tools.struts.ui.preferences.PluginInsetsPreferencesPage" id="org.jboss.tools.common.xstudio.automation.plugin.insets" name="Plug-in Insets">

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4422 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2007-10-22 15:50:48 -0400 (Mon, 22 Oct 2007) New Revision: 4422 Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java Removed: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java Log: RedHat mentioned WebDevelopment Perspective Factory was removed. All references were updated. Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java 2007-10-22 18:01:04 UTC (rev 4421) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java 2007-10-22 19:50:48 UTC (rev 4422) @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.web.ui; - -import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.jdt.ui.JavaUI; -import org.eclipse.ui.IFolderLayout; -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; - -/** - * @author Igels - */ -public class RedHat4WebPerspectiveFactory implements IPerspectiveFactory { - - public static final String PERSPECTIVE_ID = "org.jboss.tools.jst.web.ui.RedHat4WebPerspective"; - - /* (non-Javadoc) - * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout) - */ - public void createInitialLayout(IPageLayout layout) { - String editorArea = layout.getEditorArea(); - - IFolderLayout leftTop = layout.createFolder("leftTop", IPageLayout.LEFT, (float)0.2, editorArea); //$NON-NLS-1$ - leftTop.addView(JavaUI.ID_PACKAGES); - leftTop.addView("org.jboss.tools.jst.web.ui.navigator.WebProjectsView"); - leftTop.addView("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); - leftTop.addPlaceholder(IPageLayout.ID_RES_NAV); - - - IFolderLayout leftBottom = layout.createFolder("leftBottom", IPageLayout.BOTTOM, 0.64f, "leftTop"); - //leftBottom.addView(IPageLayout.ID_OUTLINE); - leftBottom.addView(IPageLayout.ID_PROP_SHEET); - - - IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.78, editorArea); //$NON-NLS-1$ - bottom.addView(BrowserView.ID); - bottom.addView(IPageLayout.ID_PROBLEM_VIEW); - bottom.addView(IPageLayout.ID_TASK_LIST); - - - IFolderLayout rightTop = layout.createFolder("right", IPageLayout.RIGHT, (float)0.8, editorArea); //$NON-NLS-1$ - rightTop.addView("org.jboss.tools.common.model.ui.views.palette.PaletteView"); - IFolderLayout rightBottom = layout.createFolder("rightBottom", IPageLayout.BOTTOM, (float)0.64, "right"); //$NON-NLS-1$ - rightBottom.addView(IPageLayout.ID_OUTLINE); - - layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET); - layout.addActionSet(JavaUI.ID_ACTION_SET); - layout.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET); - layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); - - // views - seam - layout.addShowViewShortcut("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); - - // views - java - layout.addShowViewShortcut(JavaUI.ID_PACKAGES); - layout.addShowViewShortcut(JavaUI.ID_TYPE_HIERARCHY); - layout.addShowViewShortcut(JavaUI.ID_SOURCE_VIEW); - - // views - standard workbench - layout.addShowViewShortcut(IPageLayout.ID_OUTLINE); - layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW); - layout.addShowViewShortcut(IPageLayout.ID_RES_NAV); - - // new actions - Java project creation wizard - layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewPackageCreationWizard"); //$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewClassCreationWizard"); //$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard"); //$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard"); //$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard"); //$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$ - layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$ - } -} \ No newline at end of file Copied: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java (from rev 4416, trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java) =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java 2007-10-22 19:50:48 UTC (rev 4422) @@ -0,0 +1,82 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.ui; + +import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.ui.IFolderLayout; +import org.eclipse.ui.IPageLayout; +import org.eclipse.ui.IPerspectiveFactory; + +/** + * @author Igels + */ +public class WebDevelopmentPerspectiveFactory implements IPerspectiveFactory { + + public static final String PERSPECTIVE_ID = "org.jboss.tools.jst.web.ui.RedHat4WebPerspective"; + + /* (non-Javadoc) + * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout) + */ + public void createInitialLayout(IPageLayout layout) { + String editorArea = layout.getEditorArea(); + + IFolderLayout leftTop = layout.createFolder("leftTop", IPageLayout.LEFT, (float)0.2, editorArea); //$NON-NLS-1$ + leftTop.addView(JavaUI.ID_PACKAGES); + leftTop.addView("org.jboss.tools.jst.web.ui.navigator.WebProjectsView"); + leftTop.addView("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); + leftTop.addPlaceholder(IPageLayout.ID_RES_NAV); + + + IFolderLayout leftBottom = layout.createFolder("leftBottom", IPageLayout.BOTTOM, 0.64f, "leftTop"); + //leftBottom.addView(IPageLayout.ID_OUTLINE); + leftBottom.addView(IPageLayout.ID_PROP_SHEET); + + + IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.78, editorArea); //$NON-NLS-1$ + bottom.addView(BrowserView.ID); + bottom.addView(IPageLayout.ID_PROBLEM_VIEW); + bottom.addView(IPageLayout.ID_TASK_LIST); + + + IFolderLayout rightTop = layout.createFolder("right", IPageLayout.RIGHT, (float)0.8, editorArea); //$NON-NLS-1$ + rightTop.addView("org.jboss.tools.common.model.ui.views.palette.PaletteView"); + IFolderLayout rightBottom = layout.createFolder("rightBottom", IPageLayout.BOTTOM, (float)0.64, "right"); //$NON-NLS-1$ + rightBottom.addView(IPageLayout.ID_OUTLINE); + + layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET); + layout.addActionSet(JavaUI.ID_ACTION_SET); + layout.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET); + layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); + + // views - seam + layout.addShowViewShortcut("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); + + // views - java + layout.addShowViewShortcut(JavaUI.ID_PACKAGES); + layout.addShowViewShortcut(JavaUI.ID_TYPE_HIERARCHY); + layout.addShowViewShortcut(JavaUI.ID_SOURCE_VIEW); + + // views - standard workbench + layout.addShowViewShortcut(IPageLayout.ID_OUTLINE); + layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW); + layout.addShowViewShortcut(IPageLayout.ID_RES_NAV); + + // new actions - Java project creation wizard + layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewPackageCreationWizard"); //$NON-NLS-1$ + layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewClassCreationWizard"); //$NON-NLS-1$ + layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard"); //$NON-NLS-1$ + layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard"); //$NON-NLS-1$ + layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard"); //$NON-NLS-1$ + layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$ + layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$ + } +} \ No newline at end of file

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4421 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2007-10-22 14:01:04 -0400 (Mon, 22 Oct 2007) New Revision: 4421 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java Log: http://jira.jboss.com/jira/browse/JBIDE-1037 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-22 17:58:09 UTC (rev 4420) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-22 18:01:04 UTC (rev 4421) @@ -211,7 +211,7 @@ getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(!isWar); IFieldEditor packageEditor = getEditor(IParameter.SEAM_PACKAGE_NAME); if(packageEditor!=null) { - packageEditor.setEnabled(!isWar); + packageEditor.setEnabled(true); } if(!isValidRuntimeConfigured(project)) return;

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4420 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: texteditors and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2007-10-22 13:58:09 -0400 (Mon, 22 Oct 2007) New Revision: 4420 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java Log: http://jira.jboss.org/jira/browse/JBIDE-1124 hibernate tools code completion are no longer available in hbm.xml editing Issue is fixed. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2007-10-22 17:57:57 UTC (rev 4419) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2007-10-22 17:58:09 UTC (rev 4420) @@ -41,7 +41,8 @@ private int describe(String text, IContentDescription description) { String entity = PreferenceModelUtilities.getPreferenceModel().getEntityRecognizer().getEntityName("xml", text); - if(entity == null || entity.length() == 0 || entity.equals("FileXML")) { + if(entity == null || entity.length() == 0 || entity.equals("FileXML") || + entity.equals("FileHibConfig3") || entity.equals("FileHibernate3")) { return INDETERMINATE; } return VALID; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2007-10-22 17:57:57 UTC (rev 4419) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2007-10-22 17:58:09 UTC (rev 4420) @@ -27,6 +27,7 @@ import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.events.FocusListener; //import org.eclipse.swt.graphics.Point; @@ -45,6 +46,8 @@ import org.eclipse.ui.texteditor.RevertToSavedAction; import org.eclipse.ui.texteditor.SaveAction; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; +import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler; @@ -67,6 +70,12 @@ ModelPlugin.getWorkspace().addResourceChangeListener(changeListener = new ICL()); } + public XMLTextEditorComponent(SourceViewerConfiguration configuration) { + super(configuration); + support.setProvider(this); + ModelPlugin.getWorkspace().addResourceChangeListener(changeListener = new ICL()); + } + protected TextEditorSupport createSupport() { return new TextEditorSupport(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2007-10-22 17:57:57 UTC (rev 4419) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2007-10-22 17:58:09 UTC (rev 4420) @@ -97,8 +97,27 @@ super.setSourceViewerConfiguration(new RedHatStructuredTextViewerConfigurationXML()); } + public XMLTextEditor(SourceViewerConfiguration config) { + super.setSourceViewerConfiguration(config); + XmlEditorPlugin.getDefault().initDefaultPluginPreferences(); +/// dnd.setTextEditorDropProvider(new TextEditorDropProviderImpl()); + if (config != null) { + if (!(config instanceof RedHatStructuredTextViewerConfigurationXML)) { + rhsvcEnabled = false; + } + super.setSourceViewerConfiguration(config); + } + } + + private boolean rhsvcEnabled = true; + + protected boolean isRedHatSourceViewerConfigurationEnabled() { + return rhsvcEnabled; + } + protected void setSourceViewerConfiguration(SourceViewerConfiguration config) { - if(!(config instanceof RedHatStructuredTextViewerConfigurationXML) + if( isRedHatSourceViewerConfigurationEnabled() + && !(config instanceof RedHatStructuredTextViewerConfigurationXML) && (config instanceof StructuredTextViewerConfigurationXML || !(config instanceof StructuredTextViewerConfiguration) )

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4419 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui: META-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2007-10-22 13:57:57 -0400 (Mon, 22 Oct 2007) New Revision: 4419 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plugin.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java Log: http://jira.jboss.org/jira/browse/JBIDE-1124 hibernate tools code completion are no longer available in hbm.xml editing Issue is fixed. Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2007-10-22 17:48:30 UTC (rev 4418) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2007-10-22 17:57:57 UTC (rev 4419) @@ -24,6 +24,8 @@ org.jboss.tools.common.kb, org.jboss.tools.common.model, org.jboss.tools.common.model.ui, - org.jboss.tools.hibernate.xml + org.jboss.tools.hibernate.xml, + org.hibernate.eclipse.mapper, + org.eclipse.wst.xml.ui Bundle-Version: 2.0.0 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plugin.xml =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plugin.xml 2007-10-22 17:48:30 UTC (rev 4418) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plugin.xml 2007-10-22 17:57:57 UTC (rev 4419) @@ -2,19 +2,44 @@ <?eclipse version="3.0"?> <plugin> <extension id="e" name="XML Editors" point="org.jboss.tools.common.model.ui.xmlEditor"> - <xmlEditor class="org.jboss.tools.hibernate.ui.xml.editor.Hibernate3CompoundEditor" +  +  </extension> + + <extension point="org.eclipse.ui.editors"> + <editor + class="org.jboss.tools.hibernate.ui.xml.editor.Hibernate3CompoundEditor" + contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" + default="true" + icon="images/xstudio/editors/hibernate_file.gif" + id="org.jboss.tools.hibernate.ui.xml.editor.Hibernate3CompoundEditor" + matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl" + name="Hibernate 3.0 XML Editor"> + <contentTypeBinding contentTypeId="org.hibernate.eclipse.mapper.hbmxmlsource"/> + </editor> + <editor + class="org.jboss.tools.hibernate.ui.xml.editor.HibConfig3CompoundEditor" + contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" + default="true" + icon="images/xstudio/editors/hibernate_file.gif" + id="org.jboss.tools.hibernate.ui.xml.editor.HibConfig3CompoundEditor" + matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl" + name="Hibernate Configuration 3.0 XML Editor"> + <contentTypeBinding contentTypeId="org.hibernate.eclipse.mapper.cfgxmlsource"/> + </editor> + </extension> + + <extension point="org.jboss.tools.common.model.resourceMapping"> <mapping Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2007-10-22 17:48:30 UTC (rev 4418) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2007-10-22 17:57:57 UTC (rev 4419) @@ -10,9 +10,11 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.xml.editor; +import org.hibernate.eclipse.mapper.editors.CFGXMLStructuredTextViewerConfiguration; import org.jboss.tools.common.editor.TreeFormPage; import org.jboss.tools.common.model.ui.editor.EditorDescriptor; import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor; +import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent; import org.jboss.tools.hibernate.ui.xml.HibernateUIXMLPlugin; import org.jboss.tools.hibernate.xml.model.FileHibernateFilteredTreeConstraint; @@ -94,4 +96,9 @@ return super.getAdapter(adapter); } + protected XMLTextEditorComponent createTextEditorComponent() { + final CFGXMLStructuredTextViewerConfiguration svc = new CFGXMLStructuredTextViewerConfiguration(); + return new XMLTextEditorComponent(svc); + } + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java 2007-10-22 17:48:30 UTC (rev 4418) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java 2007-10-22 17:57:57 UTC (rev 4419) @@ -10,9 +10,15 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.xml.editor; +import org.eclipse.jface.text.source.SourceViewerConfiguration; +import org.eclipse.ui.editors.text.TextEditor; +import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; +import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML; +import org.hibernate.eclipse.mapper.editors.HBMXMLStructuredTextViewerConfiguration; import org.jboss.tools.common.editor.TreeFormPage; import org.jboss.tools.common.model.ui.editor.EditorDescriptor; import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor; +import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent; import org.jboss.tools.hibernate.xml.model.FileHibernateFilteredTreeConstraint; @@ -37,4 +43,10 @@ return new EditorDescriptor("Hibernate3.0"); return super.getAdapter(adapter); } + + protected XMLTextEditorComponent createTextEditorComponent() { + final HBMXMLStructuredTextViewerConfiguration svc = new HBMXMLStructuredTextViewerConfiguration(); + return new XMLTextEditorComponent(svc); + } + } \ No newline at end of file

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4418 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2007-10-22 13:48:30 -0400 (Mon, 22 Oct 2007) New Revision: 4418 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java Log: http://jira.jboss.com/jira/browse/JBIDE-1037 Package Name for New Form Wizard Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2007-10-22 17:41:40 UTC (rev 4417) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2007-10-22 17:48:30 UTC (rev 4418) @@ -16,10 +16,12 @@ import java.util.Map; import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.INewWizard; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.ui.SeamUIMessages; +import org.jboss.tools.seam.ui.widget.editor.INamedElement; /** * @@ -37,32 +39,32 @@ setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); //$NON-NLS-1$ } - + @Override public void addPages() { addPage(new SeamFormWizardPage1(getInitialSelection())); } private static IUndoableOperation CREATE_SEAM_FORM = new SeamFormCreateOperation(); - + public static class SeamFormCreateOperation extends SeamBaseOperation { - + public SeamFormCreateOperation() { super(SeamUIMessages.SEAM_FORM_WIZARD_FORM_CREATING_OPERATION); } - + public File getBeanFile(Map<String, Object> vars) { return new File(getSeamFolder(vars),"src/FormActionJavaBean.java"); //$NON-NLS-1$ } - + public File getTestClassFile(Map<String, Object> vars) { return new File(getSeamFolder(vars),"test/FormTest.java"); //$NON-NLS-1$ } - + public File getTestngXmlFile(Map<String, Object> vars) { return new File(getSeamFolder(vars),"test/testng.xml"); //$NON-NLS-1$ } - + public File getPageXhtml(Map<String, Object> vars) { return new File(getSeamFolder(vars),"view/form.xhtml"); //$NON-NLS-1$ } @@ -77,11 +79,11 @@ else return FORM_EAR_MAPPING; } - + public static final List<String[]> FORM_WAR_MAPPING = new ArrayList<String[]>(); - + public static final List<String[]> FORM_EAR_MAPPING = new ArrayList<String[]>(); - + static { FORM_WAR_MAPPING.add(new String[]{ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$ @@ -95,7 +97,7 @@ FORM_WAR_MAPPING.add(new String[]{ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/form.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + // initialize ear files mapping FORM_EAR_MAPPING.add(new String[]{ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionBean.java", //$NON-NLS-1$ //$NON-NLS-2$ @@ -111,5 +113,14 @@ "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_EAR_MAPPING.add(FORM_WAR_MAPPING.get(3)); } + + /* + * (non-Javadoc) + * @see org.jboss.tools.seam.ui.wizard.SeamBaseOperation#getSessionBeanPackageName(org.eclipse.core.runtime.preferences.IEclipsePreferences, java.util.Map) + */ + @Override + protected String getSessionBeanPackageName(IEclipsePreferences seamFacetPrefs, Map<String, INamedElement> wizardParams) { + return wizardParams.get(IParameter.SEAM_PACKAGE_NAME).getValue().toString(); + } }; -} +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-10-22 17:41:40 UTC (rev 4417) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-10-22 17:48:30 UTC (rev 4418) @@ -13,7 +13,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.jboss.tools.seam.ui.SeamUIMessages; - /** * @author eskimo * @@ -28,16 +27,12 @@ super("seam.new.form.page1",SeamUIMessages.SEAM_FORM_WIZARD_PAGE1_SEAM_FORM,null, is); //$NON-NLS-1$ setMessage(getDefaultMessageText()); } - /* (non-Javadoc) * @see org.jboss.tools.seam.ui.wizard.SeamBaseWizardPage#getDefaultMessageText() */ @Override public String getDefaultMessageText() { - // TODO Auto-generated method stub return "Create a new Seam form"; } - - -} +} \ No newline at end of file

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r4417 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2007-10-22 13:41:40 -0400 (Mon, 22 Oct 2007) New Revision: 4417 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java Log: http://jira.jboss.com/jira/browse/JBIDE-1037 Package Name for New Conversation Wizard Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2007-10-22 17:04:29 UTC (rev 4416) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2007-10-22 17:41:40 UTC (rev 4417) @@ -23,9 +23,9 @@ public class ComboFieldEditor extends BaseFieldEditor implements ITaggedFieldEditor,PropertyChangeListener{ List values = null; - + boolean editable = false; - + public ComboFieldEditor(String name, String label, List values,Object defaultValue,boolean editableSelection) { super(name, label, defaultValue); this.values = Collections.unmodifiableList(values); @@ -36,7 +36,6 @@ @Override public Object[] getEditorControls(Object composite) { - // TODO Auto-generated method stub return new Control[] {getComboControl((Composite)composite)}; } @@ -45,7 +44,6 @@ } public Control getComboControl(Composite composite) { - // TODO Auto-generated method stub if(comboField == null) { comboField = new ComboBoxField(composite,values,getValue(),editable); comboField.addPropertyChangeListener(this); @@ -57,7 +55,6 @@ @Override public Object[] getEditorControls() { - // TODO Auto-generated method stub return null; } @@ -87,7 +84,6 @@ */ @Override public int getNumberOfControls() { - // TODO Auto-generated method stub return 1; } @@ -100,7 +96,7 @@ super.setEditable(ediatble); comboField.setEditable(ediatble); } - + public void setValue(Object newValue) { super.setValue(newValue); if(comboField!=null) { @@ -108,6 +104,5 @@ comboField.setValue(newValue.toString()); comboField.addPropertyChangeListener(this); } - } } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java 2007-10-22 17:04:29 UTC (rev 4416) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java 2007-10-22 17:41:40 UTC (rev 4417) @@ -29,15 +29,6 @@ setMessage(getDefaultMessageText()); } - @Override - protected void createEditors() { - super.createEditors(); - String selectedProject = SeamWizardUtils.getRootSeamProjectName(initialSelection); - String packageName = getDefaultPackageName(selectedProject); - addEditor(SeamWizardFactory.createSeamJavaPackageSelectionFieldEditor(packageName)); - setSeamProjectNameData(selectedProject); - } - /* (non-Javadoc) * @see org.jboss.tools.seam.ui.wizard.SeamBaseWizardPage#getDefaultMessageText() */ Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-22 17:04:29 UTC (rev 4416) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-22 17:41:40 UTC (rev 4417) @@ -72,6 +72,10 @@ protected void createEditors() { addEditors(SeamWizardFactory.createBaseFormFieldEditors(SeamWizardUtils.getRootSeamProjectName(initialSelection))); + String selectedProject = SeamWizardUtils.getRootSeamProjectName(initialSelection); + String packageName = getDefaultPackageName(selectedProject); + addEditor(SeamWizardFactory.createSeamJavaPackageSelectionFieldEditor(packageName)); + setSeamProjectNameData(selectedProject); } Map<String,IFieldEditor> editorRegistry = new HashMap<String,IFieldEditor>(); @@ -99,7 +103,10 @@ getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(true); } } else { - getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false); + getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false); + if(getEditor(IParameter.SEAM_PACKAGE_NAME)!=null) { + getEditor(IParameter.SEAM_PACKAGE_NAME).setEnabled(false); + } } String selectdProject = getEditor(IParameter.SEAM_PROJECT_NAME).getValueAsString(); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-10-22 17:04:29 UTC (rev 4416) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-10-22 17:41:40 UTC (rev 4417) @@ -15,17 +15,15 @@ import java.util.Map; import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.ui.SeamUIMessages; +import org.jboss.tools.seam.ui.widget.editor.INamedElement; public class SeamConversationWizard extends SeamBaseWizard implements INewWizard { - - public SeamConversationWizard() { super(CREATE_SEAM_CONVERSATION); setWindowTitle(SeamUIMessages.SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION); @@ -37,13 +35,14 @@ super.addPages(); addPage(new SeamConversationWizardPage1(getInitialSelection())); } + public static final IUndoableOperation CREATE_SEAM_CONVERSATION = new SeamConversationCreateOperation(); + /** - * * TODO move operations to core plugin */ public static class SeamConversationCreateOperation extends SeamBaseOperation{ - + /** * @param label */ @@ -58,11 +57,11 @@ else return ACTION_EAR_MAPPING; } - + public static final List<String[]> ACTION_WAR_MAPPING = new ArrayList<String[]>(); - + public static final List<String[]> ACTION_EAR_MAPPING = new ArrayList<String[]>(); - + static { // initialize war files mapping ACTION_WAR_MAPPING.add(new String[]{ @@ -74,7 +73,7 @@ ACTION_WAR_MAPPING.add(new String[]{ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/conversation.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + // initialize ear files mapping ACTION_EAR_MAPPING.add(new String[]{ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationBean.java", //$NON-NLS-1$ //$NON-NLS-2$ @@ -84,6 +83,14 @@ "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(2)); } + + /* + * (non-Javadoc) + * @see org.jboss.tools.seam.ui.wizard.SeamBaseOperation#getSessionBeanPackageName(org.eclipse.core.runtime.preferences.IEclipsePreferences, java.util.Map) + */ + @Override + protected String getSessionBeanPackageName(IEclipsePreferences seamFacetPrefs, Map<String, INamedElement> wizardParams) { + return wizardParams.get(IParameter.SEAM_PACKAGE_NAME).getValue().toString(); + } }; - -} +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-22 17:04:29 UTC (rev 4416) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-22 17:41:40 UTC (rev 4417) @@ -25,14 +25,11 @@ */ public class SeamConversationWizardPage1 extends SeamBaseWizardPage { - private final IStructuredSelection initialSelection; - public SeamConversationWizardPage1(IStructuredSelection initialSelection) { super("seam.new.conversation.page1",SeamUIMessages.SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION,null, initialSelection); - this.initialSelection = initialSelection; setMessage(getDefaultMessageText()); } - + /** * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ @@ -43,11 +40,15 @@ if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){ Map errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate( getEditor(IParameter.SEAM_PROJECT_NAME).getValue(), null); - + if(errors.size()>0) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false); } + } else { + if(getEditor(IParameter.SEAM_PACKAGE_NAME)!=null) { + getEditor(IParameter.SEAM_PACKAGE_NAME).setEnabled(false); + } } setPageComplete(false); } @@ -57,7 +58,6 @@ */ @Override public String getDefaultMessageText() { - // TODO Auto-generated method stub return "Create a new Seam conversation"; } -} +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-10-22 17:04:29 UTC (rev 4416) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-10-22 17:41:40 UTC (rev 4417) @@ -47,11 +47,6 @@ protected void createEditors() { super.createEditors(); - String selectedProject = SeamWizardUtils.getRootSeamProjectName(initialSelection); - String packageName = getDefaultPackageName(selectedProject); - addEditor(SeamWizardFactory.createSeamJavaPackageSelectionFieldEditor(packageName)); - setSeamProjectNameData(selectedProject); - addEditor(SeamWizardFactory.createSeamEntityClasNameFieldEditor()); addEditor(SeamWizardFactory.createSeamMasterPageNameFieldEditor()); addEditor(SeamWizardFactory.createSeamPageNameFieldEditor()); @@ -61,6 +56,11 @@ public void createControl(Composite parent) { setControl(new GridLayoutComposite(parent)); setPageComplete(false); + if ("".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())) { //$NON-NLS-1$ + if(getEditor(IParameter.SEAM_PACKAGE_NAME)!=null) { + getEditor(IParameter.SEAM_PACKAGE_NAME).setEnabled(false); + } + } } @Override

17 years, 2 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2007