316224 - JAXB Class Generation: need hotkeys for Catalog browse and Bindings files

3 files changed, 48 insertions, 34 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
index fd316e397e..de6b324dfa 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
@@ -56,16 +56,20 @@ SchemaWizardPage_xmlCatalogUriColumn = URI
 
 SchemaWizardPage_errorUriCannotBeLocated = The selected catalog entry specifies a URI that can not be located.
 
+SelectFileOrXMLCatalogIdPanel_fileFromWorkspace = Select file from Work&space
+SelectFileOrXMLCatalogIdPanel_xmlCatalogEntry = Select XML Catalo&g entry
+SelectFileOrXMLCatalogIdPanel_importButton = &Import Files...
+
 ClassesGeneratorWizardPage_title = Generate Classes from Schema: {0}
 ClassesGeneratorWizardPage_desc = Configure JAXB class generation.
 
-ClassesGeneratorWizardPage_usesMoxyImplementation = Use EclipseLink MOXy as the JAXB implementation
+ClassesGeneratorWizardPage_usesMoxyImplementation = Use EclipseLink MO&Xy as the JAXB implementation
 
-ClassesGeneratorWizardPage_catalog = Catalog:
+ClassesGeneratorWizardPage_catalog = Catalo&g:
 ClassesGeneratorWizardPage_bindingsFiles = Bindings files:
-ClassesGeneratorWizardPage_browseButton = Browse...
-ClassesGeneratorWizardPage_addButton = Add...
-ClassesGeneratorWizardPage_removeButton = Remove
+ClassesGeneratorWizardPage_browseButton = Brow&se...
+ClassesGeneratorWizardPage_addButton = &Add...
+ClassesGeneratorWizardPage_removeButton = Re&move
 ClassesGeneratorWizardPage_chooseABindingsFile = External Bindings File Selection
 ClassesGeneratorWizardPage_chooseACatalog = Catalog File Selection
 
@@ -84,33 +88,33 @@ ClassesGeneratorOptionsWizardPage_title = Classes Generator Options
 ClassesGeneratorOptionsWizardPage_desc = Configure JAXB compiler options.
 
 ClassesGeneratorOptionsWizardPage_proxyGroup = Proxy
-ClassesGeneratorOptionsWizardPage_noProxy = No proxy
-ClassesGeneratorOptionsWizardPage_proxy = Proxy:
-ClassesGeneratorOptionsWizardPage_proxyFile = Proxy file:
+ClassesGeneratorOptionsWizardPage_noProxy = N&o proxy
+ClassesGeneratorOptionsWizardPage_proxy = &Proxy:
+ClassesGeneratorOptionsWizardPage_proxyFile = Prox&y file:
 ClassesGeneratorOptionsWizardPage_chooseAProxyFile = Proxy File Selection
 
-ClassesGeneratorOptionsWizardPage_useStrictValidation = Use strict validation
-ClassesGeneratorOptionsWizardPage_makeReadOnly = Generate read-only files
-ClassesGeneratorOptionsWizardPage_suppressPackageInfoGen = Suppress package-info generation
-ClassesGeneratorOptionsWizardPage_suppressesHeaderGen = Suppress generation of file header
-ClassesGeneratorOptionsWizardPage_target = Target XJC 2.0
-ClassesGeneratorOptionsWizardPage_verbose = Verbose
-ClassesGeneratorOptionsWizardPage_quiet = Suppress compiler output
-
-ClassesGeneratorOptionsWizardPage_treatsAsXmlSchema = Treat input as XML schema
-ClassesGeneratorOptionsWizardPage_treatsAsRelaxNg = Treat input as RELAX NG
-ClassesGeneratorOptionsWizardPage_treatsAsRelaxNgCompact = Treat input as RELAX NG compact syntax
-ClassesGeneratorOptionsWizardPage_treatsAsDtd = Treat input as XML DTD
-ClassesGeneratorOptionsWizardPage_treatsAsWsdl = Treat input as WSDL and compile schema inside it
-ClassesGeneratorOptionsWizardPage_showsVersion = Show version
-ClassesGeneratorOptionsWizardPage_showsHelp = Show help
+ClassesGeneratorOptionsWizardPage_useStrictValidation = Use strict v&alidation
+ClassesGeneratorOptionsWizardPage_makeReadOnly = Generate &read-only files
+ClassesGeneratorOptionsWizardPage_suppressPackageInfoGen = Suppress pac&kage-info generation
+ClassesGeneratorOptionsWizardPage_suppressesHeaderGen = Suppress generation of file &header
+ClassesGeneratorOptionsWizardPage_target = Target X&JC 2.0
+ClassesGeneratorOptionsWizardPage_verbose = &Verbose
+ClassesGeneratorOptionsWizardPage_quiet = Suppress compiler outp&ut
+
+ClassesGeneratorOptionsWizardPage_treatsAsXmlSchema = Treat input as &XML schema
+ClassesGeneratorOptionsWizardPage_treatsAsRelaxNg = Treat input as RELAX N&G
+ClassesGeneratorOptionsWizardPage_treatsAsRelaxNgCompact = Treat input as RELAX NG &compact syntax
+ClassesGeneratorOptionsWizardPage_treatsAsDtd = Treat input as XML D&TD
+ClassesGeneratorOptionsWizardPage_treatsAsWsdl = Treat input as WS&DL and compile schema inside it
+ClassesGeneratorOptionsWizardPage_showsVersion = Show vers&ion
+ClassesGeneratorOptionsWizardPage_showsHelp = Show h&elp
 
 ClassesGeneratorExtensionOptionsWizardPage_title = Classes Generator Extension Configuration
 ClassesGeneratorExtensionOptionsWizardPage_desc = Configure JAXB compiler vendor extensions.
 
