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

2002-12-02 Thread pbwest 
pbwest  2002/12/02 23:26:58

  Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropNames.java
  Log:
  Add PropertyException to getPropertyIndex when name is unknown.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.10  +10 -4 xml-fop/src/org/apache/fop/fo/Attic/PropNames.java
  
  Index: PropNames.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropNames.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- PropNames.java31 Oct 2002 01:56:47 -  1.1.2.9
  +++ PropNames.java3 Dec 2002 07:26:58 -   1.1.2.10
  @@ -773,13 +773,19 @@
   }
   
   /**
  + * Get the property index of a property name.
* @param propindex int index of the FO property.
* @return String name of the indexd FO property.
* @exception PropertyException if the property index is invalid.
*/
   public static int getPropertyIndex(String name)
  +throws PropertyException
   {
  -return ((Integer)(toIndex.get(name))).intValue();
  +Integer intg = (Integer)(toIndex.get(name));
  +if (intg == null)
  +throw new PropertyException
  +("Property name '" + name + "' is unknown.");
  +return intg.intValue();
   }
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

2002-10-30 Thread pbwest 
pbwest  2002/10/30 17:56:47

  Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropNames.java
  Log:
  Added uage-context-of-suppress-at-line-break.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.9   +35 -33xml-fop/src/org/apache/fop/fo/Attic/PropNames.java
  
  Index: PropNames.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropNames.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- PropNames.java19 Oct 2002 03:49:04 -  1.1.2.8
  +++ PropNames.java31 Oct 2002 01:56:47 -  1.1.2.9
  @@ -372,21 +372,22 @@
   TOP = 302,
   TREAT_AS_WORD_SPACE = 303,
  UNICODE_BIDI = 304,
  - VISIBILITY = 305,
  -   VOICE_FAMILY = 306,
  - VOLUME = 307,
  -   WHITE_SPACE_COLLAPSE = 308,
  -  WHITE_SPACE_TREATMENT = 309,
  - WIDOWS = 310,
  -  WIDTH = 311,
  -   WORD_SPACING = 312,
  -   WORD_SPACING_MINIMUM = 313,
  -   WORD_SPACING_OPTIMUM = 314,
  -   WORD_SPACING_MAXIMUM = 315,
  -WORD_SPACING_CONDITIONALITY = 316,
  -WORD_SPACING_PRECEDENCE = 317,
  -WRAP_OPTION = 318,
  -Z_INDEX = 319,
  +USAGE_CONTEXT_OF_SUPPRESS_AT_LINE_BREAK = 305,
  + VISIBILITY = 306,
  +   VOICE_FAMILY = 307,
  + VOLUME = 308,
  +   WHITE_SPACE_COLLAPSE = 309,
  +  WHITE_SPACE_TREATMENT = 310,
  + WIDOWS = 311,
  +  WIDTH = 312,
  +   WORD_SPACING = 313,
  +   WORD_SPACING_MINIMUM = 314,
  +   WORD_SPACING_OPTIMUM = 315,
  +   WORD_SPACING_MAXIMUM = 316,
  +WORD_SPACING_CONDITIONALITY = 317,
  +WORD_SPACING_PRECEDENCE = 318,
  +WRAP_OPTION = 319,
  +Z_INDEX = 320,
   
   LAST_PROPERTY_INDEX = Z_INDEX;
   
  @@ -720,21 +721,22 @@
  ,"top"  // 302
  ,"treat-as-word-space"  // 303
 ,"unicode-bidi"  // 304
  -,"visibility"  // 305
  -  ,"voice-family"  // 306
  -,"volume"  // 307
  -  ,"white-space-collapse"  // 308
  - ,"white-space-treatment"  // 309
  -,"widows"  // 310
  - ,"width"  // 311
  -  ,"word-spacing"  // 312
  -  ,"word-spacing-minimum"  // 313
  -  ,"word-spacing-optimum"  // 314
  -  ,"word-spacing-maximum"  // 315
  -   ,"word-spacing-conditionality"  // 316
  -   ,"word-spacing-precedence"  // 317
  -   ,"wrap-option"  // 318
  -   ,"z-index"  // 319
  +   ,"usage-context-of-suppress-at-line-break"  // 305
  +,"visibility"  // 306
  +  ,"voice-family"  // 307
  +,"volume"  // 308
  +  ,"white-space-collapse"  // 309
  + ,"white-space-treatment"  // 310
  +,"widows"  // 311
  + ,"width"  // 312
  +  ,"word-spacing"  // 313
  +  ,"word-spacing-minimum"  // 314
  +  ,"word-spacing-optimum"  // 315
  +  ,"word-spacing-maximum"  // 316
  +   ,"word-spacing-conditionality"  // 317
  +   ,"word-spacing-precedence"  // 318
  +   ,"wrap-option"  /

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

