You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/07/29 00:57:40 UTC
svn commit: r798725 - in /directory/studio/trunk:
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-core/src/mai...
Author: seelmann
Date: Tue Jul 28 22:57:40 2009
New Revision: 798725
URL: http://svn.apache.org/viewvc?rev=798725&view=rev
Log:
Changes in shared API
Modified:
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java?rev=798725&r1=798724&r2=798725&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java Tue Jul 28 22:57:40 2009
@@ -175,7 +175,7 @@
AttributeTypeAndValue atav = atavIterator.next();
addRdnLine( rdnComposite, i );
rdnLineList.get( i ).rdnTypeCombo.setText( atav.getUpType() );
- rdnLineList.get( i ).rdnValueText.setText( ( String ) atav.getNormValue() );
+ rdnLineList.get( i ).rdnValueText.setText( atav.getNormValue().getString() );
if ( i == 0 )
{
if ( "".equals( rdnLineList.get( i ).rdnTypeCombo ) ) //$NON-NLS-1$
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=798725&r1=798724&r2=798725&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java Tue Jul 28 22:57:40 2009
@@ -231,7 +231,7 @@
IValue[] values = attribute.getValues();
for ( int v = 0; v < values.length; v++ )
{
- if ( values[v].getStringValue().equals( atav.getNormValue() ) )
+ if ( values[v].getStringValue().equals( atav.getNormValue().getString() ) )
{
attribute.deleteValue( values[v] );
}
@@ -281,7 +281,7 @@
rdnAttribute = new Attribute( newEntry, atav.getUpType() );
newEntry.addAttribute( rdnAttribute );
}
- Object rdnValue = atav.getNormValue();
+ Object rdnValue = atav.getNormValue().getString();
String[] stringValues = rdnAttribute.getStringValues();
if ( !Arrays.asList( stringValues ).contains( rdnValue ) )
{
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java?rev=798725&r1=798724&r2=798725&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java Tue Jul 28 22:57:40 2009
@@ -415,7 +415,7 @@
Attribute attribute = attributes.get( atav.getUpType() );
if ( attribute != null )
{
- attribute.remove( atav.getNormValue() );
+ attribute.remove( atav.getNormValue().getString() );
if ( attribute.size() == 0 )
{
attributes.remove( atav.getUpType() );
@@ -433,9 +433,9 @@
attribute = new BasicAttribute( atav.getUpType() );
attributes.put( attribute );
}
- if ( !attribute.contains( atav.getNormValue() ) )
+ if ( !attribute.contains( atav.getNormValue().getString() ) )
{
- attribute.add( atav.getNormValue() );
+ attribute.add( atav.getNormValue().getString() );
}
}
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java?rev=798725&r1=798724&r2=798725&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java Tue Jul 28 22:57:40 2009
@@ -311,7 +311,7 @@
{
AttributeTypeAndValue atav = atavIterator.next();
if ( getAttribute().getDescription().equals( atav.getUpType() )
- && getStringValue().equals( atav.getNormValue() ) )
+ && getStringValue().equals( atav.getNormValue().getString() ) )
{
return true;
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java?rev=798725&r1=798724&r2=798725&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java Tue Jul 28 22:57:40 2009
@@ -156,7 +156,7 @@
{
String oid = schema != null ? schema.getAttributeTypeDescription( atav.getNormType() ).getNumericOid() : atav
.getNormType();
- return oid.trim().toLowerCase() + "=" + ( ( String ) atav.getUpValue() ).trim().toLowerCase(); //$NON-NLS-1$
+ return oid.trim().toLowerCase() + "=" + atav.getUpValue().getString().trim().toLowerCase(); //$NON-NLS-1$
}