You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/11/27 00:57:13 UTC
svn commit: r479463 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/renderkit/html/
example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/
src/site/fml/ theme/speyside/src/main/resources/META-INF/
theme/speyside/src...
Author: bommel
Date: Sun Nov 26 15:57:12 2006
New Revision: 479463
URL: http://svn.apache.org/viewvc?view=rev&rev=479463
Log:
checkstyle
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/src/site/fml/faq.fml
myfaces/tobago/trunk/theme/speyside/src/main/resources/META-INF/tobago-theme.xml
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java?view=diff&rev=479463&r1=479462&r2=479463
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java Sun Nov 26 15:57:12 2006
@@ -243,7 +243,8 @@
style.put(styleAttribute, value);
}
- public static void replaceStyleAttribute(UIComponent component, String attribute, String styleAttribute, String value) {
+ public static void replaceStyleAttribute(UIComponent component, String attribute,
+ String styleAttribute, String value) {
HtmlStyleMap style = ensureStyleAttributeMap(component, attribute);
style.put(styleAttribute, value);
}
@@ -253,7 +254,8 @@
style.put(styleAttribute, value);
}
- public static void replaceStyleAttribute(UIComponent component, String attribute, String styleAttribute, int value) {
+ public static void replaceStyleAttribute(UIComponent component, String attribute,
+ String styleAttribute, int value) {
HtmlStyleMap style = ensureStyleAttributeMap(component, attribute);
style.put(styleAttribute, value);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java?view=diff&rev=479463&r1=479462&r2=479463
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java Sun Nov 26 15:57:12 2006
@@ -34,7 +34,7 @@
private static final Log LOG = LogFactory.getLog(HtmlStyleMap.class);
public Object put(String s, Object o) {
- if (o instanceof String && ( s.equals("height")|| s.equals("width"))) {
+ if (o instanceof String && (s.equals("height") || s.equals("width"))) {
String str = (String) o;
if (str.endsWith("px")) {
LOG.error("", new Exception());
@@ -58,7 +58,7 @@
public String toString() {
StringBuilder buf = new StringBuilder();
- for(Map.Entry<String,Object> style :entrySet()) {
+ for(Map.Entry<String, Object> style :entrySet()) {
buf.append(style.getKey());
buf.append(":");
buf.append(style.getValue());
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?view=diff&rev=479463&r1=479462&r2=479463
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Sun Nov 26 15:57:12 2006
@@ -55,7 +55,7 @@
private SelectItem[] salutationItems;
- private Boolean[] bool;
+ private boolean[] bool;
private Boolean boolTest;
@@ -128,7 +128,7 @@
salutationItems = getSelectItems(salutationKeys, "demo");
this.salutation = new String[]{"", "", "", ""};
- bool = new Boolean[10];
+ bool = new boolean[10];
bool[0] = true;
bool[1] = false;
bool[2] = true;
@@ -281,11 +281,11 @@
this.salutationItems = salutationItems;
}
- public Boolean[] getBool() {
+ public boolean[] getBool() {
return this.bool;
}
- public void setBool(Boolean[] argBool) {
+ public void setBool(boolean[] argBool) {
this.bool = argBool;
}
Modified: myfaces/tobago/trunk/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/fml/faq.fml?view=diff&rev=479463&r1=479462&r2=479463
==============================================================================
--- myfaces/tobago/trunk/src/site/fml/faq.fml (original)
+++ myfaces/tobago/trunk/src/site/fml/faq.fml Sun Nov 26 15:57:12 2006
@@ -122,6 +122,31 @@
/org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago-sheet.css (sheet styles)
/org/apache/myfaces/tobago/renderkit/html/xxxxx/msie/style/style.css (different styles for msie)
</source>
+
+ Property and resource loading and Renderer loading is done in following order
+ <source>
+ resource-path/content-type/theme/client/[tag(for renderer)|property|style|script|image]_locale.(class|property|property.xml|css|js| gif|png...]
+ </source>
+
+ for example OutRenderer<br/
+
+ org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.OutRenderer<br/>
+
+ OutRenderer is getRendererType() + "Renderer"<br/>
+
+
+
+ The locale handling is handled like the Properties Class.<br/>
+
+ You have not define everything because the ResourceManager is asking the fallback theme for missing resources<br/>
+
+ The fallback theme of charlotteville is speyside.<br/>
+ The fallback theme of speyside is scarborough.<br/>
+ The fallback theme of scarborough is standard<br/>
+
+ The resource manager looks in the case of the charlotteville theme in<br/>
+ charlotteville -> speyside -> scarborough -> standard
+
</answer>
</faq>
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/META-INF/tobago-theme.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/META-INF/tobago-theme.xml?view=diff&rev=479463&r1=479462&r2=479463
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/META-INF/tobago-theme.xml Sun Nov 26 15:57:12 2006
@@ -22,4 +22,28 @@
<deprecated-name>org.apache.myfaces.tobago.context.SpeysideTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>scarborough</fallback>
+ <renderers>
+ <renderer>
+ <name>Out</name>
+ <supported-markup>
+ <markup>strong</markup>
+ <markup>deleted</markup>
+ <markup>number</markup>
+ <markup>header</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>In</name>
+ <supported-markup>
+ <markup>number</markup>
+ <markup>required</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
+ <name>Box</name>
+ <supported-markup>
+ <markup>header</markup>
+ </supported-markup>
+ </renderer>
+ </renderers>
</tobago-theme>
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?view=diff&rev=479463&r1=479462&r2=479463
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Sun Nov 26 15:57:12 2006
@@ -457,6 +457,40 @@
.tobago-out-default {
font: 12px arial, helvetica, sans-serif;
}
+
+.tobago-out-markup-header {
+ background: #ffffff none;
+ height: 20px;
+ width: 100%;
+ display: block;
+ border-bottom: 1px solid #b2b2b2;
+ font: bold 12px arial, helvetica, sans-serif;
+ color: #000066;
+ padding-left: 5px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.tobago-box-markup-header {
+ top: -1px;
+ background: #ffffff;
+ height: 20px;
+ border: 0px;
+ border-bottom: 1px solid #b2b2b2;
+ font: bold 12px arial, helvetica, sans-serif;
+ color: #000066;
+ padding: 0px;
+ padding-left: 5px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ overflow: hidden;
+ position: relative;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
/* textArea ---------------------------------------------------------------- */
.tobago-textArea-default {
Modified: myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml?view=diff&rev=479463&r1=479462&r2=479463
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml Sun Nov 26 15:57:12 2006
@@ -36,5 +36,11 @@
<markup>number</markup>
</supported-markup>
</renderer>
+ <renderer>
+ <name>Box</name>
+ <supported-markup>
+ <markup>number</markup>
+ </supported-markup>
+ </renderer>
</renderers>
</tobago-theme>