directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1488161 - in /directory/studio/trunk/plugins: ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ ldapbrowser.ui/ ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/
Date Fri, 31 May 2013 11:16:30 GMT
Author: pamarcelot
Date: Fri May 31 11:16:30 2013
New Revision: 1488161

URL: http://svn.apache.org/r1488161
Log:
Fix for DIRSTUDIO-912 (No connection pre-selected when DIT, Searches or Bookmarks is selected
in the LDAP Brower view and the wizard is accessed via 'File' > 'Import' menu)

Modified:
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
    directory/studio/trunk/plugins/ldapbrowser.ui/plugin.xml
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java?rev=1488161&r1=1488160&r2=1488161&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
Fri May 31 11:16:30 2013
@@ -22,6 +22,7 @@ package org.apache.directory.studio.ldap
 
 
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.eclipse.core.runtime.IAdaptable;
 
 
 /**
@@ -31,7 +32,7 @@ import org.apache.directory.studio.ldapb
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class BrowserCategory
+public class BrowserCategory implements IAdaptable
 {
 
     /** The Constant TYPE_DIT identifies DIT categories. */
@@ -117,4 +118,12 @@ public class BrowserCategory
         }
     }
 
+
+    /**
+     * {@inheritDoc}
+     */
+    public Object getAdapter( Class adapter )
+    {
+        return null;
+    }
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/plugin.xml?rev=1488161&r1=1488160&r2=1488161&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/plugin.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/plugin.xml Fri May 31 11:16:30 2013
@@ -177,6 +177,7 @@
        </description>
        <selection class="org.apache.directory.studio.connection.core.Connection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory"/>
     </wizard>
     <wizard
           category="%ImportWizards_Category_id"
@@ -189,6 +190,7 @@
        </description>
        <selection class="org.apache.directory.studio.connection.core.Connection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory"/>
     </wizard>
  </extension>
  <extension
@@ -207,6 +209,7 @@
        </description>
        <selection class="org.apache.directory.studio.connection.core.Connection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory"/>
     </wizard>
     <wizard
           category="%ExportWizards_Category_id"
@@ -219,6 +222,7 @@
        </description>
        <selection class="org.apache.directory.studio.connection.core.Connection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory"/>
     </wizard>
     <wizard
           category="%ExportWizards_Category_id"
@@ -231,6 +235,7 @@
        </description>
        <selection class="org.apache.directory.studio.connection.core.Connection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory"/>
     </wizard>
     <wizard
           category="%ExportWizards_Category_id"
@@ -243,6 +248,7 @@
        </description>
        <selection class="org.apache.directory.studio.connection.core.Connection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory"/>
     </wizard>
     <wizard
           category="%ExportWizards_Category_id"
@@ -255,6 +261,7 @@
        </description>
        <selection class="org.apache.directory.studio.connection.core.Connection"/>
        <selection class="org.apache.directory.studio.ldapbrowser.core.model.IEntry"/>
+       <selection class="org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory"/>
     </wizard>
  </extension>
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java?rev=1488161&r1=1488160&r2=1488161&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java
Fri May 31 11:16:30 2013
@@ -24,6 +24,7 @@ package org.apache.directory.studio.ldap
 import java.io.File;
 
 import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
 import org.apache.directory.studio.ldapbrowser.core.jobs.ImportDsmlRunnable;
 import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
@@ -159,6 +160,10 @@ public class ImportDsmlWizard extends Wi
             importConnection = BrowserCorePlugin.getDefault().getConnectionManager()
                 .getBrowserConnection( ( Connection ) o );
         }
+        else if ( o instanceof BrowserCategory )
+        {
+            importConnection = ( ( BrowserCategory ) o ).getParent();
+        }
         else
         {
             importConnection = null;

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java?rev=1488161&r1=1488160&r2=1488161&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java
Fri May 31 11:16:30 2013
@@ -24,6 +24,7 @@ package org.apache.directory.studio.ldap
 import java.io.File;
 
 import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
 import org.apache.directory.studio.ldapbrowser.core.jobs.ImportLdifRunnable;
 import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
@@ -140,6 +141,10 @@ public class ImportLdifWizard extends Wi
             importConnection = BrowserCorePlugin.getDefault().getConnectionManager()
                 .getBrowserConnection( ( Connection ) o );
         }
+        else if ( o instanceof BrowserCategory )
+        {
+            importConnection = ( ( BrowserCategory ) o ).getParent();
+        }
         else
         {
             importConnection = null;



Mime
View raw message