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 2011/05/23 17:50:01 UTC
svn commit: r1126549 - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago:
config/TobagoConfig.java internal/config/TobagoConfigBuilder.java
internal/config/TobagoConfigImpl.java
Author: lofwyr
Date: Mon May 23 15:50:01 2011
New Revision: 1126549
URL: http://svn.apache.org/viewvc?rev=1126549&view=rev
Log:
TOBAGO-990 Refactor Tobago configuration
- removing redundant information
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=1126549&r1=1126548&r2=1126549&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Mon May 23 15:50:01 2011
@@ -65,7 +65,10 @@ public abstract class TobagoConfig {
public abstract ProjectStage getProjectStage();
+/*
+ // todo: should this be part of the api?
public abstract List<Theme> getThemeDefinitions();
+*/
public abstract boolean isCreateSessionSecret();
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java?rev=1126549&r1=1126548&r2=1126549&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java Mon May 23 15:50:01 2011
@@ -19,7 +19,6 @@ package org.apache.myfaces.tobago.intern
import org.apache.commons.collections.CollectionUtils;
import org.apache.myfaces.tobago.config.TobagoConfig;
-import org.apache.myfaces.tobago.context.Theme;
import org.apache.myfaces.tobago.context.ThemeImpl;
import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.slf4j.Logger;
@@ -120,9 +119,11 @@ public class TobagoConfigBuilder {
// theme definition
// todo
+/*
for (Theme theme : fragment.getThemeDefinitions()) {
result.addThemeDefinition(theme);
}
+*/
// url
// todo???
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1126549&r1=1126548&r2=1126549&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Mon May 23 15:50:01 2011
@@ -51,15 +51,12 @@ public class TobagoConfigImpl extends To
private ProjectStage projectStage;
private boolean createSessionSecret;
private boolean checkSessionSecret;
- // todo
- private List<Theme> themeDefinitions;
private URL url;
public TobagoConfigImpl() {
supportedThemeNames = new ArrayList<String>();
supportedThemes = new ArrayList<Theme>();
resourceDirs = new ArrayList<String>();
- themeDefinitions = new ArrayList<Theme>();
createSessionSecret = true;
checkSessionSecret = true;
}
@@ -228,14 +225,6 @@ public class TobagoConfigImpl extends To
}
}
- public void addThemeDefinition(Theme theme) {
- themeDefinitions.add(theme);
- }
-
- public List<Theme> getThemeDefinitions() {
- return themeDefinitions;
- }
-
public boolean isCreateSessionSecret() {
return createSessionSecret;
}
@@ -263,7 +252,6 @@ public class TobagoConfigImpl extends To
+ ", \nprojectStage=" + projectStage
+ ", \ncreateSessionSecret=" + createSessionSecret
+ ", \ncheckSessionSecret=" + checkSessionSecret
- + ", \nthemeDefinitions=" + themeDefinitions
+ ", \nurl=" + url
+ '}';
}