310863 - JAXB class generation wizard Catalog browse dialog title is wrong

4 files changed, 11 insertions, 3 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties b/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
index fc79d6c6d3..98bdd833ca 100644
--- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
@@ -25,6 +25,7 @@ ClassesGeneratorWizardPage_browseButton = Browse...
 ClassesGeneratorWizardPage_addButton = Add...
 ClassesGeneratorWizardPage_removeButton = Remove
 ClassesGeneratorWizardPage_chooseABindingsFile = External Bindings File Selection
+ClassesGeneratorWizardPage_chooseACatalog = Catalog File Selection
 
 ClassesGeneratorWizardPage_jaxbLibrariesNotAvailable = \
 		The classpath for this project does not appear to contain the necessary libraries to proceed with class generation.\
diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
index d1cfee4317..26ed4aca07 100644
--- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
@@ -34,6 +34,7 @@ public class JptJaxbUiMessages {
 	public static String ClassesGeneratorWizardPage_addButton;
 	public static String ClassesGeneratorWizardPage_removeButton;
 	public static String ClassesGeneratorWizardPage_chooseABindingsFile;
+	public static String ClassesGeneratorWizardPage_chooseACatalog;
 	
 	public static String ClassesGeneratorWizardPage_jaxbLibrariesNotAvailable;
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java
index b5a997e600..1361ae1bca 100644
--- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java
@@ -446,7 +446,6 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage {
 			// Browse buttons
 			Button browseButton = new Button(buttonComposite, SWT.PUSH);
 			browseButton.setText(JptJaxbUiMessages.ClassesGeneratorWizardPage_browseButton);
-			browseButton.setText("Browse...");
 			gridData = new GridData();
 			gridData.horizontalAlignment= GridData.FILL;
 			gridData.verticalIndent = 5;
@@ -586,13 +585,16 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage {
 		 */
 		private String promptFile(String filter) {
 			String projectPath= javaProject.getProject().getLocation().toString();
+			String dialogTitle = (filter.equals(XJB_FILTER)) ?
+				JptJaxbUiMessages.ClassesGeneratorWizardPage_chooseABindingsFile :
+				JptJaxbUiMessages.ClassesGeneratorWizardPage_chooseACatalog;
 
 			FileDialog dialog = new FileDialog(getShell());
-			dialog.setText(JptJaxbUiMessages.ClassesGeneratorWizardPage_chooseABindingsFile);
+			dialog.setText(dialogTitle);
 			dialog.setFilterPath(projectPath);
 			dialog.setFilterExtensions(new String[] {filter});
 			String filePath = dialog.open();
-			
+
 			return (filePath != null) ? filePath : null;
 		}
 		
diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
index 057058a7be..cdd7793dab 100644
--- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
@@ -108,6 +108,10 @@ public class SchemaGeneratorWizardPage extends AbstractJarDestinationWizardPage
 
 		// default usesMoxy to true only when JPT EclipseLink bundle exists and MOXy is on the classpath
 		this.updateUsesMoxy(this.jptEclipseLinkBundleExists() && this.moxyIsOnClasspath());
+
+		// checkbox visible only if jpt.eclipselink.ui plugin is available
+		// and EclipseLink MOXy is not on the classpath
+		this.usesMoxyCheckBox.setVisible(this.jptEclipseLinkBundleExists() && ! this.moxyIsOnClasspath());
 		
 		this.validateProjectClasspath();
 		this.giveFocusToDestination();