Commits

Eugene Veretennikov committed 24a36e2

Переход на IDEA Nika.1 EAP. Убрал лишнее из pom. Мелкие правки.

Comments (0)

Files changed (6)

as3snapi-core/as3snapi-core.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module type="Flex" version="4">
-  <component name="Flex.Build.Configuration">
-    <option name="DO_BUILD" value="true" />
-    <option name="OUTPUT_TYPE" value="Library" />
-    <option name="OUTPUT_FILE_NAME" value="as3snapi-core.swc" />
-    <option name="TARGET_PLAYER_VERSION" value="11.1" />
-    <option name="VERSION" value="3" />
+  <component name="FlexBuildConfigurationManager" active="as3snapi-core">
+    <configurations>
+      <configuration name="as3snapi-core" output-type="Library" output-file="as3snapi-core.swc" output-folder="/srv/www/production/as3snapi-core">
+        <dependencies target-player="11.1">
+          <sdk name="flex_sdk" />
+        </dependencies>
+        <compiler-options />
+        <packaging-air-desktop />
+        <packaging-android />
+        <packaging-ios />
+      </configuration>
+    </configurations>
+    <compiler-options />
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="jdk" jdkName="flex_sdk" jdkType="__CompositeFlexSdk__" />
   </component>
 </module>
 

as3snapi-sandbox/as3snapi-sandbox.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module type="Flex" version="4">
-  <component name="Flex.Build.Configuration">
-    <option name="DO_BUILD" value="true" />
-    <option name="MAIN_CLASS" value="SandboxMain" />
-    <option name="OUTPUT_FILE_NAME" value="as3snapi-sandbox.swf" />
-    <option name="TARGET_PLAYER_VERSION" value="11.1" />
-    <option name="ADDITIONAL_COMPILER_OPTIONS" value="-static-link-runtime-shared-libraries=true" />
-    <option name="VERSION" value="3" />
+  <component name="FlexBuildConfigurationManager" active="as3snapi-sandbox">
+    <configurations>
+      <configuration name="as3snapi-sandbox" main-class="SandboxMain" output-file="as3snapi-sandbox.swf" output-folder="/srv/www/production/as3snapi-sandbox">
+        <dependencies target-player="11.1">
+          <entries>
+            <entry module-name="as3snapi-core" build-configuration-name="as3snapi-core">
+              <dependency linkage="Merged" />
+            </entry>
+          </entries>
+          <sdk name="flex_sdk" />
+        </dependencies>
+        <compiler-options>
+          <option name="additionalOptions" value="-static-link-runtime-shared-libraries=true" />
+        </compiler-options>
+        <packaging-air-desktop />
+        <packaging-android />
+        <packaging-ios />
+      </configuration>
+    </configurations>
+    <compiler-options />
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/html-template" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="module" module-name="as3snapi-core" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="jdk" jdkName="flex_sdk" jdkType="__CompositeFlexSdk__" />
   </component>
 </module>
 

as3snapi-sandbox/pom.xml

             <version>${project.version}</version>
             <type>swc</type>
         </dependency>
-
-        <!--
-        <dependency>
-            <groupId>drewbourne</groupId>
-            <artifactId>mockolate-as3</artifactId>
-            <version>0.12.2</version>
-            <type>swc</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>drewbourne</groupId>
-            <artifactId>hamcrest-as3</artifactId>
-            <version>1.1.3</version>
-            <type>swc</type>
-            <scope>test</scope>
-        </dependency>
-        -->
     </dependencies>
 
 </project>

as3snapi-sandbox/src/SandboxMain.mxml

 <?xml version="1.0"?>
 <s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
-               xmlns:s="library://ns.adobe.com/flex/spark"
-               xmlns:containers="mx.containers.*"
-               xmlns:ui="sandbox.ui.*"
-               creationComplete="creationCompleteHandler(event)">
+        xmlns:s="library://ns.adobe.com/flex/spark"
+        xmlns:ui="sandbox.ui.*"
+        creationComplete="creationCompleteHandler(event)">
     <s:VGroup width="100%" height="100%">
-        <s:HGroup width="100%">
-            <s:Button label="Settings" click="button1_clickHandler(event)"/>
-            <s:Button label="Capture mock snapshot" click="button2_clickHandler(event)"/>
+        <s:HGroup width="100%" chromeColor="green" color="white">
+            <s:Button label="Settings" click="button1_clickHandler(event)" />
+            <s:Button label="Capture mock snapshot" click="button2_clickHandler(event)" />
         </s:HGroup>
