Author: bfitzpat Date: 2011-12-12 10:13:08 -0500 (Mon, 12 Dec 2011) New Revision: 37220 Modified: branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java Log: JBIDE-10440 - fixed NPEs in RS/WS wizards Modified: branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java =================================================================== --- branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java 2011-12-12 15:05:26 UTC (rev 37219) +++ branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java 2011-12-12 15:13:08 UTC (rev 37220) @@ -350,6 +350,9 @@ private void setWebXMLSelectionValueBasedOnProjectFacet () { try { + if (((JBossRSGenerateWizard)this.getWizard()).getProject() == null) { + return; + } IFacetedProject facetProject = ProjectFacetsManager.create(((JBossRSGenerateWizard)this.getWizard()).getProject()); IProjectFacetVersion version = Modified: branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java =================================================================== --- branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java 2011-12-12 15:05:26 UTC (rev 37219) +++ branches/jbosstools-3.3.0.M5/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java 2011-12-12 15:13:08 UTC (rev 37220) @@ -571,6 +571,9 @@ private void setWebXMLSelectionValueBasedOnProjectFacet () { try { + if (((JBossWSAnnotatedClassWizard)this.getWizard()).getProject() == null) { + return; + } IFacetedProject facetProject = ProjectFacetsManager.create(((JBossWSAnnotatedClassWizard)this.getWizard()).getProject()); IProjectFacetVersion version =