-ClassesGeneratorExtensionOptionsWizardPage_allowExtensions = Allow vendor extensions
-ClassesGeneratorExtensionOptionsWizardPage_classpath = Classpath:
-ClassesGeneratorExtensionOptionsWizardPage_additionalArguments = Additional arguments:
+ClassesGeneratorExtensionOptionsWizardPage_allowExtensions = Allow vendor &extensions
+ClassesGeneratorExtensionOptionsWizardPage_classpath = Class&path:
+ClassesGeneratorExtensionOptionsWizardPage_additionalArguments = Additional ar&guments:
 
 ClassesGeneratorUi_generatingEntities = Generating JAXB Classes from Schema
 ClassesGeneratorUi_generatingEntitiesTask = Generating classes
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
index db406d2453..a71c8df345 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
@@ -62,10 +62,13 @@ public class JptJaxbUiMessages {
 	public static String SchemaWizardPage_xmlCatalogTableTitle; 
 	public static String SchemaWizardPage_xmlCatalogKeyColumn; 
 	public static String SchemaWizardPage_xmlCatalogUriColumn; 
-	
+
 	public static String SchemaWizardPage_errorUriCannotBeLocated;
-	
-	
+
+	public static String SelectFileOrXMLCatalogIdPanel_fileFromWorkspace;
+	public static String SelectFileOrXMLCatalogIdPanel_xmlCatalogEntry;
+	public static String SelectFileOrXMLCatalogIdPanel_importButton;
+
 	public static String ClassesGeneratorWizardPage_title;
 	public static String ClassesGeneratorWizardPage_desc;
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java
index c7a6db1116..da4cdc8c87 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jpt.jaxb.ui.JptJaxbUiPlugin;
+import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -58,13 +59,13 @@ public class SelectFileOrXMLCatalogIdPanel extends Composite implements Selectio
 
 		radioButton = new Button[2];
 		radioButton[0] = new Button(this, SWT.RADIO);
-		radioButton[0].setText("Select file from Workspace");
+		radioButton[0].setText(JptJaxbUiMessages.SelectFileOrXMLCatalogIdPanel_fileFromWorkspace);
 		radioButton[0].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		radioButton[0].setSelection(true);
 		radioButton[0].addSelectionListener(this);
 
 		radioButton[1] = new Button(this, SWT.RADIO);
-		radioButton[1].setText("Select XML Catalog entry");
+		radioButton[1].setText(JptJaxbUiMessages.SelectFileOrXMLCatalogIdPanel_xmlCatalogEntry);
 		radioButton[1].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		radioButton[1].addSelectionListener(this);
 
@@ -169,17 +170,23 @@ public class SelectFileOrXMLCatalogIdPanel extends Composite implements Selectio
 			super(selection, true);
 			// String[] ext = {".dtd"};
 			// addFilterExtensions(ext);
-			control = createControl(parent);
-			control.setLayoutData(new GridData(GridData.FILL_BOTH));
+			this.control = this.createControl(parent);
+			this.overrideImportButtonText();
+
+			this.control.setLayoutData(new GridData(GridData.FILL_BOTH));
 			SelectFilePanel.this.setListener(this);
 		}
 
 		public Control getControl() {
-			return control;
+			return this.control;
 		}
 
 		public void setControlComplete(boolean isComplete) {
 			updateCompletionStateChange();
 		}
+
+		private void overrideImportButtonText() {
+		    this.importButton.setText(JptJaxbUiMessages.SelectFileOrXMLCatalogIdPanel_importButton);
+		}
 	}
 }