remove unused code

SVN: 12753

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Filter.java

@@ -50,8 +50,6 @@ public class Filter extends AbstractRegistrationHolder implements IsSerializable
 
     private Set<String> parameters;
 
-    private Set<String> columns;
-
     public Filter()
     {
     }
@@ -136,14 +134,4 @@ public class Filter extends AbstractRegistrationHolder implements IsSerializable
         this.parameters = parameters;
     }
 
-    public Set<String> getColumns()
-    {
-        return columns;
-    }
-
-    public void setColumns(Set<String> columns)
-    {
-        this.columns = columns;
-    }
-
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/FilterTranslator.java

@@ -38,8 +38,6 @@ public final class FilterTranslator
 {
     private static final String PARAMETER_PATTERN = "\\$\\{.*?\\}";
 
-    private static final String COLUMN_PATTERN = "col\\(.*?\\)";
-
     private FilterTranslator()
     {
         // Can not be instantiated.
@@ -73,23 +71,9 @@ public final class FilterTranslator
                 .getDatabaseInstance()));
         result.setPublic(filter.isPublic());
         result.setParameters(extractParameters(filter.getExpression()));
-        result.setColumns(extractColumns(filter.getExpression()));
         return result;
     }
 
-    static Set<String> extractColumns(String expression)
-    {
-        Pattern parameterPattern = Pattern.compile(COLUMN_PATTERN);
-        Set<String> list = new HashSet<String>();
-        Matcher matcher = parameterPattern.matcher(expression);
-        while (matcher.find())
-        {
-            String group = matcher.group();
-            list.add(group.substring(4, group.length() - 1));
-        }
-        return list;
-    }
-
     static Set<String> extractParameters(String expression)
     {
         Pattern parameterPattern = Pattern.compile(PARAMETER_PATTERN);

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/FilterTranslatorTest.java

@@ -54,32 +54,4 @@ public class FilterTranslatorTest extends AssertJUnit
         assertEquals(3, FilterTranslator.extractParameters(expression).size());
     }
 
-    @Test
-    public void testExtractColumnsNoParameters() throws Exception
-    {
-        String expression = "";
-        assertEquals(0, FilterTranslator.extractColumns(expression).size());
-    }
-
-    @Test
-    public void testExtractColumnsOneParameter() throws Exception
-    {
-        String expression = "col(abc)";
-        assertEquals(1, FilterTranslator.extractColumns(expression).size());
-    }
-
-    @Test
-    public void testExtractColumnOneDuplicatedParameter() throws Exception
-    {
-        String expression = "col(abc) col(abc) ";
-        assertEquals(1, FilterTranslator.extractColumns(expression).size());
-    }
-
-    @Test
-    public void testExtractColumnManyParameters() throws Exception
-    {
-        String expression = "col(abc) col(abc) col(def) col(ghi)";
-        assertEquals(3, FilterTranslator.extractColumns(expression).size());
-    }
-
 }