Merge pull request #3500 from riadvice/imrpove-flex4-structure

Improve flex4 structure

clients/flash/air-client/src/ColorPalette.as

@@ -1 +0,0 @@
-../../common-library/src/main/actionscript/ColorPalette

clients/flash/air-client/src/Default.css

@@ -4,7 +4,7 @@
 @namespace libChat "org.bigbluebutton.lib.chat.views.*";
 
 @font-face { 
-	src: 		url("assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
+	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
 	fontFamily:	SourceSansPro; 
 	fontStyle:	normal; 
 	fontWeight:	normal; 
@@ -12,7 +12,7 @@
 }
 
 @font-face { 
-	src:		url("assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf"); 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf"); 
 	fontFamily:	SourceSansPro; 
 	fontStyle:	normal; 
 	fontWeight:	bold; 
@@ -20,7 +20,7 @@
 }
 
 @font-face { 
-	src:		url("assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf"); 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf"); 
 	fontFamily:	SourceSansPro; 
 	fontStyle:	italic; 
 	fontWeight:	normal; 
@@ -28,7 +28,7 @@
 }
 
 @font-face { 
-	src:		url("assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf"); 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf"); 
 	fontFamily:	SourceSansPro; 
 	fontStyle:	normal; 
 	fontWeight:	heavy; 
@@ -36,7 +36,7 @@
 }
 
 @font-face { 
-	src: 		url("assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
+	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
 	fontFamily:	SourceSansProMX; 
 	fontStyle:	normal; 
 	fontWeight:	normal; 
@@ -44,7 +44,7 @@
 }
 
 @font-face {
-	src: 		url("assets/fonts/BBBIcons/bbb-icons.ttf"); 
+	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf"); 
 	fontFamily:	BBBIcons; 
 	fontStyle:	normal; 
 	fontWeight:	normal; 
@@ -52,7 +52,7 @@
 }
 
 @font-face {
-	src: 		url("assets/fonts/BBBIcons/bbb-icons.ttf"); 
+	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf"); 
 	fontFamily:	BBBIcons; 
 	fontStyle:	normal; 
 	fontWeight:	bold; 

clients/flash/air-client/src/Main.mxml

@@ -14,7 +14,7 @@
 
 	<fx:Script>
 		<![CDATA[
-			include "ColorPalette.as"
+			include "../../shared/ColorPalette.as"
 			
 			import com.adobe.utils.LocaleUtil;
 			

clients/flash/air-client/src/assets

@@ -1 +0,0 @@
-../../common-library/src/main/actionscript/assets/

clients/flash/air-client/src/org/bigbluebutton/air/main/views/PagesNavigatorViewMediator.as

@@ -15,8 +15,7 @@ package org.bigbluebutton.air.main.views {
 	import org.bigbluebutton.air.common.TransitionAnimationEnum;
 	import org.bigbluebutton.air.main.models.IUISession;
 	
-	import robotlegs.bender.bundles.mvcs.Mediator;
-	import org.bigbluebutton.air.main.viewsold.pagesnavigator.IPagesNavigatorView;
+	import robotlegs.bender.bundles.mvcs.Mediator;
 	
 	public class PagesNavigatorViewMediator extends Mediator {
 		

clients/flash/air-client/src/org/bigbluebutton/air/video/VideoConfig.as

@@ -1,14 +1,6 @@
 package org.bigbluebutton.air.video {
 	
-	import org.bigbluebutton.air.main.viewsold.ui.videobutton.IVideoButton;
-	import org.bigbluebutton.air.main.viewsold.ui.videobutton.VideoButtonMediator;
 	import org.bigbluebutton.air.video.commands.ShareCameraCommand;
-	import org.bigbluebutton.air.video.views.swapcamera.ISwapCameraButton;
-	import org.bigbluebutton.air.video.views.swapcamera.SwapCameraMediator;
-	import org.bigbluebutton.air.video.views.videochat.IVideoChatView;
-	import org.bigbluebutton.air.video.views.videochat.VideoChatViewMediator;
-	import org.bigbluebutton.lib.video.commands.CameraQualityCommand;
-	import org.bigbluebutton.lib.video.commands.CameraQualitySignal;
 	import org.bigbluebutton.lib.video.commands.ShareCameraSignal;
 	
 	import robotlegs.bender.extensions.mediatorMap.api.IMediatorMap;

clients/flash/build.gradle

@@ -10,6 +10,7 @@ buildscript {
 
 subprojects {
 	apply plugin: 'gradlefx'
+	apply plugin: 'flashbuilder'
 
 	version = '0.1-SNAPSHOT'
 }

clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/models/IChatMessagesSession.as

@@ -2,8 +2,6 @@ package org.bigbluebutton.lib.chat.models {
 	
 	import mx.collections.ArrayCollection;
 	
-	import org.osflash.signals.ISignal;
-	
 	public interface IChatMessagesSession {
 		function get chats():ArrayCollection;
 		function set chats(val:ArrayCollection):void;

clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/common/services/BaseConnection.as

@@ -152,7 +152,7 @@ package org.bigbluebutton.lib.common.services {
 		
 		protected function netASyncError(event:AsyncErrorEvent):void {
 			trace(LOG + "Asynchronous code error - " + event.error + " on " + _uri);
-      trace(event.toString());
+      		trace(event.toString());
 			sendConnectionFailedSignal(ConnectionFailedEvent.UNKNOWN_REASON);
 		}