Renamed OpenZoom Flex components. Upgraded all examples.

gasi · Aug 11, 2009 · cd60b0f · cd60b0f
1 parent 1f1289d
commit cd60b0f
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 38 deletions.
diff --git a/examples/actionscript/interactive-renderers/.actionScriptProperties b/examples/actionscript/interactive-renderers/.actionScriptProperties
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<actionScriptProperties mainApplicationPath="RendererVisibility.as" projectUUID="134f3217-3438-4232-8b53-cc2a1425e11d" version="6">
+<actionScriptProperties mainApplicationPath="InteractiveRenderers.as" projectUUID="134f3217-3438-4232-8b53-cc2a1425e11d" version="6">
   <compiler additionalCompilerArguments="" autoRSLOrdering="true" copyDependentFiles="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
     <compilerSourcePath>
       <compilerSourcePathEntry kind="1" linkType="1" path="${OPENZOOM_HOME}/src"/>

diff --git a/examples/flex/flickr-djatoka/.project b/examples/flex/flickr-djatoka/.project
@@ -19,17 +19,17 @@
 		<link>
 			<name>[source path] OpenZoom SDK</name>
 			<type>2</type>
-			<location>OPENZOOM_HOME/src</location>
+			<locationURI>OPENZOOM_HOME/src</locationURI>
 		</link>
 		<link>
 			<name>[source path] as3corelib</name>
 			<type>2</type>
-			<location>OPENZOOM_HOME/lib/as3corelib/src</location>
+			<locationURI>OPENZOOM_HOME/lib/as3corelib/src</locationURI>
 		</link>
 		<link>
 			<name>[source path] as3flickrlib</name>
 			<type>2</type>
-			<location>OPENZOOM_HOME/lib/as3flickrlib/src</location>
+			<locationURI>OPENZOOM_HOME/lib/as3flickrlib/src</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/examples/flex/flickr-djatoka/src/FlickrDeepZoom.mxml b/examples/flex/flickr-djatoka/src/FlickrDeepZoom.mxml
@@ -51,7 +51,6 @@
             import org.openzoom.flash.descriptors.IImagePyramidDescriptor;
         	import org.openzoom.flash.descriptors.deepzoom.DeepZoomImageDescriptor;
             import org.openzoom.flash.descriptors.djatoka.DjatokaDescriptor;
-            import org.openzoom.flash.renderers.MultiScaleImageRenderer;
     		import org.openzoom.flash.renderers.images.ImagePyramidRenderer;
             import org.openzoom.flash.utils.ExternalMouseWheel;
 
@@ -327,7 +326,7 @@
         ]]>
     </mx:Script>
 
-    <components:MultiScaleContainer2
+    <components:MultiScaleContainer
         id="container"
         top="40" right="0" bottom="0" left="0"
         sceneWidth="48000"
@@ -341,7 +340,7 @@
         <components:transformer>
             <transformers:TweenerTransformer/>
         </components:transformer>
-    </components:MultiScaleContainer2>
+    </components:MultiScaleContainer>
 
     <mx:HBox
         horizontalCenter="0"

diff --git a/examples/flex/flickr-djatoka/src/FlickrDjatoka.mxml b/examples/flex/flickr-djatoka/src/FlickrDjatoka.mxml
@@ -55,7 +55,6 @@
     		import org.openzoom.flash.descriptors.IImagePyramidDescriptor;
         	import org.openzoom.flash.descriptors.deepzoom.DeepZoomImageDescriptor;
             import org.openzoom.flash.descriptors.djatoka.DjatokaDescriptor;
-            import org.openzoom.flash.renderers.MultiScaleImageRenderer;
             import org.openzoom.flash.utils.ExternalMouseWheel;
 
             //------------------------------------------------------------------
@@ -351,7 +350,7 @@
         ]]>
     </mx:Script>
 
-    <components:MultiScaleContainer2
+    <components:MultiScaleContainer
         id="container"
         top="40" right="0" bottom="0" left="0"
         sceneWidth="48000"
@@ -365,7 +364,7 @@
         <components:transformer>
             <transformers:TweenerTransformer/>
         </components:transformer>
-    </components:MultiScaleContainer2>
+    </components:MultiScaleContainer>
     <mx:HBox
         horizontalCenter="0"
         top="10"

diff --git a/examples/flex/gallery/src/OpenZoomGallery.mxml b/examples/flex/gallery/src/OpenZoomGallery.mxml
@@ -97,7 +97,7 @@
          width="320"
          />
 
-    <openzoom:MultiScaleImage2
+    <openzoom:MultiScaleImage
         id="image"
         top="{imagesComboBox.height + 16}"
         right="0"
@@ -114,7 +114,7 @@
             <controllers:MouseController/>
             <controllers:KeyboardController/>
         </openzoom:controllers>
