February 2010 - jbosstools-commits

JBoss Tools SVN: r20373 - in branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-02-18 20:10:07 -0500 (Thu, 18 Feb 2010) New Revision: 20373 Modified: branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java Log: Fixes for JBIDE-5877: Web service sample wizard not working https://jira.jboss.org/jira/browse/JBIDE-5877 - to CR2 branch Modified: branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties =================================================================== --- branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-02-19 01:08:19 UTC (rev 20372) +++ branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-02-19 01:10:07 UTC (rev 20373) @@ -44,10 +44,10 @@ JBossWSLibraryListFieldEditor_ActionRemove=&Remove JBossWSLibraryListFieldEditor_LIBRARY_JARS=Library Jars JBossWS_GenerateWizard_Title=Generate a Sample Web Service -JBossWS_GenerateWizard_GenerateWebXmlPage_Title=Web Service -JBossWS_GenerateWizard_GenerateWebXmlPage_Description=Create a Sample Web Service Name +JBossWS_GenerateWizard_GenerateWebXmlPage_Title=Project and Web Service Name +JBossWS_GenerateWizard_GenerateWebXmlPage_Description=Specify the Dynamic Web Project and service name for the new sample web service. JBossWS_GenerateWizard_GenerateSampleClassPage_Title=Sample Web Service Class -JBossWS_GenerateWizard_GenerateSampleClassPage_Description=Generate a Sample Web Service Class +JBossWS_GenerateWizard_GenerateSampleClassPage_Description=Define the package and class name for the generated sample web service class. JBossWS_GenerateWizard_GenerateWebXmlPage_ServiceName_Label=Name JBossWS_GenerateWizard_WizardPage_CheckButton_Label=Use the default value JBossWS_GenerateWizard_GenerateSampleClassPage_Package_Label=Package @@ -59,4 +59,8 @@ Error_JBossWS_GenerateWizard_ClassName_Empty=The Class Name may not be an empty string. Error_JBossWS_GenerateWizard_PackageName_Empty=The Package Name may not be an empty string. Error_JBossWS_GenerateWizard=Problems encountered while creating the web.xml and Java class entries. -JBossWS_UI_PLUGIN_NO_MESSAGES=No message \ No newline at end of file +JBossWS_UI_PLUGIN_NO_MESSAGES=No message +JBossWSGenerateWebXmlWizardPage_Project_Group=Dynamic Web Project Name +JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip=If no Dynamic Web Project exists, you must create one before creating your sample web service. +JBossWSGenerateWebXmlWizardPage_Web_Service_Group=Web Service +JBossWSGenerateWizard_NoProjectSelected=No project selected. Please select a Dynamic Web Project to continue. Modified: branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java =================================================================== --- branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-02-19 01:08:19 UTC (rev 20372) +++ branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-02-19 01:10:07 UTC (rev 20373) @@ -95,6 +95,14 @@ public static String JBossWS_UI_PLUGIN_NO_MESSAGES; + public static String JBossWSGenerateWebXmlWizardPage_Project_Group; + + public static String JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip; + + public static String JBossWSGenerateWebXmlWizardPage_Web_Service_Group; + + public static String JBossWSGenerateWizard_NoProjectSelected; + static { NLS.initializeMessages(BUNDLE_NAME, JBossWSUIMessages.class); } Modified: branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java =================================================================== --- branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-02-19 01:08:19 UTC (rev 20372) +++ branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-02-19 01:10:07 UTC (rev 20373) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.wizards; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.wizard.WizardPage; @@ -128,6 +129,22 @@ ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); String currentName = wizard.getClassName(); + if (wizard.getProject() == null) { + return currentName; + } + else { + boolean isDynamicWebProject = false; + try { + if (wizard.getProject().getNature("org.eclipse.wst.common.project.facet.core.nature") != null) { //$NON-NLS-1$ + isDynamicWebProject = true; + } + } catch (CoreException e) { + // ignore + } + if (!isDynamicWebProject) { + return currentName; + } + } String testName = currentName; IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(testName, wizard.getProject()); int i = 1; @@ -142,7 +159,7 @@ return testName; } - private boolean validate() { + protected boolean validate() { ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(model.getCustomClassName(), wizard.getProject()); @@ -155,4 +172,8 @@ return true; } } + + protected void refresh() { + className.setText(updateDefaultName()); + } } Modified: branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java =================================================================== --- branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java 2010-02-19 01:08:19 UTC (rev 20372) +++ branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java 2010-02-19 01:10:07 UTC (rev 20373) @@ -10,10 +10,14 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.wizards; +import java.util.ArrayList; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -22,7 +26,9 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.jboss.tools.ws.creation.core.data.ServiceModel; @@ -32,7 +38,9 @@ private JBossWSGenerateWizard wizard; private Text name; + private Combo projects; private Button checkDefault; + private boolean bHasChanged = false; protected JBossWSGenerateWebXmlWizardPage(String pageName) { super(pageName); @@ -45,10 +53,46 @@ public void createControl(Composite parent) { Composite composite = createDialogArea(parent); this.wizard = (JBossWSGenerateWizard) this.getWizard(); - new Label(composite, SWT.NONE) + + Group group = new Group (composite, SWT.NONE); + group.setText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Project_Group); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + group.setLayout(new GridLayout(2, false)); + group.setLayoutData(gd); + + projects = new Combo(group, SWT.BORDER | SWT.DROP_DOWN); + projects.setToolTipText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + projects.setLayoutData(gd); + refreshProjectList(wizard.getServiceModel().getWebProjectName()); + + projects.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + wizard.setProject(projects.getText()); + name.setText(updateDefaultName()); + wizard.getSecondPage().refresh(); + bHasChanged = true; + setPageComplete(isPageComplete()); + } + + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + Group group2 = new Group (composite, SWT.NONE); + group2.setText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Web_Service_Group); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + group2.setLayout(new GridLayout(2, false)); + group2.setLayoutData(gd); + + new Label(group2, SWT.NONE) .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWebXmlPage_ServiceName_Label); - name = new Text(composite, SWT.BORDER); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); + name = new Text(group2, SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); name.setLayoutData(gd); name.setText(updateDefaultName()); name.setEnabled(!wizard.isUseDefaultServiceName()); @@ -56,12 +100,13 @@ public void modifyText(ModifyEvent e) { wizard.setServiceName(name.getText()); + bHasChanged = true; setPageComplete(isPageComplete()); } }); - checkDefault = new Button(composite, SWT.CHECK); + checkDefault = new Button(group2, SWT.CHECK); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; checkDefault.setLayoutData(gd); @@ -89,6 +134,20 @@ setControl(composite); } + private void refreshProjectList ( String projectName ) { + String[] projectNames = getProjects(); + boolean foundInitialProject = false; + projects.removeAll(); + for (int i = 0; i < projectNames.length; i++) { + projects.add(projectNames[i]); + if (projectNames[i].equals(projectName)) { + foundInitialProject = true; + } + } + if (foundInitialProject) + projects.setText(projectName); + } + public IWizardPage getNextPage() { wizard.setServiceName(name.getText()); return super.getNextPage(); @@ -117,8 +176,15 @@ ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); String currentName = wizard.getServiceName(); + IStatus status = JBossWSGenerateWizardValidator.isWSNameValid(); + try { + if (status.getSeverity() == IStatus.ERROR && !JavaEEProjectUtilities.isDynamicWebProject(wizard.getProject())) { + return currentName; + } + } catch (NullPointerException npe) { + return currentName; + } String testName = currentName; - IStatus status = JBossWSGenerateWizardValidator.isWSNameValid(); int i = 1; while (status != null) { testName = currentName + i; @@ -134,14 +200,33 @@ private boolean validate() { ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); + if (!projects.isDisposed() && projects.getText().length() > 0) { + model.setWebProjectName(projects.getText()); + } IStatus status = JBossWSGenerateWizardValidator.isWSNameValid(); if (status != null) { - setMessage(status.getMessage(), DialogPage.ERROR); + setErrorMessage(status.getMessage()); return false; } else { - setMessage(null); + setErrorMessage(null); return true; } } + + private String[] getProjects() { + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + ArrayList<String> dynamicProjects = new ArrayList<String>(); + for (int i = 0; i < projects.length; i++) { + boolean isDynamicWebProject = JavaEEProjectUtilities.isDynamicWebProject(projects[i]); + if (isDynamicWebProject) { + dynamicProjects.add(projects[i].getName()); + } + } + return dynamicProjects.toArray(new String[dynamicProjects.size()]); + } + + protected boolean hasChanged() { + return bHasChanged; + } } Modified: branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java =================================================================== --- branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-02-19 01:08:19 UTC (rev 20372) +++ branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-02-19 01:10:07 UTC (rev 20373) @@ -15,6 +15,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -145,9 +146,18 @@ @Override public boolean canFinish() { + if (getProject() == null) { + if (firstPage != null && !firstPage.getControl().isDisposed()) { + if (firstPage.hasChanged()) + firstPage + .setErrorMessage(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } + return false; + } if (hasInited && (webFile == null || !webFile.exists())) { if (firstPage != null && !firstPage.getControl().isDisposed()) { - firstPage + if (firstPage.hasChanged()) + firstPage .setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NotDynamicWebProject); } return false; @@ -220,9 +230,13 @@ public ServiceModel getServiceModel() { ServiceModel model = new ServiceModel(); - model.setWebProjectName(project.getName()); - model.addServiceClasses(new StringBuffer().append(getPackageName()) + if (project != null) { + model.setWebProjectName(project.getName()); + } + if (getPackageName() != null) { + model.addServiceClasses(new StringBuffer().append(getPackageName()) .append(".").append(getClassName()).toString()); //$NON-NLS-1$ + } model.setServiceName(getServiceName()); model.setUpdateWebxml(true); model.setCustomPackage(getPackageName()); @@ -230,4 +244,27 @@ return model; } + public JBossWSGenerateWebXmlWizardPage getFirstPage() { + return this.firstPage; + } + + public JBossWSGenerateSampleClassWizardPage getSecondPage() { + return this.secondPage; + } + + public void setProject (String projectName) { + if (projectName != null && projectName.trim().length() > 0) { + IProject test = + ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + if (test != null) { + this.project = test; + if (project != null + && JavaEEProjectUtilities.isDynamicWebProject(project)) { + webFile = project.getParent().getFolder( + UIUtils.getWebContentRootPath(project).append(WEBINF)) + .getFile(WEB); + } + } + } + } } Modified: branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java =================================================================== --- branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-02-19 01:08:19 UTC (rev 20372) +++ branches/jbosstools-3.1.0.RC2/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-02-19 01:10:07 UTC (rev 20373) @@ -45,6 +45,20 @@ } public static IStatus isWSNameValid() { + if (model.getWebProjectName() == null) { + return StatusUtils.errorStatus(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } + else { + try { + ModelProviderManager + .getModelProvider(JBossWSCreationUtils.getProjectByName(model + .getWebProjectName())); + } catch (IllegalArgumentException iae) { + // ignore + model.setWebProjectName(null); + return StatusUtils.errorStatus(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } + } final IModelProvider provider = ModelProviderManager .getModelProvider(JBossWSCreationUtils.getProjectByName(model .getWebProjectName())); @@ -93,6 +107,9 @@ // empty class name return StatusUtils.errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_ClassName_Same); } + else if (project == null) { + return StatusUtils.errorStatus(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } else { File file = findFileByPath(className + JAVA, project .getLocation().toOSString());

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20372 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-02-18 20:08:19 -0500 (Thu, 18 Feb 2010) New Revision: 20372 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java Log: Fixes for JBIDE-5877: Web service sample wizard not working https://jira.jboss.org/jira/browse/JBIDE-5877 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-02-19 00:36:00 UTC (rev 20371) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-02-19 01:08:19 UTC (rev 20372) @@ -44,10 +44,10 @@ JBossWSLibraryListFieldEditor_ActionRemove=&Remove JBossWSLibraryListFieldEditor_LIBRARY_JARS=Library Jars JBossWS_GenerateWizard_Title=Generate a Sample Web Service -JBossWS_GenerateWizard_GenerateWebXmlPage_Title=Web Service -JBossWS_GenerateWizard_GenerateWebXmlPage_Description=Create a Sample Web Service Name +JBossWS_GenerateWizard_GenerateWebXmlPage_Title=Project and Web Service Name +JBossWS_GenerateWizard_GenerateWebXmlPage_Description=Specify the Dynamic Web Project and service name for the new sample web service. JBossWS_GenerateWizard_GenerateSampleClassPage_Title=Sample Web Service Class -JBossWS_GenerateWizard_GenerateSampleClassPage_Description=Generate a Sample Web Service Class +JBossWS_GenerateWizard_GenerateSampleClassPage_Description=Define the package and class name for the generated sample web service class. JBossWS_GenerateWizard_GenerateWebXmlPage_ServiceName_Label=Name JBossWS_GenerateWizard_WizardPage_CheckButton_Label=Use the default value JBossWS_GenerateWizard_GenerateSampleClassPage_Package_Label=Package @@ -59,4 +59,8 @@ Error_JBossWS_GenerateWizard_ClassName_Empty=The Class Name may not be an empty string. Error_JBossWS_GenerateWizard_PackageName_Empty=The Package Name may not be an empty string. Error_JBossWS_GenerateWizard=Problems encountered while creating the web.xml and Java class entries. -JBossWS_UI_PLUGIN_NO_MESSAGES=No message \ No newline at end of file +JBossWS_UI_PLUGIN_NO_MESSAGES=No message +JBossWSGenerateWebXmlWizardPage_Project_Group=Dynamic Web Project Name +JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip=If no Dynamic Web Project exists, you must create one before creating your sample web service. +JBossWSGenerateWebXmlWizardPage_Web_Service_Group=Web Service +JBossWSGenerateWizard_NoProjectSelected=No project selected. Please select a Dynamic Web Project to continue. Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-02-19 00:36:00 UTC (rev 20371) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-02-19 01:08:19 UTC (rev 20372) @@ -95,6 +95,14 @@ public static String JBossWS_UI_PLUGIN_NO_MESSAGES; + public static String JBossWSGenerateWebXmlWizardPage_Project_Group; + + public static String JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip; + + public static String JBossWSGenerateWebXmlWizardPage_Web_Service_Group; + + public static String JBossWSGenerateWizard_NoProjectSelected; + static { NLS.initializeMessages(BUNDLE_NAME, JBossWSUIMessages.class); } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-02-19 00:36:00 UTC (rev 20371) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-02-19 01:08:19 UTC (rev 20372) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.wizards; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.wizard.WizardPage; @@ -128,6 +129,22 @@ ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); String currentName = wizard.getClassName(); + if (wizard.getProject() == null) { + return currentName; + } + else { + boolean isDynamicWebProject = false; + try { + if (wizard.getProject().getNature("org.eclipse.wst.common.project.facet.core.nature") != null) { //$NON-NLS-1$ + isDynamicWebProject = true; + } + } catch (CoreException e) { + // ignore + } + if (!isDynamicWebProject) { + return currentName; + } + } String testName = currentName; IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(testName, wizard.getProject()); int i = 1; @@ -142,7 +159,7 @@ return testName; } - private boolean validate() { + protected boolean validate() { ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(model.getCustomClassName(), wizard.getProject()); @@ -155,4 +172,8 @@ return true; } } + + protected void refresh() { + className.setText(updateDefaultName()); + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java 2010-02-19 00:36:00 UTC (rev 20371) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java 2010-02-19 01:08:19 UTC (rev 20372) @@ -10,10 +10,14 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.wizards; +import java.util.ArrayList; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -22,7 +26,9 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.jboss.tools.ws.creation.core.data.ServiceModel; @@ -32,7 +38,9 @@ private JBossWSGenerateWizard wizard; private Text name; + private Combo projects; private Button checkDefault; + private boolean bHasChanged = false; protected JBossWSGenerateWebXmlWizardPage(String pageName) { super(pageName); @@ -45,10 +53,46 @@ public void createControl(Composite parent) { Composite composite = createDialogArea(parent); this.wizard = (JBossWSGenerateWizard) this.getWizard(); - new Label(composite, SWT.NONE) + + Group group = new Group (composite, SWT.NONE); + group.setText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Project_Group); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + group.setLayout(new GridLayout(2, false)); + group.setLayoutData(gd); + + projects = new Combo(group, SWT.BORDER | SWT.DROP_DOWN); + projects.setToolTipText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + projects.setLayoutData(gd); + refreshProjectList(wizard.getServiceModel().getWebProjectName()); + + projects.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + wizard.setProject(projects.getText()); + name.setText(updateDefaultName()); + wizard.getSecondPage().refresh(); + bHasChanged = true; + setPageComplete(isPageComplete()); + } + + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + Group group2 = new Group (composite, SWT.NONE); + group2.setText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Web_Service_Group); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + group2.setLayout(new GridLayout(2, false)); + group2.setLayoutData(gd); + + new Label(group2, SWT.NONE) .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWebXmlPage_ServiceName_Label); - name = new Text(composite, SWT.BORDER); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); + name = new Text(group2, SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); name.setLayoutData(gd); name.setText(updateDefaultName()); name.setEnabled(!wizard.isUseDefaultServiceName()); @@ -56,12 +100,13 @@ public void modifyText(ModifyEvent e) { wizard.setServiceName(name.getText()); + bHasChanged = true; setPageComplete(isPageComplete()); } }); - checkDefault = new Button(composite, SWT.CHECK); + checkDefault = new Button(group2, SWT.CHECK); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; checkDefault.setLayoutData(gd); @@ -89,6 +134,20 @@ setControl(composite); } + private void refreshProjectList ( String projectName ) { + String[] projectNames = getProjects(); + boolean foundInitialProject = false; + projects.removeAll(); + for (int i = 0; i < projectNames.length; i++) { + projects.add(projectNames[i]); + if (projectNames[i].equals(projectName)) { + foundInitialProject = true; + } + } + if (foundInitialProject) + projects.setText(projectName); + } + public IWizardPage getNextPage() { wizard.setServiceName(name.getText()); return super.getNextPage(); @@ -117,8 +176,15 @@ ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); String currentName = wizard.getServiceName(); + IStatus status = JBossWSGenerateWizardValidator.isWSNameValid(); + try { + if (status.getSeverity() == IStatus.ERROR && !JavaEEProjectUtilities.isDynamicWebProject(wizard.getProject())) { + return currentName; + } + } catch (NullPointerException npe) { + return currentName; + } String testName = currentName; - IStatus status = JBossWSGenerateWizardValidator.isWSNameValid(); int i = 1; while (status != null) { testName = currentName + i; @@ -134,14 +200,33 @@ private boolean validate() { ServiceModel model = wizard.getServiceModel(); JBossWSGenerateWizardValidator.setServiceModel(model); + if (!projects.isDisposed() && projects.getText().length() > 0) { + model.setWebProjectName(projects.getText()); + } IStatus status = JBossWSGenerateWizardValidator.isWSNameValid(); if (status != null) { - setMessage(status.getMessage(), DialogPage.ERROR); + setErrorMessage(status.getMessage()); return false; } else { - setMessage(null); + setErrorMessage(null); return true; } } + + private String[] getProjects() { + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + ArrayList<String> dynamicProjects = new ArrayList<String>(); + for (int i = 0; i < projects.length; i++) { + boolean isDynamicWebProject = JavaEEProjectUtilities.isDynamicWebProject(projects[i]); + if (isDynamicWebProject) { + dynamicProjects.add(projects[i].getName()); + } + } + return dynamicProjects.toArray(new String[dynamicProjects.size()]); + } + + protected boolean hasChanged() { + return bHasChanged; + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-02-19 00:36:00 UTC (rev 20371) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-02-19 01:08:19 UTC (rev 20372) @@ -15,6 +15,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -145,9 +146,18 @@ @Override public boolean canFinish() { + if (getProject() == null) { + if (firstPage != null && !firstPage.getControl().isDisposed()) { + if (firstPage.hasChanged()) + firstPage + .setErrorMessage(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } + return false; + } if (hasInited && (webFile == null || !webFile.exists())) { if (firstPage != null && !firstPage.getControl().isDisposed()) { - firstPage + if (firstPage.hasChanged()) + firstPage .setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NotDynamicWebProject); } return false; @@ -220,9 +230,13 @@ public ServiceModel getServiceModel() { ServiceModel model = new ServiceModel(); - model.setWebProjectName(project.getName()); - model.addServiceClasses(new StringBuffer().append(getPackageName()) + if (project != null) { + model.setWebProjectName(project.getName()); + } + if (getPackageName() != null) { + model.addServiceClasses(new StringBuffer().append(getPackageName()) .append(".").append(getClassName()).toString()); //$NON-NLS-1$ + } model.setServiceName(getServiceName()); model.setUpdateWebxml(true); model.setCustomPackage(getPackageName()); @@ -230,4 +244,27 @@ return model; } + public JBossWSGenerateWebXmlWizardPage getFirstPage() { + return this.firstPage; + } + + public JBossWSGenerateSampleClassWizardPage getSecondPage() { + return this.secondPage; + } + + public void setProject (String projectName) { + if (projectName != null && projectName.trim().length() > 0) { + IProject test = + ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + if (test != null) { + this.project = test; + if (project != null + && JavaEEProjectUtilities.isDynamicWebProject(project)) { + webFile = project.getParent().getFolder( + UIUtils.getWebContentRootPath(project).append(WEBINF)) + .getFile(WEB); + } + } + } + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-02-19 00:36:00 UTC (rev 20371) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-02-19 01:08:19 UTC (rev 20372) @@ -45,6 +45,20 @@ } public static IStatus isWSNameValid() { + if (model.getWebProjectName() == null) { + return StatusUtils.errorStatus(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } + else { + try { + ModelProviderManager + .getModelProvider(JBossWSCreationUtils.getProjectByName(model + .getWebProjectName())); + } catch (IllegalArgumentException iae) { + // ignore + model.setWebProjectName(null); + return StatusUtils.errorStatus(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } + } final IModelProvider provider = ModelProviderManager .getModelProvider(JBossWSCreationUtils.getProjectByName(model .getWebProjectName())); @@ -93,6 +107,9 @@ // empty class name return StatusUtils.errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_ClassName_Same); } + else if (project == null) { + return StatusUtils.errorStatus(JBossWSUIMessages.JBossWSGenerateWizard_NoProjectSelected); + } else { File file = findFileByPath(className + JAVA, project .getLocation().toOSString());

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20371 - branches/jbosstools-3.1.0.RC2/jbpm/releng/org.jboss.tools.jbpm4.releng.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-18 19:36:00 -0500 (Thu, 18 Feb 2010) New Revision: 20371 Modified: branches/jbosstools-3.1.0.RC2/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties Log: jbpm4 branch should build against jbpm3 branch M snapshot, not trunk N snapshot. Modified: branches/jbosstools-3.1.0.RC2/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties =================================================================== --- branches/jbosstools-3.1.0.RC2/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2010-02-18 23:07:22 UTC (rev 20370) +++ branches/jbosstools-3.1.0.RC2/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2010-02-19 00:36:00 UTC (rev 20371) @@ -30,7 +30,7 @@ http://download.jboss.org/jbosstools/updates/nightly/trunk/,\ http://download.eclipse.org/releases/galileo/,\ http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-... -http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip +http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3-branch/lastSuccessfulBuild/artifact/build/M-SNAPSHOT/jbpm3-Update-M-SNAPSHOT.zip IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\ org.jboss.tools.jbpm.common.feature.feature.group,org.jboss.tools.jbpm.common.source.feature.feature.group

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20370 - in trunk: common/features/org.jboss.tools.common.text.ext.feature and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-18 18:07:22 -0500 (Thu, 18 Feb 2010) New Revision: 20370 Modified: trunk/common/features/org.jboss.tools.common.feature/feature.xml trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml trunk/struts/features/org.jboss.tools.struts.feature/feature.xml Log: comment out JBT update site to avoid it appearing in JBDS Modified: trunk/common/features/org.jboss.tools.common.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) +++ trunk/common/features/org.jboss.tools.common.feature/feature.xml 2010-02-18 23:07:22 UTC (rev 20370) @@ -23,9 +23,9 @@ </license> - <url> +  <includes id="org.eclipse.wst.common_core.feature" Modified: trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) +++ trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2010-02-18 23:07:22 UTC (rev 20370) @@ -23,9 +23,9 @@ </license> - <url> +  <requires> <import feature="org.jboss.tools.common.core.feature" version="2.0.0" match="greaterOrEqual"/> Modified: trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml =================================================================== --- trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) +++ trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-02-18 23:07:22 UTC (rev 20370) @@ -18,9 +18,9 @@ %license </license> - <url> +  <plugin id="org.jboss.tools.portlet.core" Modified: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml =================================================================== --- trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) +++ trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2010-02-18 23:07:22 UTC (rev 20370) @@ -18,9 +18,9 @@ %license </license> - <url> +  <plugin id="org.jboss.tools.smooks.core" Modified: trunk/struts/features/org.jboss.tools.struts.feature/feature.xml =================================================================== --- trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) +++ trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2010-02-18 23:07:22 UTC (rev 20370) @@ -18,9 +18,9 @@ %license </license> - <url> +  <plugin id="org.jboss.tools.struts"

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20369 - in branches/jbosstools-3.1.0.RC2: common/features/org.jboss.tools.common.text.ext.feature and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-18 17:50:24 -0500 (Thu, 18 Feb 2010) New Revision: 20369 Modified: branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.feature/feature.xml branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.text.ext.feature/feature.xml branches/jbosstools-3.1.0.RC2/portlet/features/org.jboss.tools.portlet.feature/feature.xml branches/jbosstools-3.1.0.RC2/seam/features/org.jboss.tools.seam.feature/feature.xml branches/jbosstools-3.1.0.RC2/smooks/features/org.jboss.tools.smooks.feature/feature.xml branches/jbosstools-3.1.0.RC2/struts/features/org.jboss.tools.struts.feature/feature.xml Log: comment out JBT update site to avoid it appearing in JBDS Modified: branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.feature/feature.xml =================================================================== --- branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.feature/feature.xml 2010-02-18 18:07:18 UTC (rev 20368) +++ branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) @@ -22,10 +22,11 @@ Raleigh NC 27606 USA. </license> - +  <includes id="org.eclipse.wst.common_core.feature" Modified: branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.text.ext.feature/feature.xml =================================================================== --- branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2010-02-18 18:07:18 UTC (rev 20368) +++ branches/jbosstools-3.1.0.RC2/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) @@ -22,10 +22,11 @@ Raleigh NC 27606 USA. </license> - +  <requires> <import feature="org.jboss.tools.common.core.feature" version="2.0.0" match="greaterOrEqual"/> Modified: branches/jbosstools-3.1.0.RC2/portlet/features/org.jboss.tools.portlet.feature/feature.xml =================================================================== --- branches/jbosstools-3.1.0.RC2/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-02-18 18:07:18 UTC (rev 20368) +++ branches/jbosstools-3.1.0.RC2/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) @@ -18,9 +18,11 @@ %license </license> +  <plugin id="org.jboss.tools.portlet.core" Modified: branches/jbosstools-3.1.0.RC2/seam/features/org.jboss.tools.seam.feature/feature.xml =================================================================== --- branches/jbosstools-3.1.0.RC2/seam/features/org.jboss.tools.seam.feature/feature.xml 2010-02-18 18:07:18 UTC (rev 20368) +++ branches/jbosstools-3.1.0.RC2/seam/features/org.jboss.tools.seam.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) @@ -18,9 +18,11 @@ %license </license> +  <requires> <import feature="org.jboss.tools.richfaces.feature" version="2.0.0" match="greaterOrEqual"/> Modified: branches/jbosstools-3.1.0.RC2/smooks/features/org.jboss.tools.smooks.feature/feature.xml =================================================================== --- branches/jbosstools-3.1.0.RC2/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2010-02-18 18:07:18 UTC (rev 20368) +++ branches/jbosstools-3.1.0.RC2/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) @@ -18,9 +18,11 @@ %license </license> +  <plugin id="org.jboss.tools.smooks.core" Modified: branches/jbosstools-3.1.0.RC2/struts/features/org.jboss.tools.struts.feature/feature.xml =================================================================== --- branches/jbosstools-3.1.0.RC2/struts/features/org.jboss.tools.struts.feature/feature.xml 2010-02-18 18:07:18 UTC (rev 20368) +++ branches/jbosstools-3.1.0.RC2/struts/features/org.jboss.tools.struts.feature/feature.xml 2010-02-18 22:50:24 UTC (rev 20369) @@ -18,9 +18,11 @@ %license </license> +  <plugin id="org.jboss.tools.struts"

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20368 - in branches/jbosstools-3.1.0.RC2: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5872 and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-02-18 13:07:18 -0500 (Thu, 18 Feb 2010) New Revision: 20368 Added: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5872/ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5872/JBIDE-5872.html branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FontNameFormatController.java Log: https://jira.jboss.org/jira/browse/JBIDE-5872 VPE throws java.lang.NullPointerException, while editing font-family - fixed - JUnit created Added: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5872/JBIDE-5872.html =================================================================== --- branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5872/JBIDE-5872.html (rev 0) +++ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5872/JBIDE-5872.html 2010-02-18 18:07:18 UTC (rev 20368) @@ -0,0 +1,5 @@ +<html> +<body> + <button style='FONT-FAMILY: "serif"'>bla bla</button> +</body> +</html> \ No newline at end of file Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-18 17:44:42 UTC (rev 20367) +++ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-18 18:07:18 UTC (rev 20368) @@ -18,6 +18,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.ChangeMessageBundleTest_JBIDE5818; import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTest_JBIDE3888; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditFontFamilyTest_JBIDE5872; import org.jboss.tools.jsf.vpe.jsf.test.jbide.FacetProcessingTest; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1105Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1460Test; @@ -122,6 +123,7 @@ TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$ // $JUnit-BEGIN$ + suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class); suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class); suite.addTestSuite(TestForUsingComponentsLibrariesWithDefaultNamespace.class); suite.addTestSuite(EditingSPecialSymbolsVPE_JBIDE3810.class); Added: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java =================================================================== --- branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java (rev 0) +++ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditFontFamilyTest_JBIDE5872.java 2010-02-18 18:07:18 UTC (rev 20368) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.eclipse.jface.text.TextViewer; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.graphics.Point; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; + +/** + * Test for JBIDE-5872: VPE throws java.lang.NullPointerException, + * while editing font-family. + * + * @see <a href="https://jira.jboss.org/jira/browse/JBIDE-5872">JBIDE-5872</a> + * @author Yahor Radtsevich (yradtsevich) + */ +public class EditFontFamilyTest_JBIDE5872 extends VpeTest { + private static final Point EDIT_POSITION = new Point(3, 40); + private static final int SELECTION_LENGTH = 1; + private static final String TEST_PAGE_NAME = "JBIDE/5872/JBIDE-5872.html"; + + public EditFontFamilyTest_JBIDE5872(String name) { + super(name); + } + + /** + * Deletes quote after style attribute. This may lead to NPE. + * + * @see <a href="https://jira.jboss.org/jira/browse/JBIDE-5872">JBIDE-5872</a> + */ + public void testEditFontFamily() throws Throwable { + TestUtil.waitForJobs(); + setException(null); + + VpeController vpeController + = openInVpe(JsfAllTests.IMPORT_PROJECT_NAME, TEST_PAGE_NAME); + StructuredTextEditor sourceEditor = vpeController.getSourceEditor(); + TextViewer textViewer = sourceEditor.getTextViewer(); + StyledText textWidget = textViewer.getTextWidget(); + + int offset = getCaretOffset(textViewer, EDIT_POSITION); + textWidget.setSelectionRange(offset, SELECTION_LENGTH); + textWidget.insert(""); + TestUtil.waitForIdle(); + + ISelectionProvider selectionProvider = sourceEditor.getSelectionProvider(); + vpeController.selectionChanged(new SelectionChangedEvent( + selectionProvider, selectionProvider.getSelection())); + + if(getException() != null) { + throw new Exception(getException()); + } + } + + private static int getCaretOffset(TextViewer textViewer, Point position) { + return TestUtil.getLinePositionOffcet(textViewer, position.x, position.y); + } +} Modified: branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FontNameFormatController.java =================================================================== --- branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FontNameFormatController.java 2010-02-18 17:44:42 UTC (rev 20367) +++ branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FontNameFormatController.java 2010-02-18 18:07:18 UTC (rev 20368) @@ -14,6 +14,7 @@ import org.jboss.tools.vpe.editor.template.textformating.FormatAttributeData; import org.jboss.tools.vpe.editor.toolbar.format.css.StyleAttribute; import org.jboss.tools.vpe.editor.toolbar.format.css.StyleProperty; +import org.jboss.tools.vpe.editor.toolbar.format.css.Token; import org.w3c.dom.Attr; /** @@ -80,33 +81,34 @@ * enabled) */ public void setToolbarItemEnabled(boolean enabled) { - comboBlockFormat.setEnabled(enabled); - if (enabled) { - Attr style = getStyleAttributeFromSelectedNode(true); - if (style != null) { - StyleAttribute styleAttribute = new StyleAttribute(style); - StyleProperty fontProperty = styleAttribute - .getProperty(STYLE_PROPERTY_NAME); - if (fontProperty != null) { - String fontName = fontProperty.getPropertyValue() - .getDirtyValue().trim(); - if (fontName != null) { - fontName = fontName.replaceAll(REPLACE_VALUE, EMPTY); - if (getComboBlockFormat().getText().equalsIgnoreCase( - fontName)) { - return; - } - String[] items = this.getComboBlockFormat().getItems(); - for (int i = 0; i < items.length; i++) { - if (items[i].equalsIgnoreCase(fontName)) { - this.getComboBlockFormat().select(i); - return; - } - } + comboBlockFormat.setEnabled(enabled); + if (enabled) { + Attr style = getStyleAttributeFromSelectedNode(true); + if (style != null) { + StyleAttribute styleAttribute = new StyleAttribute(style); + StyleProperty fontProperty + = styleAttribute.getProperty(STYLE_PROPERTY_NAME); + if (fontProperty != null) { + Token fontPropertyValue = fontProperty.getPropertyValue(); + if (fontPropertyValue != null) { + String fontName + = fontPropertyValue.getDirtyValue().trim(); + fontName = fontName.replaceAll(REPLACE_VALUE, EMPTY); + if (getComboBlockFormat().getText().equalsIgnoreCase( + fontName)) { + return; + } + String[] items = this.getComboBlockFormat().getItems(); + for (int i = 0; i < items.length; i++) { + if (items[i].equalsIgnoreCase(fontName)) { + this.getComboBlockFormat().select(i); + return; + } + } + } + } } } - } - } - getComboBlockFormat().select(0); + getComboBlockFormat().select(0); } -} \ No newline at end of file +}

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20367 - trunk/birt/features/org.jboss.tools.birt.feature.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-02-18 12:44:42 -0500 (Thu, 18 Feb 2010) New Revision: 20367 Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml Log: <plugin id="org.eclipse.birt.integration.wtp.ui" download-size="0" install-size="0" version="0.0.0"/> removed from birt feature Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml =================================================================== --- trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-18 17:09:12 UTC (rev 20366) +++ trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-18 17:44:42 UTC (rev 20367) @@ -18,12 +18,6 @@ %license </license> -  -  <requires> <import feature="org.eclipse.birt" version="2.5.0" match="greaterOrEqual"/> <import feature="org.eclipse.birt.integration.wtp" version="2.5.0" match="greaterOrEqual"/> @@ -50,10 +44,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.eclipse.birt.integration.wtp.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - </feature>

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20366 - branches/jbosstools-3.1.0.RC2/birt/features/org.jboss.tools.birt.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-18 12:09:12 -0500 (Thu, 18 Feb 2010) New Revision: 20366 Modified: branches/jbosstools-3.1.0.RC2/birt/features/org.jboss.tools.birt.feature/feature.xml Log: fix requirement from 2.3.1 to 2.5.0+ Modified: branches/jbosstools-3.1.0.RC2/birt/features/org.jboss.tools.birt.feature/feature.xml =================================================================== --- branches/jbosstools-3.1.0.RC2/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-18 17:05:21 UTC (rev 20365) +++ branches/jbosstools-3.1.0.RC2/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-18 17:09:12 UTC (rev 20366) @@ -19,8 +19,8 @@ </license> <requires> - <import feature="org.eclipse.birt" version="2.3.1"/> - <import feature="org.eclipse.birt.integration.wtp" version="2.3.1"/> + <import feature="org.eclipse.birt" version="2.5.0" match="greaterOrEqual"/> + <import feature="org.eclipse.birt.integration.wtp" version="2.5.0" match="greaterOrEqual"/> </requires> <plugin

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20365 - trunk/birt/features/org.jboss.tools.birt.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-18 12:05:21 -0500 (Thu, 18 Feb 2010) New Revision: 20365 Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml Log: fix requirement from 2.3.1 to 2.5.0+ Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml =================================================================== --- trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-18 17:05:08 UTC (rev 20364) +++ trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-18 17:05:21 UTC (rev 20365) @@ -25,8 +25,8 @@ <discovery label="Business Intelligence and Reporting Tools (BIRT) Updates" url="http://download.eclipse.org/birt/update-site/2.5/"/> --> <requires> - <import feature="org.eclipse.birt" version="2.3.1"/> - <import feature="org.eclipse.birt.integration.wtp" version="2.3.1"/> + <import feature="org.eclipse.birt" version="2.5.0" match="greaterOrEqual"/> + <import feature="org.eclipse.birt.integration.wtp" version="2.5.0" match="greaterOrEqual"/> </requires> <plugin

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20364 - trunk/birt/tests/org.jboss.tools.birt.core.test/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-18 12:05:08 -0500 (Thu, 18 Feb 2010) New Revision: 20364 Modified: trunk/birt/tests/org.jboss.tools.birt.core.test/META-INF/MANIFEST.MF Log: add .qualifier Modified: trunk/birt/tests/org.jboss.tools.birt.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/birt/tests/org.jboss.tools.birt.core.test/META-INF/MANIFEST.MF 2010-02-18 16:58:18 UTC (rev 20363) +++ trunk/birt/tests/org.jboss.tools.birt.core.test/META-INF/MANIFEST.MF 2010-02-18 17:05:08 UTC (rev 20364) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: BIRT Core Tests Bundle-SymbolicName: org.jboss.tools.birt.core.test -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Vendor: JBoss by RedHat Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.jboss.tools.tests,

14 years, 4 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 February 2010