flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cza...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - FLEX-33718 updated sdk code to remove "Warning: variable definition duplicates function parameter" in falcon compiler
Date Tue, 10 Sep 2013 07:59:14 GMT
Updated Branches:
  refs/heads/develop b05e4c8c6 -> 7b20e2345


FLEX-33718 updated sdk code to remove "Warning: variable definition duplicates function parameter"
in falcon compiler


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7b20e234
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7b20e234
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7b20e234

Branch: refs/heads/develop
Commit: 7b20e23452f19dd0f400f22a3f19a2479984fa27
Parents: b05e4c8
Author: cyrill.zadra <cyrill.zadra@gmail.com>
Authored: Tue Sep 10 09:58:06 2013 +0200
Committer: cyrill.zadra <cyrill.zadra@gmail.com>
Committed: Tue Sep 10 09:58:06 2013 +0200

----------------------------------------------------------------------
 frameworks/projects/mx/src/mx/controls/DataGrid.as     | 12 ++++++------
 frameworks/projects/mx/src/mx/controls/List.as         | 13 ++++++-------
 .../mx/src/mx/controls/listClasses/ListBase.as         | 12 ++++++------
 3 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b20e234/frameworks/projects/mx/src/mx/controls/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DataGrid.as b/frameworks/projects/mx/src/mx/controls/DataGrid.as
index 53ddbd4..e3127ef 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -3358,14 +3358,14 @@ public class DataGrid extends DataGridBase implements IIMESupport
 
         // Height is usually as tall is the items in the row, but not if
         // it would extend below the bottom of listContent
-        var height:Number = Math.min(height,
+        var minHeight:Number = Math.min(height,
                                      contentHolder.height -
                                      y);
 
         var g:Graphics = background.graphics;
         g.clear();
         g.beginFill(color, getStyle("backgroundAlpha"));
-        g.drawRect(0, 0, contentHolder.width, height);
+        g.drawRect(0, 0, contentHolder.width, minHeight);
         g.endFill();
     }
 
@@ -5310,12 +5310,12 @@ public class DataGrid extends DataGridBase implements IIMESupport
             if (itemEditorInstance is IFocusManagerComponent)
                 fm.setFocus(IFocusManagerComponent(itemEditorInstance));
                 
-            var event:DataGridEvent =
+            var itemFocusInEvent:DataGridEvent =
                 new DataGridEvent(DataGridEvent.ITEM_FOCUS_IN);
-            event.columnIndex = _editedItemPosition.columnIndex;
-            event.rowIndex = _editedItemPosition.rowIndex;
+            itemFocusInEvent.columnIndex = _editedItemPosition.columnIndex;
+            itemFocusInEvent.rowIndex = _editedItemPosition.rowIndex;
                 event.itemRenderer = itemEditorInstance;
-            dispatchEvent(event);
+            dispatchEvent(itemFocusInEvent);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b20e234/frameworks/projects/mx/src/mx/controls/List.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/List.as b/frameworks/projects/mx/src/mx/controls/List.as
index cf08440..d60e407 100644
--- a/frameworks/projects/mx/src/mx/controls/List.as
+++ b/frameworks/projects/mx/src/mx/controls/List.as
@@ -1289,8 +1289,7 @@ public class List extends ListBase implements IIMESupport
 
         // Height is usually as tall is the items in the row,
         // but not if it would extend below the bottom of listContent.
-        var height:Number = Math.min(
-            rowInfo[rowIndex].height,
+        var minHeight:Number = Math.min( rowInfo[rowIndex].height,
             listContent.height - rowInfo[rowIndex].y);
 
         bg.y = rowInfo[rowIndex].y;
@@ -1298,7 +1297,7 @@ public class List extends ListBase implements IIMESupport
         var g:Graphics = bg.graphics;
         g.clear();
         g.beginFill(color, getStyle("backgroundAlpha"));
-        g.drawRect(0, 0, listContent.width, height);
+        g.drawRect(0, 0, listContent.width, minHeight);
         g.endFill();
     }
 
@@ -2807,11 +2806,11 @@ public class List extends ListBase implements IIMESupport
             if (itemEditorInstance is IFocusManagerComponent)
                 fm.setFocus(IFocusManagerComponent(itemEditorInstance));
             
-            var event:ListEvent =
+            var itemFocusInEvent:ListEvent =
                 new ListEvent(ListEvent.ITEM_FOCUS_IN);
-            event.rowIndex = _editedItemPosition.rowIndex;
-            event.itemRenderer = itemEditorInstance;
-            dispatchEvent(event);
+            itemFocusInEvent.rowIndex = _editedItemPosition.rowIndex;
+            itemFocusInEvent.itemRenderer = itemEditorInstance;
+            dispatchEvent(itemFocusInEvent);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b20e234/frameworks/projects/mx/src/mx/controls/listClasses/ListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/listClasses/ListBase.as b/frameworks/projects/mx/src/mx/controls/listClasses/ListBase.as
index 4e5c49d..7b2ff26 100644
--- a/frameworks/projects/mx/src/mx/controls/listClasses/ListBase.as
+++ b/frameworks/projects/mx/src/mx/controls/listClasses/ListBase.as
@@ -7349,9 +7349,9 @@ public class ListBase extends ScrollControlBase
                     return;
                 }
                 var bookmark:CursorBookmark = collectionIterator.bookmark;
-                var index:int = bookmark.getViewIndex();
-                if (index >= 0)
-                    insertSelectionDataBefore(uid, new ListBaseSelectionData(item, index,
true), firstSelectionData);
+                var viewIndex:int = bookmark.getViewIndex();
+                if (viewIndex >= 0)
+                    insertSelectionDataBefore(uid, new ListBaseSelectionData(item, viewIndex,
true), firstSelectionData);
                 else
                 {
                     try
@@ -7372,11 +7372,11 @@ public class ListBase extends ScrollControlBase
                 }
                 if (items.length == 0)
                 {
-                    _selectedIndex = index;
+                    _selectedIndex = viewIndex;
                     _selectedItem = item;
-                    caretIndex = index;
+                    caretIndex = viewIndex;
                     caretBookmark = collectionIterator.bookmark;
-                    anchorIndex = index;
+                    anchorIndex = viewIndex;
                     anchorBookmark = collectionIterator.bookmark;
                 }
             }


Mime
View raw message