Skip to content

Commit 762b75a

Browse files
committed
[biosilico][review][tests]Changes dues to changes in utilities.
1 parent 577bd0a commit 762b75a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+210
-1200
lines changed

biosilico-biosilico/src/main/java/gabywald/biosilico/data/FilterBioSilico.java

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package gabywald.biosilico.data;
22

3-
import gabywald.global.data.FilterUtils;
3+
import gabywald.global.data.filters.FilterUtils.FilterGroupType;
4+
import gabywald.global.data.filters.GenericFileFilter;
45

56
/**
67
* This class defines filters for BioSilico Files (Gattaca and Phase II)
78
* @author Gabriel Chandesris (2010, 2020, 2022)
89
*/
9-
public class FilterBioSilico extends FilterUtils {
10+
public class FilterBioSilico extends GenericFileFilter {
1011
/** BioSilico Phase II files extension. '.ph2' */
1112
public final static String ph2 = FilePhaseTwo.DEFAULT_EXTENSION;
1213
/** BioSilico Gattaca files extension. '.gat' */
@@ -34,9 +35,23 @@ public FilterBioSilico()
3435
* @param extensions (String[]) extensions.
3536
*/
3637
public FilterBioSilico(String name, String... extensions) {
37-
super(FilterGroupType.NONE, name);
38+
super(FilterGroupType.NONE.extensions());
3839
for (int i = 0 ; i < extensions.length ; i++)
3940
{ this.addExtension( extensions[i]); }
4041
}
4142

43+
/**
44+
* To get a GenericFileFilter for alignments.
45+
* @return (GenericFileFilter)
46+
*/
47+
public static GenericFileFilter getAlignmentsFilter()
48+
{ return new GenericFileFilter(FilterGroupType.ALIGNMENTS.extensions()); }
49+
50+
/**
51+
* To get a GenericFileFilter for sequences.
52+
* @return (GenericFileFilter)
53+
*/
54+
public static GenericFileFilter getSequencesFilter()
55+
{ return new GenericFileFilter(FilterGroupType.SEQUENCES.extensions()); }
56+
4257
}

biosilico-commons/.classpath

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9+
<classpathentry kind="src" path="src/main/resources"/>
910
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
1011
<attributes>
1112
<attribute name="test" value="true"/>
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
eclipse.preferences.version=1
22
encoding//src/main/java=UTF-8
33
encoding//src/main/resources=UTF-8
4-
encoding//src/test/java=UTF-8
5-
encoding//src/test/resources=UTF-8
64
encoding/<project>=UTF-8

biosilico-commons/src/main/java/gabywald/global/controller/BooleanActionListener.java

-19
This file was deleted.

biosilico-commons/src/main/java/gabywald/global/controller/ObservableByLoaders.java

-18
This file was deleted.

biosilico-commons/src/main/java/gabywald/global/data/Directory.java

-97
This file was deleted.

0 commit comments

Comments
 (0)