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/01/14 20:19:02 UTC
svn commit: r1059129 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/
Author: lofwyr
Date: Fri Jan 14 19:19:01 2011
New Revision: 1059129
URL: http://svn.apache.org/viewvc?rev=1059129&view=rev
Log:
TOBAGO-943:
- renaming
- make ThemeResource serializable
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java
- copied, changed from r1057511, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResource.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeScript.java
- copied, changed from r1057511, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoScript.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeStyle.java
- copied, changed from r1057511, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoStyle.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResource.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoScript.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoStyle.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java?rev=1059129&r1=1059128&r2=1059129&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java Fri Jan 14 19:19:01 2011
@@ -229,12 +229,12 @@ class ThemeImpl implements Theme, Serial
return;
}
for (int i = toAddResources.getScriptList().size()-1; i >= 0; i--) {
- TobagoScript script = toAddResources.getScriptList().get(i);
+ ThemeScript script = toAddResources.getScriptList().get(i);
resources.getScriptList().remove(script);
resources.getScriptList().add(0, script);
}
for (int i = toAddResources.getStyleList().size()-1; i >= 0; i--) {
- TobagoStyle style = toAddResources.getStyleList().get(i);
+ ThemeStyle style = toAddResources.getStyleList().get(i);
resources.getStyleList().remove(style);
resources.getStyleList().add(0, style);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java?rev=1059129&r1=1059128&r2=1059129&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java Fri Jan 14 19:19:01 2011
@@ -64,10 +64,10 @@ class ThemeParser {
digester.addObjectCreate("tobago-theme/resources", ThemeResources.class);
digester.addSetProperties("tobago-theme/resources");
digester.addSetNext("tobago-theme/resources", "addResources");
- digester.addObjectCreate("tobago-theme/resources/script", TobagoScript.class);
+ digester.addObjectCreate("tobago-theme/resources/script", ThemeScript.class);
digester.addSetProperties("tobago-theme/resources/script");
digester.addSetNext("tobago-theme/resources/script", "addScript");
- digester.addObjectCreate("tobago-theme/resources/style", TobagoStyle.class);
+ digester.addObjectCreate("tobago-theme/resources/style", ThemeStyle.class);
digester.addSetProperties("tobago-theme/resources/style");
digester.addSetNext("tobago-theme/resources/style", "addStyle");
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java (from r1057511, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResource.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResource.java&r1=1057511&r2=1059129&rev=1059129&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoResource.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java Fri Jan 14 19:19:01 2011
@@ -17,11 +17,13 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
+import java.io.Serializable;
+
/**
- *
* @since 1.5.0
*/
-public class TobagoResource {
+public class ThemeResource implements Serializable {
+
private String name;
public String getName() {
@@ -37,11 +39,11 @@ public class TobagoResource {
if (this == o) {
return true;
}
- if (!(o instanceof TobagoResource)) {
+ if (!(o instanceof ThemeResource)) {
return false;
}
- TobagoResource that = (TobagoResource) o;
+ ThemeResource that = (ThemeResource) o;
return !(name != null ? !name.equals(that.name) : that.name != null);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java?rev=1059129&r1=1059128&r2=1059129&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResources.java Fri Jan 14 19:19:01 2011
@@ -29,8 +29,8 @@ import java.util.List;
public final class ThemeResources implements Serializable {
private boolean production;
- private List<TobagoScript> scriptList = new ArrayList<TobagoScript>();
- private List<TobagoStyle> styleList = new ArrayList<TobagoStyle>();
+ private List<ThemeScript> scriptList = new ArrayList<ThemeScript>();
+ private List<ThemeStyle> styleList = new ArrayList<ThemeStyle>();
public ThemeResources copy() {
ThemeResources resources = new ThemeResources();
@@ -48,19 +48,19 @@ public final class ThemeResources implem
this.production = production;
}
- public boolean addScript(TobagoScript script) {
+ public boolean addScript(ThemeScript script) {
return scriptList.add(script);
}
- public boolean addStyle(TobagoStyle style) {
+ public boolean addStyle(ThemeStyle style) {
return styleList.add(style);
}
- public List<TobagoScript> getScriptList() {
+ public List<ThemeScript> getScriptList() {
return scriptList;
}
- public List<TobagoStyle> getStyleList() {
+ public List<ThemeStyle> getStyleList() {
return styleList;
}
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeScript.java (from r1057511, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoScript.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeScript.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeScript.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoScript.java&r1=1057511&r2=1059129&rev=1059129&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoScript.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeScript.java Fri Jan 14 19:19:01 2011
@@ -18,11 +18,7 @@ package org.apache.myfaces.tobago.contex
*/
/**
- *
* @since 1.5.0
*/
-public final class TobagoScript extends TobagoResource {
-
-
-
+public final class ThemeScript extends ThemeResource {
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeStyle.java (from r1057511, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoStyle.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeStyle.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeStyle.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoStyle.java&r1=1057511&r2=1059129&rev=1059129&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoStyle.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeStyle.java Fri Jan 14 19:19:01 2011
@@ -18,9 +18,7 @@ package org.apache.myfaces.tobago.contex
*/
/**
- *
* @since 1.5.0
*/
-public final class TobagoStyle extends TobagoResource {
-
+public final class ThemeStyle extends ThemeResource {
}