flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - Determined that a special version of RangeModel was unnecessary and simply set default values in RangeModel itself.
Date Mon, 22 Jul 2013 19:09:40 GMT
Updated Branches:
  refs/heads/develop c2132c26d -> a4d65501e


Determined that a special version of RangeModel was unnecessary and simply set default values
in RangeModel itself.


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

Branch: refs/heads/develop
Commit: a4d65501e843f0e629d946e2b472ba9a337687cd
Parents: c2132c2
Author: Peter Ent <pent@apache.org>
Authored: Mon Jul 22 15:09:30 2013 -0400
Committer: Peter Ent <pent@apache.org>
Committed: Mon Jul 22 15:09:30 2013 -0400

----------------------------------------------------------------------
 frameworks/as/defaults.css                      |  6 ++--
 frameworks/as/src/FlexJSUIClasses.as            |  1 -
 .../staticControls/beads/models/RangeModel.as   | 10 +++---
 .../beads/models/SpinnerRangeModel.as           | 34 --------------------
 4 files changed, 8 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4d65501/frameworks/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/defaults.css b/frameworks/as/defaults.css
index 055d06d..91c4a5e 100644
--- a/frameworks/as/defaults.css
+++ b/frameworks/as/defaults.css
@@ -133,7 +133,7 @@ List
 
 NumericStepper
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.SpinnerRangeModel");
+    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
     IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.NumericStepperView");
     
     padding: 0px;
@@ -188,7 +188,7 @@ SimpleAlert
 
 Slider
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.SpinnerRangeModel");
+    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
     iBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.SliderView");
     iBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.SliderMouseController");
     iThumbView: ClassReference("org.apache.flex.html.staticControls.beads.SliderThumbView");
@@ -197,7 +197,7 @@ Slider
 
 Spinner
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.SpinnerRangeModel");
+    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
     IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.SpinnerView");
     IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController");
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4d65501/frameworks/as/src/FlexJSUIClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/FlexJSUIClasses.as b/frameworks/as/src/FlexJSUIClasses.as
index 6bd6029..7ec1edc 100644
--- a/frameworks/as/src/FlexJSUIClasses.as
+++ b/frameworks/as/src/FlexJSUIClasses.as
@@ -56,7 +56,6 @@ internal class FlexJSUIClasses
     import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel; ArraySelectionModel;
     import org.apache.flex.html.staticControls.beads.models.ComboBoxModel; ComboBoxModel;
 	import org.apache.flex.html.staticControls.beads.models.PanelModel; PanelModel;
-	import org.apache.flex.html.staticControls.beads.models.SpinnerRangeModel; SpinnerRangeModel;
 	import org.apache.flex.html.staticControls.beads.models.TextModel; TextModel;
     import org.apache.flex.html.staticControls.beads.models.TitleBarModel; TitleBarModel;
 	import org.apache.flex.html.staticControls.beads.models.ToggleButtonModel; ToggleButtonModel;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4d65501/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
index 2b4283e..ff0edd5 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
@@ -37,7 +37,7 @@ package org.apache.flex.html.staticControls.beads.models
 			_strand = value;
 		}
 
-		private var _maximum:Number;
+		private var _maximum:Number = 100;
 		public function get maximum():Number
 		{
 			return _maximum;
@@ -52,7 +52,7 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 		
-		private var _minimum:Number;
+		private var _minimum:Number = 0;
 		public function get minimum():Number
 		{
 			return _minimum;
@@ -67,7 +67,7 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 
-		private var _snapInterval:Number;
+		private var _snapInterval:Number = 1;
 		public function get snapInterval():Number
 		{
 			return _snapInterval;
@@ -82,7 +82,7 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 		
-		private var _stepSize:Number;
+		private var _stepSize:Number = 1;
 		public function get stepSize():Number
 		{
 			return _stepSize;
@@ -97,7 +97,7 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 		
-		private var _value:Number;
+		private var _value:Number = 0;
 		public function get value():Number
 		{
 			return _value;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4d65501/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SpinnerRangeModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SpinnerRangeModel.as
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SpinnerRangeModel.as
deleted file mode 100644
index 507c568..0000000
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SpinnerRangeModel.as
+++ /dev/null
@@ -1,34 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.flex.html.staticControls.beads.models
-{
-	public class SpinnerRangeModel extends RangeModel
-	{
-		public function SpinnerRangeModel()
-		{
-			super();
-			
-			minimum = 0;
-			maximum = 100;
-			value = 0;
-			stepSize = 1;
-			snapInterval = 1;
-		}
-	}
-}
\ No newline at end of file


Mime
View raw message