svn commit: r1291738 - in /directory/studio/trunk/plugins: ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/ ldapbrowser.cor...

[pa...@apache.org]

Author: pamarcelot
Date: Tue Feb 21 12:27:41 2012
New Revision: 1291738

URL: http://svn.apache.org/viewvc?rev=1291738&view=rev
Log:
Fixed compilation issues.
Ava.getUpType() => Ava.getType()
Ava.getUpValue() => Ava.getValue()

Modified:
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java?rev=1291738&r1=1291737&r2=1291738&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java Tue Feb 21 12:27:41 2012
@@ -217,7 +217,7 @@ public class DnBuilderWidget extends Bro
 
                     removeRdnLineListeners( i );
 
-                    rdnLineList.get( i ).rdnTypeCombo.setText( ava.getUpType() );
+                    rdnLineList.get( i ).rdnTypeCombo.setText( ava.getType() );
                     rdnLineList.get( i ).rdnValueText.setText( ava.getNormValue().getString() );
 
                     addRdnLineListeners( i );

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=1291738&r1=1291737&r2=1291738&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java Tue Feb 21 12:27:41 2012
@@ -229,7 +229,7 @@ public class NewEntryDnWizardPage extend
                 while ( atavIterator.hasNext() )
                 {
                     Ava atav = atavIterator.next();
-                    IAttribute attribute = newEntry.getAttribute( atav.getUpType() );
+                    IAttribute attribute = newEntry.getAttribute( atav.getType() );
                     if ( attribute != null )
                     {
                         IValue[] values = attribute.getValues();
@@ -288,10 +288,10 @@ public class NewEntryDnWizardPage extend
                 while ( atavIterator.hasNext() )
                 {
                     Ava atav = atavIterator.next();
-                    IAttribute rdnAttribute = newEntry.getAttribute( atav.getUpType() );
+                    IAttribute rdnAttribute = newEntry.getAttribute( atav.getType() );
                     if ( rdnAttribute == null )
                     {
-                        rdnAttribute = new Attribute( newEntry, atav.getUpType() );
+                        rdnAttribute = new Attribute( newEntry, atav.getType() );
                         newEntry.addAttribute( rdnAttribute );
                     }
                     Object rdnValue = atav.getNormValue().getString();

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java?rev=1291738&r1=1291737&r2=1291738&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java Tue Feb 21 12:27:41 2012
@@ -442,13 +442,13 @@ public class CopyEntriesRunnable impleme
         for ( Iterator<Ava> it = oldRdn.iterator(); it.hasNext(); )
         {
             Ava atav = it.next();
-            Attribute attribute = attributes.get( atav.getUpType() );
+            Attribute attribute = attributes.get( atav.getType() );
             if ( attribute != null )
             {
                 attribute.remove( atav.getNormValue().getString() );
                 if ( attribute.size() == 0 )
                 {
-                    attributes.remove( atav.getUpType() );
+                    attributes.remove( atav.getType() );
                 }
             }
         }
@@ -457,10 +457,10 @@ public class CopyEntriesRunnable impleme
         for ( Iterator<Ava> it = newRdn.iterator(); it.hasNext(); )
         {
             Ava atav = it.next();
-            Attribute attribute = attributes.get( atav.getUpType() );
+            Attribute attribute = attributes.get( atav.getType() );
             if ( attribute == null )
             {
-                attribute = new BasicAttribute( atav.getUpType() );
+                attribute = new BasicAttribute( atav.getType() );
                 attributes.put( attribute );
             }
             if ( !attribute.contains( atav.getNormValue().getString() ) )

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java?rev=1291738&r1=1291737&r2=1291738&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java Tue Feb 21 12:27:41 2012
@@ -129,7 +129,7 @@ public class Utils
     {
         String oid = schema != null ? schema.getAttributeTypeDescription( ava.getNormType() ).getOid() : ava
             .getNormType();
-        return Strings.toLowerCase( Strings.trim( oid ) ) + "=" + Strings.toLowerCase( Strings.trim( ava.getUpValue().getString() ) ); //$NON-NLS-1$
+        return Strings.toLowerCase( Strings.trim( oid ) ) + "=" + Strings.toLowerCase( Strings.trim( ava.getValue().getString() ) ); //$NON-NLS-1$
     }