Changeset 6104

Timestamp:

03/17/15 09:14:38 (9 years ago)

Author:

Twan Goosen

Message:

Slight optimisation in checking language code availability for language link in record view

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/LanguageInfoLink.java (modified) (3 diffs)

vlo/trunk/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());
+    }
 }