Changeset 6117

Timestamp:

03/24/15 16:04:20 (9 years ago)

Author:

Twan Goosen

Message:

up to date with trunk

Location:

vlo/branches/vlo-3.1

Files:

• . (modified) (1 prop)
• CHANGES.txt (modified) (1 diff)
• UPGRADE.txt (modified) (1 diff, 1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/LanguageInfoLink.java (modified) (3 diffs)

vlo/branches/vlo-3.1/CHANGES.txt

@@ -1 +1 @@
 Bug Fixes and Features
 
-VLO 3.1 (???)
+VLO 3.1 (March 2015)
 * Added the 'license' facet
         <https://trac.clarin.eu/ticket/393>

vlo/branches/vlo-3.1/UPGRADE.txt

@@ -18 +18 @@
         - solrUrl
         - homeUrl
+        - deleteAllFirst
         - maxDaysInSolr
 - Make any further version specific adjustments as described in this document

vlo/branches/vlo-3.1/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/LanguageInfoLink.java

@@ -82 +82 @@
         // when a link can be generated (i.e. wehen a language code is 
         // available) show the link; otherwise show the fallback label
-        final boolean linkAvailable = getLanguageCode() != null;
+        final boolean linkAvailable = newLanguageCodeMatcher().matches();
         link.setVisible(linkAvailable);
         fallbackLabel.setVisible(!linkAvailable);
@@ -88 +88 @@
 
     private String getLanguageCode() {
-        final Matcher matcher = LANGUAGE_CODE_REGEX.matcher(getModelObject());
+        final Matcher matcher = newLanguageCodeMatcher();
         if (matcher.matches() && matcher.groupCount() == 1) {
             return matcher.group(1);
@@ -95 +95 @@
         }
     }
+
+    private Matcher newLanguageCodeMatcher() {
+        return LANGUAGE_CODE_REGEX.matcher(getModelObject());
+    }
 }