Changeset 4220 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/Theme.java

Timestamp:

01/07/14 11:05:14 (10 years ago)

Author:

twagoo

Message:

Merged twagoo branch of to-wicket-1.6 back to original, removed this branch

Location:

vlo/branches/to-wicket-1.6

Files:

• . (modified) (1 prop)
• vlo_web_app (modified) (1 prop)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/Theme.java (modified) (4 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app

@@ -1 +1 @@
 target
+vlo-importer.log*

@@ -1 +1 @@
 target
+vlo-importer.log*

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/Theme.java

@@ -1 @@
-
 package eu.clarin.cmdi.vlo;
 
 import eu.clarin.cmdi.vlo.config.VloConfig;
+import java.io.Serializable;
 
 /**
@@ -11 +11 @@
  * partner link map relating coordinates in the right image to partner links
  */
-public class Theme {
+public class Theme implements Serializable {
 
-    public String name, pageTitle, topLeftImage, topRightImage, cssFile,
+    public final String name, pageTitle, topLeftImage, topRightImage, cssFile,
             partnerLinkMap;
 
@@ -19 +19 @@
      * Compose a theme<br><br>
      *
-     * @param name the name of the theme to be composed
+     * @param themeName the name of the theme to be composed
      */
     public Theme(String themeName) {
@@ -59 +59 @@
      * Compose a map to be included in the HTML document, designating the
      * positions of the links to partner web sites
-     * 
+     *
      * @return the map
      */

@@ -1 +1 @@
 target
+vlo-importer.log*