directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r664542 - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ rcp/ studio/ test-integration-core/ test-integration-ui/
Date Sun, 08 Jun 2008 19:33:45 GMT
Author: seelmann
Date: Sun Jun  8 12:33:44 2008
New Revision: 664542

URL: http://svn.apache.org/viewvc?rev=664542&view=rev
Log:
Merged testframework into trunk

Added:
    directory/studio/trunk/rcp/Studio-Runtime.launch
      - copied unchanged from r664537, directory/sandbox/seelmann/testingframework/rcp/Studio-Runtime.launch
    directory/studio/trunk/test-integration-core/
      - copied from r664541, directory/sandbox/seelmann/testingframework/test-integration-core/
    directory/studio/trunk/test-integration-ui/
      - copied from r664541, directory/sandbox/seelmann/testingframework/test-integration-ui/
Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
    directory/studio/trunk/studio/pom.xml

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java?rev=664542&r1=664541&r2=664542&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
Sun Jun  8 12:33:44 2008
@@ -85,10 +85,7 @@
             IEntry entry = ( IEntry ) obj;
 
             StringBuffer append = new StringBuffer();
-            if ( entry instanceof IRootDSE )
-            {
-                append.append( "Root DSE" );
-            }
+           
             if ( entry.isChildrenInitialized() && ( entry.getChildrenCount() >
0 ) || entry.getChildrenFilter() != null )
             {
                 append.append( " (" ).append( entry.getChildrenCount() );
@@ -103,21 +100,24 @@
                 append.append( ")" );
             }
 
-            if ( entry instanceof ReferralBaseEntry )
+            if ( entry instanceof IRootDSE )
             {
-                return entry.getUrl().toString() + " " + append.toString();
+                return "Root DSE" + append.toString();
+            }
+            else if ( entry instanceof ReferralBaseEntry )
+            {
+                return entry.getUrl().toString() + append.toString();
             }
             else if ( entry instanceof AliasBaseEntry )
             {
-                return entry.getDn().getUpName() + " " + append.toString();
+                return entry.getDn().getUpName() + append.toString();
             }
             else if ( entry instanceof BaseDNEntry )
             {
-                return entry.getDn().getUpName() + " " + append.toString();
+                return entry.getDn().getUpName() + append.toString();
             }
             else if ( entry.hasParententry() )
             {
-
                 String label = "";
                 if ( preferences.getEntryLabel() == BrowserCommonConstants.SHOW_DN )
                 {

Modified: directory/studio/trunk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio/pom.xml?rev=664542&r1=664541&r2=664542&view=diff
==============================================================================
--- directory/studio/trunk/studio/pom.xml (original)
+++ directory/studio/trunk/studio/pom.xml Sun Jun  8 12:33:44 2008
@@ -921,7 +921,7 @@
                   <groupId>org.apache.directory.studio</groupId>
                   <artifactId>apacheds.configuration.help</artifactId>
                 </artifactItem>
-
+                 
                 <!-- The eclipse plugins -->
                 <artifactItem>
                   <groupId>org.eclipse.update</groupId>



Mime
View raw message