Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4

14 files changed, 75 insertions, 71 deletions

diff --git a/libjava/classpath/gnu/CORBA/DynAn/abstractDynAny.java b/libjava/classpath/gnu/CORBA/DynAn/AbstractAny.java
index 47176c4b589..7060f86b27f 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/abstractDynAny.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/AbstractAny.java
@@ -1,4 +1,4 @@
-/* abstractDynAny.java --
+/* AbstractAny.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.typeNamer;
+import gnu.CORBA.TypeKindNamer;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.LocalObject;
@@ -54,7 +54,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public abstract class abstractDynAny
+public abstract class AbstractAny
   extends LocalObject
   implements Serializable
 {
@@ -108,12 +108,12 @@ public abstract class abstractDynAny
   /**
    * The change value listener.
    */
-  valueChangedListener listener;
+  ValueChangeListener listener;
 
   /**
    * Create the abstract dyn any.
    */
-  public abstractDynAny(TypeCode oType, TypeCode aType,
+  public AbstractAny(TypeCode oType, TypeCode aType,
                         gnuDynAnyFactory aFactory, ORB anOrb
                        )
   {
@@ -163,8 +163,8 @@ public abstract class abstractDynAny
    */
   String typeMismatch(TypeCode expected, TypeCode actual)
   {
-    return typeNamer.nameIt(expected) + " expected " +
-           typeNamer.nameIt(actual);
+    return TypeKindNamer.nameIt(expected) + " expected " +
+           TypeKindNamer.nameIt(actual);
   }
 
   /**
diff --git a/libjava/classpath/gnu/CORBA/DynAn/anyDivideable.java b/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java
index 5f52c8078eb..c96cbedc73b 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/anyDivideable.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java
@@ -1,4 +1,4 @@
-/* anyDivideable.java --
+/* DivideableAny.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.typeNamer;
+import gnu.CORBA.TypeKindNamer;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.CompletionStatus;
@@ -58,8 +58,8 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public abstract class anyDivideable
-  extends abstractDynAny
+public abstract class DivideableAny
+  extends AbstractAny
   implements Serializable
 {
   /**
@@ -78,7 +78,7 @@ public abstract class anyDivideable
    */
   protected int pos = 0;
 
-  public anyDivideable(TypeCode oType, TypeCode aType,
+  public DivideableAny(TypeCode oType, TypeCode aType,
                        gnuDynAnyFactory aFactory, ORB anOrb
                       )
   {
@@ -486,9 +486,9 @@ public abstract class anyDivideable
       {
         if (!official_type.equal(other.type()))
           return false;
-        else if (other instanceof anyDivideable)
+        else if (other instanceof DivideableAny)
           {
-            anyDivideable x = (anyDivideable) other;
+            DivideableAny x = (DivideableAny) other;
             if (x.array.length != array.length)
               return false;
 
@@ -499,7 +499,7 @@ public abstract class anyDivideable
               }
             return true;
           }
-        else if (other == null || other instanceof abstractDynAny)
+        else if (other == null || other instanceof AbstractAny)
           return false;
         else
           return other.to_any().equal(to_any());
diff --git a/libjava/classpath/gnu/CORBA/DynAn/abstractRecord.java b/libjava/classpath/gnu/CORBA/DynAn/RecordAny.java
index 8d8b7a559b1..a3e3680d966 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/abstractRecord.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/RecordAny.java
@@ -1,4 +1,4 @@
-/* abstractRecord.java --
+/* RecordAny.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ exception statement from your version. */
 package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -65,8 +65,8 @@ import java.lang.reflect.Field;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public abstract class abstractRecord
-  extends anyDivideable
+public abstract class RecordAny
+  extends DivideableAny
   implements DynAny, Serializable
 {
   /**
@@ -80,7 +80,7 @@ public abstract class abstractRecord
    *
    * @param fields The DynAny's, representing the fields of the structure.
    */
-  public abstractRecord(TypeCode oType, TypeCode aType,
+  public RecordAny(TypeCode oType, TypeCode aType,
                         gnuDynAnyFactory aFactory, ORB anOrb
                        )
   {
@@ -277,7 +277,7 @@ public abstract class abstractRecord
         c [ i ] = array [ i ].copy();
       }
 
-    abstractRecord d = newInstance(official_type, final_type, factory, orb);
+    RecordAny d = newInstance(official_type, final_type, factory, orb);
     d.array = c;
     return d;
   }
@@ -285,7 +285,7 @@ public abstract class abstractRecord
   /**
    * Create a new instance when copying.
    */
-  protected abstract abstractRecord newInstance(TypeCode oType, TypeCode aType,
+  protected abstract RecordAny newInstance(TypeCode oType, TypeCode aType,
                                                 gnuDynAnyFactory aFactory,
                                                 ORB anOrb
                                                );
@@ -297,7 +297,7 @@ public abstract class abstractRecord
   {
     try
       {
-        Streamable sHolder = holderFactory.createHolder(official_type);
+        Streamable sHolder = HolderLocator.createHolder(official_type);
 
         Class sHolderClass = sHolder.getClass();
         Field sHolderValue = sHolderClass.getField("value");
@@ -371,7 +371,7 @@ public abstract class abstractRecord
             fField = structure.getClass().getField(fNames [ i ]);
             field = fField.get(structure);
             fType = array [ i ].type();
-            holder = holderFactory.createHolder(fType);
+            holder = HolderLocator.createHolder(fType);
 
             member = createAny();
             holder.getClass().getField("value").set(holder, field);
diff --git a/libjava/classpath/gnu/CORBA/DynAn/anyUndivideable.java b/libjava/classpath/gnu/CORBA/DynAn/UndivideableAny.java
index b31a6b357f9..da4e9618ee7 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/anyUndivideable.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/UndivideableAny.java
@@ -55,8 +55,8 @@ import org.omg.DynamicAny.DynAnyPackage.TypeMismatch;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public abstract class anyUndivideable
-  extends abstractDynAny
+public abstract class UndivideableAny
+  extends AbstractAny
   implements Serializable
 {
   /**
@@ -67,7 +67,7 @@ public abstract class anyUndivideable
   /**
    * Create a new instance with the given typecode.
    */
-  public anyUndivideable(TypeCode oType, TypeCode aType,
+  public UndivideableAny(TypeCode oType, TypeCode aType,
                          gnuDynAnyFactory aFactory, ORB anOrb)
   {
     super(oType, aType, aFactory, anOrb);
diff --git a/libjava/classpath/gnu/CORBA/DynAn/valueChangedListener.java b/libjava/classpath/gnu/CORBA/DynAn/ValueChangeListener.java
index 94ddffbecf7..59727615999 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/valueChangedListener.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/ValueChangeListener.java
@@ -1,4 +1,4 @@
-/* valueChangedListener.java --
+/* ValueChangeListener.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,7 +44,7 @@ package gnu.CORBA.DynAn;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public interface valueChangedListener
+public interface ValueChangeListener
 {
   void changed();
 }
\ No newline at end of file
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java
index 015628ebf90..23141de3d96 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.CDR.cdrBufOutput;
+import gnu.CORBA.CDR.BufferedCdrOutput;
 import gnu.CORBA.OctetHolder;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.WCharHolder;
 import gnu.CORBA.WStringHolder;
-import gnu.CORBA.holderFactory;
-import gnu.CORBA.typeNamer;
-import gnu.CORBA.universalHolder;
+import gnu.CORBA.HolderLocator;
+import gnu.CORBA.TypeKindNamer;
+import gnu.CORBA.GeneralHolder;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.AnyHolder;
@@ -84,7 +84,7 @@ import java.util.Arrays;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
+public class gnuDynAny extends AbstractAny implements DynAny, Serializable
 {
   /**
    * Use serialVersionUID for interoperability.
@@ -132,7 +132,7 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
   {
     if (holder != null)
       {
-        cdrBufOutput buffer = new cdrBufOutput();
+        BufferedCdrOutput buffer = new BufferedCdrOutput();
         holder._write(buffer);
 
         gnuDynAny other;
@@ -165,7 +165,7 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
   public DynAny current_component() throws TypeMismatch
   {
     throw new TypeMismatch("Not applicable for " +
-      typeNamer.nameIt(final_type)
+      TypeKindNamer.nameIt(final_type)
     );
   }
 
@@ -193,14 +193,14 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
       {
         throw new InvalidValue(ISNULL);
       }
-    else if (a_holder instanceof universalHolder)
+    else if (a_holder instanceof GeneralHolder)
       {
-        holder = holderFactory.createHolder(official_type);
+        holder = HolderLocator.createHolder(official_type);
         if (holder == null)
-          holder = holderFactory.createHolder(final_type);
+          holder = HolderLocator.createHolder(final_type);
 
         if (holder == null)
-          holder = ((universalHolder) a_holder).Clone();
+          holder = ((GeneralHolder) a_holder).Clone();
         else
           {
             InputStream in = an_any.create_input_stream();
@@ -890,7 +890,7 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
    */
   public boolean equal(DynAny other)
   {
-    if (other instanceof abstractDynAny)
+    if (other instanceof AbstractAny)
       {
         if (other instanceof gnuDynAny)
           {
@@ -899,10 +899,10 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
             if (!x.holder.getClass().equals(holder.getClass()))
               return false;
 
-            cdrBufOutput b1 = new cdrBufOutput();
+            BufferedCdrOutput b1 = new BufferedCdrOutput();
             x.holder._write(b1);
 
-            cdrBufOutput b2 = new cdrBufOutput(b1.buffer.size() + 10);
+            BufferedCdrOutput b2 = new BufferedCdrOutput(b1.buffer.size() + 10);
             holder._write(b2);
 
             return Arrays.equals(b1.buffer.toByteArray(),
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java
index dd1762890de..b8b39bfbcdf 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java
@@ -40,8 +40,8 @@ package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Poa.ORB_1_4;
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
-import gnu.CORBA.typeNamer;
+import gnu.CORBA.HolderLocator;
+import gnu.CORBA.TypeKindNamer;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.LocalObject;
@@ -227,7 +227,7 @@ public class gnuDynAnyFactory
    */
   public DynAny create_simple(TypeCode official, TypeCode type)
   {
-    Streamable holder = holderFactory.createHolder(type);
+    Streamable holder = HolderLocator.createHolder(type);
     return new gnuDynAny(holder, official, type, this, orb);
   }
 
@@ -314,7 +314,7 @@ public class gnuDynAnyFactory
             case TCKind._tk_Principal :
             case TCKind._tk_abstract_interface :
               throw new InconsistentTypeCode("Following API, the " +
-                                             typeNamer.nameIt(type) +
+                                             TypeKindNamer.nameIt(type) +
                                              " must not be supported."
                                             );
 
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java
index 1c08496d423..825cd0a5638 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
@@ -66,7 +66,7 @@ import java.lang.reflect.Field;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class gnuDynArray
-  extends anyDivideable
+  extends DivideableAny
   implements DynArray, Serializable
 {
   /**
@@ -238,10 +238,10 @@ public class gnuDynArray
     try
       {
         Streamable memberHolder =
-          holderFactory.createHolder(official_components);
+          HolderLocator.createHolder(official_components);
 
         if (memberHolder == null)
-          memberHolder = holderFactory.createHolder(final_components);
+          memberHolder = HolderLocator.createHolder(final_components);
 
         Class memberHolderClass = memberHolder.getClass();
         Class memberClass = memberHolderClass.getField("value").getType();
@@ -260,7 +260,7 @@ public class gnuDynArray
             Array.set(members, i, member);
           }
 
-        Streamable arrayHolder = holderFactory.createHolder(official_type);
+        Streamable arrayHolder = HolderLocator.createHolder(official_type);
         arrayHolder.getClass().getField("value").set(arrayHolder, members);
 
         Any g = createAny();
@@ -296,9 +296,9 @@ public class gnuDynArray
           {
             if (holderClass == null)
               {
-                holder = holderFactory.createHolder(official_components);
+                holder = HolderLocator.createHolder(official_components);
                 if (holder == null)
-                  holder = holderFactory.createHolder(final_components);
+                  holder = HolderLocator.createHolder(final_components);
                 holderClass = holder.getClass();
               }
             else
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java
index 2fccc85c59d..6eb7fe2bcac 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java
@@ -60,7 +60,7 @@ import java.util.Arrays;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynEnum extends anyUndivideable implements DynEnum
+public class gnuDynEnum extends UndivideableAny implements DynEnum
 {
   /**
    * Use serialVersionUID for interoperability.
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java
index 39b00226245..9655f0387da 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java
@@ -57,7 +57,7 @@ import java.math.BigDecimal;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynFixed extends anyUndivideable implements DynFixed
+public class gnuDynFixed extends UndivideableAny implements DynFixed
 {
   /**
    * Use serialVersionUID for interoperability.
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynStruct.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynStruct.java
index b086d6478cc..b15aff3e124 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynStruct.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynStruct.java
@@ -54,7 +54,7 @@ import org.omg.DynamicAny.DynAny;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class gnuDynStruct
-  extends abstractRecord
+  extends RecordAny
   implements DynStruct, Serializable
 {
   /**
@@ -89,7 +89,7 @@ public class gnuDynStruct
   }
 
   /** @inheritDoc */
-  protected abstractRecord newInstance(TypeCode oType, TypeCode aType,
+  protected RecordAny newInstance(TypeCode oType, TypeCode aType,
                                        gnuDynAnyFactory aFactory, ORB anOrb)
   {
     return new gnuDynStruct(oType, aType, aFactory, anOrb);
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java
index ad41e24b6ae..ef5aed64512 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java
@@ -62,8 +62,8 @@ import java.io.Serializable;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class gnuDynUnion
-  extends anyDivideable
-  implements DynUnion, Serializable, valueChangedListener
+  extends DivideableAny
+  implements DynUnion, Serializable, ValueChangeListener
 {
   /**
    * Use serialVersionUID for interoperability.
@@ -96,7 +96,7 @@ public class gnuDynUnion
         discriminator =
           factory.create_dyn_any_from_type_code(final_type.discriminator_type());
 
-        ((abstractDynAny) discriminator).listener = this;
+        ((AbstractAny) discriminator).listener = this;
 
         if (final_type.default_index() >= 0)
           set_to_default_member();
@@ -114,7 +114,7 @@ public class gnuDynUnion
   /*
    * (non-Javadoc)
    *
-   * @see gnu.CORBA.DynAn.anyDivideable#to_any()
+   * @see gnu.CORBA.DynAn.DivideableAny#to_any()
    */
   public Any to_any()
   {
@@ -171,7 +171,7 @@ public class gnuDynUnion
         gnuDynUnion other =
           new gnuDynUnion(official_type, final_type, factory, orb);
         other.discriminator = discriminator.copy();
-        ((abstractDynAny) other.discriminator).listener = other;
+        ((AbstractAny) other.discriminator).listener = other;
         if (array.length == 1)
           {
             other.array = new DynAny[] { other.discriminator };
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java
index c2db9479785..0c31d4093e2 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Unexpected;
 
 import org.omg.CORBA.Any;
@@ -66,7 +67,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynValue extends abstractRecord implements DynValue,
+public class gnuDynValue extends RecordAny implements DynValue,
   Serializable
 {
   /**
@@ -243,7 +244,7 @@ public class gnuDynValue extends abstractRecord implements DynValue,
   /**
    * Create a new instance.
    */
-  protected abstractRecord newInstance(TypeCode oType, TypeCode aType,
+  protected RecordAny newInstance(TypeCode oType, TypeCode aType,
     gnuDynAnyFactory aFactory, ORB anOrb
   )
   {
@@ -301,9 +302,12 @@ public class gnuDynValue extends abstractRecord implements DynValue,
             ValueFactory factory =
               ((org.omg.CORBA_2_3.ORB) orb).lookup_value_factory(official_type.id());
             if (factory == null)
-              throw new MARSHAL("Factory for " + official_type.id() +
-                " not registered."
-              );
+              {
+                MARSHAL m = new MARSHAL("Factory for " + official_type.id() +
+                " not registered.");
+                m.minor = Minor.Factory;
+                throw m;
+              }
 
             OutputStream out = orb.create_output_stream();
 
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java
index 66e18f3b2fe..a13e9fc2c50 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -65,7 +65,7 @@ import java.lang.reflect.Field;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class gnuDynValueBox
-  extends anyDivideable
+  extends DivideableAny
   implements DynValueBox, Serializable
 {
   /**
@@ -208,7 +208,7 @@ public class gnuDynValueBox
       {
         try
           {
-            Streamable holder = holderFactory.createHolder(content);
+            Streamable holder = HolderLocator.createHolder(content);
             Field v = holder.getClass().getField("value");
             v.set(holder, s);