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 2007/03/08 23:50:58 UTC
svn commit: r516215 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
bean/ResourceMap.java component/UIGridLayout.java
context/ClientProperties.java model/SheetState.java
renderkit/html/HtmlStyleMap.java
Author: bommel
Date: Thu Mar 8 14:50:57 2007
New Revision: 516215
URL: http://svn.apache.org/viewvc?view=rev&rev=516215
Log:
some cleanups
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java?view=diff&rev=516215&r1=516214&r2=516215
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java Thu Mar 8 14:50:57 2007
@@ -32,6 +32,7 @@
public class ResourceMap extends Properties {
private static final Log LOG = LogFactory.getLog(ResourceMap.class);
+ private static final long serialVersionUID = -6696019120255349519L;
public ResourceMap() {
if (LOG.isDebugEnabled()) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java?view=diff&rev=516215&r1=516214&r2=516215
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java Thu Mar 8 14:50:57 2007
@@ -344,11 +344,9 @@
}
public static class Row implements Serializable {
-
+ private static final long serialVersionUID = 1511693677519052045L;
private int columns;
-
private List cells;
-
private boolean hidden;
public Row(int columns) {
@@ -424,10 +422,9 @@
}
public static class Marker implements Serializable {
-
+ private static final long serialVersionUID = 2505999420762504893L;
private final String name;
-
- private boolean rendered;
+ private boolean rendered;
private Marker(String name) {
this.name = name;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?view=diff&rev=516215&r1=516214&r2=516215
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java Thu Mar 8 14:50:57 2007
@@ -37,13 +37,13 @@
import java.util.Locale;
public class ClientProperties implements Serializable {
-
- private static final String CLIENT_PROPERTIES_IN_SESSION
- = ClientProperties.class.getName();
+ private static final long serialVersionUID = -6719319982485268698L;
+ private static final String CLIENT_PROPERTIES_IN_SESSION = ClientProperties.class.getName();
private static final Log LOG = LogFactory.getLog(ClientProperties.class);
private String contentType = "html";
+ // TODO transient
private Theme theme;
private UserAgent userAgent = UserAgent.DEFAULT;
private boolean debugMode;
@@ -89,7 +89,8 @@
// theme
String requestTheme
= (String) externalContext.getRequestParameterMap().get("tobago.theme");
- this.theme = TobagoConfig.getInstance(facesContext).getTheme(requestTheme);
+ TobagoConfig config = TobagoConfig.getInstance(facesContext);
+ this.theme = config.getTheme(requestTheme);
LOG.info("theme='" + theme.getName() + "' from requestParameter "
+ "tobago.theme='" + requestTheme + "'");
updateId();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java?view=diff&rev=516215&r1=516214&r2=516215
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java Thu Mar 8 14:50:57 2007
@@ -30,7 +30,7 @@
// TODO find a better solution for this
public class SheetState implements Serializable {
-
+ private static final long serialVersionUID = 7765536344426661777L;
private static final Log LOG = LogFactory.getLog(SheetState.class);
public static final String SEPARATOR = ",";
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=516215&r1=516214&r2=516215
==============================================================================
--- 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 Thu Mar 8 14:50:57 2007
@@ -32,6 +32,7 @@
public class HtmlStyleMap extends HashMap<String, Object> {
private static final Log LOG = LogFactory.getLog(HtmlStyleMap.class);
+ private static final long serialVersionUID = 342607693971417143L;
public Object put(String s, Object o) {
if (o instanceof String && (s.equals("height") || s.equals("width"))) {