0 Replies Latest reply on Jun 17, 2008 7:47 AM by (Jeff_Kamerer)

    [svn] 2108: Merge from flex trunk to 3.0.x.

      Revision: 2108
      Author: jkamerer@adobe.com
      Date: 2008-06-17 08:47:48 -0700 (Tue, 17 Jun 2008)

      Log Message:
      -----------
      Merge from flex trunk to 3.0.x. Merged changes:
      1384, 1388, 1806 (changes to TageEncoder.java only), 1941, 1932
      Had to hand edit added files DefineFont1.java and DefineFont2.java
      to remove use of generics and make them Java 1.4 compatible.

      Also checking in asc.jar build from the 3.0.x branch.

      Modified Paths:
      --------------
      flex/sdk/branches/3.0.x/lib/asc.jar
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/media/AbstractTranscoder .java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/media/FontTranscoder.jav a
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/util/MimeMappings.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/PreLink.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/fonts/CachedFontManager.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/Dictionary.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/MovieEncoder.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/TagDecoder.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/TagEncoder.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/TagHandler.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/TagValues.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/builder/tags/FontBuilder.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tags/DefineFont.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tags/DefineFontAlignZones.jav a
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tags/DefineFontInfo.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/types/FocalGradient.java

      Added Paths:
      -----------
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/fonts/DefineFont3Face.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tags/DefineFont1.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tags/DefineFont2.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tags/DefineFont3.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tags/DefineFont4.java

      Removed Paths:
      -------------
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/fonts/DefineFontFace.java