You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/12/14 17:34:16 UTC

[royale-asjs] branch develop updated: jewel: some cleaning of imports and texts

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new b91ad97  jewel: some cleaning of imports and texts
b91ad97 is described below

commit b91ad97d2f0c4c29bc2bdfdb1aa905d059b302dc
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Dec 14 18:34:08 2019 +0100

    jewel: some cleaning of imports and texts
---
 .../royale/jewel/beads/views/CheckBoxView.as       |  4 +--
 .../royale/jewel/beads/views/DateChooserView.as    |  2 --
 .../royale/jewel/beads/views/DateFieldView.as      |  1 -
 .../royale/jewel/beads/views/DropDownListView.as   |  6 ++--
 .../apache/royale/jewel/beads/views/PopUpView.as   |  3 +-
 .../royale/jewel/beads/views/RadioButtonView.as    |  4 +--
 .../royale/jewel/beads/views/SliderThumbView.as    |  5 +---
 .../royale/jewel/beads/views/SliderTrackView.as    |  5 +---
 .../royale/jewel/beads/views/SnackbarView.as       |  7 +++--
 .../apache/royale/jewel/beads/views/SpinnerView.as | 32 ++++++++++------------
 .../apache/royale/jewel/beads/views/TableView.as   |  2 +-
 .../royale/jewel/beads/views/TextFieldView.as      |  7 +++--
 .../royale/jewel/itemRenderers/DateItemRenderer.as |  4 ---
 .../itemRenderers/DropDownListItemRenderer.as      | 11 ++++----
 14 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/CheckBoxView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/CheckBoxView.as