2002-08-19 Thread pbwest 

pbwest  2002/08/19 09:26:55

  Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropNames.java
  Log:
  Changed ordering of property names to reflect processing order
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.3   +370 -334  xml-fop/src/org/apache/fop/fo/Attic/PropNames.java
  
  Index: PropNames.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropNames.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- PropNames.java27 Jun 2002 12:55:18 -  1.1.2.2
  +++ PropNames.java19 Aug 2002 16:26:55 -  1.1.2.3
  @@ -22,6 +22,10 @@
   private static final String revision = "$Revision$";
   
   /*
  + * List of property constants in property processing order -
  + * FONT, FONT_SIZE first
  + * Shorthands must precede any of their expansion elements.
  + * Compounds must precede any of their components.
* The list of property constants can be regenerated in XEmacs by setting
* the region on the list of constants. (C-Space at the beginning,
* move to last line, C-x C-x to exchange mark and point.)  Then run
  @@ -38,223 +42,239 @@
   
   public static final int
   NO_PROPERTY = 0,
  -  ABSOLUTE_POSITION = 1,
  -   ACTIVE_STATE = 2,
  -   ALIGNMENT_ADJUST = 3,
  - ALIGNMENT_BASELINE = 4,
  -   AUTO_RESTORE = 5,
  -AZIMUTH = 6,
  - BACKGROUND = 7,
  -  BACKGROUND_ATTACHMENT = 8,
  -   BACKGROUND_COLOR = 9,
  -   BACKGROUND_IMAGE = 10,
  -BACKGROUND_POSITION = 11,
  - BACKGROUND_POSITION_HORIZONTAL = 12,
  -   BACKGROUND_POSITION_VERTICAL = 13,
  -  BACKGROUND_REPEAT = 14,
  - BASELINE_SHIFT = 15,
  - BLANK_OR_NOT_BLANK = 16,
  -BLOCK_PROGRESSION_DIMENSION = 17,
  -BLOCK_PROGRESSION_DIMENSION_MINIMUM = 18,
  -BLOCK_PROGRESSION_DIMENSION_OPTIMUM = 19,
  -BLOCK_PROGRESSION_DIMENSION_MAXIMUM = 20,
  - BORDER = 21,
  - BORDER_AFTER_COLOR = 22,
  -BORDER_AFTER_PRECEDENCE = 23,
  - BORDER_AFTER_STYLE = 24,
  - BORDER_AFTER_WIDTH = 25,
  -  BORDER_AFTER_WIDTH_LENGTH = 26,
  -  BORDER_AFTER_WIDTH_CONDITIONALITY = 27,
  -BORDER_BEFORE_COLOR = 28,
  -   BORDER_BEFORE_PRECEDENCE = 29,
  -BORDER_BEFORE_STYLE = 30,
  -BORDER_BEFORE_WIDTH = 31,
  - BORDER_BEFORE_WIDTH_LENGTH = 32,
  - BORDER_BEFORE_WIDTH_CONDITIONALITY = 33,
  -  BORDER_BOTTOM = 34,
  -BORDER_BOTTOM_COLOR = 35,
  -BORDER_BOTTOM_STYLE = 36,
  -BORDER_BOTTOM_WIDTH = 37,
  -BORDER_COLLAPSE = 38,
  -   BORDER_COLOR = 39,
  -   BORDER_END_COLOR = 40,
  -  BORDER_END_PRECEDENCE = 41,
  -   BORDER_END_STYLE = 42,
  -   BORDER_END_WIDTH = 43,
  -BORDER_END_WIDTH_LENGTH = 44,
  -BORDER_END_WIDTH_CONDITIONALITY = 45,
  -BORDER_LEFT = 46,
  -  BORDER_LEFT_COLOR = 47,
  -  BORDER_LEFT_STYLE = 48,
  -  BORDER_LEFT_WIDTH = 49,
  -   BORDER_RIGHT = 50,
  - BORDER_RIGHT_COLOR = 51,
  - BORDER_RIGHT_STYLE = 52,
  - BORDER_RIGHT_WIDTH = 53,
  -  BORDER_SEPARATION = 54,
  -  BORDER_SEPARATION_BLOCK_PROGRESSION_DIRECTION = 55,
  - BORDER_SEPARATION_INLINE_PROGRESSION_DIRECTION = 56,
  - BORDER_SPACING = 57,
  - BORDER_START_COLOR = 58,
  -BORDER_START_PRECEDENCE = 59,
  - BORDER_START_STYLE = 60,
  - BORDER_START_WIDTH = 61,
  -  BORDER_START_WIDTH_LENGTH = 62,
  -  BORDER_STAR