July 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r9125 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2008-07-13 09:15:57 -0400 (Sun, 13 Jul 2008) New Revision: 9125 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: JBIDE-2093 TPTP profiling not available on "JBoss, a division of RedHat"-servers Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2008-07-11 18:58:46 UTC (rev 9124) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2008-07-13 13:15:57 UTC (rev 9125) @@ -28,6 +28,7 @@ public static String jboss; public static String server; public static String runtime; + public static String runModeNotSupported; static { NLS.initializeMessages(JBossServerCorePlugin.PLUGIN_ID + ".Messages", Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2008-07-11 18:58:46 UTC (rev 9124) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2008-07-13 13:15:57 UTC (rev 9125) @@ -1,3 +1,4 @@ jboss=JBoss server=Server -runtime=Runtime \ No newline at end of file +runtime=Runtime +runModeNotSupported=Selected VM does not support this mode \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2008-07-11 18:58:46 UTC (rev 9124) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2008-07-13 13:15:57 UTC (rev 9125) @@ -14,6 +14,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate; import org.eclipse.jdt.launching.ExecutionArguments; import org.eclipse.jdt.launching.IRuntimeClasspathEntry; @@ -21,12 +22,16 @@ import org.eclipse.jdt.launching.IVMRunner; import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.jdt.launching.VMRunnerConfiguration; +import org.eclipse.jst.server.core.ServerProfilerDelegate; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; +import org.eclipse.wst.server.core.ServerUtil; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public abstract class AbstractJBossLaunchConfigType extends AbstractJavaLaunchConfigurationDelegate { @@ -59,6 +64,13 @@ IVMInstall vm = verifyVMInstall(configuration); IVMRunner runner = vm.getVMRunner(mode); + if(runner == null && ILaunchManager.PROFILE_MODE.equals(mode)){ + runner = vm.getVMRunner(ILaunchManager.RUN_MODE); + } + if(runner == null){ + throw new CoreException(new Status(IStatus.ERROR,JBossServerCorePlugin.PLUGIN_ID,0,Messages.runModeNotSupported,null)); + } + File workingDir = verifyWorkingDirectory(configuration); String workingDirName = null; if (workingDir != null) @@ -90,6 +102,17 @@ setDefaultSourceLocator(launch, configuration); + if (ILaunchManager.PROFILE_MODE.equals(mode)) { + try { + ServerProfilerDelegate.configureProfiling(launch, vm, runConfig, monitor); + } catch (CoreException ce) { + IServer server = ServerUtil.getServer(configuration); + JBossServerBehavior jbsb = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class); + jbsb.stop(true); + //genericServer.stopImpl(); + throw ce; + } + } // Launch the configuration runner.run(runConfig, launch, monitor); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-07-11 18:58:46 UTC (rev 9124) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-07-13 13:15:57 UTC (rev 9125) @@ -249,7 +249,7 @@ category="JBoss" delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration" id="org.jboss.ide.eclipse.as.core.server.startupConfiguration" - modes="run,debug" + modes="run,debug,profile" name="JBoss Application Server Startup Configuration" public="true" sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9124 - trunk/seam/plugins/org.jboss.tools.seam.core/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-07-11 14:58:46 -0400 (Fri, 11 Jul 2008) New Revision: 9124 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF Log: http://jira.jboss.com/jira/browse/JBIDE-2486 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-07-11 18:56:27 UTC (rev 9123) +++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-07-11 18:58:46 UTC (rev 9124) @@ -46,8 +46,7 @@ org.eclipse.wst.sse.ui, org.eclipse.jst.jsf.common, org.eclipse.emf.ecore, - org.eclipse.jst.j2ee.core, - org.eclipse.jst.common.frameworks;bundle-version="1.1.200" + org.eclipse.jst.j2ee.core Provide-Package: org.jboss.tools.seam.core, org.jboss.tools.seam.internal.core, org.jboss.tools.seam.internal.core.scanner,

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9123 - in trunk/seam/plugins: org.jboss.tools.seam.core/META-INF and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-07-11 14:56:27 -0400 (Fri, 11 Jul 2008) New Revision: 9123 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 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/SeamWizardFactory.java Log: http://jira.jboss.com/jira/browse/JBIDE-2486 Fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-07-11 18:56:27 UTC (rev 9123) @@ -46,7 +46,8 @@ org.eclipse.wst.sse.ui, org.eclipse.jst.jsf.common, org.eclipse.emf.ecore, - org.eclipse.jst.j2ee.core + org.eclipse.jst.j2ee.core, + org.eclipse.jst.common.frameworks;bundle-version="1.1.200" Provide-Package: org.jboss.tools.seam.core, org.jboss.tools.seam.internal.core, org.jboss.tools.seam.internal.core.scanner, Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-07-11 18:56:27 UTC (rev 9123) @@ -52,7 +52,7 @@ <and> <requires facet="jst.web" - version="[2.4"> + version="[2.5"> </requires> <requires facet="jst.jsf" @@ -72,7 +72,7 @@ <and> <requires facet="jst.web" - version="[2.4"> + version="[2.5"> </requires> <requires facet="jst.jsf" @@ -143,32 +143,15 @@ facet="jst.java"/> <fixed facet="jst.web"/> - <fixed +  <preset id="jst.seam.preset"> </preset> </template> - <preset - id="jst.seam.preset"> - <label> - Dynamic Web Project with Seam 1.2 - </label> - <facet - id="jst.java" - version="5.0"/> - <facet - id="jst.web" - version="2.5"/> - <facet - id="jst.jsf" - version="1.2"/> - <facet - id="jst.seam" - version="1.2"/> - </preset> + <template id="template.jst.seam2"> <label> @@ -178,33 +161,42 @@ facet="jst.java"/> <fixed facet="jst.web"/> - <fixed +  <preset id="jst.seam2.preset"> </preset> </template> - <preset - id="jst.seam2.preset"> - <label> - Dynamic Web Project with Seam 2.0 (technology preview) - </label> - <facet - id="jst.java" - version="5.0"/> - <facet - id="jst.web" - version="2.5"/> - <facet - id="jst.jsf" - version="1.2"/> - <facet - id="jst.seam" - version="2.0"/> - </preset> </extension> + + <extension + point="org.eclipse.wst.common.project.facet.core.presets"> + <static-preset + id="jst.seam.preset"> + <label>Dynamic Web Project with Seam 1.2</label> + <facet id="jst.java" version="5.0" /> + <facet id="jst.web" version="2.5"/> + <facet id="jst.jsf" version="1.2" /> + <facet id="jst.seam" version="2.0" /> + <description> + Configures a Dynamic Web application to use Seam v1.2 + </description> + </static-preset> + <static-preset + id="jst.seam2.preset"> + <label>Dynamic Web Project with Seam 2.0 (technology preview)</label> + <facet id="jst.java" version="5.0" /> + <facet id="jst.web" version="2.5"/> + <facet id="jst.jsf" version="1.2" /> + <facet id="jst.seam" version="2.0" /> + <description> + Configures a Dynamic Web application to use Seam v2.0 + </description> + </static-preset> + </extension> + <extension point="org.eclipse.wst.common.project.facet.core.runtimes"> <supported> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2008-07-11 18:56:27 UTC (rev 9123) @@ -8,7 +8,7 @@ static { NLS.initializeMessages(BUNDLE_NAME, SeamCoreMessages.class); } - + public static String SeamCoreBuilder_1; public static String ANT_COPY_UTILS_COPY_FAILED; public static String ANT_COPY_UTILS_COULD_NOT_FIND_FOLDER; @@ -38,5 +38,4 @@ public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED = null; public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW; public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR; - -} +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2008-07-11 18:56:27 UTC (rev 9123) @@ -26,4 +26,4 @@ ERROR_JBOSS_AS_TARGET_SERVER_NO_SERVERS_DEFINED=There are no available Target Service for selected Target Runtime ERROR_JBOSS_AS_TARGET_SERVER_INCOMPATIBLE=Target Server is incompatible with Target Runtime selected ERROR_JBOSS_AS_TARGET_RUNTIME_IS_EMPTY=Target Runtime cannot be empty -ERROR_JBOSS_AS_TARGET_RUNTIME_UNKNOWN=Unknown Target Runtime +ERROR_JBOSS_AS_TARGET_RUNTIME_UNKNOWN=Unknown Target Runtime \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java 2008-07-11 18:56:27 UTC (rev 9123) @@ -22,4 +22,13 @@ */ String SEAM_CORE_FACET_ID = "jst.seam"; //$NON-NLS-1$ -} + /** + * Seam 1.2 Facet Version constant + */ + String SEAM_CORE_FACET_VERSION_12 = "1.2"; //$NON-NLS-1$ + + /** + * Seam 2.0 Facet Version constant + */ + String SEAM_CORE_FACET_VERSION_20 = "2.0"; //$NON-NLS-1$ +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2008-07-11 18:56:27 UTC (rev 9123) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Seam GUI Tools -Bundle-SymbolicName: org.jboss.tools.seam.ui; singleton:=true +Bundle-SymbolicName: org.jboss.tools.seam.ui;singleton:=true Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.seam.ui.SeamGuiPlugin Bundle-Localization: plugin Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-07-11 18:56:27 UTC (rev 9123) @@ -215,6 +215,8 @@ public static String SEAM_PROJECT_WIZARD_PAGE1_SELECT_NEW_FILE_CONTAINER; + public static String SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED; + public static String SEAM_PROJECT_WIZARD_PAGE1_THIS_WIZARD_CREATES_A_NEW_FILE; public static String SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-07-11 18:56:27 UTC (rev 9123) @@ -10,6 +10,7 @@ SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS=Configure Seam Facet Settings SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6=''{0}'' deployment cannot be used, because selected Server Runtime ''{1}'' doesn't support EJB 3.0 and EAR 5.0 modules SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME_MUST_BE_SPECIFIED=File name must be specified +SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED=Seam facet must be enabled SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT=Select Seam Web Project SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT=Create standalone Seam Web Project SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME=Seam Runtime: 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 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-07-11 18:56:27 UTC (rev 9123) @@ -29,16 +29,19 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; +import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; 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.SeamProjectPreferences; +import org.jboss.tools.seam.internal.core.project.facet.ISeamCoreConstants; 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.ISeamHelpContextIds; @@ -52,7 +55,6 @@ */ public class SeamProjectWizard extends WebProjectWizard { - public SeamProjectWizard() { super(); setWindowTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT); @@ -86,8 +88,7 @@ if (control != null) control.setVisible(false); } - - + Control findControlByClass(Composite comp, Class claz) { for (Control child : comp.getChildren()) { if(child.getClass()==claz) { @@ -99,8 +100,7 @@ } return null; } - - + Control findGroupByText(Composite comp, String text) { for (Control child : comp.getChildren()) { if(child instanceof Group && ((Group)child).getText().equals(text)) { @@ -113,7 +113,6 @@ return null; } - @Override protected String getFinalPerspectiveID() { return "org.jboss.tools.seam.ui.SeamPerspective"; //$NON-NLS-1$ @@ -122,7 +121,7 @@ protected IFacetedProjectTemplate getTemplate() { return ProjectFacetsManager.getTemplate("template.jst.seam"); //$NON-NLS-1$ } - + /* (non-Javadoc) * @see org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard#performFinish() */ @@ -132,19 +131,19 @@ page.finishPressed(); return super.performFinish(); } - + class SeamWebProjectFirstPage extends WebProjectFirstPage { @Override protected String getInfopopID() { return ISeamHelpContextIds.NEW_SEAM_PROJECT; } - + public SeamWebProjectFirstPage(IDataModel model, String pageName ) { super(model, pageName); } protected Combo matchedServerTargetCombo; - + protected Composite createTopLevelComposite(Composite parent) { Composite top = new Composite(parent, SWT.NONE); top.setLayout(new GridLayout()); @@ -157,7 +156,6 @@ return top; } - protected void createSeamServerTargetComposite(Composite parent) { // super.createServerTargetComposite(parent); Group group = new Group(parent, SWT.NONE); @@ -182,7 +180,7 @@ if (matchedServerTargetCombo.getSelectionIndex() == -1 && matchedServerTargetCombo.getVisibleItemCount() != 0) matchedServerTargetCombo.select(0); } - + protected String[] getValidationPropertyNames() { String[] superProperties = super.getValidationPropertyNames(); List list = Arrays.asList(superProperties); @@ -196,7 +194,30 @@ public boolean launchNewServerWizard(Shell shell, IDataModel model) { return launchNewServerWizard(shell, model, null); } - + + /* + * (non-Javadoc) + * @see org.eclipse.jface.wizard.WizardPage#isPageComplete() + */ + @Override + public boolean isPageComplete() { + if(super.isPageComplete()) { + IProjectFacet pFacet = ProjectFacetsManager.getProjectFacet(ISeamCoreConstants.SEAM_CORE_FACET_ID); + IFacetedProjectWorkingCopy fProject = getFacetedProjectWorkingCopy(); + if(fProject!=null) { + IProjectFacetVersion seamFacet = fProject.getProjectFacetVersion(pFacet); + if(seamFacet==null) { + this.setErrorMessage(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED); + return false; + } else { + this.setErrorMessage(null); + } + } + return true; + } + return false; + } + public boolean launchNewServerWizard(Shell shell, IDataModel model, String serverTypeID) { DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER); IRuntime rt = (IRuntime)model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME); @@ -232,7 +253,7 @@ } if (preAddition == null && postAddition != null && postAddition.length == 1) newAddition = postAddition[0]; - + model.notifyPropertyChange(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, IDataModel.VALID_VALUES_CHG); if (newAddition != null) model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, newAddition); @@ -241,17 +262,17 @@ } return isOK; } - + public boolean internalLaunchNewServerWizard(Shell shell, IDataModel model) { return launchNewServerWizard(shell, model, getModuleTypeID()); } - + public void restoreDefaultSettings() { super.restoreDefaultSettings(); String lastServerName = SeamProjectPreferences .getStringPreference(SeamProjectPreferences.SEAM_LAST_SERVER_NAME); - + if (lastServerName != null && lastServerName.length() > 0) { SeamFacetProjectCreationDataModelProvider.setServerName(model,lastServerName); } @@ -266,6 +287,5 @@ serverName); } } - } } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-07-11 15:59:59 UTC (rev 9122) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-07-11 18:56:27 UTC (rev 9123) @@ -390,11 +390,15 @@ /* (non-Javadoc) * @see org.eclipse.datatools.connectivity.IProfileListener#profileAdded(org.eclipse.datatools.connectivity.IConnectionProfile) */ - public void profileAdded(IConnectionProfile profile) { - connProfileSelEditor.setValue(profile.getName()); - ((ITaggedFieldEditor) ((CompositeEditor) connProfileSelEditor) - .getEditors().get(1)).setTags(getConnectionProfileNameList() - .toArray(new String[0])); + public void profileAdded(final IConnectionProfile profile) { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + connProfileSelEditor.setValue(profile.getName()); + ((ITaggedFieldEditor) ((CompositeEditor) connProfileSelEditor) + .getEditors().get(1)).setTags(getConnectionProfileNameList() + .toArray(new String[0])); + } + }); validator.validate(profile.getName(), null); }

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9122 - in trunk/vpe/plugins/org.jboss.tools.vpe/resources: meta and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-07-11 11:59:59 -0400 (Fri, 11 Jul 2008) New Revision: 9122 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta Log: Change label values and combobox to input. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties 2008-07-11 14:31:27 UTC (rev 9121) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties 2008-07-11 15:59:59 UTC (rev 9122) @@ -9,9 +9,11 @@ VPETLDReference.location=URI VPETLDReferenceExt.location=URI -VPEElReference.location=El -VPEElReferenceExt.location=El +VPEElReference.location=El Value +VPEElReference.prefix=Value +VPEElReferenceExt.location=El Value +VPEElReferenceExt.prefix=Value VpeResourcesDialog.WindowTitle=References to Resources VpeResourcesDialog.Title=Page Design Options Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-07-11 14:31:27 UTC (rev 9121) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-07-11 15:59:59 UTC (rev 9122) @@ -118,8 +118,8 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute name="location" xmlname="location"> - <Constraint loader="ListString"/> - <Editor name="List"/> + <Constraint/> + <Editor/> </XModelAttribute> <XModelAttribute PROPERTIES="border=true" default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> @@ -140,8 +140,8 @@ <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" PROPERTIES="support=org.jboss.tools.vpe.editor.css.VpeAddReferenceSupport" displayName="Add El Reference..." kind="action" name="AddItem"> - <EntityData EntityName="VPETLDReference"> - <AttributeData AttributeName="location"/> + <EntityData EntityName="VPEElReference"> + <AttributeData AttributeName="location" Mandatory="no"/> <AttributeData AttributeName="scope" Mandatory="no"/> <AttributeData AttributeName="prefix" Mandatory="no"/> </EntityData> @@ -173,8 +173,8 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute name="location" xmlname="location"> - <Constraint loader="ListString"/> - <Editor name="List"/> + <Constraint/> + <Editor/> </XModelAttribute> <XModelAttribute PROPERTIES="border=true" default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope">

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9121 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-07-11 10:31:27 -0400 (Fri, 11 Jul 2008) New Revision: 9121 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java Log: Make Load/Save functionality Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-07-11 00:07:29 UTC (rev 9120) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-07-11 14:31:27 UTC (rev 9121) @@ -82,6 +82,7 @@ if(OK.equals(command)) { absFolder.commit(); relFolder.commit(); + el.commit(); css.commit(); tld.commit(); }

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9120 - trunk/jsf/features/org.jboss.tools.richfaces.feature.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-07-10 20:07:29 -0400 (Thu, 10 Jul 2008) New Revision: 9120 Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml Log: fix build error during building RichFaces feature Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml =================================================================== --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-07-10 17:11:49 UTC (rev 9119) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-07-11 00:07:29 UTC (rev 9120) @@ -1,26 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.richfaces.feature" - label="RichFaces VPE Feature" - version="2.0.0" - provider-name="JBoss, a division of Red Hat" - plugin="org.jboss.tools.vpe"> - - <description url="http://www.jboss.org/tools"> - JBossTools RichFaces feature - </description> - - <copyright> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.richfaces.feature" + label="RichFaces VPE Feature" + version="2.0.0" + provider-name="JBoss, a division of Red Hat" + plugin="org.jboss.tools.vpe"> + + <description url="http://www.jboss.org/tools"> + JBossTools RichFaces feature + </description> + + <copyright> 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 - </copyright> - - <license url="http://www.eclipse.org/legal/epl-v10.html"> +Exadel, Inc. and Red Hat, Inc. - initial API and implementation + </copyright> + + <license url="http://www.eclipse.org/legal/epl-v10.html"> Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR @@ -216,251 +216,239 @@ No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting -litigation. - </license> - - <url> - <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/> - <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/> - </url> - - <requires> - <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> - </requires> - - <plugin - id="org.jboss.tools.common" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.gef" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.kb" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.projecttemplates" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.text.ext" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.text.xml" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.verification" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.verification.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.text.ext" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.text.ext.facelets" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.verification" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.ajax4jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.facelets" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.richfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.seam" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.tomahawk" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.debug" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.debug.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.verification" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.ui.palette" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.firstrun" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.xulrunner" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.hibernate.xml" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.hibernate.xml.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.adf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.myfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.html" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - -</feature> +litigation. + </license> + + <url> + <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/> + <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/> + </url> + + <requires> + <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> + </requires> + + <plugin + id="org.jboss.tools.common" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.gef" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.kb" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.projecttemplates" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.text.ext" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.text.xml" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.verification" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.verification.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.text.ext" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.facelets" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.verification" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.ajax4jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.facelets" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.richfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.seam" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.debug" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.debug.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.tiles" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.tiles.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.verification" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.ui.palette" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.firstrun" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.xulrunner" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.hibernate.xml" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.hibernate.xml.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.myfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.html" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + +</feature>

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9119 - branches/jbosstools-2.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-07-10 13:11:49 -0400 (Thu, 10 Jul 2008) New Revision: 9119 Modified: branches/jbosstools-2.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java Log: http://jira.jboss.org/jira/browse/JBIDE-2433 Modified: branches/jbosstools-2.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java =================================================================== --- branches/jbosstools-2.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-07-10 15:25:00 UTC (rev 9118) +++ branches/jbosstools-2.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-07-10 17:11:49 UTC (rev 9119) @@ -24,6 +24,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.jboss.tools.vpe.VpePlugin; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -50,8 +51,9 @@ * @param editorInput * @return */ - static public String getDoctype(IEditorInput editorInput) { + public static String getDoctype(IEditorInput editorInput) { + try{ // if opened file is located in eclipse workspace if (editorInput instanceof IFileEditorInput) { IFile f = ((IFileEditorInput) editorInput).getFile(); @@ -64,6 +66,11 @@ return null; return getDoctype(path.toFile()); } + }catch(StackOverflowError error) { + //Fix For JBIDE-2433 + VpePlugin.getPluginLog().logInfo(error.toString()); + return ""; //$NON-NLS-1$ + } return null; } @@ -74,7 +81,7 @@ * @param file * @return */ - static public String getDoctype(IFile file) { + static private String getDoctype(IFile file) { String docTypeValue = null;

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9118 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-07-10 11:25:00 -0400 (Thu, 10 Jul 2008) New Revision: 9118 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-07-10 15:23:09 UTC (rev 9117) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-07-10 15:25:00 UTC (rev 9118) @@ -69,7 +69,6 @@ } super.bringDown(); - // dispose any scaled fonts that might have been created disposeScaledFont(); PagesElement element = ((PagesEditPart)getEditPart()).getElementModel(); @@ -88,27 +87,21 @@ } protected void initCellEditor() { - // update text - NodeFigure stickyNote = (NodeFigure) getEditPart().getFigure(); - if(stickyNote instanceof PageFigure) - getCellEditor().setValue(((PageFigure)stickyNote).page.getName()); - else if(stickyNote instanceof ExceptionFigure) - getCellEditor().setValue(((ExceptionFigure)stickyNote).exc.getName()); + NodeFigure figure = (NodeFigure) getEditPart().getFigure(); + if(figure instanceof PageFigure) + getCellEditor().setValue(((PageFigure)figure).page.getName()); + else if(figure instanceof ExceptionFigure) + getCellEditor().setValue(((ExceptionFigure)figure).exc.getName()); - // update font ZoomManager zoomMgr = (ZoomManager) getEditPart().getViewer() .getProperty(ZoomManager.class.toString()); if (zoomMgr != null) { - // this will force the font to be set cachedZoom = -1.0; updateScaledFont(zoomMgr.getZoom()); zoomMgr.addZoomListener(zoomListener); } else - getCellEditor().getControl().setFont(stickyNote.getFont()); + getCellEditor().getControl().setFont(figure.getFont()); - // Hook the cell editor's copy/paste actions to the actionBars so that - // they can - // be invoked via keyboard shortcuts. actionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getActivePage().getActiveEditor().getEditorSite() .getActionBars(); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java 2008-07-10 15:23:09 UTC (rev 9117) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java 2008-07-10 15:25:00 UTC (rev 9118) @@ -10,15 +10,11 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.pages.editor.edit; -import org.eclipse.swt.widgets.Text; - -import org.eclipse.jface.viewers.CellEditor; - import org.eclipse.draw2d.geometry.Rectangle; - import org.eclipse.gef.tools.CellEditorLocator; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.swt.widgets.Text; import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure; -import org.jboss.tools.seam.ui.pages.editor.figures.PageFigure; final public class ViewIDEditorLocator implements CellEditorLocator {

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9117 - in trunk/vpe/plugins/org.jboss.tools.vpe: resources/meta and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-07-10 11:23:09 -0400 (Thu, 10 Jul 2008) New Revision: 9117 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ELReferenceList.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesTableProvider.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java Log: Add table (part of http://jira.jboss.com/jira/browse/JBIDE-2010) issue. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties 2008-07-10 14:35:59 UTC (rev 9116) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/help/keys-vpe.properties 2008-07-10 15:23:09 UTC (rev 9117) @@ -9,6 +9,10 @@ VPETLDReference.location=URI VPETLDReferenceExt.location=URI +VPEElReference.location=El +VPEElReferenceExt.location=El + + VpeResourcesDialog.WindowTitle=References to Resources VpeResourcesDialog.Title=Page Design Options Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-07-10 14:35:59 UTC (rev 9116) +++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-07-10 15:23:09 UTC (rev 9117) @@ -106,6 +106,119 @@ </XActionItem> <XDependencies/> </XModelEntity> + +  + <XModelEntity ImplementingClass="%Regular%" name="VPEElReference"> + + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="action.empty" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute name="location" xmlname="location"> + <Constraint loader="ListString"/> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="border=true" + default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> + <Constraint loader="ListString"> + <value name="Page: Only This Page"/> + <value name="Folder: Any Page at the Same Folder"/> + <value name="Project: Any Page at the Same Project"/> + </Constraint> + <Editor name="RadioArray"/> + </XModelAttribute> + <XModelAttribute name="prefix"> + <Constraint/> + <Editor/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="support=org.jboss.tools.vpe.editor.css.VpeAddReferenceSupport" + displayName="Add El Reference..." kind="action" name="AddItem"> + <EntityData EntityName="VPETLDReference"> + <AttributeData AttributeName="location"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="prefix" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="support=org.jboss.tools.vpe.editor.css.VpeAddReferenceSupport" + displayName="Edit El Reference..." kind="action" name="EditItem"> + <EntityData EntityName="VPEElReference"> + <AttributeData AttributeName="location"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="prefix" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + + <XModelEntity ImplementingClass="%Regular%" name="VPEElReferenceExt"> + + + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="action.empty" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute name="location" xmlname="location"> + <Constraint loader="ListString"/> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="border=true" + default="Folder: Any Page at the Same Folder" name="scope" xmlname="scope"> + <Constraint loader="ListString"> + <value name="Page: Only This Page"/> + <value name="Folder: Any Page at the Same Folder"/> + </Constraint> + <Editor name="RadioArray"/> + </XModelAttribute> + <XModelAttribute name="prefix"> + <Constraint/> + <Editor/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="support=org.jboss.tools.vpe.editor.css.VpeAddReferenceSupport" + displayName="Add El Reference..." kind="action" name="AddItem"> + <EntityData EntityName="VPEELReferenceExt"> + <AttributeData AttributeName="location"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="prefix" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="support=org.jboss.tools.vpe.editor.css.VpeAddReferenceSupport" + displayName="Edit El Reference..." kind="action" name="EditItem"> + <EntityData EntityName="VPEElReference"> + <AttributeData AttributeName="location"/> + <AttributeData AttributeName="scope" Mandatory="no"/> + <AttributeData AttributeName="prefix" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> +  + + + <XModelEntity ImplementingClass="%Regular%" name="VPEFolderReference"> <XChildrenEntities/> <XEntityRenderer> Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ELReferenceList.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ELReferenceList.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ELReferenceList.java 2008-07-10 15:23:09 UTC (rev 9117) @@ -0,0 +1,37 @@ + + +package org.jboss.tools.vpe.editor.css; + + +import org.eclipse.core.runtime.QualifiedName; + + +/** + * The Class ELReferenceList. + */ +public class ELReferenceList extends ResourceReferenceList { + + /** The PROPERT y_ NAME. */ + private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.ELReference"); + + /** The instance. */ + static ELReferenceList instance = new ELReferenceList(); + + /** + * Gets the instance. + * + * @return the instance + */ + public static ELReferenceList getInstance() { + return instance; + } + + /** + * Gets the property name. + * + * @return the property name + */ + protected QualifiedName getPropertyName() { + return PROPERTY_NAME; + } +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ELReferenceList.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java 2008-07-10 15:23:09 UTC (rev 9117) @@ -0,0 +1,43 @@ +package org.jboss.tools.vpe.editor.css; + +import java.util.List; + +/** + * The Class ElVariablesComposite. + */ +public class ElVariablesComposite extends ResourceReferencesComposite { + + /** + * Creates the table provider. + * + * @param dataList the data list + * + * @return the resource references table provider + */ + @Override + protected ResourceReferencesTableProvider createTableProvider(List dataList) { + return ResourceReferencesTableProvider.getELTableProvider(dataList); + }; + + + /** + * Gets the entity. + * + * @return the entity + */ + @Override + protected String getEntity() { + return (file != null) ? "VPEElReference" : "VPEElReferenceExt"; + } + + /** + * Gets the reference list. + * + * @return the reference list + */ + @Override + protected ResourceReferenceList getReferenceList() { + return ELReferenceList.getInstance(); + } + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesTableProvider.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesTableProvider.java 2008-07-10 14:35:59 UTC (rev 9116) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesTableProvider.java 2008-07-10 15:23:09 UTC (rev 9117) @@ -18,6 +18,7 @@ static String[] CSS_COLUMNS = new String[]{"Scope", "CSS File Path"}; static String[] IMG_COLUMNS = new String[]{"Scope", "Image Folder Path"}; static String[] TLD_COLUMNS = new String[]{"Scope", "URI", "Prefix"}; + static String[] EL_COLUMNS = new String[]{"Scope", "El Expression", "Value"}; int[] widths = new int[]{50, 200}; List dataList; @@ -41,6 +42,16 @@ p.widths = new int[]{50, 150, 50}; return p; } + + public static ResourceReferencesTableProvider getELTableProvider(List dataList) { + ResourceReferencesTableProvider p = new ResourceReferencesTableProvider(dataList); + p.columns = EL_COLUMNS; + p.widths = new int[]{50, 150, 50}; + return p; + } + + + private ResourceReferencesTableProvider(List dataList) { this.dataList = dataList; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-07-10 14:35:59 UTC (rev 9116) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-07-10 15:23:09 UTC (rev 9117) @@ -25,6 +25,9 @@ IFile file; IPath path; CssReferencesComposite css = new CssReferencesComposite(); + //changed by estherbin + //http://jira.jboss.com/jira/browse/JBIDE-2010 + ElVariablesComposite el = new ElVariablesComposite(); TaglibReferencesComposite tld = new TaglibReferencesComposite(); AbsoluteFolderReferenceComposite absFolder = new AbsoluteFolderReferenceComposite(); RelativeFolderReferenceComposite relFolder = new RelativeFolderReferenceComposite(); @@ -36,6 +39,9 @@ path = (IPath)p.get("path"); css.setObject(object); + //changed by estherbin + //http://jira.jboss.com/jira/browse/JBIDE-2010 + el.setObject(object); tld.setObject(object); absFolder.setObject(p); relFolder.setObject(p); @@ -63,6 +69,12 @@ Control tldControl = tld.createControl(c); data = new GridData(GridData.FILL_BOTH); tldControl.setLayoutData(data); + + //changed by estherbin + //http://jira.jboss.com/jira/browse/JBIDE-2010 + Control elControl = el.createControl(c); + data = new GridData(GridData.FILL_BOTH); + elControl.setLayoutData(data); return c; } @@ -78,12 +90,16 @@ public Point getPreferredSize() { try { + //changed by estherbin + //http://jira.jboss.com/jira/browse/JBIDE-2010 String os_name = System.getProperty("os.name"); - if(os_name != null && os_name.indexOf("Windows") >= 0) return new Point(600, 400); + if(os_name != null && os_name.indexOf("Windows") >= 0) return new Point(800, 600); } catch (Exception e) { //ignore } - return new Point(600, 500); + //changed by estherbin + //http://jira.jboss.com/jira/browse/JBIDE-2010 + return new Point(700, 600); } }

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r9116 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-07-10 10:35:59 -0400 (Thu, 10 Jul 2008) New Revision: 9116 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta Log: http://jira.jboss.com/jira/browse/JBIDE-2309 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-07-10 13:27:38 UTC (rev 9115) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-07-10 14:35:59 UTC (rev 9116) @@ -2817,7 +2817,7 @@ </XModelAttributes> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" +  <XActionItem HandlerClassName="org.jboss.tools.seam.ui.pages.editor.commands.AddPageOnDiagramHandler" ICON="action.empty" - displayName="New Page (diagram)..." kind="action" name="AddPage"/> - <XActionItem + displayName="New Page..." kind="action" name="AddPage"/> +  <XActionItem HandlerClassName="org.jboss.tools.seam.ui.pages.editor.commands.AddExceptionOnDiagramHandler" ICON="action.empty" - displayName="New Exception (diagram)..." kind="action" name="AddException"/> + displayName="New Exception ..." kind="action" name="AddException"/> </XActionItem> <XActionItem HIDE="always" HandlerClassName="org.jboss.tools.jsf.model.handlers.CreateCommentHandler"

15 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2008