index 13ca6ea..434ee1e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/CheckBoxView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/CheckBoxView.as
@@ -32,8 +32,8 @@ package org.apache.royale.jewel.beads.views
 	import org.apache.royale.events.Event;
 	
     /**
-     *  The CheckBoxView class is the default view for
-     *  the org.apache.royale.html.CheckBox class.
+     *  The CheckBoxView class is the default view for SWF platform
+     *  in the org.apache.royale.jewel.CheckBox class.
      *  It displays a simple checkbox with an 'x' if checked,
      *  and a label on the right.  There are no styles or
      *  properties to configure the look of the 'x' or the
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
index 18826ec..7af5484 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
@@ -37,8 +37,6 @@ package org.apache.royale.jewel.beads.views
 	import org.apache.royale.jewel.supportClasses.table.TableHeaderCell;
 	import org.apache.royale.jewel.supportClasses.table.TableRow;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
-	// import org.apache.royale.jewel.beads.controllers.TableCellSelectionMouseController;
-	// import org.apache.royale.jewel.beads.controllers.DateChooserTableCellSelectionMouseController;
 
 	/**
 	 * The DateChooserView class is a view bead for the DateChooser.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
index a415d6d..e702b28 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
@@ -20,7 +20,6 @@ package org.apache.royale.jewel.beads.views
 {
 	COMPILE::SWF
 	{
-	import flash.text.TextFieldType;
 	import flash.utils.setTimeout;
 	}
 	COMPILE::JS
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as
index 975bd0f..34d4e47 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as
@@ -18,10 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-COMPILE::JS
-{
+    COMPILE::JS
+    {
     import org.apache.royale.html.elements.Select;
-}
+    }
     import org.apache.royale.core.ISelectableItemRenderer;
     import org.apache.royale.core.ISelectionModel;
     import org.apache.royale.core.IStrand;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/PopUpView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/PopUpView.as
index 16cb1f3..099a8e9 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/PopUpView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/PopUpView.as
@@ -20,9 +20,8 @@ package org.apache.royale.jewel.beads.views
 {
 	COMPILE::SWF
 	{
-		import flash.utils.setTimeout;
+	import flash.utils.setTimeout;
     }
-	
     import org.apache.royale.core.BeadViewBase;
     import org.apache.royale.core.IBeadView;
     import org.apache.royale.core.IChild;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/RadioButtonView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/RadioButtonView.as
index 8ec6cb9..e26a169 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/RadioButtonView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/RadioButtonView.as
@@ -32,8 +32,8 @@ package org.apache.royale.jewel.beads.views
 	import org.apache.royale.events.Event;
 	
 	/**
-	 *  The RadioButtonView class creates the visual elements of the org.apache.royale.html.RadioButton 
-	 *  component. 
+	 *  The RadioButtonView class creates the visual elements of the org.apache.royale.jewel.RadioButton
+	 *  for the SWF platform component.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderThumbView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderThumbView.as
index 83d6172..5314c3e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderThumbView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderThumbView.as
@@ -18,12 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-	COMPILE::SWF
-	{
 	import flash.display.Graphics;
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
-	}
 
     import org.apache.royale.core.BeadViewBase;
     import org.apache.royale.core.IBeadView;
@@ -35,7 +32,7 @@ package org.apache.royale.jewel.beads.views
 	
 	/**
 	 *  The SliderThumbView class creates the draggable input element for the 
-	 *  org.apache.royale.jewel.HSlider component.
+	 *  org.apache.royale.jewel.HSlider component for the SWF platform.
 	 *  
 	 *  @viewbead
 	 *  @langversion 3.0
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderTrackView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderTrackView.as
index e76ba4f..6630ef7 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderTrackView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderTrackView.as
@@ -18,12 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-	COMPILE::SWF
-	{
 	import flash.display.Graphics;
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
-	}
 
 	import org.apache.royale.core.BeadViewBase;
 	import org.apache.royale.core.IBeadView;
@@ -35,7 +32,7 @@ package org.apache.royale.jewel.beads.views
 	
 	/**
 	 *  The SliderTrackView class creates the track area for the org.apache.royale.jewel.HSlider
-	 *  component.
+	 *  component for the SWF platform.
 	 *  
 	 *  @viewbead
 	 *  @langversion 3.0
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SnackbarView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SnackbarView.as
index dade0af..a913144 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SnackbarView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SnackbarView.as
@@ -20,14 +20,17 @@ package org.apache.royale.jewel.beads.views
 {
     COMPILE::SWF
 	{
-        import flash.utils.setTimeout;
+    import flash.utils.setTimeout;
 	}
+    COMPILE::JS
+	{
+    import org.apache.royale.core.UIBase;
+    }
     import org.apache.royale.core.BeadViewBase;
     import org.apache.royale.core.IStrand;
     import org.apache.royale.events.Event;
     import org.apache.royale.jewel.Snackbar;
     import org.apache.royale.jewel.beads.models.SnackbarModel;
-    import org.apache.royale.core.UIBase;
 
     /**
 	 *  The SnackbarView class creates the visual elements of the org.apache.royale.jewel.Snackbar 
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as
index 1045faa..e57cef9 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as
@@ -18,26 +18,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-COMPILE::SWF {
+	COMPILE::SWF {
 	import flash.display.DisplayObject;
-}
-
+	}
+	COMPILE::JS {
+	import org.apache.royale.jewel.beads.controllers.SpinnerMouseController;
+	}
     import org.apache.royale.core.BeadViewBase;
-	import org.apache.royale.core.IBeadModel;
-	import org.apache.royale.core.IBeadView;
-	import org.apache.royale.core.IRangeModel;
-	import org.apache.royale.core.IStrand;
-	import org.apache.royale.core.ILayoutChild;
-	import org.apache.royale.core.UIBase;
-	import org.apache.royale.events.Event;
-	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.jewel.Button;
-	// import org.apache.royale.jewel.beads.controllers.ButtonAutoRepeatController;
-    import org.apache.royale.jewel.beads.controls.spinner.ISpinnerView
+    import org.apache.royale.core.IBeadModel;
+    import org.apache.royale.core.IBeadView;
+    import org.apache.royale.core.ILayoutChild;
+    import org.apache.royale.core.IRangeModel;
+    import org.apache.royale.core.IStrand;
+    import org.apache.royale.core.UIBase;
+    import org.apache.royale.events.Event;
+    import org.apache.royale.events.IEventDispatcher;
+    import org.apache.royale.jewel.Button;
+    import org.apache.royale.jewel.beads.controls.spinner.ISpinnerView;
 
-COMPILE::JS {
-	import org.apache.royale.jewel.beads.controllers.SpinnerMouseController;
-}
 
 	/**
 	 *  The SpinnerView class creates the visual elements of the org.apache.royale.jewel.Spinner
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as
index 89461de..3255256 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as
@@ -20,13 +20,13 @@ package org.apache.royale.jewel.beads.views
 {
 	import org.apache.royale.core.ISelectableItemRenderer;
 	import org.apache.royale.core.IStrand;
+	import org.apache.royale.core.IStrandWithModel;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.jewel.beads.models.TableModel;
 	import org.apache.royale.jewel.beads.views.ListView;
 	import org.apache.royale.jewel.supportClasses.table.TFoot;
 	import org.apache.royale.jewel.supportClasses.table.THead;
-	import org.apache.royale.core.IStrandWithModel;
 	
 	/**
 	 *  The TableView class creates the visual elements of the org.apache.royale.jewel.Table component.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
index 258c4c4..fcc74f6 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
@@ -18,12 +18,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-    import org.apache.royale.html.beads.TextFieldViewBase
-	import flash.text.TextFieldType;
+    import flash.text.TextFieldType;
+
+    import org.apache.royale.html.beads.TextFieldViewBase;
 	
     /**
      *  The TextFieldView class is the default view for
-     *  the org.apache.royale.jewel.Label class.
+     *  the org.apache.royale.jewel.Label class in the SWF platform.
      *  It displays text using a TextInput, so there is no
      *  right-to-left text support in this view.
      *  
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as
index f218369..a9d0ce8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as
@@ -18,10 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.itemRenderers
 {
-	COMPILE::SWF
-	{
-		import flash.text.TextFieldAutoSize;
-	}
 	import org.apache.royale.jewel.beads.models.DateChooserModel;
 
 	/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DropDownListItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DropDownListItemRenderer.as
index d6261eb..499847d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DropDownListItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DropDownListItemRenderer.as
@@ -18,15 +18,14 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.itemRenderers
 {
-    import org.apache.royale.html.elements.Option;
-    import org.apache.royale.html.supportClasses.MXMLItemRenderer;
-    import org.apache.royale.jewel.beads.views.DropDownListView;
-
     COMPILE::JS
     {
-        import org.apache.royale.core.WrappedHTMLElement;            
+    import org.apache.royale.core.WrappedHTMLElement;
+    import org.apache.royale.jewel.beads.views.DropDownListView;            
     }
-	
+    import org.apache.royale.html.elements.Option;
+    import org.apache.royale.html.supportClasses.MXMLItemRenderer;
+
     /**
      *  The DropDownListItemRenderer class creates a DropDownList menu item
      *