Partial fix for issue 2296: fix minor bugs in XSL scripts.

matthew_swift

14.25.2010 bd52198a13392f495ac04abd8e9aad370d02376e

Partial fix for issue 2296: fix minor bugs in XSL scripts.

 opends/resource/admin/metaMO.xsl

@@ -164,11 +164,11 @@
      <xsl:value-of select="'  static {&#xa;'" />
      <xsl:if test="$this-is-advanced">
        <xsl:value-of
          select="concat('    INSTANCE.registerOption(ManagedObjectOption.ADVANCED);&#xa;')" />
          select="'    INSTANCE.registerOption(ManagedObjectOption.ADVANCED);&#xa;'" />
      </xsl:if>
      <xsl:if test="$this-is-hidden">
        <xsl:value-of
          select="concat('    INSTANCE.registerOption(ManagedObjectOption.HIDDEN);&#xa;')" />
          select="'    INSTANCE.registerOption(ManagedObjectOption.HIDDEN);&#xa;'" />
      </xsl:if>
      <xsl:value-of select="'  }&#xa;'" />
    </xsl:if>

 opends/resource/admin/property-types.xsl

@@ -22,10 +22,11 @@
  ! CDDL HEADER END
  !
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
  !      Copyright 2008-2010 Sun Microsystems, Inc.
  ! -->
<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:import href="java-utilities.xsl" />
  <!-- 
    
    
@@ -618,8 +619,13 @@
        <xsl:otherwise>
          <xsl:value-of select="'Collection&lt;'" />
          <xsl:call-template name="get-property-java-type" />
          <xsl:value-of select="'&gt; values)'" />
          <xsl:if test="@read-only='true'">
            <xsl:value-of
              select="' throws PropertyIsReadOnlyException'" />
          </xsl:if>
          <xsl:value-of
            select="concat('&gt; values) {&#xa;' ,
            select="concat(' {&#xa;' ,
                     '      impl.setPropertyValues(INSTANCE.get',
                     $java-prop-name ,
                     'PropertyDefinition(), values);&#xa;',

 opends/resource/admin/property-types/aggregation.xsl

@@ -22,10 +22,11 @@
  ! CDDL HEADER END
  !
  !
  !      Copyright 2008 Sun Microsystems, Inc.
  !      Copyright 2008-2010 Sun Microsystems, Inc.
  ! -->
<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:import href="../java-utilities.xsl" />
  <xsl:include href="../conditions.xsl" />
  <!-- 
    Templates for processing aggregation properties.
@@ -209,7 +210,7 @@
          <xsl:value-of
            select="concat('      String value = get', $java-property-name, '();&#xa;')" />
          <xsl:value-of
            select="concat('      if (value == null) return null;&#xa;')" />
            select="'      if (value == null) return null;&#xa;'" />
          <xsl:value-of
            select="concat('      return INSTANCE.get', $java-property-name, 'PropertyDefinition().getChildDN(value);&#xa;')" />
          <xsl:value-of select="'    }&#xa;'" />