directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r490689 - in /directory/trunks/ldapstudio: ldapstudio-browser-core/ ldapstudio-browser-core/META-INF/ ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/ ldapstudio-browser-core/src/main/java/org/apache/direc...
Date Thu, 28 Dec 2006 09:55:28 GMT
Author: pamarcelot
Date: Thu Dec 28 01:55:25 2006
New Revision: 490689

URL: http://svn.apache.org/viewvc?view=rev&rev=490689
Log:
Adding DSML Import Wizard to LDAP Browser.

Added:
    directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ImportDsmlJob.java
    directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml.gif   (with props)
    directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml_wizard.gif   (with
props)
    directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlMainWizardPage.java
    directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java
Modified:
    directory/trunks/ldapstudio/ldapstudio-browser-core/.classpath
    directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF
    directory/trunks/ldapstudio/ldapstudio-browser-core/build.properties
    directory/trunks/ldapstudio/ldapstudio-browser-core/ivy.xml
    directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/BrowserCoreMessages.java
    directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/browsercoremessages.properties
    directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml
    directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIConstants.java
    directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java
    directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java
    directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java
    directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/.classpath
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/.classpath?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/.classpath (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/.classpath Thu Dec 28 01:55:25 2006
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="output" path="target/classes"/>
-	<classpathentry kind="lib" path="lib/antlr-2.7.5.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/poi-2.5.1-final-20040804.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/>
+	<classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/ldapstudio-dsml-parser-0.1.jar"/>
+	<classpathentry kind="lib" path="lib/nlog4j-1.2.25.jar"/>
+	<classpathentry kind="lib" path="lib/shared-asn1-0.9.6-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/shared-ldap-0.9.6-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/xpp3-1.1.3_8.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/META-INF/MANIFEST.MF Thu Dec 28 01:55:25
2006
@@ -26,6 +26,13 @@
  org.apache.directory.ldapstudio.browser.core.propertypageproviders,
  org.apache.directory.ldapstudio.browser.core.utils
 Bundle-ClassPath: browser-core.jar,
- lib/antlr-2.7.5.jar,
  lib/commons-codec-1.3.jar,
- lib/poi-2.5.1-final-20040804.jar
+ lib/poi-2.5.1-final-20040804.jar,
+ lib/antlr-2.7.6.jar,
+ lib/commons-collections-3.1.jar,
+ lib/dom4j-1.6.1.jar,
+ lib/ldapstudio-dsml-parser-0.1.jar,
+ lib/nlog4j-1.2.25.jar,
+ lib/shared-asn1-0.9.6-SNAPSHOT.jar,
+ lib/shared-ldap-0.9.6-SNAPSHOT.jar,
+ lib/xpp3-1.1.3_8.jar

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/build.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/build.properties?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/build.properties (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/build.properties Thu Dec 28 01:55:25
2006
@@ -4,7 +4,15 @@
                browser-core.jar,\
                plugin.properties,\
                about.html,\
-               about_files/,
+               about_files/,\
+               lib/antlr-2.7.6.jar,\
+               lib/commons-collections-3.1.jar,\
+               lib/dom4j-1.6.1.jar,\
+               lib/ldapstudio-dsml-parser-0.1.jar,\
+               lib/nlog4j-1.2.25.jar,\
+               lib/shared-asn1-0.9.6-SNAPSHOT.jar,\
+               lib/shared-ldap-0.9.6-SNAPSHOT.jar,\
+               lib/xpp3-1.1.3_8.jar
 jars.compile.order = browser-core.jar
 src.includes = src/main/java/,\
                plugin.xml,\

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/ivy.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/ivy.xml?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/ivy.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/ivy.xml Thu Dec 28 01:55:25 2006
@@ -22,5 +22,6 @@
 		<dependency org="antlr" name="antlr" rev="2.7.5"/>
 		<dependency org="commons-codec" name="commons-codec" rev="1.3"/>
 		<dependency org="org.apache.poi" name="poi" rev="2.5.1-final-20040804"/>
+    	<dependency org="org.apache.directory.ldapstudio" name="ldapstudio-dsml-parser" rev="0.1"/>
     </dependencies>
 </ivy-module>

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/BrowserCoreMessages.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/BrowserCoreMessages.java?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/BrowserCoreMessages.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/BrowserCoreMessages.java
Thu Dec 28 01:55:25 2006
@@ -166,6 +166,8 @@
     public static String ldif__import_into_host_port_failed_on_date;
 
     public static String ldif__error_msg;
+    
+    public static String dsml__n_errors_see_responsefile;
 
     public static String model__no_connection;
 
@@ -296,6 +298,12 @@
     public static String jobs__import_ldif_task;
 
     public static String jobs__import_ldif_error;
+    
+    public static String jobs__import_dsml_name;
+
+    public static String jobs__import_dsml_task;
+
+    public static String jobs__import_dsml_error;
 
     public static String jobs__init_entries_title_attandsub;
 

Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/browsercoremessages.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/browsercoremessages.properties?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/browsercoremessages.properties
(original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/browsercoremessages.properties
Thu Dec 28 01:55:25 2006
@@ -78,6 +78,8 @@
 ldif__import_into_host_port_failed_on_date=# Import into ldap://{0}:{1} failed on {2}
 ldif__error_msg=# ERROR: {0}
 
+dsml__n_errors_see_responsefile={0} errors occurred, see response file for details
+
 model__unsupported_hash=Unsupported hash method
 model__url_no_protocol=No protocol
 model__url_no_attributes=No attributes
@@ -191,6 +193,10 @@
 jobs__import_ldif_name=Import LDIF
 jobs__import_ldif_task=Importing LDIF
 jobs__import_ldif_error=Error while importing LDIF
+
+jobs__import_dsml_name=Import DSML
+jobs__import_dsml_task=Importing DSML
+jobs__import_dsml_error=Error while importing DSML
 
 jobs__init_entries_title_attandsub=Read Attributes and Children
 jobs__init_entries_title_subonly=Read Children

Added: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ImportDsmlJob.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ImportDsmlJob.java?view=auto&rev=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ImportDsmlJob.java
(added)
+++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ImportDsmlJob.java
Thu Dec 28 01:55:25 2006
@@ -0,0 +1,178 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+
+package org.apache.directory.ldapstudio.browser.core.jobs;
+
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.ldapstudio.browser.core.BrowserCoreMessages;
+import org.apache.directory.ldapstudio.browser.core.model.IConnection;
+import org.apache.directory.ldapstudio.dsmlv2.Dsmlv2ResponseParser;
+import org.apache.directory.ldapstudio.dsmlv2.engine.Dsmlv2Engine;
+import org.apache.directory.ldapstudio.dsmlv2.reponse.ErrorResponse;
+import org.apache.directory.shared.ldap.codec.LdapResponse;
+
+
+/**
+ * This class implements a Job for Importing a DSML File into a LDAP server
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ImportDsmlJob extends AbstractEclipseJob
+{
+
+    /** The connection to use */
+    private IConnection connection;
+
+    /** The DSML file to use */
+    private File dsmlFile;
+
+    /** The Save file to use */
+    private File responseFile;
+
+
+    /**
+     * Creates a new instance of ImportDsmlJob.
+     *
+     * @param connection
+     *          The connection to use
+     * @param dsmlFile
+     *          The DSML file to read from
+     * @param saveFile
+     *          The Save file to use
+     * @param continueOnError
+     *          The ContinueOnError flag
+     */
+    public ImportDsmlJob( IConnection connection, File dsmlFile, File saveFile )
+    {
+        this.connection = connection;
+        this.dsmlFile = dsmlFile;
+        this.responseFile = saveFile;
+
+        setName( BrowserCoreMessages.jobs__import_dsml_name );
+    }
+
+
+    /**
+     * Creates a new instance of ImportDsmlJob.
+     *
+     * @param connection
+     *          The Connection to use
+     * @param dsmlFile
+     *          The DSML file to read from
+     * @param continueOnError
+     *          The ContinueOnError flag
+     */
+    public ImportDsmlJob( IConnection connection, File dsmlFile )
+    {
+        this( connection, dsmlFile, null );
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.ldapstudio.browser.core.jobs.AbstractEclipseJob#getConnections()
+     */
+    protected IConnection[] getConnections()
+    {
+        return new IConnection[]
+            { connection };
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.ldapstudio.browser.core.jobs.AbstractEclipseJob#getLockedObjects()
+     */
+    protected Object[] getLockedObjects()
+    {
+        List l = new ArrayList();
+        l.add( connection.getUrl() + "_" + DigestUtils.shaHex( dsmlFile.toString() ) );
+        return l.toArray();
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.ldapstudio.browser.core.jobs.AbstractEclipseJob#executeAsyncJob(org.apache.directory.ldapstudio.browser.core.jobs.ExtendedProgressMonitor)
+     */
+    protected void executeAsyncJob( ExtendedProgressMonitor monitor )
+    {
+
+        monitor.beginTask( BrowserCoreMessages.jobs__import_dsml_task, 2 );
+        monitor.reportProgress( " " ); //$NON-NLS-1$
+        monitor.worked( 1 );
+        
+        Dsmlv2Engine engine = new Dsmlv2Engine( connection.getHost(), connection.getPort(),
connection.getBindPrincipal(), connection.getBindPassword() );
+        try
+        {
+            // Executing the DSML request and getting the response
+            String response = engine.processDSMLFile( dsmlFile.getAbsolutePath() );
+            
+            // Saving Response if needed
+            if ( responseFile != null )
+            {
+                FileOutputStream fout = new FileOutputStream( responseFile );
+                new PrintStream( fout ).println( response );
+                fout.close();
+            }
+            
+            // Processing Reponse (Reading and displaying possible errors)
+            int errorCount = 0;
+            Dsmlv2ResponseParser responseParser = new Dsmlv2ResponseParser();
+            responseParser.setInput( response );
+            LdapResponse ldapResponse = responseParser.getNextResponse();
+            while ( ldapResponse != null )
+            {
+                if ( ( ldapResponse instanceof ErrorResponse ) 
+                     || ( ldapResponse.getLdapResult().getResultCode() != 0 ) )
+                {
+                    errorCount++;
+                }
+                ldapResponse = responseParser.getNextResponse();
+            }
+            
+            if ( errorCount > 0 )
+            {
+                monitor.reportError( BrowserCoreMessages.bind(
+                        BrowserCoreMessages.dsml__n_errors_see_responsefile, new String[]
+                            { "" + errorCount } ) ); //$NON-NLS-1$
+            }
+        }
+        catch ( Exception e )
+        {
+            monitor.reportError( e );
+        }
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.ldapstudio.browser.core.jobs.AbstractEclipseJob#getErrorMessage()
+     */
+    protected String getErrorMessage()
+    {
+        return BrowserCoreMessages.jobs__import_dsml_error;
+    }
+
+}

Added: directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml.gif
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml.gif?view=auto&rev=490689
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml_wizard.gif
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml_wizard.gif?view=auto&rev=490689
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/ldapstudio/ldapstudio-browser-ui/icons/import_dsml_wizard.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/plugin.xml Thu Dec 28 01:55:25 2006
@@ -143,6 +143,17 @@
        <selection class="org.apache.directory.ldapstudio.browser.core.model.IConnection"/>
        <selection class="org.apache.directory.ldapstudio.browser.core.model.IEntry"/>
     </wizard>
+    <wizard
+          class="org.apache.directory.ldapstudio.browser.ui.wizards.ImportDsmlWizard"
+          icon="icons/import_dsml.gif"
+          id="org.apache.directory.ldapstudio.browser.ui.wizards.ImportDsmlWizard"
+          name="DSML into LDAP">
+       <description>
+          Imports a DSML file into a LDAP directory
+       </description>
+       <selection class="org.apache.directory.ldapstudio.browser.core.model.IConnection"/>
+       <selection class="org.apache.directory.ldapstudio.browser.core.model.IEntry"/>
+    </wizard>
  </extension>
  <extension
        point="org.eclipse.ui.exportWizards">

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIConstants.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIConstants.java?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIConstants.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/BrowserUIConstants.java
Thu Dec 28 01:55:25 2006
@@ -255,6 +255,8 @@
     public static final String IMG_IMPORT = "icons/import.gif";
 
     public static final String IMG_EXPORT = "icons/export.gif";
+    
+    public static final String IMG_IMPORT_DSML_WIZARD = "icons/import_dsml_wizard.gif";
 
     public static final String IMG_IMPORT_LDIF_WIZARD = "icons/import_ldif_wizard.gif";
 
@@ -268,6 +270,8 @@
 
     public static final String IMG_EXPORT_XLS_WIZARD = "icons/export_xls_wizard.gif";
 
+    public static final String IMG_IMPORT_DSML = "icons/import_dsml.gif";
+    
     public static final String IMG_IMPORT_LDIF = "icons/import_ldif.gif";
 
     public static final String IMG_EXPORT_LDIF = "icons/export_ldif.gif";

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/actions/ImportExportAction.java
Thu Dec 28 01:55:25 2006
@@ -29,6 +29,7 @@
 import org.apache.directory.ldapstudio.browser.ui.wizards.ExportCsvWizard;
 import org.apache.directory.ldapstudio.browser.ui.wizards.ExportExcelWizard;
 import org.apache.directory.ldapstudio.browser.ui.wizards.ExportLdifWizard;
+import org.apache.directory.ldapstudio.browser.ui.wizards.ImportDsmlWizard;
 import org.apache.directory.ldapstudio.browser.ui.wizards.ImportLdifWizard;
 
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -46,6 +47,8 @@
     public static final int TYPE_EXPORT_CSV = 2;
 
     public static final int TYPE_EXPORT_EXCEL = 3;
+    
+    public static final int TYPE_IMPORT_DSML = 4;
 
     private int type;
 
@@ -75,6 +78,10 @@
         {
             return "Excel Export...";
         }
+        else if ( this.type == TYPE_IMPORT_DSML )
+        {
+            return "DSML Import...";
+        }
         else
         {
             return "Export...";
@@ -100,6 +107,10 @@
         {
             return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_EXPORT_XLS
);
         }
+        else if ( this.type == TYPE_IMPORT_DSML )
+        {
+            return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_IMPORT_DSML
);
+        }
         else
         {
             return null;
@@ -141,6 +152,25 @@
             else if ( getConnection() != null )
             {
                 wizard = new ImportLdifWizard( getConnection() );
+            }
+        }
+        else if ( this.type == TYPE_IMPORT_DSML )
+        {
+            if ( getEntry() != null )
+            {
+                wizard = new ImportDsmlWizard( getEntry().getConnection() );
+            }
+            else if ( getSearch() != null )
+            {
+                wizard = new ImportDsmlWizard( getSearch().getConnection() );
+            }
+            else if ( getConnectionInput() != null )
+            {
+                wizard = new ImportDsmlWizard( getConnectionInput() );
+            }
+            else if ( getConnection() != null )
+            {
+                wizard = new ImportDsmlWizard( getConnection() );
             }
         }
         else if ( this.type == TYPE_EXPORT_LDIF )

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewActionGroup.java
Thu Dec 28 01:55:25 2006
@@ -104,6 +104,8 @@
 
     private static final String copyEntryAsCsvOperationalAction = "copyEntryAsCsvOperationalAction";
 
+    private static final String importDsmlAction = "importDsmlAction";
+
     private static final String importLdifAction = "importLdifAction";
 
     private static final String exportLdifAction = "exportLdifAction";
@@ -161,6 +163,8 @@
         this.browserActionMap.put( copyEntryAsCsvOperationalAction, new BrowserViewActionProxy(
viewer,
             new CopyEntryAsCsvAction( CopyEntryAsLdifAction.MODE_INCLUDE_OPERATIONAL_ATTRIBUTES
) ) );
 
+        this.browserActionMap.put( importDsmlAction, new BrowserViewActionProxy( viewer,
new ImportExportAction(
+                ImportExportAction.TYPE_IMPORT_DSML ) ) );
         this.browserActionMap.put( importLdifAction, new BrowserViewActionProxy( viewer,
new ImportExportAction(
             ImportExportAction.TYPE_IMPORT_LDIF ) ) );
         this.browserActionMap.put( exportLdifAction, new BrowserViewActionProxy( viewer,
new ImportExportAction(
@@ -263,6 +267,7 @@
         MenuManager importMenuManager = new MenuManager( "Import" );
         importMenuManager.add( ( IAction ) this.browserActionMap.get( importLdifAction )
);
         importMenuManager.add( new Separator() );
+        importMenuManager.add( ( IAction ) this.browserActionMap.get( importDsmlAction )
);
         menuManager.add( importMenuManager );
 
         MenuManager exportMenuManager = new MenuManager( "Export" );

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/connection/ConnectionViewActionGroup.java
Thu Dec 28 01:55:25 2006
@@ -46,6 +46,8 @@
 
     private static final String selectAllAction = "selectAllAction";
 
+    private static final String importDsmlAction = "importDsmlAction";
+
     private static final String importLdifAction = "importLdifAction";
 
     private static final String exportLdifAction = "exportLdifAction";
@@ -69,6 +71,8 @@
 
         this.connectionActionMap.put( selectAllAction, new ConnectionViewActionProxy( viewer,
new SelectAllAction(
             viewer ) ) );
+        this.connectionActionMap.put( importDsmlAction, new ConnectionViewActionProxy( viewer,
new ImportExportAction(
+                ImportExportAction.TYPE_IMPORT_DSML ) ) );
         this.connectionActionMap.put( importLdifAction, new ConnectionViewActionProxy( viewer,
new ImportExportAction(
             ImportExportAction.TYPE_IMPORT_LDIF ) ) );
         this.connectionActionMap.put( exportLdifAction, new ConnectionViewActionProxy( viewer,
new ImportExportAction(
@@ -136,6 +140,7 @@
         MenuManager importMenuManager = new MenuManager( "Import" );
         importMenuManager.add( ( IAction ) this.connectionActionMap.get( importLdifAction
) );
         importMenuManager.add( new Separator() );
+        importMenuManager.add( ( IAction ) this.connectionActionMap.get( importDsmlAction
) );
         menuManager.add( importMenuManager );
         MenuManager exportMenuManager = new MenuManager( "Export" );
         exportMenuManager.add( ( IAction ) this.connectionActionMap.get( exportLdifAction
) );

Added: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlMainWizardPage.java?view=auto&rev=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlMainWizardPage.java
(added)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlMainWizardPage.java
Thu Dec 28 01:55:25 2006
@@ -0,0 +1,259 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+
+package org.apache.directory.ldapstudio.browser.ui.wizards;
+
+import java.io.File;
+
+
+import org.apache.directory.ldapstudio.browser.ui.BrowserUIConstants;
+import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
+import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.ldapstudio.browser.ui.widgets.FileBrowserWidget;
+import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.ldapstudio.browser.ui.widgets.WidgetModifyListener;
+import org.apache.directory.ldapstudio.browser.ui.widgets.search.ConnectionWidget;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+public class ImportDsmlMainWizardPage extends WizardPage
+{    
+    /** The wizard the page is attached to */
+    private ImportDsmlWizard wizard;
+    
+    /** The extensions used by DSML files*/
+    private static final String[] EXTENSIONS = new String[] { "*.xml", "*.*" };
+    
+    // UI elements    
+    private FileBrowserWidget dsmlFileBrowserWidget;
+    private ConnectionWidget connectionWidget;
+    private Button saveResponseButton;
+    private Button useDefaultResponseFileButton;
+    private Button useCustomResponseFileButton;
+    private FileBrowserWidget responseFileBrowserWidget;
+    private Button overwriteResponseFileButton;
+    
+    private String customResponseFileName;
+    
+    public ImportDsmlMainWizardPage( String pageName, ImportDsmlWizard wizard )
+    {
+        super( pageName );
+        super.setTitle( ImportDsmlWizard.WIZARD_TITLE );
+        super.setDescription( "Please select a connection and the DSML file to import" );
+        super.setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_IMPORT_DSML_WIZARD
) );
+        super.setPageComplete( false );
+        this.wizard = wizard;
+    }
+    
+    public void createControl( Composite parent )
+    {
+        Composite composite = BaseWidgetUtils.createColumnContainer( parent, 3, 1 );
+
+        // DSML file
+        BaseWidgetUtils.createLabel( composite, "DSML file:", 1 );
+        dsmlFileBrowserWidget = new FileBrowserWidget( "Select a DSML File", EXTENSIONS,
FileBrowserWidget.TYPE_OPEN );
+        dsmlFileBrowserWidget.createWidget( composite );
+        dsmlFileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener()
+        {
+            public void widgetModified( WidgetModifyEvent event )
+            {
+                wizard.setDsmlFilename( dsmlFileBrowserWidget.getFilename() );
+                if ( useDefaultResponseFileButton.getSelection() )
+                {
+                    responseFileBrowserWidget.setFilename( dsmlFileBrowserWidget.getFilename()
+ ".response.xml" );
+                }
+                validate();
+            }
+        } );
+        
+        // Connection
+        BaseWidgetUtils.createLabel( composite, "Import into:", 1 );
+        connectionWidget = new ConnectionWidget( wizard.getImportConnection() );
+        connectionWidget.createWidget( composite );
+        connectionWidget.addWidgetModifyListener( new WidgetModifyListener()
+        {
+            public void widgetModified( WidgetModifyEvent event )
+            {
+                wizard.setImportConnection( connectionWidget.getConnection() );
+                validate();
+            }
+        } );
+        
+        // Save Response
+        Composite responseOuterComposite = BaseWidgetUtils.createColumnContainer( composite,
1, 3 );
+        Group responseGroup = BaseWidgetUtils.createGroup( responseOuterComposite, "Response",
1 );
+        Composite responseContainer = BaseWidgetUtils.createColumnContainer( responseGroup,
3, 1 );
+
+        saveResponseButton = BaseWidgetUtils.createCheckbox( responseContainer, "Save response",
3 );
+        saveResponseButton.setSelection( true );
+        wizard.setSaveResponse( saveResponseButton.getSelection() );
+        saveResponseButton.addSelectionListener( new SelectionAdapter()
+        {
+            public void widgetSelected( SelectionEvent event )
+            {
+                wizard.setSaveResponse( saveResponseButton.getSelection() );
+                useDefaultResponseFileButton.setEnabled( saveResponseButton.getSelection()
);
+                useCustomResponseFileButton.setEnabled( saveResponseButton.getSelection()
);
+                responseFileBrowserWidget.setEnabled( saveResponseButton.getSelection()
+                    && useCustomResponseFileButton.getSelection() );
+                overwriteResponseFileButton.setEnabled( saveResponseButton.getSelection()
);
+                validate();
+            }
+        } );
+
+        BaseWidgetUtils.createRadioIndent( responseContainer, 1 );
+        useDefaultResponseFileButton = BaseWidgetUtils.createRadiobutton( responseContainer,
"Use default response file", 2 );
+        useDefaultResponseFileButton.setSelection( true );
+        useDefaultResponseFileButton.addSelectionListener( new SelectionAdapter()
+        {
+            public void widgetSelected( SelectionEvent event )
+            {
+                String temp = customResponseFileName;
+                responseFileBrowserWidget.setFilename( dsmlFileBrowserWidget.getFilename()
+ ".response.xml" );
+                responseFileBrowserWidget.setEnabled( false );
+                customResponseFileName = temp;
+                validate();
+            }
+        } );
+
+        BaseWidgetUtils.createRadioIndent( responseContainer, 1 );
+        useCustomResponseFileButton = BaseWidgetUtils.createRadiobutton( responseContainer,
"Use custom response file", 2 );
+        useCustomResponseFileButton.setSelection( false );
+        useCustomResponseFileButton.addSelectionListener( new SelectionAdapter()
+        {
+            public void widgetSelected( SelectionEvent event )
+            {
+                responseFileBrowserWidget.setFilename( customResponseFileName != null ? customResponseFileName
: "" );
+                responseFileBrowserWidget.setEnabled( true );
+                validate();
+            }
+        } );
+
+        BaseWidgetUtils.createRadioIndent( responseContainer, 1 );
+        responseFileBrowserWidget = new FileBrowserWidget( "Select save file", null, FileBrowserWidget.TYPE_SAVE
);
+        responseFileBrowserWidget.createWidget( responseContainer );
+        responseFileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener()
+        {
+            public void widgetModified( WidgetModifyEvent event )
+            {
+                customResponseFileName = responseFileBrowserWidget.getFilename();
+                wizard.setResponseFilename( customResponseFileName );
+                validate();
+            }
+        } );
+        responseFileBrowserWidget.setEnabled( false );
+
+        BaseWidgetUtils.createRadioIndent( responseContainer, 1 );
+        overwriteResponseFileButton = BaseWidgetUtils.createCheckbox( responseContainer,
"Overwrite existing response file", 2 );
+        overwriteResponseFileButton.addSelectionListener( new SelectionAdapter()
+        {
+            public void widgetSelected( SelectionEvent event )
+            {
+                validate();
+            }
+        } );
+        
+        setControl( composite );
+    }
+    
+    private void validate()
+    {
+        boolean ok = true;
+
+        File dsmlFile = new File( dsmlFileBrowserWidget.getFilename() );
+        if ( "".equals( dsmlFileBrowserWidget.getFilename() ) )
+        {
+            setErrorMessage( null );
+            ok = false;
+        }
+        else if ( !dsmlFile.isFile() || !dsmlFile.exists() )
+        {
+            setErrorMessage( "Selected DSML file doesn't exist." );
+            ok = false;
+        }
+        else if ( !dsmlFile.canRead() )
+        {
+            setErrorMessage( "Selected DSML file is not readable." );
+            ok = false;
+        }
+        else if ( this.saveResponseButton.getSelection() )
+        {
+            File responseFile = new File( responseFileBrowserWidget.getFilename() );
+            File responseFileDirectory = responseFile.getParentFile();
+
+            if ( responseFile.equals( dsmlFile ) )
+            {
+                setErrorMessage( "DSML file and response file must not be equal." );
+                ok = false;
+            }
+            else if ( responseFile.isDirectory() )
+            {
+                setErrorMessage( "Selected response file is not a file." );
+                ok = false;
+            }
+            else if ( responseFile.exists() && !this.overwriteResponseFileButton.getSelection()
)
+            {
+                setErrorMessage( "Selected response file already exists. Select option 'Overwrite
existing response file' if you want to overwrite the response file." );
+                ok = false;
+            }
+            else if ( responseFile.exists() && !responseFile.canWrite() )
+            {
+                setErrorMessage( "Selected response file is not writeable." );
+                ok = false;
+            }
+            else if ( responseFile.getParentFile() == null )
+            {
+                setErrorMessage( "Selected response file directory is not writeable." );
+                ok = false;
+            }
+            else if ( !responseFile.exists() && ( responseFileDirectory == null ||
!responseFileDirectory.canWrite() ) )
+            {
+                setErrorMessage( "Selected response file directory is not writeable." );
+                ok = false;
+            }
+        }
+        
+        if ( ( wizard.getImportConnection() == null ) || (connectionWidget.getConnection()
== null ) )
+        {
+            setErrorMessage( "Please select a Connection." );
+            ok = false;
+        }
+
+        if ( ok )
+        {
+            setErrorMessage( null );
+        }
+        setPageComplete( ok );
+        getContainer().updateButtons();
+    }
+
+    
+    /**
+     * Saves the Dialog Settings of the Page
+     */
+    public void saveDialogSettings()
+    {
+        this.dsmlFileBrowserWidget.saveDialogSettings();
+    }
+}

Added: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java?view=auto&rev=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java
(added)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java
Thu Dec 28 01:55:25 2006
@@ -0,0 +1,215 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+
+package org.apache.directory.ldapstudio.browser.ui.wizards;
+
+
+import java.io.File;
+
+import org.apache.directory.ldapstudio.browser.core.jobs.ImportDsmlJob;
+import org.apache.directory.ldapstudio.browser.core.model.IAttribute;
+import org.apache.directory.ldapstudio.browser.core.model.IBookmark;
+import org.apache.directory.ldapstudio.browser.core.model.IConnection;
+import org.apache.directory.ldapstudio.browser.core.model.IEntry;
+import org.apache.directory.ldapstudio.browser.core.model.ISearchResult;
+import org.apache.directory.ldapstudio.browser.core.model.IValue;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+
+/**
+ * This class implements the Import DSML Wizard.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ImportDsmlWizard extends Wizard implements IImportWizard
+{
+    /** Page Title */
+    public static final String WIZARD_TITLE = "DSML Import";
+    
+    /** The connection attached to the import */
+    private IConnection importConnection;
+    
+    /** The main page of the wizard */
+    private ImportDsmlMainWizardPage mainPage;
+    
+    /** The DSML Filename */
+    private String dsmlFilename;
+
+    /** The Save Filename */
+    private String responseFilename;
+
+    /** The Save Response flag */
+    private boolean saveResponse;
+    
+    /**
+     * Creates a new instance of ImportDsmlWizard.
+     */
+    public ImportDsmlWizard()
+    {
+        super();
+        super.setWindowTitle( WIZARD_TITLE );
+    }
+    
+    /**
+     * Creates a new instance of ImportDsmlWizard.
+     * @param selectedConnection
+     *          The connection to use
+     */
+    public ImportDsmlWizard( IConnection selectedConnection )
+    {
+        super.setWindowTitle( WIZARD_TITLE );
+        this.importConnection = selectedConnection;
+    }
+    
+    /**
+     * Gets the ID of the Import DSML Wizard
+     * @return The ID of the Import DSML Wizard
+     */
+    public static String getId()
+    {
+        return ImportDsmlWizard.class.getName();
+    }
+    
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.Wizard#performFinish()
+     */
+    public boolean performFinish()
+    {
+
+        this.mainPage.saveDialogSettings();
+
+        if ( this.dsmlFilename != null && !"".equals( this.dsmlFilename ) )
+        {
+            File dsmlFile = new File( this.dsmlFilename );
+
+            if ( this.saveResponse )
+            {
+                File responseFile = new File( this.responseFilename );
+                new ImportDsmlJob( this.importConnection, dsmlFile, responseFile ).execute();
+            }
+            else
+            {
+                new ImportDsmlJob( this.importConnection, dsmlFile ).execute();
+            }
+
+            return true;
+        }
+        return false;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
+     */
+    public void init( IWorkbench workbench, IStructuredSelection selection )
+    {
+        Object o = selection.getFirstElement();
+        if ( o instanceof IEntry )
+        {
+            this.importConnection = ( ( IEntry ) o ).getConnection();
+        }
+        else if ( o instanceof ISearchResult )
+        {
+            this.importConnection = ( ( ISearchResult ) o ).getEntry().getConnection();
+        }
+        else if ( o instanceof IBookmark )
+        {
+            this.importConnection = ( ( IBookmark ) o ).getConnection();
+        }
+        else if ( o instanceof IAttribute )
+        {
+            this.importConnection = ( ( IAttribute ) o ).getEntry().getConnection();
+        }
+        else if ( o instanceof IValue )
+        {
+            this.importConnection = ( ( IValue ) o ).getAttribute().getEntry().getConnection();
+        }
+        else if ( o instanceof IConnection )
+        {
+            this.importConnection = ( IConnection ) o;
+        }
+        else
+        {
+            this.importConnection = null;
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.Wizard#addPages()
+     */
+    public void addPages()
+    {
+        mainPage = new ImportDsmlMainWizardPage( ImportDsmlMainWizardPage.class.getName(),
this );
+        addPage( mainPage );
+
+    }
+    
+    /**
+     * Get the connection attached to the Import
+     * @return The connection attached to the Import
+     */
+    public IConnection getImportConnection()
+    {
+        return importConnection;
+    }
+    
+    /**
+     * Sets the connection attached to the Import
+     * @param connection
+     *          The connection attached to the Import
+     */
+    public void setImportConnection( IConnection connection )
+    {
+        this.importConnection = connection;
+    }
+
+    /**
+     * Sets the DSML Filename
+     * @param dsmlFilename
+     *          The DSML Filename
+     */
+    public void setDsmlFilename( String dsmlFilename )
+    {
+        this.dsmlFilename = dsmlFilename;
+    }
+
+    /**
+     * Sets the Save Filename
+     * @param saveFilename
+     *          The Save Filename
+     */
+    public void setResponseFilename( String saveFilename )
+    {
+        this.responseFilename = saveFilename;
+    }
+
+    /**
+     * Sets the SaveResponse flag
+     * @param b
+     *          The SaveResponse flag
+     */
+    public void setSaveResponse( boolean b )
+    {
+        this.saveResponse = b;
+    }
+}

Modified: directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java?view=diff&rev=490689&r1=490688&r2=490689
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java
Thu Dec 28 01:55:25 2006
@@ -114,8 +114,8 @@
         mainPage = new ImportLdifMainWizardPage( ImportLdifMainWizardPage.class.getName(),
this );
         addPage( mainPage );
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( getContainer().getShell(),
-            BrowserUIPlugin.PLUGIN_ID + "." + "tools_ldifimport_wizard" );
+//        PlatformUI.getWorkbench().getHelpSystem().setHelp( getContainer().getShell(),
+//            BrowserUIPlugin.PLUGIN_ID + "." + "tools_ldifimport_wizard" );
     }
 
 



Mime
View raw message