-    </openzoom:MultiScaleImage2>
+    </openzoom:MultiScaleImage>
 
     <mx:Label
         text="All Images Copyright Microsoft"

diff --git a/examples/flex/isthisyourluggage/.project b/examples/flex/isthisyourluggage/.project
@@ -25,7 +25,7 @@
 		<link>
 			<name>[source path] OpenZoom SDK</name>
 			<type>2</type>
-			<location>OPENZOOM_HOME/src</location>
+			<locationURI>OPENZOOM_HOME/src</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/examples/flex/isthisyourluggage/src/IsThisYourLuggage.mxml b/examples/flex/isthisyourluggage/src/IsThisYourLuggage.mxml
@@ -40,7 +40,6 @@
             import org.openzoom.flash.events.NetworkRequestEvent;
             import org.openzoom.flash.net.INetworkRequest;
             import org.openzoom.flash.net.NetworkQueue;
-            import org.openzoom.flash.renderers.MultiScaleImageRenderer;
             import org.openzoom.flash.utils.ExternalMouseWheel;
             import org.openzoom.flash.viewport.SceneViewport;
 
@@ -109,7 +108,7 @@
         ]]>
     </mx:Script>
 
-    <components:MultiScaleContainer2
+    <components:MultiScaleContainer
         id="container"
         top="0"
         right="0"
@@ -133,7 +132,7 @@
                <constraints:ZoomConstraint minZoom="1"/>
             </constraints:CompositeConstraint>
         </components:constraint>
-    </components:MultiScaleContainer2>
+    </components:MultiScaleContainer>
 
     <mx:Image
         source="@Embed('../assets/buttons/home-button.png')"

diff --git a/examples/flex/mapping-layers/src/MappingLayers.mxml b/examples/flex/mapping-layers/src/MappingLayers.mxml
@@ -26,7 +26,6 @@
             import org.openzoom.flash.events.NetworkRequestEvent;
             import org.openzoom.flash.net.INetworkRequest;
             import org.openzoom.flash.net.NetworkQueue;
-            import org.openzoom.flash.renderers.MultiScaleImageRenderer;
 
             import mx.events.FlexEvent;
 
@@ -86,7 +85,7 @@
 
         ]]>
     </mx:Script>
-    <components:MultiScaleContainer2
+    <components:MultiScaleContainer
         id="container"
         top="0"
         right="0"
@@ -101,7 +100,7 @@
             <controllers:KeyboardController/>
             <controllers:MouseController smoothPanning="false"/>
         </components:controllers>
-    </components:MultiScaleContainer2>
+    </components:MultiScaleContainer>
 
     <mx:VSlider
         id="layerAlphaSlider"

diff --git a/examples/flex/mapping/.project b/examples/flex/mapping/.project
@@ -19,7 +19,7 @@
 		<link>
 			<name>[source path] OpenZoom SDK</name>
 			<type>2</type>
-			<location>OPENZOOM_HOME/src</location>
+			<locationURI>OPENZOOM_HOME/src</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/examples/flex/mapping/src/MappingFlex.mxml b/examples/flex/mapping/src/MappingFlex.mxml
@@ -66,7 +66,7 @@
         ]]>
     </mx:Script>
 
-    <openzoom:MultiScaleImage2
+    <openzoom:MultiScaleImage
         id="map"
         top="0"
         right="0"
@@ -90,7 +90,7 @@
         <openzoom:transformer>
             <transformers:TweenerTransformer/>
         </openzoom:transformer>
-    </openzoom:MultiScaleImage2>
+    </openzoom:MultiScaleImage>
 
     <mx:HBox
         left="12"

diff --git a/examples/flex/multiscalecontainer/src/MultiScaleContainerExample.mxml b/examples/flex/multiscalecontainer/src/MultiScaleContainerExample.mxml
@@ -89,7 +89,7 @@
         ]]>
     </mx:Script>
 
-    <openzoom:MultiScaleContainer2
+    <openzoom:MultiScaleContainer
         id="container"
         top="40"
         right="0"
@@ -106,7 +106,7 @@
         <openzoom:transformer>
             <transformers:TweenerTransformer/>
         </openzoom:transformer>
-    </openzoom:MultiScaleContainer2>
+    </openzoom:MultiScaleContainer>
 
     <mx:Button
         label="Play!"

diff --git a/examples/flex/power-law-scaling/src/PowerLawScaling.mxml b/examples/flex/power-law-scaling/src/PowerLawScaling.mxml
@@ -62,7 +62,7 @@
 
         ]]>
     </mx:Script>
-    <openzoom:MultiScaleImage2
+    <openzoom:MultiScaleImage
         id="map"
         top="0"
         right="0"
