You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2021/12/19 06:57:08 UTC
[royale-asjs] branch develop updated (4aa577a -> b595848)
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 4aa577a Add apache heaaders, keep RAT happy.
new 8634494 Added IHasDataField and IHasLabelField
new b595848 Fixed imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../royale/org/apache/royale/html/DataContainer.as | 3 ++-
.../royale/org/apache/royale/html/DropDownList.as | 3 ++-
.../CollectionChangeUpdateForArrayListData.as | 16 ++++++++++--
.../royale/html/beads/DataFieldProviderBead.as | 2 +-
...{IAccordionCollapseBead.as => IHasDataField.as} | 8 +++---
...IAccordionCollapseBead.as => IHasLabelField.as} | 8 +++---
.../html/beads/IndexedItemRendererInitializer.as | 16 ++++++++++--
.../beads/VirtualDataItemRendererFactoryBase.as | 30 +++++++++++++++++++---
.../html/beads/models/ArrayListSelectionModel.as | 3 ++-
.../html/beads/models/ArrayMultiSelectionModel.as | 3 ++-
.../html/beads/models/ArraySelectionModel.as | 3 ++-
.../royale/html/beads/models/DataProviderModel.as | 3 ++-
.../models/MultiSelectionCollectionViewModel.as | 3 ++-
.../models/SingleSelectionCollectionViewModel.as | 3 ++-
.../html/beads/models/StringSelectionModel.as | 3 ++-
.../royale/html/supportClasses/DataGridColumn.as | 3 ++-
.../royale/html/supportClasses/DataItemRenderer.as | 3 ++-
.../html/supportClasses/GraphicsItemRenderer.as | 4 ++-
.../html/supportClasses/StyledDataItemRenderer.as | 5 ++--
.../supportClasses/StyledUIItemRendererBase.as | 3 ++-
.../html/supportClasses/TextButtonItemRenderer.as | 3 ++-
.../html/supportClasses/TextFieldItemRenderer.as | 3 ++-
.../html/supportClasses/UIItemRendererBase.as | 3 ++-
.../apache/royale/html/util/getLabelFromData.as | 9 +++++--
24 files changed, 105 insertions(+), 38 deletions(-)
copy frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/{IAccordionCollapseBead.as => IHasDataField.as} (91%)
copy frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/{IAccordionCollapseBead.as => IHasLabelField.as} (91%)
[royale-asjs] 01/02: Added IHasDataField and IHasLabelField
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 8634494917e105ea46c78fb6d43e3605d6f41a8f
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Dec 19 08:53:42 2021 +0200
Added IHasDataField and IHasLabelField
---
.../royale/org/apache/royale/html/DataContainer.as | 3 ++-
.../royale/org/apache/royale/html/DropDownList.as | 3 ++-
.../CollectionChangeUpdateForArrayListData.as | 16 ++++++++++--
.../royale/html/beads/DataFieldProviderBead.as | 2 +-
.../org/apache/royale/html/beads/IHasDataField.as | 25 ++++++++++++++++++
.../org/apache/royale/html/beads/IHasLabelField.as | 25 ++++++++++++++++++
.../html/beads/IndexedItemRendererInitializer.as | 16 ++++++++++--
.../beads/VirtualDataItemRendererFactoryBase.as | 30 +++++++++++++++++++---
.../html/beads/models/ArrayListSelectionModel.as | 3 ++-
.../html/beads/models/ArrayMultiSelectionModel.as | 3 ++-
.../html/beads/models/ArraySelectionModel.as | 3 ++-
.../royale/html/beads/models/DataProviderModel.as | 3 ++-
.../models/MultiSelectionCollectionViewModel.as | 3 ++-
.../models/SingleSelectionCollectionViewModel.as | 3 ++-
.../html/beads/models/StringSelectionModel.as | 3 ++-
.../royale/html/supportClasses/DataGridColumn.as | 3 ++-
.../royale/html/supportClasses/DataItemRenderer.as | 3 ++-
.../html/supportClasses/GraphicsItemRenderer.as | 4 ++-
.../html/supportClasses/StyledDataItemRenderer.as | 3 ++-
.../supportClasses/StyledUIItemRendererBase.as | 3 ++-
.../html/supportClasses/TextButtonItemRenderer.as | 3 ++-
.../html/supportClasses/TextFieldItemRenderer.as | 3 ++-
.../html/supportClasses/UIItemRendererBase.as | 3 ++-
23 files changed, 141 insertions(+), 25 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
index ad2ff6e..41b08ee 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
@@ -47,6 +47,7 @@ package org.apache.royale.html
import org.apache.royale.html.beads.models.ListPresentationModel;
import org.apache.royale.html.beads.IListView;
import org.apache.royale.core.IListWithPresentationModel;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* Indicates that the initialization of the list is complete.
@@ -74,7 +75,7 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class DataContainer extends DataContainerBase implements IStrandWithPresentationModel, IListWithPresentationModel
+ public class DataContainer extends DataContainerBase implements IStrandWithPresentationModel, IListWithPresentationModel, IHasLabelField
{
/**
* constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
index e4b49e8..b14c1b4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
@@ -26,6 +26,7 @@ package org.apache.royale.html
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.beads.models.ArraySelectionModel;
import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.html.beads.IHasLabelField;
}
//--------------------------------------
@@ -62,7 +63,7 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class DropDownList extends Button
+ public class DropDownList extends Button implements IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CollectionChangeUpdateForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CollectionChangeUpdateForArrayListData.as
index 1c5ca92..164c93f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CollectionChangeUpdateForArrayListData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CollectionChangeUpdateForArrayListData.as
@@ -36,7 +36,7 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class CollectionChangeUpdateForArrayListData extends Bead
+ public class CollectionChangeUpdateForArrayListData extends Bead implements IHasLabelField
{
/**
* Constructor
@@ -50,7 +50,19 @@ package org.apache.royale.html.beads
{
}
- protected var labelField:String;
+ private var _labelField:String;
+ /**
+ * Label field
+ */
+ public function get labelField():String
+ {
+ return _labelField;
+ }
+
+ public function set labelField(value:String):void
+ {
+ _labelField = value;
+ }
/**
* @copy org.apache.royale.core.IStrand
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataFieldProviderBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataFieldProviderBead.as
index dbfcea3..0b90851 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataFieldProviderBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataFieldProviderBead.as
@@ -29,7 +29,7 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class DataFieldProviderBead extends Bead
+ public class DataFieldProviderBead extends Bead implements IHasDataField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasDataField.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasDataField.as
new file mode 100644
index 0000000..a8de2ba
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasDataField.as
@@ -0,0 +1,25 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.html.beads
+{
+ public interface IHasDataField
+ {
+ function get dataField():String;
+ }
+}
\ No newline at end of file
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasLabelField.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasLabelField.as
new file mode 100644
index 0000000..190109b
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasLabelField.as
@@ -0,0 +1,25 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.html.beads
+{
+ public interface IHasLabelField
+ {
+ function get labelField():String;
+ }
+}
\ No newline at end of file
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as
index d8d1424..c87b945 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as
@@ -36,7 +36,7 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class IndexedItemRendererInitializer extends Bead implements IIndexedItemRendererInitializer
+ public class IndexedItemRendererInitializer extends Bead implements IIndexedItemRendererInitializer, IHasLabelField
{
/**
* constructor.
@@ -51,7 +51,19 @@ package org.apache.royale.html.beads
}
protected var dataProviderModel:IDataProviderModel;
- protected var labelField:String;
+ private var _labelField:String;
+ /**
+ * Label field
+ */
+ public function get labelField():String
+ {
+ return _labelField;
+ }
+
+ public function set labelField(value:String):void
+ {
+ _labelField = value;
+ }
/**
* @copy org.apache.royale.core.IBead#strand
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryBase.as
index d9d3508..db4e300 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryBase.as
@@ -51,7 +51,7 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class VirtualDataItemRendererFactoryBase extends DispatcherBead implements IDataProviderVirtualItemRendererMapper
+ public class VirtualDataItemRendererFactoryBase extends DispatcherBead implements IDataProviderVirtualItemRendererMapper, IHasDataField, IHasLabelField
{
/**
* Constructor.
@@ -69,8 +69,32 @@ package org.apache.royale.html.beads
protected var dataProviderModel:IDataProviderModel;
protected var dataFieldProvider:DataFieldProviderBead;
- protected var labelField:String;
- protected var dataField:String;
+ private var _labelField:String;
+ /**
+ * The label field
+ */
+ public function get labelField():String
+ {
+ return _labelField;
+ }
+
+ public function set labelField(value:String):void
+ {
+ _labelField = value;
+ }
+ private var _dataField:String;
+ /**
+ * The data field
+ */
+ public function get dataField():String
+ {
+ return _dataField;
+ }
+
+ public function set dataField(value:String):void
+ {
+ _dataField = value;
+ }
protected var rendererMap:Object;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as
index c351076..4d6446e 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as
@@ -23,6 +23,7 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.events.Event;
import org.apache.royale.core.DispatcherBead;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The ArrayListSelectionModel class is a selection model for
@@ -34,7 +35,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class ArrayListSelectionModel extends DispatcherBead implements ISelectionModel, IRollOverModel
+ public class ArrayListSelectionModel extends DispatcherBead implements ISelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as
index 374b3a6..df18585 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as
@@ -23,6 +23,7 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The ArrayMultiSelectionModel class is a selection model for
@@ -37,7 +38,7 @@ package org.apache.royale.html.beads.models
* @productversion 0.9.7
*/
- public class ArrayMultiSelectionModel extends EventDispatcher implements IMultiSelectionModel, IRollOverModel
+ public class ArrayMultiSelectionModel extends EventDispatcher implements IMultiSelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
index 1b3c5a5..7076d52 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
@@ -22,6 +22,7 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.IRollOverModel;
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.events.Event;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The ArraySelectionModel class is a selection model for
@@ -35,7 +36,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class ArraySelectionModel extends DispatcherBead implements ISelectionModel, IRollOverModel
+ public class ArraySelectionModel extends DispatcherBead implements ISelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as
index 6da65ea..db8e37a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as
@@ -21,6 +21,7 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.DispatcherBead;
import org.apache.royale.core.IDataProviderModel;
import org.apache.royale.events.Event;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The DataProviderModel class is a model for
@@ -31,7 +32,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class DataProviderModel extends DispatcherBead implements IDataProviderModel
+ public class DataProviderModel extends DispatcherBead implements IDataProviderModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as
index 926695c..e613426 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as
@@ -23,6 +23,7 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.IMultiSelectionModel;
import org.apache.royale.core.IRollOverModel;
import org.apache.royale.events.Event;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The MultiSelectionCollectionViewModel class is a selection model for
@@ -34,7 +35,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class MultiSelectionCollectionViewModel extends DispatcherBead implements IRollOverModel, IMultiSelectionModel
+ public class MultiSelectionCollectionViewModel extends DispatcherBead implements IRollOverModel, IMultiSelectionModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as
index d071619..7996c9d 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as
@@ -23,6 +23,7 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.IRollOverModel;
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.events.Event;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The SingleSelectionCollectionViewModel class is a selection model for
@@ -34,7 +35,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class SingleSelectionCollectionViewModel extends DispatcherBead implements ISelectionModel, IRollOverModel
+ public class SingleSelectionCollectionViewModel extends DispatcherBead implements ISelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as
index 8662672..46f0c6a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as
@@ -23,6 +23,7 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The StringSelectionModel class is a selection model for
@@ -33,7 +34,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class StringSelectionModel extends EventDispatcher implements ISelectionModel
+ public class StringSelectionModel extends EventDispatcher implements ISelectionModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as
index f58fbc1..e00671c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as
@@ -22,6 +22,7 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.core.IUIBase;
import org.apache.royale.events.EventDispatcher;
import org.apache.royale.html.List;
+ import org.apache.royale.html.beads.IHasDataField;
/**
* The DataGridColumn class is the collection of properties that describe
@@ -35,7 +36,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class DataGridColumn extends EventDispatcher implements IDataGridColumn
+ public class DataGridColumn extends EventDispatcher implements IDataGridColumn, IHasDataField
{
/**
* constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
index 074512b..d46d683 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
@@ -29,6 +29,7 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.core.IBeadController;
}
import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.html.beads.IHasDataField;
/**
* The DataItemRenderer class is the base class for most itemRenderers. This class
@@ -40,7 +41,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class DataItemRenderer extends UIItemRendererBase
+ public class DataItemRenderer extends UIItemRendererBase implements IHasDataField
{
/**
* constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/GraphicsItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/GraphicsItemRenderer.as
index 1465794..0652c42 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/GraphicsItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/GraphicsItemRenderer.as
@@ -26,6 +26,8 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.svg.CompoundGraphic;
import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.utils.MXMLDataInterpreter;
+ import org.apache.royale.html.beads.IHasDataField;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The GraphicsItemRenderer provides a base class for itemRenderers that use graphics rather than
@@ -36,7 +38,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class GraphicsItemRenderer extends CompoundGraphic implements IItemRenderer
+ public class GraphicsItemRenderer extends CompoundGraphic implements IItemRenderer, IHasDataField, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as
index 7403bcb..01afc08 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as
@@ -27,6 +27,7 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
import org.apache.royale.core.IBeadController;
+ import org.apache.royale.html.beads.IHasDataField;
}
/**
@@ -39,7 +40,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class StyledDataItemRenderer extends StyledUIItemRendererBase
+ public class StyledDataItemRenderer extends StyledUIItemRendererBase implements IHasDataField
{
/**
* constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as
index d4c0146..55ddff6 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as
@@ -23,6 +23,7 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.events.Event;
import org.apache.royale.utils.MXMLDataInterpreter;
import org.apache.royale.core.ILabelFieldItemRenderer;
+ import org.apache.royale.html.beads.IHasLabelField;
[DefaultProperty("mxmlContent")]
@@ -44,7 +45,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class StyledUIItemRendererBase extends StyledUIBase implements ILabelFieldItemRenderer
+ public class StyledUIItemRendererBase extends StyledUIBase implements ILabelFieldItemRenderer, IHasLabelField
{
/**
* constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as
index 81df983..03abebc 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as
@@ -32,6 +32,7 @@ package org.apache.royale.html.supportClasses
COMPILE::JS
{
import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.beads.IHasLabelField;
}
/**
@@ -43,7 +44,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.8
*/
- public class TextButtonItemRenderer extends TextButton implements ITextItemRenderer
+ public class TextButtonItemRenderer extends TextButton implements ITextItemRenderer, IHasLabelField
{
public function TextButtonItemRenderer()
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
index 1d04f33..db7ce68 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
@@ -40,6 +40,7 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.geom.Rectangle;
import org.apache.royale.html.beads.ITextItemRenderer;
import org.apache.royale.utils.loadBeadFromValuesManager;
+ import org.apache.royale.html.beads.IHasLabelField;
/**
* The TextFieldItemRenderer class provides a org.apache.royale.html.TextField as an itemRenderer.
@@ -49,7 +50,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase, IRoyaleElement
+ public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase, IRoyaleElement, IHasLabelField
{
/**
* constructor.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
index 798d46e..b82b75f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
@@ -23,6 +23,7 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.events.Event;
import org.apache.royale.utils.MXMLDataInterpreter;
import org.apache.royale.core.ILabelFieldItemRenderer;
+ import org.apache.royale.html.beads.IHasLabelField;
[DefaultProperty("mxmlContent")]
@@ -46,7 +47,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class UIItemRendererBase extends UIBase implements ILabelFieldItemRenderer
+ public class UIItemRendererBase extends UIBase implements ILabelFieldItemRenderer, IHasLabelField
{
/**
* constructor.
[royale-asjs] 02/02: Fixed imports
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit b5958488ccd2d8db321f935b894bced967dba7d1
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Dec 19 08:56:59 2021 +0200
Fixed imports
---
.../Basic/src/main/royale/org/apache/royale/html/DropDownList.as | 2 +-
.../apache/royale/html/supportClasses/StyledDataItemRenderer.as | 4 ++--
.../apache/royale/html/supportClasses/TextButtonItemRenderer.as | 2 +-
.../main/royale/org/apache/royale/html/util/getLabelFromData.as | 9 +++++++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
index b14c1b4..90ca0cc 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
@@ -19,6 +19,7 @@
package org.apache.royale.html
{
import org.apache.royale.core.ISelectionModel;
+ import org.apache.royale.html.beads.IHasLabelField;
COMPILE::JS
{
@@ -26,7 +27,6 @@ package org.apache.royale.html
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.beads.models.ArraySelectionModel;
import org.apache.royale.html.util.addElementToWrapper;
- import org.apache.royale.html.beads.IHasLabelField;
}
//--------------------------------------
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as
index 01afc08..415ecc7 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as
@@ -25,10 +25,10 @@ package org.apache.royale.html.supportClasses
COMPILE::JS
{
import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.html.util.addElementToWrapper;
import org.apache.royale.core.IBeadController;
- import org.apache.royale.html.beads.IHasDataField;
}
+ import org.apache.royale.html.beads.IHasDataField;
/**
* The DataItemRenderer class is the base class for most itemRenderers. This class
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as
index 03abebc..fc47482 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as
@@ -28,11 +28,11 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.html.beads.ITextItemRenderer;
import org.apache.royale.events.ItemClickedEvent;
import org.apache.royale.html.util.getLabelFromData;
+ import org.apache.royale.html.beads.IHasLabelField;
COMPILE::JS
{
import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.beads.IHasLabelField;
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as
index f5853b4..e3923b2 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as
@@ -19,11 +19,16 @@
package org.apache.royale.html.util
{
+ import org.apache.royale.html.beads.IHasLabelField;
+ import org.apache.royale.html.beads.IHasDataField;
+
/**
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
+ * @royaleignorecoercion org.apache.royale.html.beads.IHasLabelField
+ * @royaleignorecoercion org.apache.royale.html.beads.IHasDataField
* Utility function to get a label string from a value object
*/
public function getLabelFromData(obj:Object,data:Object):String
@@ -32,8 +37,8 @@ package org.apache.royale.html.util
if (data is String) return "" + data;
if(!data) return "";
- if (obj["labelField"]) return "" + data[obj["labelField"]];
- if (obj["dataField"]) return "" + data[obj["dataField"]];
+ if (obj is IHasLabelField && (obj as IHasLabelField).labelField && data[(obj as IHasLabelField).labelField] != null) return "" + data[(obj as IHasLabelField).labelField];
+ if (obj is IHasDataField && (obj as IHasDataField).dataField && data[(obj as IHasDataField).dataField] != null) return "" + data[(obj as IHasDataField).dataField];
var label:String = data["label"];
if(label != null){
return label;