You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2004/01/03 14:00:50 UTC

cvs commit: xml-fop/src/java/org/apache/fop/fo PropertyConsts.java

pbwest      2004/01/03 05:00:50

  Modified:    src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
                        PropertyConsts.java
  Log:
  Adjusted HashMap initial size.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.2   +9 -28     xml-fop/src/java/org/apache/fop/fo/Attic/PropertyConsts.java
  
  Index: PropertyConsts.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/PropertyConsts.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- PropertyConsts.java	5 Jul 2003 19:26:05 -0000	1.1.2.1
  +++ PropertyConsts.java	3 Jan 2004 13:00:50 -0000	1.1.2.2
  @@ -137,8 +137,8 @@
        * of a property class.  The index value is the index of the property
        * class name in the classNames[] array.
        */
  -    private final HashMap classToIndex
  -                        = new HashMap(PropNames.LAST_PROPERTY_INDEX + 1);
  +    private final HashMap classToIndex = new HashMap(
  +                    (int)((PropNames.LAST_PROPERTY_INDEX + 1) / 0.75) + 1);
   
       /**
        * An <tt>int[]</tt> containing the <i>inherited</i> values from the
  @@ -458,8 +458,6 @@
           Class pclass;
           Property property;
   
  -        //System.out.println("setupProperty " + propindex + " "
  -                            //+ PropNames.getPropertyName(propindex));
           if ((property = properties[propindex]) != null) return property;
   
           // Get the property class name
  @@ -484,38 +482,25 @@
           // Get the class for this property name
           String name = packageName + ".properties." + cname;
           try {
  -            //System.out.println("classes["+propindex+"] "+name);//DEBUG
               pclass = Class.forName(name);
               classes[propindex] = pclass;
   
               // Instantiate the class
               property = (Property)(pclass.newInstance());
               properties[propindex] = property;
  -            //System.out.println
  -                    //("property name "
  -                     //+ property.getClass().getName());
  -            //System.out.println
  -            //("property name " +
  -            //properties[propindex].getClass().getName());
   
               // Set inheritance value
               if ((inherited[propindex]
  -                                = pclass.getField("inherited").getInt(null))
  +                                = property.getInherited())
                       != Property.NO)
                               inheritedprops.set(propindex);
               // Set datatypes
  -            datatypes[propindex] = pclass.getField("dataTypes").getInt(null);
  -            //System.out.println("datatypes " + datatypes[propindex] + "\n"
  -                           //+ Property.listDataTypes(datatypes[propindex]));
  +            datatypes[propindex] = property.getDataTypes();
   
               // Set initialValueTypes
  -            initialValueTypes[propindex] =
  -                            pclass.getField("initialValueType").getInt(null);
  -            //System.out.println("initialValueType "
  -                               //+ initialValueTypes[propindex]);
  +            initialValueTypes[propindex] = property.getInitialValueType();
   
  -            traitMappings[propindex] =
  -                                pclass.getField("traitMapping").getInt(null);
  +            traitMappings[propindex] = property.getTraitMapping();
   
           } catch (ClassNotFoundException e) {
               throw new PropertyException
  @@ -526,10 +511,6 @@
           } catch (InstantiationException e) {
               throw new PropertyException
                       ("InstantiationException" + e.getMessage());
  -        }
  -        catch (NoSuchFieldException e) {
  -            throw new PropertyException
  -                    ("NoSuchFieldException" + e.getMessage());
           }
   
           return property;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org