[richfaces-svn-commits] JBoss Rich Faces SVN: r18639 - in sandbox/trunk/ui/inputs/inputnumberslider/src/main: java/org/richfaces/component and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2010-08-15 14:52:28 -0400 (Sun, 15 Aug 2010)
New Revision: 18639

Added:
   sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/InputNumberSliderInputPosition.java
Removed:
   sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/PositionType.java
Modified:
   sandbox/trunk/ui/inputs/inputnumberslider/src/main/config/faces-config.xml
   sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
Log:
PositionType renamed into InputNumberSliderInputPosition

Modified: sandbox/trunk/ui/inputs/inputnumberslider/src/main/config/faces-config.xml
===================================================================
--- sandbox/trunk/ui/inputs/inputnumberslider/src/main/config/faces-config.xml	2010-08-15 18:48:47 UTC (rev 18638)
+++ sandbox/trunk/ui/inputs/inputnumberslider/src/main/config/faces-config.xml	2010-08-15 18:52:28 UTC (rev 18639)
@@ -29,7 +29,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<component>
 		<component-type>org.richfaces.InputNumberSlider</component-type>
-		<component-class>org.richfaces.component.HTMLInputNumberSlider</component-class>
+		<component-class>org.richfaces.component.HtmlInputNumberSlider</component-class>
 		<property>
 			<property-name>accesskey</property-name>
 			<property-class>java.lang.String</property-class>
@@ -112,8 +112,8 @@
 		</property>
 		<property>
 			<property-name>inputPosition</property-name>
-			<property-class>org.richfaces.component.PositionType</property-class>
-			<default-value>PositionType.DEFAULT</default-value>
+			<property-class>org.richfaces.component.InputNumberSliderInputPosition</property-class>
+			<default-value>InputNumberSliderInputPosition.DEFAULT</default-value>
 			<property-extension>
 				<cdk:generate>true</cdk:generate>
 			</property-extension>

Copied: sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/InputNumberSliderInputPosition.java (from rev 18637, sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/PositionType.java)
===================================================================
--- sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/InputNumberSliderInputPosition.java	                        (rev 0)
+++ sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/InputNumberSliderInputPosition.java	2010-08-15 18:52:28 UTC (rev 18639)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.component;
+
+public enum InputNumberSliderInputPosition {
+    top, right, bottom, left;
+    
+    public static final InputNumberSliderInputPosition DEFAULT = right;
+}

Deleted: sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/PositionType.java
===================================================================
--- sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/PositionType.java	2010-08-15 18:48:47 UTC (rev 18638)
+++ sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/component/PositionType.java	2010-08-15 18:52:28 UTC (rev 18639)
@@ -1,7 +0,0 @@
-package org.richfaces.component;
-
-public enum PositionType {
-    top, right, bottom, left;
-    
-    public static final PositionType DEFAULT = right;
-}

Modified: sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
===================================================================
--- sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java	2010-08-15 18:48:47 UTC (rev 18638)
+++ sandbox/trunk/ui/inputs/inputnumberslider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java	2010-08-15 18:52:28 UTC (rev 18639)
@@ -23,7 +23,7 @@
 
 import javax.faces.component.UIComponent;
 
-import org.richfaces.component.PositionType;
+import org.richfaces.component.InputNumberSliderInputPosition;
 
 /**
  * @author Nick Belaevski
@@ -32,12 +32,12 @@
 public abstract class InputNumberSliderRendererBase extends InputRendererBase {
 
     protected boolean isInputPosition(UIComponent component, String name) {
-        PositionType type = (PositionType) component.getAttributes().get("inputPosition");
+        InputNumberSliderInputPosition type = (InputNumberSliderInputPosition) component.getAttributes().get("inputPosition");
         if (type == null) {
-            type = PositionType.DEFAULT;
+            type = InputNumberSliderInputPosition.DEFAULT;
         }
         
-        return type == PositionType.valueOf(name);
+        return type == InputNumberSliderInputPosition.valueOf(name);
     }
     
 }