-        <ui:MainPanel id="mainPanel" width="100%" height="100%"/>
+        <ui:MainPanel id="mainPanel" width="100%" height="100%" />
     </s:VGroup>
 
     <fx:Script><![CDATA[

as3snapi-sandbox/src/sandbox/ui/MainPanel.mxml

 <?xml version="1.0"?>
 <s:VGroup xmlns:fx="http://ns.adobe.com/mxml/2009"
-          xmlns:s="library://ns.adobe.com/flex/spark"
-          xmlns:containers="library://ns.adobe.com/flex/mx">
+        xmlns:s="library://ns.adobe.com/flex/spark"
+        xmlns:containers="library://ns.adobe.com/flex/mx">
 
-    <s:ButtonBar dataProvider="{pages}"/>
+    <s:ButtonBar dataProvider="{pages}" chromeColor="blue" color="white" />
     <containers:ViewStack id="pages" creationPolicy="all" width="100%" height="100%">
         <s:NavigatorContent label="Log" width="100%" height="100%">
             <s:VGroup width="100%" height="100%">
                 <!--<s:Button label="clear log" click="logTxt.text='';"/>-->
-                <s:TextArea width="100%" height="100%" id="logTxt" editable="false"/>
+                <s:TextArea width="100%" height="100%" id="logTxt" editable="false" />
             </s:VGroup>
         </s:NavigatorContent>
         <s:NavigatorContent label="apiLog" width="100%" height="100%">
             <s:VGroup width="100%" height="100%">
-                <s:Button label="clear log" click="apiLogTxt.text='';"/>
-                <s:TextArea width="100%" height="100%" id="apiLogTxt" editable="false"/>
+                <s:Button label="clear log" click="apiLogTxt.text='';" />
+                <s:TextArea width="100%" height="100%" id="apiLogTxt" editable="false" />
             </s:VGroup>
         </s:NavigatorContent>
         <s:NavigatorContent label="eventLog" width="100%" height="100%">
             <s:VGroup width="100%" height="100%">
-                <s:Button label="clear log" click="eventLogTxt.text='';"/>
-                <s:TextArea width="100%" height="100%" id="eventLogTxt" editable="false"/>
+                <s:Button label="clear log" click="eventLogTxt.text='';" />
+                <s:TextArea width="100%" height="100%" id="eventLogTxt" editable="false" />
             </s:VGroup>
         </s:NavigatorContent>
         <s:NavigatorContent label="friends" width="100%" height="100%">
             <s:Scroller width="100%" height="100%">
                 <s:DataGroup itemRenderer="sandbox.ui.ProfileRenderer"
-                             id="friendsProfilesDG"
-                             dataProvider="{friendsProfiles}">
+                        id="friendsProfilesDG"
+                        dataProvider="{friendsProfiles}">
                     <s:layout>
-                        <s:VerticalLayout useVirtualLayout="true"/>
+                        <s:VerticalLayout useVirtualLayout="true" />
                     </s:layout>
                 </s:DataGroup>
             </s:Scroller>
         <s:NavigatorContent label="appFriends" width="100%" height="100%">
             <s:Scroller width="100%" height="100%">
                 <s:DataGroup itemRenderer="sandbox.ui.ProfileRenderer"
-                             id="appFriendsProfilesDG"
-                             dataProvider="{appFriendsProfiles}">
+                        id="appFriendsProfilesDG"
+                        dataProvider="{appFriendsProfiles}">
                     <s:layout>
-                        <s:VerticalLayout useVirtualLayout="true"/>
+                        <s:VerticalLayout useVirtualLayout="true" />
                     </s:layout>
                 </s:DataGroup>
             </s:Scroller>
         <s:NavigatorContent label="profiles" width="100%" height="100%">
             <s:VGroup width="100%" height="100%">
                 <s:HGroup>
-                    <s:TextInput id="profilesUserIdTI" width="200"/>
-                    <s:Button id="profilesLoadBtn" label="load profiles"/>
-                    <s:Button label="clean history" click="profiles =  new ArrayList()"/>
+                    <s:TextInput id="profilesUserIdTI" width="200" />
+                    <s:Button id="profilesLoadBtn" label="load profiles" />
+                    <s:Button label="clean history" click="profiles =  new ArrayList()" />
                 </s:HGroup>
                 <s:Scroller width="100%" height="100%">
                     <s:DataGroup itemRenderer="sandbox.ui.ProfileRenderer"
-                                 id="profilesDG"
-                                 dataProvider="{profiles}">
+                            id="profilesDG"
+                            dataProvider="{profiles}">
                         <s:layout>
-                            <s:VerticalLayout useVirtualLayout="true"/>
+                            <s:VerticalLayout useVirtualLayout="true" />
                         </s:layout>
                     </s:DataGroup>
                 </s:Scroller>
         </s:NavigatorContent>
         <s:NavigatorContent label="uiFeatures" width="100%" height="100%">
             <s:Scroller width="100%" height="100%">
-                <s:VGroup id="btns"/>
+                <s:VGroup id="btns" />
             </s:Scroller>
         </s:NavigatorContent>
     </containers:ViewStack>
 
         import mx.collections.ArrayList;
         import mx.collections.IList;
-        import mx.events.FlexEvent;
-
-        import sandbox.AppController;
 
         [Bindable]
         public var friendsProfiles:IList;
                         <optimize>true</optimize>
                         <targetPlayer>${flashplayer.version}</targetPlayer>
                         <staticLinkRuntimeSharedLibraries>true</staticLinkRuntimeSharedLibraries>
-                        <!--<warnings>--><!--<noConstructor>false</noConstructor>--><!--</warnings>--><!--<locales>--><!--<locale>en_US</locale>--><!--</locales>--><!--<configurationReport>true</configurationReport>-->
-
                         <compilerWarnings>
                             <no-constructor>false</no-constructor>
                         </compilerWarnings>
                         </dependency>
                     </dependencies>
                 </plugin>
-
-                <!--
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <configuration>
-                        <outputDirectory>${project.build.directory}/lib/</outputDirectory>
-                        <overWriteReleases>false</overWriteReleases>
-                        <overWriteSnapshots>false</overWriteSnapshots>
-                        <overWriteIfNewer>true</overWriteIfNewer>
-                        <artifactItems/>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>copy-dependencies</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>copy-dependencies</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                -->
-            </plugins>
+             </plugins>
         </pluginManagement>
     </build>
 
             <version>${flex.version}</version>
             <type>pom</type>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>com.adobe.flexunit</groupId>
-            <artifactId>flexunit</artifactId>
-            <version>4.1.0</version>
-            <type>swc</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.adobe</groupId>
-            <artifactId>as3corelib</artifactId>
-            <version>0.93.0</version>
-            <type>swc</type>
-        </dependency>
-        -->
     </dependencies>
 
     <repositories>