You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/11/19 15:54:22 UTC
svn commit: r882165 - in /myfaces/tobago/trunk/sandbox/src/main:
java/org/apache/myfaces/tobago/component/
java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/
java/org/apache/myfaces/tobago/taglib/sandbox/
resources/org/apache/myfaces/t...
Author: lofwyr
Date: Thu Nov 19 14:54:21 2009
New Revision: 882165
URL: http://svn.apache.org/viewvc?rev=882165&view=rev
Log:
TOBAGO-412: Cleanup
- rename classes of tcs:numberSlider to valid naming conventions
Added:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java (contents, props changed)
- copied, changed from r882081, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (contents, props changed)
- copied, changed from r882081, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/NumberSliderTagDeclaration.java (contents, props changed)
- copied, changed from r882081, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/InputNumberSliderTagDeclaration.java
Removed:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/InputNumberSliderTagDeclaration.java
Modified:
myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java (from r882081, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java&r1=882081&r2=882165&rev=882165&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUIInputNumberSlider.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java Thu Nov 19 14:54:21 2009
@@ -23,7 +23,7 @@
import javax.faces.validator.LongRangeValidator;
import javax.faces.validator.ValidatorException;
-public abstract class AbstractUIInputNumberSlider extends javax.faces.component.UIInput implements LayoutComponent {
+public abstract class AbstractUINumberSlider extends javax.faces.component.UIInput implements LayoutComponent {
public abstract Integer getMin();
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (from r882081, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java&r1=882081&r2=882165&rev=882165&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Thu Nov 19 14:54:21 2009
@@ -18,7 +18,7 @@
*/
import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.component.AbstractUIInputNumberSlider;
+import org.apache.myfaces.tobago.component.AbstractUINumberSlider;
import org.apache.myfaces.tobago.config.ThemeConfig;
import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
@@ -41,7 +41,7 @@
import java.io.IOException;
import java.util.Map;
-public class InputNumberSliderRenderer extends LayoutComponentRendererBase {
+public class NumberSliderRenderer extends LayoutComponentRendererBase {
private static final String SLIDER_WIDTH_PERCENT = "sliderWidthPercent";
@@ -55,7 +55,7 @@
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- AbstractUIInputNumberSlider slider = (AbstractUIInputNumberSlider) component;
+ AbstractUINumberSlider slider = (AbstractUINumberSlider) component;
String id = slider.getClientId(facesContext);
String currentValue = getCurrentValue(facesContext, slider);
@@ -68,7 +68,7 @@
Style style = new Style(facesContext, slider);
int width = -1;
int sliderWidthPerc
- = ThemeConfig.getMeasure(facesContext, slider.getRendererType(), SLIDER_WIDTH_PERCENT).getPixel();
+ = ThemeConfig.getMeasure(facesContext, slider, SLIDER_WIDTH_PERCENT).getPixel();
if (sliderWidthPerc <= 25) {
sliderWidthPerc = 25;
}
@@ -89,7 +89,7 @@
//writer.writeAttribute("border","1",false);
StyleClasses styleClasses = new StyleClasses();
- styleClasses.addAspectClass("inputNumberSlider", "min", StyleClasses.Aspect.DEFAULT);
+ styleClasses.addAspectClass("numberSlider", "min", StyleClasses.Aspect.DEFAULT);
writer.startElement(HtmlConstants.TR, null);
writer.startElement(HtmlConstants.TD, null);
@@ -104,7 +104,7 @@
writer.endElement(HtmlConstants.SPAN);
styleClasses = new StyleClasses();
- styleClasses.addAspectClass("inputNumberSlider", "max", StyleClasses.Aspect.DEFAULT);
+ styleClasses.addAspectClass("numberSlider", "max", StyleClasses.Aspect.DEFAULT);
writer.endElement(HtmlConstants.TD);
writer.startElement(HtmlConstants.TD, null);
@@ -119,7 +119,7 @@
// the input field starts here
writer.startElement(HtmlConstants.TD, null);
writer.writeAttribute("rowspan", "2", false);
- writer.writeClassAttribute("tobago-inputNumberSlider-input-default");
+ writer.writeClassAttribute("tobago-numberSlider-input-default");
writer.startElement(HtmlConstants.INPUT, null);
writer.writeClassAttribute("tobago-in-default");
@@ -144,7 +144,7 @@
//track
writer.startElement(HtmlConstants.DIV, null);
- writer.writeClassAttribute("tobago-inputNumberSlider-slider-default");
+ writer.writeClassAttribute("tobago-numberSlider-slider-default");
writer.writeIdAttribute(getIdForSliderTrack(facesContext, slider));
// handle
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/NumberSliderTagDeclaration.java (from r882081, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/InputNumberSliderTagDeclaration.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/NumberSliderTagDeclaration.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/NumberSliderTagDeclaration.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/InputNumberSliderTagDeclaration.java&r1=882081&r2=882165&rev=882165&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/InputNumberSliderTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/NumberSliderTagDeclaration.java Thu Nov 19 14:54:21 2009
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
@@ -30,12 +31,12 @@
@Tag(name = "numberSlider")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIInputNumberSlider",
- uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUIInputNumberSlider",
- rendererType = "InputNumberSlider")
+ uiComponent = "org.apache.myfaces.tobago.component.UINumberSlider",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUINumberSlider",
+ rendererType = "NumberSlider")
-public interface InputNumberSliderTagDeclaration extends
- HasIdBindingAndRendered, IsReadonly, IsDisabled,
+public interface NumberSliderTagDeclaration extends
+ HasIdBindingAndRendered, IsReadonly, IsDisabled, HasMarkup,
HasValue, HasValueChangeListener, IsGridLayoutComponent {
/**
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/NumberSliderTagDeclaration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/NumberSliderTagDeclaration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/property/tobago-theme-config.properties?rev=882165&r1=882164&r2=882165&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/property/tobago-theme-config.properties Thu Nov 19 14:54:21 2009
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-InputNumberSlider.sliderWidthPercent=66
\ No newline at end of file
+NumberSlider.sliderWidthPercent=66
\ No newline at end of file
Modified: myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css?rev=882165&r1=882164&r2=882165&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css (original)
+++ myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css Thu Nov 19 14:54:21 2009
@@ -17,29 +17,29 @@
/* number Slider --------------------------------------------------------------- */
-.tobago-inputNumberSlider-default {
+.tobago-numberSlider-default {
}
-.tobago-inputNumberSlider-min-default {
+.tobago-numberSlider-min-default {
text-align: left;
}
-.tobago-inputNumberSlider-min-default {
+.tobago-numberSlider-min-default {
font: bold 11px arial, helvetica, sans-serif;
}
-.tobago-inputNumberSlider-max-default {
+.tobago-numberSlider-max-default {
text-align: right;
}
-.tobago-inputNumberSlider-max-default {
+.tobago-numberSlider-max-default {
font: bold 11px arial, helvetica, sans-serif;
}
-.tobago-inputNumberSlider-input-default {
+.tobago-numberSlider-input-default {
}
-.tobago-inputNumberSlider-slider-default {
+.tobago-numberSlider-slider-default {
width: 100%;
height: 3px;
background-color: #660000;