Skip to content

Commit

Permalink
Full mavenization and yaml preferences
Browse files Browse the repository at this point in the history
* Integrated paintCommon into PAINT
* Using Yaml for user preferences
* New browser launcher
  • Loading branch information
selewis committed Sep 28, 2015
1 parent 8693b83 commit 9cda808
Show file tree
Hide file tree
Showing 83 changed files with 4,326 additions and 1,179 deletions.
1 change: 0 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/paintCommon"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ target

/junk/
/lib/
/test_resources/
*.log
/restore.txt
/backup.txt
4 changes: 0 additions & 4 deletions config/component_prefs/bp-info:bp-info

This file was deleted.

4 changes: 0 additions & 4 deletions config/component_prefs/cc-info:cc-info

This file was deleted.

4 changes: 0 additions & 4 deletions config/component_prefs/gene-info:gene-info

This file was deleted.

4 changes: 0 additions & 4 deletions config/component_prefs/mf-info:mf-info

This file was deleted.

108 changes: 0 additions & 108 deletions config/preferences.xml

This file was deleted.

28 changes: 28 additions & 0 deletions config/preferences.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
!!org.paint.config.PaintConfig
bpPaintColor: !color '138, 190, 204, 255'
ccPaintColor: !color '138, 204, 177, 255'
collapse_no_exp: true
curatedPaintColor: !color '255, 127, 0, 255'
expPaintColor: !color '142, 35, 35, 255'
full_msa: false
gafdir: /Users/suzi/projects/go/gene-associations/submission/paint/PTHR10026
inferPaintColor: !color '16, 64, 128, 255'
mfPaintColor: !color '177, 204, 138, 255'
msa_colors:
- !color '51, 102, 77, 255'
- !color '112, 153, 92, 255'
- !color '204, 194, 143, 255'
msa_threshold:
- 80.0
- 60.0
- 40.0
msa_weighted_colors:
- !color '21, 138, 255, 255'
- !color '220, 233, 255, 255'
msa_weighted_threshold:
- 90.0
- 75.0
tree_distance_scaling: 50.0
treedir: /Users/suzi/projects/go/data/trees/panther/
use_distances: true
weighted: true
32 changes: 32 additions & 0 deletions paint-all.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>paint-all</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>META-INF</exclude>
<exclude>META-INF/**</exclude>
<exclude>log4j.properties</exclude>
<exclude>*.txt</exclude>
<exclude>README</exclude>
</excludes>
</unpackOptions>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
<files>
<file>
<source>${project.build.outputDirectory}/log4j.properties</source>
</file>
</files>
</assembly>
10 changes: 0 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,6 @@
<artifactId>xml-apis-ext</artifactId>
<version>1.3.04</version>
</dependency>
<dependency>
<groupId>edu.stanford.ejalbert</groupId>
<artifactId>BrowserLauncher2</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.bbop</groupId>
<artifactId>bbop</artifactId>
Expand All @@ -146,11 +141,6 @@
<artifactId>idw</artifactId>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sri.panther</groupId>
<artifactId>paint-common</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>macify</groupId>
<artifactId>macify</artifactId>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions repo/com/sri/panther/paint-common/maven-metadata.xml

This file was deleted.

1 change: 0 additions & 1 deletion repo/com/sri/panther/paint-common/maven-metadata.xml.md5

This file was deleted.

1 change: 0 additions & 1 deletion repo/com/sri/panther/paint-common/maven-metadata.xml.sha1

This file was deleted.

File renamed without changes.
Loading

0 comments on commit 9cda808

Please sign in to comment.