Author: jjohnstn
Date: 2010-10-07 18:27:07 -0400 (Thu, 07 Oct 2010)
New Revision: 25583
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java
Log:
2010-10-07 Jeff Johnston <jjohnstn(a)redhat.com>
[JBIDE-7181]
* src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java (toString): Fix to
return proper regex for ALL text.
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Default to
ALL rules if image filter regex does not parse.
* src/org/jboss/tools/deltacloud/core/FieldMatcher.java (FieldMatcher): Add a
throws statement.
* src/org/jboss/tools/deltacloud/core/IImageFilter.java: Fix ALL string.
* src/org/jboss/tools/deltacloud/core/ImageFilter.java (setRules): Adds a
throws statement.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-07 22:23:49
UTC (rev 25582)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-07 22:27:07
UTC (rev 25583)
@@ -1,3 +1,16 @@
+2010-10-07 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ [JBIDE-7181]
+ * src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java (toString): Fix to
+ return proper regex for ALL text.
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Default to
+ ALL rules if image filter regex does not parse.
+ * src/org/jboss/tools/deltacloud/core/FieldMatcher.java (FieldMatcher): Add a
+ throws statement.
+ * src/org/jboss/tools/deltacloud/core/IImageFilter.java: Fix ALL string.
+ * src/org/jboss/tools/deltacloud/core/ImageFilter.java (setRules): Adds a
+ throws statement.
+
2010-10-07 André Dietisheim <adietish(a)redhat.com>
* lib/deltacloudclient-1.0.jar: [JBIDE-7259] removed unneeded jar from classpath
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java 2010-10-07
22:23:49 UTC (rev 25582)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java 2010-10-07
22:27:07 UTC (rev 25583)
@@ -9,7 +9,7 @@
@Override
public String toString() {
- return "*"; //$NON-NLS-1$
+ return ".*"; //$NON-NLS-1$
}
}
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-07
22:23:49 UTC (rev 25582)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-07
22:27:07 UTC (rev 25583)
@@ -17,6 +17,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.regex.PatternSyntaxException;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.jobs.Job;
@@ -67,7 +68,11 @@
this.username = username;
this.type = type;
imageFilter = new ImageFilter();
- imageFilter.setRules(imageFilterRules);
+ try {
+ imageFilter.setRules(imageFilterRules);
+ } catch (PatternSyntaxException e) {
+ imageFilter.setRules(IImageFilter.ALL_STRING);
+ }
if (persistent) {
ISecurePreferences root = SecurePreferencesFactory.getDefault();
String key = DeltaCloud.getPreferencesKey(url, username);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java 2010-10-07
22:23:49 UTC (rev 25582)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java 2010-10-07
22:27:07 UTC (rev 25583)
@@ -2,13 +2,14 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
public class FieldMatcher implements IFieldMatcher {
private String rule;
private Pattern pattern;
- public FieldMatcher(String rule) {
+ public FieldMatcher(String rule) throws PatternSyntaxException {
this.rule = rule;
pattern = Pattern.compile(rule);
}
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java 2010-10-07
22:23:49 UTC (rev 25582)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java 2010-10-07
22:27:07 UTC (rev 25583)
@@ -2,7 +2,7 @@
public interface IImageFilter {
- public final static String ALL_STRING = "*;*;*;*"; //$NON-NLS-1$
+ public final static String ALL_STRING = ".*;.*;.*;.*"; //$NON-NLS-1$
public boolean isVisible(DeltaCloudImage image);
public void setRules(String ruleString);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-10-07
22:23:49 UTC (rev 25582)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-10-07
22:27:07 UTC (rev 25583)
@@ -1,5 +1,7 @@
package org.jboss.tools.deltacloud.core;
+import java.util.regex.PatternSyntaxException;
+
public class ImageFilter implements IImageFilter {
private IFieldMatcher nameRule;
@@ -16,24 +18,24 @@
}
@Override
- public void setRules(String ruleString) {
+ public void setRules(String ruleString) throws PatternSyntaxException {
String[] tokens = ruleString.split(";");
- if (tokens[0].equals("*")) {
+ if (tokens[0].equals(".*")) { //$NON-NLS-1$
nameRule = new AllFieldMatcher();
} else {
nameRule = new FieldMatcher(tokens[0]);
}
- if (tokens[1].equals("*")) {
+ if (tokens[1].equals(".*")) { //$NON-NLS-1$
idRule = new AllFieldMatcher();
} else {
idRule = new FieldMatcher(tokens[1]);
}
- if (tokens[2].equals("*")) {
+ if (tokens[2].equals(".*")) { //$NON-NLS-1$
archRule = new AllFieldMatcher();
} else {
archRule = new FieldMatcher(tokens[2]);
}
- if (tokens[3].equals("*")) {
+ if (tokens[3].equals(".*")) { //$NON-NLS-1$
descRule = new AllFieldMatcher();
} else {
descRule = new FieldMatcher(tokens[3]);
Show replies by date