You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2012/01/06 18:14:17 UTC
svn commit: r1228284 - in /directory/studio/trunk/plugins/ldifparser/src:
main/java/org/apache/directory/studio/ldifparser/
main/java/org/apache/directory/studio/ldifparser/model/
main/java/org/apache/directory/studio/ldifparser/model/container/ main/j...
Author: pamarcelot
Date: Fri Jan 6 17:14:15 2012
New Revision: 1228284
URL: http://svn.apache.org/viewvc?rev=1228284&view=rev
Log:
Marked strings as non-externalized.
Modified:
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java
directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java
directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java
directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java Fri Jan 6 17:14:15 2012
@@ -47,7 +47,7 @@ public class LdifUtils
{
try
{
- return s.getBytes( "UTF-8" );
+ return s.getBytes( "UTF-8" ); //$NON-NLS-1$
}
catch ( UnsupportedEncodingException e )
{
@@ -67,7 +67,7 @@ public class LdifUtils
{
try
{
- return URLEncoder.encode( s, "UTF-8" );
+ return URLEncoder.encode( s, "UTF-8" ); //$NON-NLS-1$
}
catch ( UnsupportedEncodingException e )
{
@@ -130,7 +130,7 @@ public class LdifUtils
{
try
{
- return new String( b, "UTF-8" );
+ return new String( b, "UTF-8" ); //$NON-NLS-1$
}
catch ( UnsupportedEncodingException e )
{
@@ -181,11 +181,11 @@ public class LdifUtils
return false;
}
- if ( value.startsWith( " " ) || value.startsWith( ":" ) || value.startsWith( "<" ) )
+ if ( value.startsWith( " " ) || value.startsWith( ":" ) || value.startsWith( "<" ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
{
return true;
}
- if ( value.endsWith( " " ) )
+ if ( value.endsWith( " " ) ) //$NON-NLS-1$
{
return true;
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java Fri Jan 6 17:14:15 2012
@@ -57,22 +57,22 @@ public final class LdifEOFPart implement
public final String toRawString()
{
- return "";
+ return ""; //$NON-NLS-1$
}
public final String toFormattedString( LdifFormatParameters formatParameters )
{
- return "";
+ return ""; //$NON-NLS-1$
}
public final String toString()
{
String text = toRawString();
- text = text.replaceAll( "\n", "\\\\n" );
- text = text.replaceAll( "\r", "\\\\r" );
- return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'";
+ text = text.replaceAll( "\n", "\\\\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ text = text.replaceAll( "\r", "\\\\r" ); //$NON-NLS-1$ //$NON-NLS-2$
+ return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
@@ -84,7 +84,7 @@ public final class LdifEOFPart implement
public final String getInvalidString()
{
- return "";
+ return ""; //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java Fri Jan 6 17:14:15 2012
@@ -73,9 +73,9 @@ public final class LdifInvalidPart imple
public final String toString()
{
String text = toRawString();
- text = text.replaceAll( "\n", "\\\\n" );
- text = text.replaceAll( "\r", "\\\\r" );
- return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'";
+ text = text.replaceAll( "\n", "\\\\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ text = text.replaceAll( "\r", "\\\\r" ); //$NON-NLS-1$ //$NON-NLS-2$
+ return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java Fri Jan 6 17:14:15 2012
@@ -50,7 +50,7 @@ public class LdifChangeAddRecord extends
public void addAttrVal( LdifAttrValLine attrVal )
{
if ( attrVal == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( attrVal );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java Fri Jan 6 17:14:15 2012
@@ -50,7 +50,7 @@ public class LdifChangeModDnRecord exten
public void setNewrdn( LdifNewrdnLine newrdn )
{
if ( newrdn == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( newrdn );
}
@@ -58,7 +58,7 @@ public class LdifChangeModDnRecord exten
public void setDeloldrdn( LdifDeloldrdnLine deloldrdn )
{
if ( deloldrdn == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( deloldrdn );
}
@@ -66,7 +66,7 @@ public class LdifChangeModDnRecord exten
public void setNewsuperior( LdifNewsuperiorLine newsuperior )
{
if ( newsuperior == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( newsuperior );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java Fri Jan 6 17:14:15 2012
@@ -49,7 +49,7 @@ public class LdifChangeModifyRecord exte
public void addModSpec( LdifModSpec modSpec )
{
if ( modSpec == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( modSpec );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java Fri Jan 6 17:14:15 2012
@@ -50,7 +50,7 @@ public class LdifChangeRecord extends Ld
public void addControl( LdifControlLine controlLine )
{
if ( controlLine == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( controlLine );
}
@@ -58,7 +58,7 @@ public class LdifChangeRecord extends Ld
public void setChangeType( LdifChangeTypeLine changeTypeLine )
{
if ( changeTypeLine == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
if ( getChangeTypeLine() != null )
throw new IllegalArgumentException( "changetype is already set" );
this.parts.add( changeTypeLine );
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java Fri Jan 6 17:14:15 2012
@@ -44,7 +44,7 @@ public class LdifCommentContainer extend
public void addComment( LdifCommentLine comment )
{
if ( comment == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( comment );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java Fri Jan 6 17:14:15 2012
@@ -48,7 +48,7 @@ public abstract class LdifContainer impl
{
this.parts = new ArrayList( 1 );
if ( part == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( part );
}
@@ -69,7 +69,7 @@ public abstract class LdifContainer impl
public final void addInvalid( LdifInvalidPart invalid )
{
if ( invalid == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( invalid );
}
@@ -92,13 +92,13 @@ public abstract class LdifContainer impl
StringBuffer sb = new StringBuffer();
sb.append( getClass().getName() );
- sb.append( ":" );
+ sb.append( ":" ); //$NON-NLS-1$
sb.append( LdifParserConstants.LINE_SEPARATOR );
LdifPart[] parts = this.getParts();
for ( int i = 0; i < parts.length; i++ )
{
- sb.append( " " );
+ sb.append( " " ); //$NON-NLS-1$
sb.append( parts[i].toString() );
sb.append( LdifParserConstants.LINE_SEPARATOR );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java Fri Jan 6 17:14:15 2012
@@ -49,7 +49,7 @@ public class LdifContentRecord extends L
public void addAttrVal( LdifAttrValLine attrVal )
{
if ( attrVal == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( attrVal );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java Fri Jan 6 17:14:15 2012
@@ -51,7 +51,7 @@ public class LdifModSpec extends LdifCon
public void addAttrVal( LdifAttrValLine attrVal )
{
if ( attrVal == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( attrVal );
}
@@ -59,7 +59,7 @@ public class LdifModSpec extends LdifCon
public void finish( LdifModSpecSepLine modSpecSepLine )
{
if ( modSpecSepLine == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( modSpecSepLine );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java Fri Jan 6 17:14:15 2012
@@ -47,7 +47,7 @@ public abstract class LdifRecord extends
public void addComment( LdifCommentLine comment )
{
if ( comment == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( comment );
}
@@ -55,7 +55,7 @@ public abstract class LdifRecord extends
public void finish( LdifSepLine sep )
{
if ( sep == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( sep );
}
@@ -63,7 +63,7 @@ public abstract class LdifRecord extends
public void finish( LdifEOFPart eof )
{
if ( eof == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( eof );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java Fri Jan 6 17:14:15 2012
@@ -44,7 +44,7 @@ public class LdifSepContainer extends Ld
public void addSep( LdifSepLine sep )
{
if ( sep == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( sep );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java Fri Jan 6 17:14:15 2012
@@ -83,14 +83,14 @@ public class LdifAttrValLine extends Ldi
}
else
{
- return new LdifAttrValLine( 0, name, ":", value, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifAttrValLine( 0, name, ":", value, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$
}
}
public static LdifAttrValLine create( String name, byte[] value )
{
- return new LdifAttrValLine( 0, name, "::", LdifUtils.base64encode( value ), LdifParserConstants.LINE_SEPARATOR );
+ return new LdifAttrValLine( 0, name, "::", LdifUtils.base64encode( value ), LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java Fri Jan 6 17:14:15 2012
@@ -74,25 +74,25 @@ public class LdifChangeTypeLine extends
public boolean isAdd()
{
- return this.getUnfoldedChangeType().equals( "add" );
+ return this.getUnfoldedChangeType().equals( "add" ); //$NON-NLS-1$
}
public boolean isDelete()
{
- return this.getUnfoldedChangeType().equals( "delete" );
+ return this.getUnfoldedChangeType().equals( "delete" ); //$NON-NLS-1$
}
public boolean isModify()
{
- return this.getUnfoldedChangeType().equals( "modify" );
+ return this.getUnfoldedChangeType().equals( "modify" ); //$NON-NLS-1$
}
public boolean isModDn()
{
- return this.getUnfoldedChangeType().equals( "moddn" ) || this.getUnfoldedChangeType().equals( "modrdn" );
+ return this.getUnfoldedChangeType().equals( "moddn" ) || this.getUnfoldedChangeType().equals( "modrdn" ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -121,31 +121,31 @@ public class LdifChangeTypeLine extends
public static LdifChangeTypeLine createDelete()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "delete", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "delete", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createAdd()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "add", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "add", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createModify()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "modify", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "modify", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createModDn()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "moddn", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "moddn", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createModRdn()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "modrdn", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "modrdn", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java Fri Jan 6 17:14:15 2012
@@ -102,7 +102,7 @@ public class LdifControlLine extends Ldi
public boolean isCritical()
{
- return this.getUnfoldedCriticality().endsWith( "true" );
+ return this.getUnfoldedCriticality().endsWith( "true" ); //$NON-NLS-1$
}
@@ -142,8 +142,8 @@ public class LdifControlLine extends Ldi
return this.getUnfoldedControlSpec().length() > 0
&& this.getUnfoldedControlType().length() > 0
&& this.getUnfoldedOid().length() > 0
- && ( this.rawCriticality == null || this.getUnfoldedCriticality().endsWith( "true" ) || this
- .getUnfoldedCriticality().endsWith( "false" ) )
+ && ( this.rawCriticality == null || this.getUnfoldedCriticality().endsWith( "true" ) || this //$NON-NLS-1$
+ .getUnfoldedCriticality().endsWith( "false" ) ) //$NON-NLS-1$
&& ( ( this.rawControlValueType == null && this.rawControlValue == null ) || ( this.rawControlValueType != null && this.rawControlValue != null ) )
&& this.getUnfoldedNewLine().length() > 0;
}
@@ -159,8 +159,8 @@ public class LdifControlLine extends Ldi
{
return "Missing OID";
}
- else if ( ( this.rawCriticality != null && !this.getUnfoldedCriticality().endsWith( "true" ) && !this
- .getUnfoldedCriticality().endsWith( "false" ) ) )
+ else if ( ( this.rawCriticality != null && !this.getUnfoldedCriticality().endsWith( "true" ) && !this //$NON-NLS-1$
+ .getUnfoldedCriticality().endsWith( "false" ) ) ) //$NON-NLS-1$
{
return "Invalid criticality, must be 'true' or 'false'";
}
@@ -212,13 +212,13 @@ public class LdifControlLine extends Ldi
public boolean isControlValueTypeBase64()
{
- return this.getUnfoldedControlValueType().startsWith( "::" );
+ return this.getUnfoldedControlValueType().startsWith( "::" ); //$NON-NLS-1$
}
public boolean isControlValueTypeSafe()
{
- return this.getUnfoldedControlValueType().startsWith( ":" ) && !this.isControlValueTypeBase64();
+ return this.getUnfoldedControlValueType().startsWith( ":" ) && !this.isControlValueTypeBase64(); //$NON-NLS-1$
}
@@ -230,8 +230,8 @@ public class LdifControlLine extends Ldi
}
else
{
- LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality,
- controlValue != null ? ":" : null, controlValue != null ? controlValue : null,
+ LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality, //$NON-NLS-1$ //$NON-NLS-2$
+ controlValue != null ? ":" : null, controlValue != null ? controlValue : null, //$NON-NLS-1$
LdifParserConstants.LINE_SEPARATOR );
return controlLine;
}
@@ -240,8 +240,8 @@ public class LdifControlLine extends Ldi
public static LdifControlLine create( String oid, String criticality, byte[] controlValue )
{
- LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality, controlValue != null
- && controlValue.length > 0 ? "::" : null, controlValue != null && controlValue.length > 0 ? LdifUtils
+ LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality, controlValue != null //$NON-NLS-1$ //$NON-NLS-2$
+ && controlValue.length > 0 ? "::" : null, controlValue != null && controlValue.length > 0 ? LdifUtils //$NON-NLS-1$
.base64encode( controlValue ) : null, LdifParserConstants.LINE_SEPARATOR );
return controlLine;
}
@@ -249,13 +249,13 @@ public class LdifControlLine extends Ldi
public static LdifControlLine create( String oid, boolean isCritical, String controlValue )
{
- return create( oid, isCritical ? " true" : " false", controlValue );
+ return create( oid, isCritical ? " true" : " false", controlValue ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static LdifControlLine create( String oid, boolean isCritical, byte[] controlValue )
{
- return create( oid, isCritical ? " true" : " false", controlValue );
+ return create( oid, isCritical ? " true" : " false", controlValue ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java Fri Jan 6 17:14:15 2012
@@ -68,7 +68,7 @@ public class LdifDeloldrdnLine extends L
public boolean isDeleteOldRdn()
{
- return "1".equals( this.getUnfoldedDeleteOldrdn() );
+ return "1".equals( this.getUnfoldedDeleteOldrdn() ); //$NON-NLS-1$
}
@@ -83,7 +83,7 @@ public class LdifDeloldrdnLine extends L
if ( !super.isValid() )
return false;
- return ( "0".equals( getUnfoldedDeleteOldrdn() ) || "1".equals( getUnfoldedDeleteOldrdn() ) );
+ return ( "0".equals( getUnfoldedDeleteOldrdn() ) || "1".equals( getUnfoldedDeleteOldrdn() ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -93,7 +93,7 @@ public class LdifDeloldrdnLine extends L
{
return "Missing delete old Rdn spec 'deleteoldrdn'";
}
- else if ( !"0".equals( getUnfoldedDeleteOldrdn() ) && !"1".equals( getUnfoldedDeleteOldrdn() ) )
+ else if ( !"0".equals( getUnfoldedDeleteOldrdn() ) && !"1".equals( getUnfoldedDeleteOldrdn() ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
return "Invalid value of delete old Rdn, must be '0' or '1'";
}
@@ -106,13 +106,13 @@ public class LdifDeloldrdnLine extends L
public static LdifDeloldrdnLine create0()
{
- return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "0", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "0", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifDeloldrdnLine create1()
{
- return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "1", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "1", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java Fri Jan 6 17:14:15 2012
@@ -104,12 +104,12 @@ public class LdifDnLine extends LdifValu
{
if ( LdifUtils.mustEncode( dn ) )
{
- return new LdifDnLine( 0, "dn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( dn ) ),
+ return new LdifDnLine( 0, "dn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( dn ) ), //$NON-NLS-1$ //$NON-NLS-2$
LdifParserConstants.LINE_SEPARATOR );
}
else
{
- return new LdifDnLine( 0, "dn", ":", dn, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifDnLine( 0, "dn", ":", dn, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java Fri Jan 6 17:14:15 2012
@@ -128,24 +128,24 @@ public abstract class LdifLineBase imple
public final String toString()
{
String text = toRawString();
- text = text.replaceAll( "\n", "\\\\n" );
- text = text.replaceAll( "\r", "\\\\r" );
- return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'";
+ text = text.replaceAll( "\n", "\\\\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ text = text.replaceAll( "\r", "\\\\r" ); //$NON-NLS-1$ //$NON-NLS-2$
+ return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
protected static String getNonNull( String s )
{
- return s != null ? s : "";
+ return s != null ? s : ""; //$NON-NLS-1$
}
protected static String unfold( String s )
{
- s = s.replaceAll( "\n\r ", "" );
- s = s.replaceAll( "\r\n ", "" );
- s = s.replaceAll( "\n ", "" );
- s = s.replaceAll( "\r ", "" );
+ s = s.replaceAll( "\n\r ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+ s = s.replaceAll( "\r\n ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+ s = s.replaceAll( "\n ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+ s = s.replaceAll( "\r ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
return s;
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java Fri Jan 6 17:14:15 2012
@@ -61,13 +61,13 @@ public class LdifModSpecSepLine extends
public boolean isValid()
{
- return super.isValid() && this.getUnfoldedMinus().equals( "-" );
+ return super.isValid() && this.getUnfoldedMinus().equals( "-" ); //$NON-NLS-1$
}
public String getInvalidString()
{
- if ( !this.getUnfoldedMinus().equals( "-" ) )
+ if ( !this.getUnfoldedMinus().equals( "-" ) ) //$NON-NLS-1$
{
return "Missing '-'";
}
@@ -80,7 +80,7 @@ public class LdifModSpecSepLine extends
public static LdifModSpecSepLine create()
{
- return new LdifModSpecSepLine( 0, "-", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecSepLine( 0, "-", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java Fri Jan 6 17:14:15 2012
@@ -74,19 +74,19 @@ public class LdifModSpecTypeLine extends
public boolean isAdd()
{
- return this.getUnfoldedModType().equals( "add" );
+ return this.getUnfoldedModType().equals( "add" ); //$NON-NLS-1$
}
public boolean isReplace()
{
- return this.getUnfoldedModType().equals( "replace" );
+ return this.getUnfoldedModType().equals( "replace" ); //$NON-NLS-1$
}
public boolean isDelete()
{
- return this.getUnfoldedModType().equals( "delete" );
+ return this.getUnfoldedModType().equals( "delete" ); //$NON-NLS-1$
}
@@ -119,19 +119,19 @@ public class LdifModSpecTypeLine extends
public static LdifModSpecTypeLine createAdd( String attributeName )
{
- return new LdifModSpecTypeLine( 0, "add", ":", attributeName, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecTypeLine( 0, "add", ":", attributeName, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static LdifModSpecTypeLine createReplace( String attributeName )
{
- return new LdifModSpecTypeLine( 0, "replace", ":", attributeName, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecTypeLine( 0, "replace", ":", attributeName, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static LdifModSpecTypeLine createDelete( String attributeName )
{
- return new LdifModSpecTypeLine( 0, "delete", ":", attributeName, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecTypeLine( 0, "delete", ":", attributeName, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java Fri Jan 6 17:14:15 2012
@@ -99,12 +99,12 @@ public class LdifNewrdnLine extends Ldif
{
if ( LdifUtils.mustEncode( newrdn ) )
{
- return new LdifNewrdnLine( 0, "newrdn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( newrdn ) ),
+ return new LdifNewrdnLine( 0, "newrdn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( newrdn ) ), //$NON-NLS-1$ //$NON-NLS-2$
LdifParserConstants.LINE_SEPARATOR );
}
else
{
- return new LdifNewrdnLine( 0, "newrdn", ":", newrdn, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifNewrdnLine( 0, "newrdn", ":", newrdn, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java Fri Jan 6 17:14:15 2012
@@ -100,12 +100,12 @@ public class LdifNewsuperiorLine extends
{
if ( LdifUtils.mustEncode( newsuperior ) )
{
- return new LdifNewsuperiorLine( 0, "newsuperior", "::", LdifUtils.base64encode( LdifUtils
+ return new LdifNewsuperiorLine( 0, "newsuperior", "::", LdifUtils.base64encode( LdifUtils //$NON-NLS-1$ //$NON-NLS-2$
.utf8encode( newsuperior ) ), LdifParserConstants.LINE_SEPARATOR );
}
else
{
- return new LdifNewsuperiorLine( 0, "newsuperior", ":", newsuperior, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifNewsuperiorLine( 0, "newsuperior", ":", newsuperior, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java Fri Jan 6 17:14:15 2012
@@ -79,7 +79,7 @@ public abstract class LdifNonEmptyLineBa
public boolean isFolded()
{
String rawString = toRawString();
- return rawString.indexOf( "\n " ) > -1 || rawString.indexOf( "\r " ) > -1;
+ return rawString.indexOf( "\n " ) > -1 || rawString.indexOf( "\r " ) > -1; //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java Fri Jan 6 17:14:15 2012
@@ -91,21 +91,21 @@ public class LdifValueLineBase extends L
// Fix for DIRSTUDIO-285: We must take care that we only check
// the first colon in the line. If there is another :: or :<
// in the value we must not use that as separator.
- int firstColonIndex = unfolded.indexOf( ":" );
- int firstDoubleColonIndex = unfolded.indexOf( "::" );
- int firstColonLessIndex = unfolded.indexOf( ":<" );
+ int firstColonIndex = unfolded.indexOf( ":" ); //$NON-NLS-1$
+ int firstDoubleColonIndex = unfolded.indexOf( "::" ); //$NON-NLS-1$
+ int firstColonLessIndex = unfolded.indexOf( ":<" ); //$NON-NLS-1$
if ( firstDoubleColonIndex > -1 && firstDoubleColonIndex == firstColonIndex )
{
- unfolded = unfolded.replaceFirst( "::[ ]*", formatParameters.isSpaceAfterColon() ? ":: " : "::" );
+ unfolded = unfolded.replaceFirst( "::[ ]*", formatParameters.isSpaceAfterColon() ? ":: " : "::" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else if ( firstColonLessIndex > -1 && firstColonLessIndex == firstColonIndex )
{
- unfolded = unfolded.replaceFirst( ":<[ ]*", formatParameters.isSpaceAfterColon() ? ":< " : ":<" );
+ unfolded = unfolded.replaceFirst( ":<[ ]*", formatParameters.isSpaceAfterColon() ? ":< " : ":<" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else if ( firstColonIndex > -1 )
{
- unfolded = unfolded.replaceFirst( ":[ ]*", formatParameters.isSpaceAfterColon() ? ": " : ":" );
+ unfolded = unfolded.replaceFirst( ":[ ]*", formatParameters.isSpaceAfterColon() ? ": " : ":" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if ( rawNewLine != null )
@@ -162,7 +162,7 @@ public class LdifValueLineBase extends L
}
else
{
- return "";
+ return ""; //$NON-NLS-1$
}
}
@@ -237,19 +237,19 @@ public class LdifValueLineBase extends L
public boolean isValueTypeURL()
{
- return this.getUnfoldedValueType().startsWith( ":<" );
+ return this.getUnfoldedValueType().startsWith( ":<" ); //$NON-NLS-1$
}
public boolean isValueTypeBase64()
{
- return this.getUnfoldedValueType().startsWith( "::" );
+ return this.getUnfoldedValueType().startsWith( "::" ); //$NON-NLS-1$
}
public boolean isValueTypeSafe()
{
- return this.getUnfoldedValueType().startsWith( ":" ) && !this.isValueTypeBase64() && !this.isValueTypeURL();
+ return this.getUnfoldedValueType().startsWith( ":" ) && !this.isValueTypeBase64() && !this.isValueTypeURL(); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java Fri Jan 6 17:14:15 2012
@@ -96,7 +96,7 @@ public class LdifVersionLine extends Ldi
public static LdifVersionLine create()
{
- return new LdifVersionLine( 0, "version", ":", "1", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifVersionLine( 0, "version", ":", "1", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java Fri Jan 6 17:14:15 2012
@@ -637,7 +637,7 @@ public class LdifParser
modSpec.addAttrVal( line );
// clean line
- if ( "".equals( line.getRawNewLine() ) )
+ if ( "".equals( line.getRawNewLine() ) ) //$NON-NLS-1$
{
this.cleanupLine( record );
}
@@ -702,7 +702,7 @@ public class LdifParser
}
// clean line
- if ( "".equals( line.getRawNewLine() ) )
+ if ( "".equals( line.getRawNewLine() ) ) //$NON-NLS-1$
{
this.cleanupLine( record );
}
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java Fri Jan 6 17:14:15 2012
@@ -504,7 +504,7 @@ public class LdifScanner
private String getWordTillColon( String word )
{
- String wordWithColon = word + ":";
+ String wordWithColon = word + ":"; //$NON-NLS-1$
String line = getWord( wordWithColon );
if ( line != null )
{
@@ -567,7 +567,7 @@ public class LdifScanner
if ( line != null || sep != null )
{
if ( line == null )
- line = "";
+ line = ""; //$NON-NLS-1$
if ( sep != null )
line += sep.getValue();
@@ -609,7 +609,7 @@ public class LdifScanner
}
catch ( EOFException e )
{
- return new LdifToken( LdifToken.EOF, "", pos + 1 );
+ return new LdifToken( LdifToken.EOF, "", pos + 1 ); //$NON-NLS-1$
}
}
@@ -669,7 +669,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getFullLine( "#" );
+ String line = getFullLine( "#" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.COMMENT, line, pos - line.length() + 1 );
@@ -683,7 +683,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWordTillColon( "version" );
+ String line = getWordTillColon( "version" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.VERSION_SPEC, line, pos - line.length() + 1 );
@@ -697,7 +697,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWordTillColon( "dn" );
+ String line = getWordTillColon( "dn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.DN_SPEC, line, pos - line.length() + 1 );
@@ -711,7 +711,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWordTillColon( "control" );
+ String line = getWordTillColon( "control" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CONTROL_SPEC, line, pos - line.length() + 1 );
@@ -725,7 +725,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWordTillColon( "changetype" );
+ String line = getWordTillColon( "changetype" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_SPEC, line, pos - line.length() + 1 );
@@ -739,27 +739,27 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWord( "add" );
+ String line = getWord( "add" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_ADD, line, pos - line.length() + 1 );
}
- line = getWord( "modify" );
+ line = getWord( "modify" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_MODIFY, line, pos - line.length() + 1 );
}
- line = getWord( "delete" );
+ line = getWord( "delete" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_DELETE, line, pos - line.length() + 1 );
}
- line = getWord( "moddn" );
+ line = getWord( "moddn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_MODDN, line, pos - line.length() + 1 );
}
- line = getWord( "modrdn" );
+ line = getWord( "modrdn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_MODDN, line, pos - line.length() + 1 );
@@ -775,20 +775,20 @@ public class LdifScanner
StringBuffer sb = new StringBuffer();
- String s = getWord( " " );
+ String s = getWord( " " ); //$NON-NLS-1$
while ( s != null )
{
sb.append( s );
- s = getWord( " " );
+ s = getWord( " " ); //$NON-NLS-1$
}
- String t = getWord( "true" );
+ String t = getWord( "true" ); //$NON-NLS-1$
if ( t != null )
{
sb.append( t );
return new LdifToken( LdifToken.CONTROL_CRITICALITY_TRUE, sb.toString(), pos - sb.length() + 1 );
}
- String f = getWord( "false" );
+ String f = getWord( "false" ); //$NON-NLS-1$
if ( f != null )
{
sb.append( f );
@@ -950,17 +950,17 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWord( "add" );
+ String line = getWord( "add" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_ADD_SPEC, line, pos - line.length() + 1 );
}
- line = getWord( "replace" );
+ line = getWord( "replace" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_REPLACE_SPEC, line, pos - line.length() + 1 );
}
- line = getWord( "delete" );
+ line = getWord( "delete" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_DELETE_SPEC, line, pos - line.length() + 1 );
@@ -974,7 +974,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWord( "-" );
+ String line = getWord( "-" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_SEP, line, pos - line.length() + 1 );
@@ -1058,7 +1058,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWordTillColon( "newrdn" );
+ String line = getWordTillColon( "newrdn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODDN_NEWRDN_SPEC, line, pos - line.length() + 1 );
@@ -1072,7 +1072,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWordTillColon( "deleteoldrdn" );
+ String line = getWordTillColon( "deleteoldrdn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODDN_DELOLDRDN_SPEC, line, pos - line.length() + 1 );
@@ -1086,7 +1086,7 @@ public class LdifScanner
{
this.flushBuffer();
- String line = getWordTillColon( "newsuperior" );
+ String line = getWordTillColon( "newsuperior" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODDN_NEWSUPERIOR_SPEC, line, pos - line.length() + 1 );
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java Fri Jan 6 17:14:15 2012
@@ -139,8 +139,8 @@ public class LdifToken implements Compar
public String toString()
{
- return "(type=" + this.type + ") " + "(offset=" + this.offset + ") " + "(length=" + this.getLength() + ") '"
- + this.value + "'";
+ return "(type=" + this.type + ") " + "(offset=" + this.offset + ") " + "(length=" + this.getLength() + ") '" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+ + this.value + "'"; //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java Fri Jan 6 17:14:15 2012
@@ -31,48 +31,48 @@ public class LdifAttrValLineTest extends
public void testToFormattedStringSimple()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn: abc\n" );
+ assertEquals( formattedString, "cn: abc\n" ); //$NON-NLS-1$
}
public void testToFormattedStringLineWrap()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn",
- "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", //$NON-NLS-1$
+ "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
assertEquals( formattedString,
- "cn: abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvw\n xyzabcdefghijklmnopqrstuvwxy\n" );
+ "cn: abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvw\n xyzabcdefghijklmnopqrstuvwxy\n" ); //$NON-NLS-1$
}
public void testToFormattedStringNoSpaceAfterColon()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn:abc\n" );
+ assertEquals( formattedString, "cn:abc\n" ); //$NON-NLS-1$
}
public void testToFormattedStringBase64()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "\u00e4\u00f6\u00fc" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "\u00e4\u00f6\u00fc" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn:: w6TDtsO8\n" );
+ assertEquals( formattedString, "cn:: w6TDtsO8\n" ); //$NON-NLS-1$
}
public void testToFormattedString_DIRSERVER_285()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc::def:<ghi" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc::def:<ghi" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn: abc::def:<ghi\n" );
+ assertEquals( formattedString, "cn: abc::def:<ghi\n" ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java?rev=1228284&r1=1228283&r2=1228284&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java Fri Jan 6 17:14:15 2012
@@ -31,48 +31,48 @@ public class LdifDnLineTest extends Test
public void testToFormattedStringSimple()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\n" );
+ assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\n" ); //$NON-NLS-1$
}
public void testToFormattedStringNewline()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\r\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\r\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\r\n" );
+ assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\r\n" ); //$NON-NLS-1$
}
public void testToFormattedStringLineWrap()
{
LdifDnLine dnLine = LdifDnLine
- .create( "cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ .create( "cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn: cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org"
- + "\n ,dc=example,dc=com\n" );
+ assertEquals( formattedString, "dn: cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org" //$NON-NLS-1$
+ + "\n ,dc=example,dc=com\n" ); //$NON-NLS-1$
}
public void testToFormattedStringNoSpaceAfterColon()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn:cn=abc,ou=department,o=org,dc=example,dc=com\n" );
+ assertEquals( formattedString, "dn:cn=abc,ou=department,o=org,dc=example,dc=com\n" ); //$NON-NLS-1$
}
public void testToFormattedStringBase64()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=\u00e4\u00f6\u00fc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=\u00e4\u00f6\u00fc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn:: Y249w6TDtsO8LG91PWRlcGFydG1lbnQsbz1vcmcsZGM9ZXhhbXBsZSxkYz1jb20=\n" );
+ assertEquals( formattedString, "dn:: Y249w6TDtsO8LG91PWRlcGFydG1lbnQsbz1vcmcsZGM9ZXhhbXBsZSxkYz1jb20=\n" ); //$NON-NLS-1$
}
@@ -82,10 +82,10 @@ public class LdifDnLineTest extends Test
*/
public void testIsValid()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system" ); //$NON-NLS-1$
assertTrue( dnLine.isValid() );
- assertEquals( "Y249XCNcXFwrXCwgXCLDtsOpXCIsb3U9dXNlcnMsb3U9c3lzdGVt", dnLine.getUnfoldedDn() );
- assertEquals( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system", dnLine.getValueAsString() );
+ assertEquals( "Y249XCNcXFwrXCwgXCLDtsOpXCIsb3U9dXNlcnMsb3U9c3lzdGVt", dnLine.getUnfoldedDn() ); //$NON-NLS-1$
+ assertEquals( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system", dnLine.getValueAsString() ); //$NON-NLS-1$
}
}