From 89d36af226fdc9431348ede8410636983bf1b4b4 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Fri, 23 Sep 2011 10:45:23 -0400
Subject: [PATCH] re-arrange present module dir
---
.../modules/present/api/IPresentationButton.as | 2 +-
.../modules/present/managers/PresentManager.as | 4 ++--
.../bigbluebutton/modules/present/maps/PresentEventMap.mxml | 2 +-
.../modules/present/{ => ui}/views/FileUploadWindow.mxml | 0
.../modules/present/{ => ui}/views/GotoPageDialog.mxml | 6 +++++-
.../modules/present/{ => ui}/views/PresentationWindow.mxml | 4 ++--
.../modules/present/{ => ui}/views/SlideView.mxml | 2 +-
.../modules/present/{ => ui}/views/Thumbnail.mxml | 0
.../modules/whiteboard/events/WhiteboardButtonEvent.as | 2 +-
.../modules/whiteboard/views/WhiteboardButton.mxml | 2 +-
.../modules/whiteboard/views/WhiteboardToolbar.mxml | 2 +-
11 files changed, 15 insertions(+), 11 deletions(-)
rename bigbluebutton-client/src/org/bigbluebutton/modules/present/{ => ui}/views/FileUploadWindow.mxml (100%)
rename bigbluebutton-client/src/org/bigbluebutton/modules/present/{ => ui}/views/GotoPageDialog.mxml (87%)
rename bigbluebutton-client/src/org/bigbluebutton/modules/present/{ => ui}/views/PresentationWindow.mxml (96%)
rename bigbluebutton-client/src/org/bigbluebutton/modules/present/{ => ui}/views/SlideView.mxml (96%)
rename bigbluebutton-client/src/org/bigbluebutton/modules/present/{ => ui}/views/Thumbnail.mxml (100%)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/api/IPresentationButton.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/api/IPresentationButton.as
index 2cd7faac9a..7d6049a856 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/api/IPresentationButton.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/api/IPresentationButton.as
@@ -18,7 +18,7 @@
*/
package org.bigbluebutton.modules.present.api
{
- import org.bigbluebutton.modules.present.views.PresentationWindow;
+ import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
public interface IPresentationButton
{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
index ed51e1ebde..ba708dfff8 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
@@ -31,8 +31,8 @@ package org.bigbluebutton.modules.present.managers
import org.bigbluebutton.main.model.users.events.RoleChangeEvent;
import org.bigbluebutton.modules.present.events.RemovePresentationEvent;
import org.bigbluebutton.modules.present.events.UploadEvent;
- import org.bigbluebutton.modules.present.views.FileUploadWindow;
- import org.bigbluebutton.modules.present.views.PresentationWindow;
+ import org.bigbluebutton.modules.present.ui.views.FileUploadWindow;
+ import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
public class PresentManager
{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
index c3851dfc63..a8e44f2b31 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
@@ -35,7 +35,7 @@
import org.bigbluebutton.modules.present.events.SlideEvent;
import org.bigbluebutton.modules.present.events.UploadEvent;
import org.bigbluebutton.modules.present.managers.PresentManager;
- import org.bigbluebutton.modules.present.views.PresentationWindow;
+ import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
private var apiInstance:PresentationAPI;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
similarity index 100%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/GotoPageDialog.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/GotoPageDialog.mxml
similarity index 87%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/present/views/GotoPageDialog.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/GotoPageDialog.mxml
index 095bb1b8b7..c5beba8c77 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/GotoPageDialog.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/GotoPageDialog.mxml
@@ -20,7 +20,11 @@
$Id: $
-->
-<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" width="195" height="70" layout="horizontal" creationComplete="onCreationComplete()" keyDown="onKeyDown(event)">
+<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml"
+ width="195" height="70"
+ layout="horizontal"
+ creationComplete="onCreationComplete()"
+ keyDown="onKeyDown(event)">
<mx:Script>
<![CDATA[
import mx.managers.PopUpManager;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
similarity index 96%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index 73ce769e7c..5621e5a207 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -34,7 +34,7 @@
width="{DEFAULT_WINDOW_WIDTH}" height="{DEFAULT_WINDOW_HEIGHT}"
x="{DEFAULT_X_POSITION}" y="{DEFAULT_Y_POSITION}"
title="{currentPresentation}" keyUp="onKeyUp(event)"
- resize="maximizeHandler()" backgroundColor="0xDDDDDD">
+ resize="maximizeHandler()" backgroundColor="0xDDDDDD" xmlns:views="org.bigbluebutton.modules.present.ui.views.*">
<mate:Dispatcher id="globalDispatcher" />
<mate:Listener type="{MadePresenterEvent.SWITCH_TO_PRESENTER_MODE}" method="becomePresenter" />
@@ -562,7 +562,7 @@
<mx:Fade id="thumbFadeIn" alphaFrom="1" alphaTo="0" duration="100" />
<mx:Fade id="thumbFadeOut" alphaFrom="0" alphaTo="1" duration="100" />
- <thumb:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true"
+ <views:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true"
mouseUp="mouseDown = false" verticalScrollPolicy="off" horizontalScrollPolicy="off" />
<mx:ApplicationControlBar id="presCtrlBar" width="100%" height="{CONTROL_BAR_HEIGHT}">
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/SlideView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
similarity index 96%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/present/views/SlideView.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
index 6980f71e01..49ff562469 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/SlideView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
@@ -537,7 +537,7 @@
<mx:SWFLoader id="slideLoader" width="100%" height="100%" creationComplete="listenForSlideLoadedCompleteEvent()"
scaleContent="false" maintainAspectRatio="true" showBusyCursor="true" completeEffect="Fade"/>
- <mx:HorizontalList id="thumbnailView" itemRenderer="org.bigbluebutton.modules.present.views.Thumbnail" itemRollOver="changeIndex(event)"
+ <mx:HorizontalList id="thumbnailView" itemRenderer="org.bigbluebutton.modules.present.ui.views.Thumbnail" itemRollOver="changeIndex(event)"
visible="false" width="100%" height="100" y="{this.height - 100}" change="changeSlide()" />
</mx:Canvas>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/Thumbnail.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/Thumbnail.mxml
similarity index 100%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/present/views/Thumbnail.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/Thumbnail.mxml
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/events/WhiteboardButtonEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/events/WhiteboardButtonEvent.as
index d69dec958f..171db70b53 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/events/WhiteboardButtonEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/events/WhiteboardButtonEvent.as
@@ -20,7 +20,7 @@ package org.bigbluebutton.modules.whiteboard.events
{
import flash.events.Event;
- import org.bigbluebutton.modules.present.views.PresentationWindow;
+ import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
public class WhiteboardButtonEvent extends Event
{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardButton.mxml
index d441bb70ba..f3b6619af6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardButton.mxml
@@ -32,7 +32,7 @@
import org.bigbluebutton.modules.whiteboard.events.WhiteboardPresenterEvent;
import org.bigbluebutton.modules.whiteboard.events.WhiteboardUpdate;
import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
- import org.bigbluebutton.modules.present.views.PresentationWindow;
+ import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
import org.bigbluebutton.util.i18n.ResourceUtil;
private var images:Images = new Images();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
index ff7a55e8c8..69ad44ee51 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
@@ -64,7 +64,7 @@
import org.bigbluebutton.modules.whiteboard.events.StopWhiteboardModuleEvent;
import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
import org.bigbluebutton.modules.present.events.PresentationEvent;
- import org.bigbluebutton.modules.present.views.PresentationWindow;
+ import org.bigbluebutton.modules.present.ui.views.PresentationWindow;
import org.bigbluebutton.util.i18n.ResourceUtil;
private var images:Images = new Images();
--
GitLab