Attachment 214603 Details for Bug 359104 – Patch V2 add missing key for new label

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch V2 add missing key for new label

clipboard.txt (text/plain), 15.78 KB, created by Arnaud MERGEY

on 2012-04-26 09:42:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Arnaud MERGEY

Created: 2012-04-26 09:42:34 EDT

Size: 15.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.supplemental.filedialog
>Index: src/org/eclipse/swt/internal/widgets/FileDialogMessages.java
>===================================================================
>RCS file: src/org/eclipse/swt/internal/widgets/FileDialogMessages.java
>diff -N src/org/eclipse/swt/internal/widgets/FileDialogMessages.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/swt/internal/widgets/FileDialogMessages.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,42 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 EclipseSource and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are 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:
>+ *    EclipseSource - initial API and implementation
>+ ******************************************************************************/
>+package org.eclipse.swt.internal.widgets;
>+
>+import org.eclipse.rwt.RWT;
>+
>+public class FileDialogMessages {
>+  public static final String PERCENT = "%";
>+
>+  public String FileDialog_AllFilesExtension;
>+  public String FileDialog_AllFilesPattern;
>+  public String FileDialog_FileSelectorTooltip;
>+  public String FileDialog_FiterComboTooltip;
>+  public String FileDialog_OkButtonTooltip;
>+  public String FileDialog_OkButtonTooltipDisable;
>+  public String FileDialog_OkButtonUploadingText;
>+  public String FileDialog_ProgressBarTooltip;
>+  
>+  public String ProgressCollector_TotalUploadProgress;
>+  
>+  public String UploadPanel_BrowseButtonText;
>+  public String UploadPanel_BrowseButtonTooltip;
>+  public String UploadPanel_FileTextTooltip;
>+  public String UploadPanel_FileTextWarnNotMatchTooltip;
>+  public String UploadPanel_ProgressBarProgressTooltip;
>+  public String UploadPanel_ProgressBarTooltip;
>+  public String UploadPanel_RemoveButtonTooltip;
>+
>+  public static FileDialogMessages get() {
>+    Object result = RWT.NLS.getISO8859_1Encoded(
>+        "org.eclipse.swt.internal.widgets.messages", FileDialogMessages.class);
>+    return (FileDialogMessages) result;
>+  }
>+}
>Index: src/org/eclipse/swt/internal/widgets/ProgressCollector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/supplemental/fileupload/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/internal/widgets/ProgressCollector.java,v
>retrieving revision 1.3
>diff -u -r1.3 ProgressCollector.java
>--- src/org/eclipse/swt/internal/widgets/ProgressCollector.java	5 Aug 2011 07:55:48 -0000	1.3
>+++ src/org/eclipse/swt/internal/widgets/ProgressCollector.java	26 Apr 2012 13:41:27 -0000
>@@ -40,7 +40,7 @@
>       if( totalProgressBar != null && !totalProgressBar.isDisposed() ) {
>         int percent = ( int )Math.floor( totalProgress / maxProgress * 100 );
>         totalProgressBar.setSelection( percent );
>-        totalProgressBar.setToolTipText( "Total upload progress: " + percent + "%" );
>+        totalProgressBar.setToolTipText( FileDialogMessages.get().ProgressCollector_TotalUploadProgress + percent + FileDialogMessages.PERCENT );
>       }
>       if( maxProgress == totalProgress ) {
>         validationHandler.updateEnablement();
>Index: src/org/eclipse/swt/internal/widgets/UploadPanel.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/supplemental/fileupload/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/internal/widgets/UploadPanel.java,v
>retrieving revision 1.10
>diff -u -r1.10 UploadPanel.java
>--- src/org/eclipse/swt/internal/widgets/UploadPanel.java	27 Feb 2012 16:33:15 -0000	1.10
>+++ src/org/eclipse/swt/internal/widgets/UploadPanel.java	26 Apr 2012 13:41:27 -0000
>@@ -41,6 +41,7 @@
>   public static final int FULL = 2;
>   public static final int REMOVEABLE = 4;
>   public static final int PROGRESS = 8;
>+
>   private final int panelStyle;
>   private final FileUploadHandler handler;
>   private ValidationHandler validationHandler;
>@@ -143,8 +144,8 @@
>     layout.marginHeight = 0;
>     setLayout( layout );
>     browseButton = new FileUpload( this, SWT.NONE );
>-    browseButton.setText( "Browse" );
>-    browseButton.setToolTipText( "Select a file" );
>+    browseButton.setText( FileDialogMessages.get().UploadPanel_BrowseButtonText); 
>+    browseButton.setToolTipText( FileDialogMessages.get().UploadPanel_BrowseButtonTooltip ); 
>     browseButton.addSelectionListener( new SelectionAdapter() {
>       @Override
>       public void widgetSelected( SelectionEvent event ) {
>@@ -157,25 +158,25 @@
>       }
>     } );
>     fileText = new Text( this, SWT.BORDER );
>-    fileText.setToolTipText( "Selected file" );
>+    fileText.setToolTipText( FileDialogMessages.get().UploadPanel_FileTextTooltip); 
>     fileText.setEditable( false );
>     if( hasStyle( PROGRESS ) ) {
>       progressBar = new ProgressBar( this, SWT.HORIZONTAL | SWT.SMOOTH );
>-      progressBar.setToolTipText( "Upload progress" );
>+      progressBar.setToolTipText( FileDialogMessages.get().UploadPanel_ProgressBarTooltip );
>       progressBar.setMinimum( 0 );
>       progressBar.setMaximum( 100 );
>       progressLabel = new Label( this, SWT.NONE );
>-      progressLabel.setText( progressBar.getSelection() + "%" );
>+      progressLabel.setText( progressBar.getSelection() + FileDialogMessages.PERCENT ); 
>     }
>     if( hasStyle( REMOVEABLE ) ) {
>       removeButton = new Button( this, SWT.PUSH );
>       Image removeIcon = Display.getCurrent().getSystemImage( SWT.ICON_CANCEL );
>       removeButton.setImage( removeIcon );
>       if( deleteImage == null ) {
>-        deleteImage = Graphics.getImage( "resources/delete_obj.gif", getClass().getClassLoader() );
>+        deleteImage = Graphics.getImage( "resources/delete_obj.gif", getClass().getClassLoader() ); 
>       }
>       removeButton.setImage( deleteImage );
>-      removeButton.setToolTipText( "Remove file" );
>+      removeButton.setToolTipText( FileDialogMessages.get().UploadPanel_RemoveButtonTooltip );
>       removeButton.addSelectionListener( new SelectionAdapter() {
>         @Override
>         public void widgetSelected( SelectionEvent e ) {
>@@ -234,11 +235,11 @@
> 
>   public void validate() {
>     if( validationHandler == null || validationHandler.validate( fileText.getText() ) ) {
>-      fileText.setToolTipText( "Selected file" );
>+      fileText.setToolTipText( FileDialogMessages.get().UploadPanel_FileTextTooltip);
>       // TODO replace this with something from theming
>       fileText.setBackground( null );
>     } else {
>-      fileText.setToolTipText( "Warning: Selected file does not match filter" );
>+      fileText.setToolTipText( FileDialogMessages.get().UploadPanel_FileTextWarnNotMatchTooltip);
>       // TODO replace this with something from theming
>       fileText.setBackground( Display.getCurrent().getSystemColor( SWT.COLOR_YELLOW ) );
>       validationHandler.updateEnablement();
>@@ -253,8 +254,8 @@
>         int percent = ( int )Math.floor( fraction * 100 );
>         if( progressBar != null && !progressBar.isDisposed() ) {
>           progressBar.setSelection( percent );
>-          progressBar.setToolTipText( "Upload progress: " + percent + "%" );
>-          progressLabel.setText( percent + "%" );
>+          progressBar.setToolTipText( FileDialogMessages.get().UploadPanel_ProgressBarProgressTooltip + percent + FileDialogMessages.PERCENT );
>+          progressLabel.setText( percent + FileDialogMessages.PERCENT );
>         }
>         // allow the uploadFinished call to notify collector of 100% progress since
>         // the file is actually written then
>@@ -275,8 +276,8 @@
>         int percent = 100;
>         if( progressBar != null && !progressBar.isDisposed() ) {
>           progressBar.setSelection( percent );
>-          progressBar.setToolTipText( "Upload progress: " + percent + "%" );
>-          progressLabel.setText( percent + "%" );
>+          progressBar.setToolTipText(FileDialogMessages.get().UploadPanel_ProgressBarProgressTooltip + percent + FileDialogMessages.PERCENT ); 
>+          progressLabel.setText( percent + FileDialogMessages.PERCENT ); //$NON-NLS-1$
>         }
>         if( progressCollector != null ) {
>           progressCollector.updateProgress( handler, percent );
>Index: src/org/eclipse/swt/internal/widgets/messages.properties
>===================================================================
>RCS file: src/org/eclipse/swt/internal/widgets/messages.properties
>diff -N src/org/eclipse/swt/internal/widgets/messages.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/swt/internal/widgets/messages.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,18 @@
>+FileDialog_AllFilesExtension=All Files
>+FileDialog_AllFilesPattern=*.*
>+FileDialog_FileSelectorTooltip=Add file
>+FileDialog_FiterComboTooltip=Selected filename filter
>+FileDialog_OkButtonTooltip=Waiting for uploads to finish
>+FileDialog_OkButtonTooltipDisable=Specify files in all empty selectors to continue.
>+FileDialog_OkButtonUploadingText=Uploading...
>+FileDialog_ProgressBarTooltip=Total upload progress
>+
>+ProgressCollector_TotalUploadProgress=Total upload progress: 
>+
>+UploadPanel_BrowseButtonText=Browse
>+UploadPanel_BrowseButtonTooltip=Select a file
>+UploadPanel_FileTextTooltip=Selected file
>+UploadPanel_FileTextWarnNotMatchTooltip=Warning: Selected file does not match filter
>+UploadPanel_ProgressBarProgressTooltip=Upload progress: 
>+UploadPanel_ProgressBarTooltip=Upload progress
>+UploadPanel_RemoveButtonTooltip=Remove file
>Index: src/org/eclipse/swt/widgets/FileDialog.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/incubator/supplemental/fileupload/org.eclipse.rap.rwt.supplemental.filedialog/src/org/eclipse/swt/widgets/FileDialog.java,v
>retrieving revision 1.24
>diff -u -r1.24 FileDialog.java
>--- src/org/eclipse/swt/widgets/FileDialog.java	10 Oct 2011 09:29:51 -0000	1.24
>+++ src/org/eclipse/swt/widgets/FileDialog.java	26 Apr 2012 13:41:29 -0000
>@@ -31,6 +31,7 @@
> import org.eclipse.swt.graphics.Point;
> import org.eclipse.swt.graphics.Rectangle;
> import org.eclipse.swt.internal.widgets.ExtensionValidationStrategy;
>+import org.eclipse.swt.internal.widgets.FileDialogMessages;
> import org.eclipse.swt.internal.widgets.ProgressCollector;
> import org.eclipse.swt.internal.widgets.UploadPanel;
> import org.eclipse.swt.internal.widgets.ValidationHandler;
>@@ -73,7 +74,7 @@
>   String[] filterNames = new String[ 0 ];
>   String[] filterExtensions = new String[ 0 ];
>   String[] fileNames = new String[ 0 ];
>-  String filterPath = "";
>+  String filterPath = ""; //$NON-NLS-1$
>   String fileName;
>   int filterIndex;
>   boolean overwrite = false;
>@@ -462,7 +463,7 @@
>     filterSelector.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false ) );
>     totalProgressBar = new ProgressBar( footerComp, SWT.HORIZONTAL | SWT.SMOOTH );
>     totalProgressBar.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, false ) );
>-    totalProgressBar.setToolTipText( "Total upload progress" );
>+    totalProgressBar.setToolTipText( FileDialogMessages.get().FileDialog_ProgressBarTooltip );
>     totalProgressBar.setMaximum( 100 );
>     progressCollector.setProgressBar( totalProgressBar );
>     return main;
>@@ -503,10 +504,10 @@
>   private void createAddSelectorButton( Composite parent ) {
>     addFileSelectorButton = new Button( parent, SWT.PUSH );
>     if( addImage == null ) {
>-      addImage = Graphics.getImage( "resources/add_obj.gif", getClass().getClassLoader() );
>+      addImage = Graphics.getImage( "resources/add_obj.gif", getClass().getClassLoader() ); //$NON-NLS-1$
>     }
>     addFileSelectorButton.setImage( addImage );
>-    addFileSelectorButton.setToolTipText( "Add file" );
>+    addFileSelectorButton.setToolTipText( FileDialogMessages.get().FileDialog_FileSelectorTooltip );
>     addFileSelectorButton.addSelectionListener( new SelectionAdapter() {
>       @Override
>       public void widgetSelected( SelectionEvent e ) {
>@@ -560,25 +561,25 @@
> 
>   private Combo createFilterSelector( Composite headerComp ) {
>     final Combo filterCombo = new Combo( headerComp, SWT.DROP_DOWN | SWT.READ_ONLY );
>-    filterCombo.setToolTipText( "Selected filename filter" );
>+    filterCombo.setToolTipText( FileDialogMessages.get().FileDialog_FiterComboTooltip); 
>     String[] names = getFilterNames();
>     String[] exts = getFilterExtensions();
>     if( ( names == null || names.length == 0 ) && ( exts == null || exts.length == 0 ) ) {
>       names = new String[]{
>-        "All Files"
>+        FileDialogMessages.get().FileDialog_AllFilesExtension
>       };
>       exts = new String[]{
>-        "*.*"
>+        FileDialogMessages.get().FileDialog_AllFilesPattern
>       };
>     }
>     for( int i = 0; i < exts.length; i++ ) {
>       StringBuffer sb = new StringBuffer();
>       if( names != null && i < names.length ) {
>-        sb.append( names[ i ] ).append( " " );
>+        sb.append( names[ i ] ).append( " " ); //$NON-NLS-1$
>       }
>-      sb.append( "(" );
>+      sb.append( "(" ); //$NON-NLS-1$
>       sb.append( exts[ i ] );
>-      sb.append( ")" );
>+      sb.append( ")" ); //$NON-NLS-1$
>       filterCombo.add( sb.toString() );
>     }
>     filterCombo.select( getFilterIndex() );
>@@ -604,11 +605,11 @@
>     buttonCompLayout.marginWidth = 0;
>     buttonCompLayout.marginHeight = 0;
>     buttonComposite.setLayout( buttonCompLayout );
>-    String okText = SWT.getMessage( "SWT_OK" );
>+    String okText = SWT.getMessage( "SWT_OK" ); //$NON-NLS-1$
>     okButton = createButton( buttonComposite, okText );
>     parent.getShell().setDefaultButton( okButton );
>     okButton.forceFocus();
>-    String cancelText = SWT.getMessage( "SWT_Cancel" );
>+    String cancelText = SWT.getMessage( "SWT_Cancel" ); //$NON-NLS-1$
>     Button cancelButton = createButton( buttonComposite, cancelText );
>     okButton.addSelectionListener( new SelectionAdapter() {
>       @Override
>@@ -655,8 +656,8 @@
>     }
>     uploadLocked = true;
>     if( needsProcessing.size() > 0 ) {
>-      okButton.setText( "Uploading..." );
>-      okButton.setToolTipText( "Waiting for uploads to finish" );
>+      okButton.setText( FileDialogMessages.get().FileDialog_OkButtonUploadingText ); 
>+      okButton.setToolTipText( FileDialogMessages.get().FileDialog_OkButtonTooltip); 
>       okButton.setEnabled( false );
>       if( addFileSelectorButton != null ) {
>         addFileSelectorButton.setEnabled( false );
>@@ -674,7 +675,7 @@
> 
>   private void updateEnablement() {
>     if( okButton != null && !okButton.isDisposed() ) {
>-      String okText = SWT.getMessage( "SWT_OK" );
>+      String okText = SWT.getMessage( "SWT_OK" ); //$NON-NLS-1$
>       if( uploadPanels.size() == 0 ) {
>         okButton.setText( okText );
>         okButton.setEnabled( false );
>@@ -698,8 +699,8 @@
>             }
>             shell.close();
>           } else {
>-            okButton.setText( "Uploading..." );
>-            okButton.setToolTipText( "Waiting for uploads to finish" );
>+            okButton.setText( FileDialogMessages.get().FileDialog_OkButtonUploadingText ); 
>+            okButton.setToolTipText( FileDialogMessages.get().FileDialog_OkButtonTooltip ); 
>             okButton.setEnabled( false );
>           }
>         } else {
>@@ -711,9 +712,9 @@
>             }
>           }
>           if( !enabled ) {
>-            okButton.setToolTipText( "Specify files in all empty selectors to continue." );
>+            okButton.setToolTipText( FileDialogMessages.get().FileDialog_OkButtonTooltipDisable );
>           } else {
>-            okButton.setToolTipText( "" );
>+            okButton.setToolTipText( "" ); //$NON-NLS-1$
>           }
>           okButton.setEnabled( enabled );
>         }

Actions: View | Diff

Attachments on bug 359104: 204101 | 214603