directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1005183 - in /directory/studio/branches/shared-trunk-merge/plugins/ldifeditor: ./ src/main/java/org/apache/directory/studio/ldifeditor/dialogs/ src/main/java/org/apache/directory/studio/ldifeditor/editor/ src/main/java/org/apache/directory...
Date Wed, 06 Oct 2010 17:40:13 GMT
Author: pamarcelot
Date: Wed Oct  6 17:40:13 2010
New Revision: 1005183

URL: http://svn.apache.org/viewvc?rev=1005183&view=rev
Log:
Fixed 'ldideditor' module.

Modified:
    directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/pom.xml
    directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java
    directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
    directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
    directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/pom.xml?rev=1005183&r1=1005182&r2=1005183&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/pom.xml Wed Oct  6 17:40:13
2010
@@ -114,7 +114,7 @@
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.ldifeditor.LdifEditorActivator</Bundle-Activator>
             <Require-Bundle>
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java?rev=1005183&r1=1005182&r2=1005183&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java
Wed Oct  6 17:40:13 2010
@@ -21,8 +21,7 @@
 package org.apache.directory.studio.ldifeditor.dialogs;
 
 
-import javax.naming.InvalidNameException;
-
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
 import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidget;
@@ -118,7 +117,7 @@ public class LdifEntryEditorDialog exten
                     this.browserConnection );
             }
         }
-        catch ( InvalidNameException e )
+        catch ( LdapInvalidDnException e )
         {
             entry = null;
         }

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java?rev=1005183&r1=1005182&r2=1005183&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
Wed Oct  6 17:40:13 2010
@@ -26,9 +26,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.naming.InvalidNameException;
-
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
 import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserLabelProvider;
@@ -457,9 +456,9 @@ public class LdifOutlinePage extends Con
                             try
                             {
                                 return BrowserLabelProvider.getImageByObjectClass( ldifEditor.getConnection()
-                                    .getEntryFromCache( new LdapDN( dn ) ) );
+                                    .getEntryFromCache( new DN( dn ) ) );
                             }
-                            catch ( InvalidNameException e )
+                            catch ( LdapInvalidDnException e )
                             {
                                 // Will never occur
                             }

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java?rev=1005183&r1=1005182&r2=1005183&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
Wed Oct  6 17:40:13 2010
@@ -21,9 +21,8 @@
 package org.apache.directory.studio.ldifeditor.editor.actions;
 
 
-import javax.naming.InvalidNameException;
-
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute;
 import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyConnection;
@@ -154,13 +153,13 @@ public abstract class AbstractOpenValueE
             try
             {
                 // some value editors need the real DN (e.g. the password editor)
-                DummyEntry dummyEntry = new DummyEntry( LdapDN.isValid( dn ) ? new LdapDN(
dn ) : new LdapDN(),
+                DummyEntry dummyEntry = new DummyEntry( DN.isValid( dn ) ? new DN( dn ) :
new DN(),
                     connection );
                 Attribute dummyAttribute = new Attribute( dummyEntry, description );
                 Value dummyValue = new Value( dummyAttribute, value );
                 rawValue = valueEditor.getRawValue( dummyValue );
             }
-            catch ( InvalidNameException e )
+            catch ( LdapInvalidDnException e )
             {
                 // should not occur, as we check with isValid()
             }

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java?rev=1005183&r1=1005182&r2=1005183&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
Wed Oct  6 17:40:13 2010
@@ -23,7 +23,8 @@ package org.apache.directory.studio.ldif
 
 import javax.naming.InvalidNameException;
 
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
 import org.apache.directory.studio.ldapbrowser.common.wizards.AttributeWizard;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -121,7 +122,7 @@ public class EditLdifAttributeAction ext
                 }
                 else if ( containers[0] instanceof LdifChangeModifyRecord )
                 {
-                    dummyEntry = new DummyEntry( new LdapDN(), dummyConnection );
+                    dummyEntry = new DummyEntry( new DN(), dummyConnection );
                 }
 
                 AttributeWizard wizard = new AttributeWizard( Messages
@@ -185,7 +186,7 @@ public class EditLdifAttributeAction ext
                         }
                         else
                         { // LdifContentRecord ||
-                            // LdifChangeAddRecord
+                          // LdifChangeAddRecord
                             LdifAttrValLine newLine = LdifAttrValLine.create( newAttributeDescription,
oldValue );
                             try
                             {
@@ -202,7 +203,7 @@ public class EditLdifAttributeAction ext
                     // ...
                 }
             }
-            catch ( InvalidNameException e )
+            catch ( LdapInvalidDnException e )
             {
             }
         }



Mime
View raw message