diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java index 660bc41da6..7b528849b2 100644 --- a/core/src/main/java/hudson/model/ListView.java +++ b/core/src/main/java/hudson/model/ListView.java @@ -44,6 +44,12 @@ public class ListView extends View { super(name); } + private Object readResolve() { + if(includeRegex!=null) + includePattern = Pattern.compile(includeRegex); + return this; + } + /** * Returns a read-only view of all {@link Job}s in this view. * @@ -54,19 +60,12 @@ public class ListView extends View { public synchronized List getItems() { Set names = (Set) ((TreeSet) jobNames).clone(); - if (includeRegex != null) { - try { - if (includePattern == null) { - includePattern = Pattern.compile(includeRegex); + if (includePattern != null) { + for (TopLevelItem item : Hudson.getInstance().getItems()) { + String itemName = item.getName(); + if (includePattern.matcher(itemName).matches()) { + names.add(itemName); } - - for (TopLevelItem item : Hudson.getInstance().getItems()) { - String itemName = item.getName(); - if (includePattern.matcher(itemName).matches()) { - names.add(itemName); - } - } - } catch (PatternSyntaxException pse) { } } @@ -120,11 +119,12 @@ public class ListView extends View { description = Util.nullify(req.getParameter("description")); if (req.getParameter("useincluderegex") != null) { - includeRegex = Util.nullify(req.getParameter("includeregex")); + includeRegex = Util.nullify(req.getParameter("includeRegex")); + includePattern = Pattern.compile(includeRegex); } else { includeRegex = null; + includePattern = null; } - includePattern = null; try { rename(req.getParameter("name")); @@ -138,26 +138,6 @@ public class ListView extends View { rsp.sendRedirect2("../"+name); } - /** - * Checks if the include regular expression is valid. - */ - public void doIncludeRegexCheck( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, InterruptedException { - new FormFieldValidator(req, rsp, false) { - @Override - protected void check() throws IOException, ServletException { - String v = Util.fixEmpty(request.getParameter("value")); - if (v != null) { - try { - Pattern.compile(v); - } catch (PatternSyntaxException pse) { - error(pse.getMessage()); - } - } - ok(); - } - }.process(); - } - public ViewDescriptor getDescriptor() { return DESCRIPTOR; } @@ -176,5 +156,25 @@ public class ListView extends View { public String getDisplayName() { return Messages.ListView_DisplayName(); } + + /** + * Checks if the include regular expression is valid. + */ + public void doCheckIncludeRegex( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, InterruptedException { + new FormFieldValidator(req, rsp, false) { + @Override + protected void check() throws IOException, ServletException { + String v = Util.fixEmpty(request.getParameter("value")); + if (v != null) { + try { + Pattern.compile(v); + } catch (PatternSyntaxException pse) { + error(pse.getMessage()); + } + } + ok(); + } + }.process(); + } } } diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly index 69acfda106..aa2e3f1070 100644 --- a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly +++ b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly @@ -10,9 +10,10 @@ - + - + diff --git a/core/src/main/resources/hudson/model/View/configure.jelly b/core/src/main/resources/hudson/model/View/configure.jelly index af241ded19..ddde274d53 100644 --- a/core/src/main/resources/hudson/model/View/configure.jelly +++ b/core/src/main/resources/hudson/model/View/configure.jelly @@ -5,12 +5,16 @@ + + + + - +