directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1591510 - /directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/
Date Wed, 30 Apr 2014 23:33:56 GMT
Author: seelmann
Date: Wed Apr 30 23:33:56 2014
New Revision: 1591510

URL: http://svn.apache.org/r1591510
Log:
Fix file extensions of import/export wizards (DIRSTUDIO-46)

Modified:
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java
Wed Apr 30 23:33:56 2014
@@ -127,8 +127,8 @@ public abstract class ExportBaseToPage e
         BaseWidgetUtils.createLabel( composite, NLS.bind(
             Messages.getString( "ExportBaseToPage.FileTypeColon" ), getFileType() ), 1 );
//$NON-NLS-1$
         fileBrowserWidget = new FileBrowserWidget( NLS.bind(
-            Messages.getString( "ExportBaseToPage.SelectFileType" ), new String[] { getFileType()
} ), getExtensions(), //$NON-NLS-1$
-            FileBrowserWidget.TYPE_SAVE );
+            Messages.getString( "ExportBaseToPage.SelectFileType" ), new String[] { getFileType()
} ), //$NON-NLS-1$
+            getExtensions(), FileBrowserWidget.TYPE_SAVE );
         fileBrowserWidget.createWidget( composite );
         fileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener()
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -136,7 +136,7 @@ public class ExportConnectionsWizardPage
         BaseWidgetUtils.createLabel( composite, Messages.getString( "ExportConnectionsWizardPage.ToFile"
), 1 ); //$NON-NLS-1$
         fileBrowserWidget = new FileBrowserWidget(
             Messages.getString( "ExportConnectionsWizardPage.ChooseFile" ), new String[]
//$NON-NLS-1$
-            { "lbc" }, FileBrowserWidget.TYPE_SAVE ); //$NON-NLS-1$
+            { "*.lbc", "*" }, FileBrowserWidget.TYPE_SAVE ); //$NON-NLS-1$
         fileBrowserWidget.createWidget( composite );
         fileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener()
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -42,8 +42,7 @@ public class ExportCsvToWizardPage exten
 
     /** The extensions used by CSV files */
     private static final String[] EXTENSIONS = new String[]
-        {
-            Messages.getString( "ExportCsvToWizardPage.0" ), Messages.getString( "ExportCsvToWizardPage.1"
), Messages.getString( "ExportCsvToWizardPage.2" ) }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        { "*.csv", "*.txt", "*" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -44,7 +44,7 @@ public class ExportDsmlToWizardPage exte
 
     /** The extensions used by DSML files*/
     private static final String[] EXTENSIONS = new String[]
-        { "*.xml", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+        { "*.xml", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -42,7 +42,7 @@ public class ExportExcelToWizardPage ext
 
     /** The extensions used by Excel files */
     private static final String[] EXTENSIONS = new String[]
-        { "*.xls", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+        { "*.xls", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -42,7 +42,7 @@ public class ExportLdifToWizardPage exte
 
     /** The extensions used by LDIF files */
     private static final String[] EXTENSIONS = new String[]
-        { "*.ldif", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+        { "*.ldif", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -37,7 +37,7 @@ public class ExportLogsToWizardPage exte
 
     /** The extensions used by LDIF files */
     private static final String[] EXTENSIONS = new String[]
-        { "*.ldif", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+        { "*.ldif", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfToWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -42,7 +42,7 @@ public class ExportOdfToWizardPage exten
 
     /** The extensions used by ODF files */
     private static final String[] EXTENSIONS = new String[]
-        { "*.ods", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+        { "*.ods", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -63,7 +63,7 @@ public class ImportConnectionsWizardPage
         BaseWidgetUtils.createLabel( composite, Messages.getString( "ImportConnectionsWizardPage.FromFile"
), 1 ); //$NON-NLS-1$
         fileBrowserWidget = new FileBrowserWidget(
             Messages.getString( "ImportConnectionsWizardPage.ChooseFile" ), new String[]
//$NON-NLS-1$
-            { "lbc" }, FileBrowserWidget.TYPE_OPEN ); //$NON-NLS-1$
+            { "*.lbc", "*" }, FileBrowserWidget.TYPE_OPEN ); //$NON-NLS-1$
         fileBrowserWidget.createWidget( composite );
         fileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener()
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -48,9 +48,9 @@ public class ImportDsmlMainWizardPage ex
     /** The wizard the page is attached to */
     private ImportDsmlWizard wizard;
 
-    /** The extensions used by DSML files*/
+    /** The extensions used by DSML files */
     private static final String[] EXTENSIONS = new String[]
-        { "*.xml", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+        { "*.xml", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
     /** The dsml file browser widget. */
     private FileBrowserWidget dsmlFileBrowserWidget;
@@ -190,8 +190,8 @@ public class ImportDsmlMainWizardPage ex
         } );
 
         BaseWidgetUtils.createRadioIndent( responseContainer, 1 );
-        responseFileBrowserWidget = new FileBrowserWidget( Messages
-            .getString( "ImportDsmlMainWizardPage.SelectSaveFile" ), null, FileBrowserWidget.TYPE_SAVE
); //$NON-NLS-1$
+        responseFileBrowserWidget = new FileBrowserWidget(
+            Messages.getString( "ImportDsmlMainWizardPage.SelectSaveFile" ), EXTENSIONS,
FileBrowserWidget.TYPE_SAVE ); //$NON-NLS-1$
         responseFileBrowserWidget.createWidget( responseContainer );
         responseFileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener()
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
Wed Apr 30 23:33:56 2014
@@ -56,7 +56,11 @@ public class ImportLdifMainWizardPage ex
 
     /** The valid extension. */
     private static final String[] EXTENSIONS = new String[]
-        { "*.ldif", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$
+        { "*.ldif", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
+
+    /** The valid log extension. */
+    private static final String[] LOG_EXTENSIONS = new String[]
+        { "*.ldif.log", "*" }; //$NON-NLS-1$ //$NON-NLS-2$
 
     /** The wizard. */
     private ImportLdifWizard wizard;
@@ -283,7 +287,7 @@ public class ImportLdifMainWizardPage ex
 
         BaseWidgetUtils.createRadioIndent( loggingContainer, 1 );
         logFileBrowserWidget = new FileBrowserWidget(
-            Messages.getString( "ImportLdifMainWizardPage.SelectLogFile" ), null, FileBrowserWidget.TYPE_SAVE
); //$NON-NLS-1$
+            Messages.getString( "ImportLdifMainWizardPage.SelectLogFile" ), LOG_EXTENSIONS,
FileBrowserWidget.TYPE_SAVE ); //$NON-NLS-1$
         logFileBrowserWidget.createWidget( loggingContainer );
         logFileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener()
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties?rev=1591510&r1=1591509&r2=1591510&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
Wed Apr 30 23:33:56 2014
@@ -64,9 +64,6 @@ ExportConnectionsWizardPage.ErrorFileNot
 ExportConnectionsWizardPage.ExportConnections=Export Connections
 ExportConnectionsWizardPage.OverwriteExistingFile=O&verwrite existing file
 ExportConnectionsWizardPage.ToFile=To file:
-ExportCsvToWizardPage.0=*.csv
-ExportCsvToWizardPage.1=*.txt
-ExportCsvToWizardPage.2=*.*
 ExportCsvToWizardPage.CVS=CSV
 ExportCsvToWizardPage.SeeTextFormats=See <a>Text Formats</a> for CSV file format
preferences.
 ExportCsvWizard.CSVExport=CSV Export



Mime
View raw message