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 2018/12/26 17:27:14 UTC
[royale-asjs] branch develop updated: rename "activableName" to
"name"
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 af5c7a2 rename "activableName" to "name"
af5c7a2 is described below
commit af5c7a2623ab2fc9ede6e45494f9fbf99793c554
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Dec 26 18:27:04 2018 +0100
rename "activableName" to "name"
---
.../TourDeJewel/src/main/royale/MainContent.mxml | 52 +++++++++++-----------
.../src/main/royale/TabBarPlayGround.mxml | 8 ++--
.../src/main/royale/WizardPlayGround.mxml | 10 ++---
.../ExampleAndSourceCodeTabbedSectionContent.as | 25 +++++++----
.../apache/royale/jewel/ApplicationMainContent.as | 6 +--
.../org/apache/royale/jewel/SectionContent.as | 31 ++++++++++---
.../org/apache/royale/jewel/TabBarContent.as | 4 +-
.../org/apache/royale/jewel/WizardContent.as | 6 +--
.../royale/jewel/supportClasses/IActivable.as | 6 +--
pom.xml | 17 ++++++-
10 files changed, 101 insertions(+), 64 deletions(-)
diff --git a/examples/royale/TourDeJewel/src/main/royale/MainContent.mxml b/examples/royale/TourDeJewel/src/main/royale/MainContent.mxml
index fdd7358..a4e9952 100644
--- a/examples/royale/TourDeJewel/src/main/royale/MainContent.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/MainContent.mxml
@@ -120,32 +120,32 @@ limitations under the License.
</j:TopAppBar>
<j:ApplicationMainContent id="main" hasTopAppBar="true" className="mainContent">
- <local:WelcomeSection activableName="welcome_panel" isActive="true"/>
- <local:AlertPlayGround activableName="alert_panel"/>
- <local:ButtonPlayGround activableName="button_panel"/>
- <local:ImagePlayGround activableName="image_panel"/>
- <local:NumericStepperPlayGround activableName="numericstepper_panel"/>
- <local:DateComponentsPlayGround activableName="datecomponents_panel"/>
- <local:ComboBoxPlayGround activableName="combobox_panel"/>
- <local:CheckBoxPlayGround activableName="checkbox_panel"/>
- <local:MiscelaneaPlayGound activableName="miscelanea_panel"/>
- <local:HeadingsAndText activableName="text_panel"/>
- <local:LabelPlayGround activableName="label_panel"/>
- <local:ListPlayGround activableName="list_panel"/>
- <local:RadioButtonPlayGround activableName="radiobutton_panel"/>
- <local:SliderPlayGround activableName="slider_panel"/>
- <local:TextInputPlayGround activableName="textinput_panel"/>
- <local:GridPlayGround activableName="grid_panel"/>
- <local:CardPlayGround activableName="card_panel"/>
- <local:TablePlayGround activableName="tables_panel"/>
- <local:FormsValidationPlayGround activableName="form_validation_panel"/>
- <local:DropDownListPlayGround activableName="dropdownlist_panel"/>
- <local:SnackbarPlayGround activableName="snackbar_panel"/>
- <local:TabBarPlayGround activableName="tabbar_panel"/>
- <local:ViewStatesPlayGround activableName="viewstates_panel"/>
- <local:LayoutsPlayGround activableName="layouts_panel"/>
- <local:WizardPlayGround activableName="wizards_panel"/>
- <local:PopUpViewPlayGround activableName="popupview_panel"/>
+ <local:WelcomeSection name="welcome_panel" isActive="true"/>
+ <local:AlertPlayGround name="alert_panel"/>
+ <local:ButtonPlayGround name="button_panel"/>
+ <local:ImagePlayGround name="image_panel"/>
+ <local:NumericStepperPlayGround name="numericstepper_panel"/>
+ <local:DateComponentsPlayGround name="datecomponents_panel"/>
+ <local:ComboBoxPlayGround name="combobox_panel"/>
+ <local:CheckBoxPlayGround name="checkbox_panel"/>
+ <local:MiscelaneaPlayGound name="miscelanea_panel"/>
+ <local:HeadingsAndText name="text_panel"/>
+ <local:LabelPlayGround name="label_panel"/>
+ <local:ListPlayGround name="list_panel"/>
+ <local:RadioButtonPlayGround name="radiobutton_panel"/>
+ <local:SliderPlayGround name="slider_panel"/>
+ <local:TextInputPlayGround name="textinput_panel"/>
+ <local:GridPlayGround name="grid_panel"/>
+ <local:CardPlayGround name="card_panel"/>
+ <local:TablePlayGround name="tables_panel"/>
+ <local:FormsValidationPlayGround name="form_validation_panel"/>
+ <local:DropDownListPlayGround name="dropdownlist_panel"/>
+ <local:SnackbarPlayGround name="snackbar_panel"/>
+ <local:TabBarPlayGround name="tabbar_panel"/>
+ <local:ViewStatesPlayGround name="viewstates_panel"/>
+ <local:LayoutsPlayGround name="layouts_panel"/>
+ <local:WizardPlayGround name="wizards_panel"/>
+ <local:PopUpViewPlayGround name="popupview_panel"/>
</j:ApplicationMainContent>
<!-- <j:ResponsiveSizeMonitor/> -->
diff --git a/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml
index 866aef4..4d260d1 100644
--- a/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/TabBarPlayGround.mxml
@@ -66,16 +66,16 @@ limitations under the License.
</j:beads>
</j:TabBar>
<j:TabBarContent id="tabcontent">
- <j:SectionContent activableName="tab1" isActive="true">
+ <j:SectionContent name="tab1" isActive="true">
<j:Label text="Tab 1"/>
</j:SectionContent>
- <j:SectionContent activableName="tab2">
+ <j:SectionContent name="tab2">
<j:Label text="Tab 2"/>
</j:SectionContent>
- <j:SectionContent activableName="tab3">
+ <j:SectionContent name="tab3">
<j:Label text="Tab 3"/>
</j:SectionContent>
- <j:SectionContent activableName="tab4">
+ <j:SectionContent name="tab4">
<j:Label text="Tab 4"/>
</j:SectionContent>
</j:TabBarContent>
diff --git a/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml
index 61ff459..e74e71e 100644
--- a/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/WizardPlayGround.mxml
@@ -61,7 +61,7 @@ limitations under the License.
</j:Group>
</j:nextButton>
- <j:WizardPage activableName="page1">
+ <j:WizardPage name="page1">
<views:step>
<j:WizardStep name="page1" nextStep="page2" initialPage="true" stepLabel="Page 1"/>
</views:step>
@@ -70,7 +70,7 @@ limitations under the License.
</j:WizardPage>
- <j:WizardPage activableName="page2">
+ <j:WizardPage name="page2">
<views:step>
<j:WizardStep id="sl" name="page2" previousStep="page1" nextStep="page3" stepLabel="Page 2"/>
</views:step>
@@ -85,7 +85,7 @@ limitations under the License.
</j:WizardPage>
- <j:WizardPage activableName="page3">
+ <j:WizardPage name="page3">
<views:step>
<j:WizardStep name="page3" previousStep="page2" nextStep="page4" stepLabel="Page 3"/>
</views:step>
@@ -99,7 +99,7 @@ limitations under the License.
</j:WizardPage>
- <j:WizardPage localId="page4" activableName="page4">
+ <j:WizardPage localId="page4" name="page4">
<views:step>
<j:WizardStep name="page4" previousStep="page3" nextStep="page5" stepLabel="Page 4"/>
</views:step>
@@ -115,7 +115,7 @@ limitations under the License.
</j:WizardPage>
- <j:WizardPage activableName="page5">
+ <j:WizardPage name="page5">
<views:step>
<j:WizardStep name="page5" previousStep="page4" stepLabel="Page 5"/>
</views:step>
diff --git a/examples/royale/TourDeJewel/src/main/royale/components/ExampleAndSourceCodeTabbedSectionContent.as b/examples/royale/TourDeJewel/src/main/royale/components/ExampleAndSourceCodeTabbedSectionContent.as
index 065acfd..c7e5688 100644
--- a/examples/royale/TourDeJewel/src/main/royale/components/ExampleAndSourceCodeTabbedSectionContent.as
+++ b/examples/royale/TourDeJewel/src/main/royale/components/ExampleAndSourceCodeTabbedSectionContent.as
@@ -53,7 +53,7 @@ package components
super();
exampleTab = new SectionContent();
- exampleTab.activableName = "exampleTab";
+ exampleTab.name = "exampleTab";
exampleTab.isActive = true;
contentArea = exampleTab;
@@ -61,20 +61,27 @@ package components
}
private var service:GitHubService;
-
- private var sourceCodeUrlPrefix:String = "https://api.github.com/repos/apache/royale-asjs/contents/examples/royale/TourDeJewel/src/main/royale/";
- public var sourceCodeUrl:String;
-
private var tabbar:TabBar;
private var tabBarNavigation:ArrayList;
-
private var tabcontent:TabBarContent;
-
private var exampleTab:SectionContent;
private var sourceCodeTab:SectionContent;
-
private var sourceCodeMXMLText:Code;
+ private var sourceCodeUrlPrefix:String = "https://api.github.com/repos/apache/royale-asjs/contents/examples/royale/TourDeJewel/src/main/royale/";
+
+ private var _sourceCodeUrl:String;
+ /**
+ * sourceCodeUrl, the name of the resource in the project that hangs from "src/main/royale"
+ */
+ public function get sourceCodeUrl():String
+ {
+ return _sourceCodeUrl;
+ }
+ public function set sourceCodeUrl(value:String):void
+ {
+ _sourceCodeUrl = value;
+ }
private function initCompleteHandler(event:Event):void
{
@@ -90,7 +97,7 @@ package components
$addElement(tabbar);
sourceCodeTab = new SectionContent();
- sourceCodeTab.activableName = "sourceCodeTab";
+ sourceCodeTab.name = "sourceCodeTab";
var pre:Pre = new Pre();
sourceCodeMXMLText = new Code();
sourceCodeMXMLText.className = "xml codeExample";
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
index 389c209..7b4854d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
@@ -85,14 +85,14 @@ package org.apache.royale.jewel
/**
* shows a concrete content and hides the rest
*
- * @param activableName, the activableName of the container to show
+ * @param name, the name of the container to show
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public function showContent(activableName:String):void
+ public function showContent(name:String):void
{
try
{
@@ -100,7 +100,7 @@ package org.apache.royale.jewel
{
var content:IActivable = getElementAt(i) as IActivable;
- if(content.activableName == activableName)
+ if(content.name == name)
{
content.isActive = true;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as
index 515320e..1f01757 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as
@@ -88,26 +88,43 @@ package org.apache.royale.jewel
}
}
- private var _activableName:String;
+ private var _name:String;
/**
- * activableName is the name od this activable content
+ * name is the name od this activable content
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public function get activableName():String
+ COMPILE::SWF
+ override public function get name():String
{
- return _activableName;
+ return _name;
}
- public function set activableName(value:String):void
+ COMPILE::SWF
+ override public function set name(value:String):void
{
- if (_activableName != value)
+ if (_name != value)
{
- _activableName = value;
+ _name = value;
+ }
+ }
+
+ COMPILE::JS
+ public function get name():String
+ {
+ return _name;
+ }
+
+ COMPILE::JS
+ public function set name(value:String):void
+ {
+ if (_name != value)
+ {
+ _name = value;
}
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as
index 91b95d1..23d54aa 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as
@@ -63,7 +63,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public function showContent(activableName:String):void
+ public function showContent(name:String):void
{
try
{
@@ -71,7 +71,7 @@ package org.apache.royale.jewel
{
var content:IActivable = getElementAt(i) as IActivable;
- if(content.activableName == activableName)
+ if(content.name == name)
{
content.isActive = true;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as
index ad94fea..f3c8bf4 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as
@@ -57,14 +57,14 @@ package org.apache.royale.jewel
/**
* shows a concrete content and hides the rest
*
- * @param activableName, the activableName of the container to show
+ * @param name, the name of the container to show
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public function showContent(activableName:String):void
+ public function showContent(name:String):void
{
try
{
@@ -72,7 +72,7 @@ package org.apache.royale.jewel
{
var content:IActivable = getElementAt(i) as IActivable;
- if(content.activableName == activableName)
+ if(content.name == name)
{
content.isActive = true;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as
index bb344e9..857ae38 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as
@@ -43,14 +43,14 @@ package org.apache.royale.jewel.supportClasses
function set isActive(value:Boolean):void;
/**
- * activableName is the name od this activable content
+ * name is the name od this activable content
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- function get activableName():String;
- function set activableName(value:String):void;
+ function get name():String;
+ function set name(value:String):void;
}
}
diff --git a/pom.xml b/pom.xml
index 21c0c95..3c08281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,10 +77,23 @@
<!-- Only configure the site distribution as the rest is handled by the apache parent -->
<distributionManagement>
- <site>
+ <!-- <site>
<id>apache.website</id>
<url>scm:git:https://git-wip-us.apache.org/repos/asf/royale-asjs.git</url>
- </site>
+ </site> -->
+ <repository>
+ <id>sgc</id>
+ <url>http://maven.codeoscopic.com/content/repositories/sgc</url>
+ </repository>
+ <snapshotRepository>
+ <id>sgc-snaps</id>
+ <url>http://maven.codeoscopic.com/content/repositories/sgc-snaps</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ <site>
+ <id>sgc-site</id>
+ <url>dav:http://dav.codeoscopic.com/private/sites/sgc</url>
+ </site>
</distributionManagement>
<issueManagement>