@@ -85,5 +85,5 @@
                <constraints:ScaleConstraint id="scaleConstraint"/>
             </constraints:CompositeConstraint>
         </openzoom:constraint>
-    </openzoom:MultiScaleImage2>
+    </openzoom:MultiScaleImage>
 </mx:Application>
diff --git a/src/org/openzoom/flash/components/MultiScaleImageBase.as b/src/org/openzoom/flash/components/MultiScaleImageBase.as
@@ -56,9 +56,9 @@ import org.openzoom.flash.viewport.IViewportTransformer;
  *
  * Base class for MultiScaleImage and DeepZoomContainer.
  */
-public class MultiScaleImageBase extends Sprite
-                                 implements IMultiScaleContainer,
-                                            ILoaderClient
+internal class MultiScaleImageBase extends Sprite
+                                   implements IMultiScaleContainer,
+                                              ILoaderClient
 {
     //--------------------------------------------------------------------------
     //

diff --git a/src/org/openzoom/flex/components/DeepZoomContainer.as b/src/org/openzoom/flex/components/DeepZoomContainer.as
@@ -80,7 +80,7 @@ import org.openzoom.flash.renderers.images.ImagePyramidRenderer;
  * as Deep Zoom collections (DZC) created by Microsoft Deep Zoom Composer,
  * DeepZoomTools.dll, Python Deep Zoom Tools (deepzoom.py) or others.
  */
-public final class DeepZoomContainer extends MultiScaleImageBase2
+public final class DeepZoomContainer extends MultiScaleImageBase
 {
     //--------------------------------------------------------------------------
     //

diff --git a/...m/flex/components/MultiScaleContainer2.as → ...om/flex/components/MultiScaleContainer.as b/...m/flex/components/MultiScaleContainer2.as → ...om/flex/components/MultiScaleContainer.as
@@ -72,7 +72,7 @@ import mx.core.UIComponent
 /**
  * Generic container for multiscale content.
  */
-public final class MultiScaleContainer2 extends UIComponent
+public final class MultiScaleContainer extends UIComponent
                                         implements /*IMultiScaleContainer,*/
                                                    ILoaderClient
 {
@@ -99,7 +99,7 @@ public final class MultiScaleContainer2 extends UIComponent
     /**
      * Constructor.
      */
-    public function MultiScaleContainer2()
+    public function MultiScaleContainer()
     {
         super()
 

diff --git a/...nzoom/flex/components/MultiScaleImage2.as → ...enzoom/flex/components/MultiScaleImage.as b/...nzoom/flex/components/MultiScaleImage2.as → ...enzoom/flex/components/MultiScaleImage.as
@@ -79,7 +79,7 @@ import org.openzoom.flash.renderers.images.ImagePyramidRenderer;
  * The animation can be customized by adding a viewport transformer through the <code>transformer</code> property.
  * Zoom, visibility or custom constraints can be added through the <code>constraint</code> property.
  */
-public final class MultiScaleImage2 extends MultiScaleImageBase2
+public final class MultiScaleImage extends MultiScaleImageBase
 {
     //--------------------------------------------------------------------------
     //
@@ -90,7 +90,7 @@ public final class MultiScaleImage2 extends MultiScaleImageBase2
     /**
      * Constructor.
      */
-    public function MultiScaleImage2()
+    public function MultiScaleImage()
     {
         super()
 

diff --git a/...m/flex/components/MultiScaleImageBase2.as → ...om/flex/components/MultiScaleImageBase.as b/...m/flex/components/MultiScaleImageBase2.as → ...om/flex/components/MultiScaleImageBase.as
@@ -56,7 +56,7 @@ import org.openzoom.flash.viewport.NormalizedViewport;
  *
  * Base class for MultiScaleImage and DeepZoomContainer.
  */
-public class MultiScaleImageBase2 extends UIComponent
+internal class MultiScaleImageBase extends UIComponent
                                   /*implements IMultiScaleContainer*/
 {
     //--------------------------------------------------------------------------
@@ -82,7 +82,7 @@ public class MultiScaleImageBase2 extends UIComponent
     /**
      * Constructor.
      */
-    public function MultiScaleImageBase2()
+    public function MultiScaleImageBase()
     {
     }
 
@@ -93,7 +93,7 @@ public class MultiScaleImageBase2 extends UIComponent
     //--------------------------------------------------------------------------
 
    ;[Bindable(event="containerChanged")]
-    protected var container:MultiScaleContainer2
+    protected var container:MultiScaleContainer
 
     //--------------------------------------------------------------------------
     //
@@ -282,7 +282,7 @@ public class MultiScaleImageBase2 extends UIComponent
 
         if (!container)
         {
-            container = new MultiScaleContainer2()
+            container = new MultiScaleContainer()
             super.addChild(container)
 
 //            container.loader.addEventListener(Event.INIT,