dishevelled-devel Mailing List for dishevelled.org
Brought to you by:
heuermh
Menu
▾
▴
dishevelled-devel — dishevelled.org developer mailing list
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(26) |
Feb
(26) |
Mar
(10) |
Apr
(13) |
May
(1) |
Jun
(5) |
Jul
(7) |
Aug
|
Sep
(1) |
Oct
(75) |
Nov
(13) |
Dec
(13) |
| 2008 |
Jan
(28) |
Feb
(9) |
Mar
(26) |
Apr
(29) |
May
(6) |
Jun
(6) |
Jul
(21) |
Aug
(13) |
Sep
(33) |
Oct
(24) |
Nov
(1) |
Dec
(41) |
| 2009 |
Jan
(13) |
Feb
(21) |
Mar
(18) |
Apr
(19) |
May
(35) |
Jun
(33) |
Jul
(55) |
Aug
(27) |
Sep
(6) |
Oct
(25) |
Nov
(23) |
Dec
(37) |
| 2010 |
Jan
(47) |
Feb
(6) |
Mar
(14) |
Apr
(74) |
May
(101) |
Jun
(72) |
Jul
(74) |
Aug
(52) |
Sep
(19) |
Oct
(15) |
Nov
(31) |
Dec
(18) |
| 2011 |
Jan
(16) |
Feb
(7) |
Mar
(16) |
Apr
(1) |
May
(4) |
Jun
(14) |
Jul
(3) |
Aug
(15) |
Sep
(6) |
Oct
(4) |
Nov
(1) |
Dec
|
| 2012 |
Jan
(11) |
Feb
(17) |
Mar
(65) |
Apr
(150) |
May
(12) |
Jun
(13) |
Jul
(27) |
Aug
|
Sep
(9) |
Oct
(3) |
Nov
(11) |
Dec
(2) |
| 2013 |
Jan
(15) |
Feb
(17) |
Mar
(15) |
Apr
(32) |
May
(3) |
Jun
(9) |
Jul
(23) |
Aug
(43) |
Sep
(43) |
Oct
(30) |
Nov
(3) |
Dec
(81) |
| 2014 |
Jan
(3) |
Feb
(18) |
Mar
(11) |
Apr
(3) |
May
(3) |
Jun
(14) |
Jul
(22) |
Aug
(1) |
Sep
(5) |
Oct
(8) |
Nov
(12) |
Dec
(4) |
| 2015 |
Jan
(10) |
Feb
(8) |
Mar
(19) |
Apr
(3) |
May
(2) |
Jun
(11) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: EU B. R. <reg...@eu...> - 2017-06-24 11:15:24
|
Hello, In order to have your company inserted in the EU Business Register for 2017/2018, please print, complete and submit the attached form (PDF file) to the following address: EU BUSINESS REGISTER P.O. BOX 34 3700 AA ZEIST THE NETHERLANDS Fax: +31 205 248 107 You can also scan the completed form and attach it in a reply to this email. Updating is free of charge. |
|
From: EU B. R. <reg...@eb...> - 2017-02-17 17:04:18
|
In order to have your company inserted in the EU Business Register for 2017/2018, please print, complete and submit the attached form (PDF file) to the following address: EU BUSINESS REGISTER P.O. BOX 34 3700 AA ZEIST THE NETHERLANDS Fax: +31 205 248 107 You can also scan the completed form and attach it in a reply to this email. Updating is free of charge. |
|
From: <he...@us...> - 2015-07-13 21:24:21
|
Revision: 1841
http://sourceforge.net/p/dishevelled/code/1841
Author: heuermh
Date: 2015-07-13 21:24:19 +0000 (Mon, 13 Jul 2015)
Log Message:
-----------
also consider shared name, default for cy 3.2.1
Modified Paths:
--------------
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/VennDiagramsUtils.java
Modified: trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/VennDiagramsUtils.java
===================================================================
--- trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/VennDiagramsUtils.java 2015-07-13 17:47:04 UTC (rev 1840)
+++ trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/VennDiagramsUtils.java 2015-07-13 21:24:19 UTC (rev 1841)
@@ -71,7 +71,16 @@
CyTable nodeTable = network.getDefaultNodeTable();
CyRow nodeRow = nodeTable.getRow(group.getGroupNode().getSUID());
String name = nodeRow.get(CyNetwork.NAME, String.class);
- return (name == null) ? group.toString() : name;
+ if (name != null)
+ {
+ return name;
+ }
+ String sharedName = nodeRow.get("shared name", String.class);
+ if (sharedName != null)
+ {
+ return sharedName;
+ }
+ return group.toString();
}
/**
@@ -105,6 +114,7 @@
CyTable nodeTable = network.getDefaultNodeTable();
CyRow nodeRow = nodeTable.getRow(group.getGroupNode().getSUID());
nodeRow.set(CyNetwork.NAME, name);
+ nodeRow.set("shared name", name);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-07-13 17:47:08
|
Revision: 1840
http://sourceforge.net/p/dishevelled/code/1840
Author: heuermh
Date: 2015-07-13 17:47:04 +0000 (Mon, 13 Jul 2015)
Log Message:
-----------
updating dependency versions, copyright years
Modified Paths:
--------------
trunk/piccolo-venn/HEADER.txt
trunk/piccolo-venn/pom.xml
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractBinaryVennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractQuaternaryVennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractTernaryVennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractVennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/BinaryVennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/Centers.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/QuaternaryVennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/TernaryVennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/VennNode.java
trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/package-info.java
trunk/piccolo-venn/src/site/site.xml
trunk/piccolo-venn/src/site/xdoc/index.xml
trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/BinaryVennNodeTest.java
trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/CentersTest.java
trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/QuaternaryVennNodeTest.java
trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/TernaryVennNodeTest.java
trunk/piccolo-venn-examples/HEADER.txt
trunk/piccolo-venn-examples/pom.xml
trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/AreaTest.java
trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/BinaryVennExample.java
trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/QuaternaryVennExample.java
trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/TernaryVennExample.java
trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/package-info.java
trunk/piccolo-venn-examples/src/site/site.xml
trunk/piccolo-venn-examples/src/site/xdoc/index.xml
trunk/pom.xml
trunk/venn/HEADER.txt
trunk/venn/pom.xml
trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennLayout.java
trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennModel.java
trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennLayout.java
trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennModel.java
trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennLayout.java
trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennModel.java
trunk/venn/src/main/java/org/dishevelled/venn/VennLayout.java
trunk/venn/src/main/java/org/dishevelled/venn/VennLayouter.java
trunk/venn/src/main/java/org/dishevelled/venn/VennModel.java
trunk/venn/src/main/java/org/dishevelled/venn/layout/BinaryVennLayoutImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/layout/QuaternaryVennLayoutImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/layout/TernaryVennLayoutImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutUtils.java
trunk/venn/src/main/java/org/dishevelled/venn/layout/package-info.java
trunk/venn/src/main/java/org/dishevelled/venn/layouter/VennLayouterImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/layouter/package-info.java
trunk/venn/src/main/java/org/dishevelled/venn/model/BinaryVennModelImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/model/QuaternaryVennModelImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/model/SelectionView.java
trunk/venn/src/main/java/org/dishevelled/venn/model/TernaryVennModelImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelBuilder.java
trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelImpl.java
trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelUtils.java
trunk/venn/src/main/java/org/dishevelled/venn/model/VennModels.java
trunk/venn/src/main/java/org/dishevelled/venn/model/package-info.java
trunk/venn/src/main/java/org/dishevelled/venn/package-info.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/AbstractBinaryVennDiagram.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/AbstractQuaternaryVennDiagram.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/AbstractTernaryVennDiagram.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/BinaryVennLabel.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/BinaryVennList.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/ObservableSetEventListAdapter.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/QuaternaryVennLabel.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/QuaternaryVennList.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/SetEventListAdapter.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/TernaryVennLabel.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/TernaryVennList.java
trunk/venn/src/main/java/org/dishevelled/venn/swing/package-info.java
trunk/venn/src/site/site.xml
trunk/venn/src/site/xdoc/index.xml
trunk/venn/src/test/java/org/dishevelled/venn/AbstractBinaryVennLayoutTest.java
trunk/venn/src/test/java/org/dishevelled/venn/AbstractBinaryVennModelTest.java
trunk/venn/src/test/java/org/dishevelled/venn/AbstractQuaternaryVennLayoutTest.java
trunk/venn/src/test/java/org/dishevelled/venn/AbstractQuaternaryVennModelTest.java
trunk/venn/src/test/java/org/dishevelled/venn/AbstractTernaryVennLayoutTest.java
trunk/venn/src/test/java/org/dishevelled/venn/AbstractTernaryVennModelTest.java
trunk/venn/src/test/java/org/dishevelled/venn/AbstractVennLayouterTest.java
trunk/venn/src/test/java/org/dishevelled/venn/layout/BinaryVennLayoutImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/layout/QuaternaryVennLayoutImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/layout/TernaryVennLayoutImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/layout/VennLayoutImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/layout/VennLayoutUtilsTest.java
trunk/venn/src/test/java/org/dishevelled/venn/layouter/VennLayouterImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/BinaryVennModelImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/QuaternaryVennModelImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/SelectionViewTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/TernaryVennModelImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/VennModelBuilderTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/VennModelImplTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/VennModelUtilsTest.java
trunk/venn/src/test/java/org/dishevelled/venn/model/VennModelsTest.java
trunk/venn-app/HEADER.txt
trunk/venn-app/pom.xml
trunk/venn-app/src/main/assembly/assembly.xml
trunk/venn-app/src/main/java/org/dishevelled/venn/app/DetailsView.java
trunk/venn-app/src/main/java/org/dishevelled/venn/app/DiagramView.java
trunk/venn-app/src/main/java/org/dishevelled/venn/app/Group.java
trunk/venn-app/src/main/java/org/dishevelled/venn/app/GroupsView.java
trunk/venn-app/src/main/java/org/dishevelled/venn/app/VennApp.java
trunk/venn-app/src/main/java/org/dishevelled/venn/app/package-info.java
trunk/venn-app/src/site/site.xml
trunk/venn-app/src/site/xdoc/index.xml
trunk/venn-cytoscape3-app/HEADER.txt
trunk/venn-cytoscape3-app/pom.xml
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/CyActivator.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/CyGroupListCellRenderer.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/CyNodeListCellRenderer.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/DetailsView.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/DiagramView.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/GroupsView.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/VennDiagramsAction.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/internal/package-info.java
trunk/venn-cytoscape3-app/src/main/java/org/dishevelled/venn/cytoscape3/package-info.java
trunk/venn-cytoscape3-app/src/site/site.xml
trunk/venn-cytoscape3-app/src/site/xdoc/index.xml
trunk/venn-cytoscape3-app/src/test/java/org/dishevelled/venn/cytoscape3/internal/CyActivatorTest.java
trunk/venn-cytoscape3-app/src/test/java/org/dishevelled/venn/cytoscape3/internal/VennDiagramsActionTest.java
trunk/venn-examples/HEADER.txt
trunk/venn-examples/pom.xml
trunk/venn-examples/src/main/java/org/dishevelled/venn/examples/VennLabelExample.java
trunk/venn-examples/src/main/java/org/dishevelled/venn/examples/VennListExample.java
trunk/venn-examples/src/main/java/org/dishevelled/venn/examples/package-info.java
trunk/venn-examples/src/site/site.xml
trunk/venn-examples/src/site/xdoc/index.xml
trunk/venn-tools/HEADER.txt
trunk/venn-tools/pom.xml
trunk/venn-tools/src/main/assembly/assembly.xml
trunk/venn-tools/src/main/java/org/dishevelled/venn/tools/AbstractVennRunnable.java
trunk/venn-tools/src/main/java/org/dishevelled/venn/tools/Venn.java
trunk/venn-tools/src/main/java/org/dishevelled/venn/tools/Venn2.java
trunk/venn-tools/src/main/java/org/dishevelled/venn/tools/Venn3.java
trunk/venn-tools/src/main/java/org/dishevelled/venn/tools/Venn4.java
trunk/venn-tools/src/main/java/org/dishevelled/venn/tools/package-info.java
trunk/venn-tools/src/site/site.xml
trunk/venn-tools/src/site/xdoc/index.xml
Modified: trunk/piccolo-venn/HEADER.txt
===================================================================
--- trunk/piccolo-venn/HEADER.txt 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/HEADER.txt 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/piccolo-venn/pom.xml
===================================================================
--- trunk/piccolo-venn/pom.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/pom.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>7-SNAPSHOT</version>
+ <version>9</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-piccolo-venn</artifactId>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-venn</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dishevelled</groupId>
@@ -73,7 +73,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- todo: must manually update the copyright dates here -->
- <bottom>Copyright (c) 2009-2013 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
+ <bottom>Copyright (c) 2009-2015 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
</configuration>
</plugin>
<plugin>
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractBinaryVennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractBinaryVennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractBinaryVennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -38,7 +38,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public abstract class AbstractBinaryVennNode<E>
extends AbstractVennNode<E>
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractQuaternaryVennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractQuaternaryVennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractQuaternaryVennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -38,7 +38,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public abstract class AbstractQuaternaryVennNode<E>
extends AbstractVennNode<E>
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractTernaryVennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractTernaryVennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractTernaryVennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -38,7 +38,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public abstract class AbstractTernaryVennNode<E>
extends AbstractVennNode<E>
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractVennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractVennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/AbstractVennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -34,7 +34,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public abstract class AbstractVennNode<E>
extends PNode
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/BinaryVennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/BinaryVennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/BinaryVennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -46,7 +46,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public class BinaryVennNode<E>
extends AbstractBinaryVennNode<E>
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/Centers.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/Centers.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/Centers.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -47,7 +47,6 @@
* Utility methods for finding the center of areas.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
final class Centers
{
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/QuaternaryVennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/QuaternaryVennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/QuaternaryVennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -51,7 +51,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public class QuaternaryVennNode<E>
extends AbstractQuaternaryVennNode<E>
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/TernaryVennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/TernaryVennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/TernaryVennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -46,7 +46,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public class TernaryVennNode<E>
extends AbstractTernaryVennNode<E>
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/VennNode.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/VennNode.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/VennNode.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -67,8 +67,8 @@
/** Thread pool executor service. */
private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(2);
- /** Animation length, in milliseconds, <code>2000L</code>. */
- private static final long MS = 2000L;
+ /** Animation length, in milliseconds, <code>800L</code>. */
+ private static final long MS = 800L;
/** Area paint. */
private static final Paint AREA_PAINT = new Color(0, 0, 0, 0);
Modified: trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/package-info.java
===================================================================
--- trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/package-info.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/main/java/org/dishevelled/piccolo/venn/package-info.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/piccolo-venn/src/site/site.xml
===================================================================
--- trunk/piccolo-venn/src/site/site.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/site/site.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -2,7 +2,7 @@
<!--
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/piccolo-venn/src/site/xdoc/index.xml
===================================================================
--- trunk/piccolo-venn/src/site/xdoc/index.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/site/xdoc/index.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -2,7 +2,7 @@
<!--
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/BinaryVennNodeTest.java
===================================================================
--- trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/BinaryVennNodeTest.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/BinaryVennNodeTest.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -36,7 +36,6 @@
* Unit test for BinaryVennNode.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class BinaryVennNodeTest
extends TestCase
Modified: trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/CentersTest.java
===================================================================
--- trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/CentersTest.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/CentersTest.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -40,7 +40,6 @@
* Unit test for Centers.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class CentersTest
extends TestCase
Modified: trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/QuaternaryVennNodeTest.java
===================================================================
--- trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/QuaternaryVennNodeTest.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/QuaternaryVennNodeTest.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -36,7 +36,6 @@
* Unit test for QuaternaryVennNode.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class QuaternaryVennNodeTest
extends TestCase
Modified: trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/TernaryVennNodeTest.java
===================================================================
--- trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/TernaryVennNodeTest.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn/src/test/java/org/dishevelled/piccolo/venn/TernaryVennNodeTest.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn Piccolo2D venn diagram nodes and supporting classes.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -36,7 +36,6 @@
* Unit test for TernaryVennNode.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class TernaryVennNodeTest
extends TestCase
Modified: trunk/piccolo-venn-examples/HEADER.txt
===================================================================
--- trunk/piccolo-venn-examples/HEADER.txt 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/HEADER.txt 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/piccolo-venn-examples/pom.xml
===================================================================
--- trunk/piccolo-venn-examples/pom.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/pom.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>7-SNAPSHOT</version>
+ <version>9</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-piccolo-venn-examples</artifactId>
@@ -80,7 +80,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- todo: must manually update the copyright dates here -->
- <bottom>Copyright (c) 2009-2013 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
+ <bottom>Copyright (c) 2009-2015 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
</configuration>
</plugin>
<plugin>
Modified: trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/AreaTest.java
===================================================================
--- trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/AreaTest.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/AreaTest.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -42,6 +42,8 @@
/**
* Use strict Java2D rendering of Areas to compare with PArea rendering.
+ *
+ * @author Michael Heuer
*/
public final class AreaTest
{
Modified: trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/BinaryVennExample.java
===================================================================
--- trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/BinaryVennExample.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/BinaryVennExample.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -42,7 +42,6 @@
* Binary venn node example.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class BinaryVennExample
extends JPanel
Modified: trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/QuaternaryVennExample.java
===================================================================
--- trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/QuaternaryVennExample.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/QuaternaryVennExample.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -52,7 +52,6 @@
* Quaternary venn node example.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class QuaternaryVennExample
extends JPanel
Modified: trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/TernaryVennExample.java
===================================================================
--- trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/TernaryVennExample.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/TernaryVennExample.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -42,7 +42,6 @@
* Ternary venn node example.
*
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class TernaryVennExample
extends JPanel
Modified: trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/package-info.java
===================================================================
--- trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/package-info.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/src/main/java/org/dishevelled/piccolo/venn/examples/package-info.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/piccolo-venn-examples/src/site/site.xml
===================================================================
--- trunk/piccolo-venn-examples/src/site/site.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/src/site/site.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -2,7 +2,7 @@
<!--
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/piccolo-venn-examples/src/site/xdoc/index.xml
===================================================================
--- trunk/piccolo-venn-examples/src/site/xdoc/index.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/piccolo-venn-examples/src/site/xdoc/index.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -2,7 +2,7 @@
<!--
dsh-piccolo-venn-examples Piccolo2D venn diagram node examples.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/pom.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>7-SNAPSHOT</version>
+ <version>9</version>
<relativePath>./parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-multi-module</artifactId>
Modified: trunk/venn/HEADER.txt
===================================================================
--- trunk/venn/HEADER.txt 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/HEADER.txt 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/pom.xml
===================================================================
--- trunk/venn/pom.xml 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/pom.xml 2015-07-13 17:47:04 UTC (rev 1840)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>7-SNAPSHOT</version>
+ <version>9</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-venn</artifactId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-bitset</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -77,7 +77,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- todo: must manually update the copyright dates here -->
- <bottom>Copyright (c) 2009-2013 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
+ <bottom>Copyright (c) 2009-2015 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
<show>public</show>
</configuration>
</plugin>
Modified: trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennLayout.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennLayout.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennLayout.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennModel.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennModel.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/BinaryVennModel.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -32,7 +32,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public interface BinaryVennModel<E> extends VennModel<E>
{
Modified: trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennLayout.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennLayout.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennLayout.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennModel.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennModel.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/QuaternaryVennModel.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -32,7 +32,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public interface QuaternaryVennModel<E> extends VennModel<E>
{
Modified: trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennLayout.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennLayout.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennLayout.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennModel.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennModel.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/TernaryVennModel.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -32,7 +32,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public interface TernaryVennModel<E> extends VennModel<E>
{
Modified: trunk/venn/src/main/java/org/dishevelled/venn/VennLayout.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/VennLayout.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/VennLayout.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/VennLayouter.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/VennLayouter.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/VennLayouter.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/VennModel.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/VennModel.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/VennModel.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layout/BinaryVennLayoutImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layout/BinaryVennLayoutImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layout/BinaryVennLayoutImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layout/QuaternaryVennLayoutImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layout/QuaternaryVennLayoutImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layout/QuaternaryVennLayoutImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layout/TernaryVennLayoutImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layout/TernaryVennLayoutImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layout/TernaryVennLayoutImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutUtils.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutUtils.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layout/VennLayoutUtils.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layout/package-info.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layout/package-info.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layout/package-info.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layouter/VennLayouterImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layouter/VennLayouterImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layouter/VennLayouterImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/layouter/package-info.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/layouter/package-info.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/layouter/package-info.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/BinaryVennModelImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/BinaryVennModelImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/BinaryVennModelImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -46,7 +46,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class BinaryVennModelImpl<E>
implements BinaryVennModel<E>
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/QuaternaryVennModelImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/QuaternaryVennModelImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/QuaternaryVennModelImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -46,7 +46,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class QuaternaryVennModelImpl<E>
implements QuaternaryVennModel<E>
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/SelectionView.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/SelectionView.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/SelectionView.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -40,7 +40,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
final class SelectionView<E>
extends ObservableSetImpl<E>
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/TernaryVennModelImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/TernaryVennModelImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/TernaryVennModelImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -46,7 +46,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public final class TernaryVennModelImpl<E>
implements TernaryVennModel<E>
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelBuilder.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelBuilder.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelBuilder.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelImpl.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelImpl.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelImpl.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelUtils.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelUtils.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/VennModelUtils.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/VennModels.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/VennModels.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/VennModels.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/model/package-info.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/model/package-info.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/model/package-info.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/package-info.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/package-info.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/package-info.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/venn/src/main/java/org/dishevelled/venn/swing/AbstractBinaryVennDiagram.java
===================================================================
--- trunk/venn/src/main/java/org/dishevelled/venn/swing/AbstractBinaryVennDiagram.java 2015-06-07 22:11:14 UTC (rev 1839)
+++ trunk/venn/src/main/java/org/dishevelled/venn/swing/AbstractBinaryVennDiagram.java 2015-07-13 17:47:04 UTC (rev 1840)
@@ -1,7 +1,7 @@
/*
dsh-venn Lightweight components for venn diagrams.
- Copyright (c) 2009-2013 held jointly by the individual authors.
+ Copyright (c) 2009-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -41,7 +41,6 @@
*
* @param <E> value type
* @author Michael Heuer
- * @version $Revision$ $Date$
*/
public abstract class AbstractBinaryVennDiagram<E>
extends LabelFieldPanel
Modified: trunk/venn/src/main/java/org/dishevelled/...
[truncated message content] |
|
From: <he...@us...> - 2015-06-07 22:11:16
|
Revision: 1839
http://sourceforge.net/p/dishevelled/code/1839
Author: heuermh
Date: 2015-06-07 22:11:14 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/compress/pom.xml
Modified: trunk/compress/pom.xml
===================================================================
--- trunk/compress/pom.xml 2015-06-07 22:11:10 UTC (rev 1838)
+++ trunk/compress/pom.xml 2015-06-07 22:11:14 UTC (rev 1839)
@@ -4,20 +4,20 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>9</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-compress</artifactId>
<packaging>jar</packaging>
<name>dishevelled.org compress</name>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<description>Compression utility classes.</description>
<url>http://www.dishevelled.org/compress</url>
<inceptionYear>2014</inceptionYear>
<scm>
- <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-compress-1.1</connection>
- <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-compress-1.1</developerConnection>
- <url>https://svn.code.sf.net/p/dishevelled/code/tags/dsh-compress-1.1</url>
+ <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/compress</connection>
+ <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/compress</developerConnection>
+ <url>https://svn.code.sf.net/p/dishevelled/code/trunk/compress</url>
</scm>
<distributionManagement>
<site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-07 22:11:12
|
Revision: 1838
http://sourceforge.net/p/dishevelled/code/1838
Author: heuermh
Date: 2015-06-07 22:11:10 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag dsh-compress-1.1
Added Paths:
-----------
tags/dsh-compress-1.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-07 22:11:08
|
Revision: 1837
http://sourceforge.net/p/dishevelled/code/1837
Author: heuermh
Date: 2015-06-07 22:11:06 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
[maven-release-plugin] prepare release dsh-compress-1.1
Modified Paths:
--------------
trunk/compress/pom.xml
Modified: trunk/compress/pom.xml
===================================================================
--- trunk/compress/pom.xml 2015-06-07 22:10:20 UTC (rev 1836)
+++ trunk/compress/pom.xml 2015-06-07 22:11:06 UTC (rev 1837)
@@ -4,20 +4,20 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <version>9</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-compress</artifactId>
<packaging>jar</packaging>
<name>dishevelled.org compress</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<description>Compression utility classes.</description>
<url>http://www.dishevelled.org/compress</url>
<inceptionYear>2014</inceptionYear>
<scm>
- <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/compress</connection>
- <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/compress</developerConnection>
- <url>https://svn.code.sf.net/p/dishevelled/code/trunk/compress</url>
+ <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-compress-1.1</connection>
+ <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-compress-1.1</developerConnection>
+ <url>https://svn.code.sf.net/p/dishevelled/code/tags/dsh-compress-1.1</url>
</scm>
<distributionManagement>
<site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-07 22:10:23
|
Revision: 1836
http://sourceforge.net/p/dishevelled/code/1836
Author: heuermh
Date: 2015-06-07 22:10:20 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
update parent dependency to version 10-SNAPSHOT
Modified Paths:
--------------
trunk/compress/pom.xml
Modified: trunk/compress/pom.xml
===================================================================
--- trunk/compress/pom.xml 2015-06-07 22:04:18 UTC (rev 1835)
+++ trunk/compress/pom.xml 2015-06-07 22:10:20 UTC (rev 1836)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-compress</artifactId>
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
<executions>
<execution>
<id>enforce-java</id>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-07 22:04:20
|
Revision: 1835
http://sourceforge.net/p/dishevelled/code/1835
Author: heuermh
Date: 2015-06-07 22:04:18 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/parent/pom.xml
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2015-06-07 22:04:14 UTC (rev 1834)
+++ trunk/parent/pom.xml 2015-06-07 22:04:18 UTC (rev 1835)
@@ -11,7 +11,7 @@
<artifactId>dsh-parent</artifactId>
<packaging>pom</packaging>
<name>dishevelled.org parent</name>
- <version>9</version>
+ <version>10-SNAPSHOT</version>
<description>dishevelled.org parent</description>
<url>http://www.dishevelled.org/parent</url>
<inceptionYear>2009</inceptionYear>
@@ -44,9 +44,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-9</connection>
- <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-9</developerConnection>
- <url>https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-9</url>
+ <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/parent</connection>
+ <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/parent</developerConnection>
+ <url>https://svn.code.sf.net/p/dishevelled/code/trunk/parent</url>
</scm>
<organization>
<name>dishevelled.org</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-07 22:04:16
|
Revision: 1834
http://sourceforge.net/p/dishevelled/code/1834
Author: heuermh
Date: 2015-06-07 22:04:14 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag dsh-parent-9
Added Paths:
-----------
tags/dsh-parent-9/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-07 22:04:12
|
Revision: 1833
http://sourceforge.net/p/dishevelled/code/1833
Author: heuermh
Date: 2015-06-07 22:04:10 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
[maven-release-plugin] prepare release dsh-parent-9
Modified Paths:
--------------
trunk/parent/pom.xml
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2015-06-07 22:03:04 UTC (rev 1832)
+++ trunk/parent/pom.xml 2015-06-07 22:04:10 UTC (rev 1833)
@@ -11,7 +11,7 @@
<artifactId>dsh-parent</artifactId>
<packaging>pom</packaging>
<name>dishevelled.org parent</name>
- <version>9-SNAPSHOT</version>
+ <version>9</version>
<description>dishevelled.org parent</description>
<url>http://www.dishevelled.org/parent</url>
<inceptionYear>2009</inceptionYear>
@@ -44,9 +44,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/parent</connection>
- <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/parent</developerConnection>
- <url>https://svn.code.sf.net/p/dishevelled/code/trunk/parent</url>
+ <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-9</connection>
+ <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-9</developerConnection>
+ <url>https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-9</url>
</scm>
<organization>
<name>dishevelled.org</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-07 22:03:07
|
Revision: 1832
http://sourceforge.net/p/dishevelled/code/1832
Author: heuermh
Date: 2015-06-07 22:03:04 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
preparing for version 9 release
Modified Paths:
--------------
trunk/parent/pom.xml
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2015-06-05 17:11:05 UTC (rev 1831)
+++ trunk/parent/pom.xml 2015-06-07 22:03:04 UTC (rev 1832)
@@ -74,7 +74,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
@@ -86,7 +86,7 @@
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
@@ -106,7 +106,7 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -129,12 +129,12 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
+ <version>2.18.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.8.1</version>
+ <version>1.10</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -194,7 +194,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -204,7 +204,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -302,7 +302,7 @@
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.11</version>
+ <version>2.9.1</version>
<configuration>
<configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
@@ -328,11 +328,11 @@
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<reportSets>
<reportSet>
<reports>
@@ -345,7 +345,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
</plugins>
</reporting>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-05 17:11:07
|
Revision: 1831
http://sourceforge.net/p/dishevelled/code/1831
Author: heuermh
Date: 2015-06-05 17:11:05 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
increasing unit test coverage
Modified Paths:
--------------
trunk/compress/src/main/java/org/dishevelled/compress/Readers.java
trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java
trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Readers.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Readers.java 2015-06-05 16:18:01 UTC (rev 1830)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Readers.java 2015-06-05 17:11:05 UTC (rev 1831)
@@ -111,8 +111,7 @@
}
catch (CompressorException e)
{
- System.out.println("caught " + e);
- //bufferedInputStream.reset();
+ // fall back to uncompressed input stream reader
return inputStreamReader(bufferedInputStream);
}
}
Modified: trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java 2015-06-05 16:18:01 UTC (rev 1830)
+++ trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java 2015-06-05 17:11:05 UTC (rev 1831)
@@ -69,6 +69,10 @@
public void testReaderFile() throws IOException
{
File file = File.createTempFile("readersTest", ".txt");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt"), outputStream);
+ }
try (BufferedReader reader = reader(file))
{
assertValidReader(reader);
@@ -203,6 +207,10 @@
public void testCompressedFileReaderPlainText() throws IOException
{
File file = File.createTempFile("readersTest", ".txt");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt"), outputStream);
+ }
try (BufferedReader reader = compressedFileReader(file))
{
assertValidReader(reader);
Modified: trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java 2015-06-05 16:18:01 UTC (rev 1830)
+++ trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java 2015-06-05 17:11:05 UTC (rev 1831)
@@ -25,10 +25,15 @@
import static org.dishevelled.compress.Sources.bzip2InputStreamCharSource;
import static org.dishevelled.compress.Sources.charSource;
+import static org.dishevelled.compress.Sources.compressedInputStreamCharSource;
+import static org.dishevelled.compress.Sources.inputStreamCharSource;
import static org.dishevelled.compress.Sources.gzipInputStreamCharSource;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -64,9 +69,13 @@
public void testCharSourceFile() throws IOException
{
File file = File.createTempFile("charSourcesTest", ".txt");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt"), outputStream);
+ }
try (Reader reader = charSource(file).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -81,7 +90,7 @@
}
try (Reader reader = charSource(file).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -96,7 +105,7 @@
}
try (Reader reader = charSource(file).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -111,9 +120,13 @@
public void testCharSourceCharsetFile() throws IOException
{
File file = File.createTempFile("charSourcesTest", ".txt");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt"), outputStream);
+ }
try (Reader reader = charSource(file, Charset.forName("UTF-8")).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -134,7 +147,7 @@
}
try (Reader reader = gzipInputStreamCharSource(new FileInputStream(file)).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -149,7 +162,7 @@
}
try (Reader reader = gzipInputStreamCharSource(new FileInputStream(file)).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -164,7 +177,7 @@
}
try (Reader reader = gzipInputStreamCharSource(new FileInputStream(file)).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -185,7 +198,7 @@
}
try (Reader reader = bzip2InputStreamCharSource(new FileInputStream(file)).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -200,7 +213,7 @@
}
try (Reader reader = bzip2InputStreamCharSource(new FileInputStream(file)).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -215,8 +228,92 @@
}
try (Reader reader = bzip2InputStreamCharSource(new FileInputStream(file)).openStream())
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
+
+ @Test(expected=NullPointerException.class)
+ public void testInputStreamCharSourceNullInputStream() throws IOException
+ {
+ inputStreamCharSource(null);
+ }
+
+ @Test
+ public void testInputStreamCharSource() throws IOException
+ {
+ File file = File.createTempFile("charSourcesTest", ".txt");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt"), outputStream);
+ }
+ try (Reader reader = inputStreamCharSource(new FileInputStream(file)).openStream())
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testCompressedInputStreamCharSourceNullInputStream() throws IOException
+ {
+ compressedInputStreamCharSource(null);
+ }
+
+ @Test
+ public void testCompressedInputStreamCharSourcePlainText() throws IOException
+ {
+ File file = File.createTempFile("charSourcesTest", ".txt");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt"), outputStream);
+ }
+ try (Reader reader = compressedInputStreamCharSource(new FileInputStream(file)).openStream())
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test
+ public void testCompressedInputStreamCharSourceGzip() throws IOException
+ {
+ File file = File.createTempFile("charSourcesTest", ".txt.gz");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt.gz"), outputStream);
+ }
+ try (Reader reader = compressedInputStreamCharSource(new FileInputStream(file)).openStream())
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test
+ public void testCompressedInputStreamCharSourceBzip2() throws IOException
+ {
+ File file = File.createTempFile("charSourcesTest", ".txt.bz2");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt.bz2"), outputStream);
+ }
+ try (Reader reader = compressedInputStreamCharSource(new FileInputStream(file)).openStream())
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ static void assertValidReader(final Reader reader) throws IOException {
+ assertNotNull(reader);
+
+ BufferedReader bufferedReader = new BufferedReader(reader);
+ int lineNumber = 0;
+ for (String line = null; (line = bufferedReader.readLine()) != null; ) {
+ assertTrue(line.startsWith("example"));
+ lineNumber++;
+ }
+ assertEquals(5, lineNumber);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-05 16:18:04
|
Revision: 1830
http://sourceforge.net/p/dishevelled/code/1830
Author: heuermh
Date: 2015-06-05 16:18:01 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
updating copyright years to include 2015
Modified Paths:
--------------
trunk/compress/HEADER.txt
trunk/compress/pom.xml
trunk/compress/src/main/java/org/dishevelled/compress/Compress.java
trunk/compress/src/main/java/org/dishevelled/compress/Readers.java
trunk/compress/src/main/java/org/dishevelled/compress/Sinks.java
trunk/compress/src/main/java/org/dishevelled/compress/Sources.java
trunk/compress/src/main/java/org/dishevelled/compress/Writers.java
trunk/compress/src/main/java/org/dishevelled/compress/package-info.java
trunk/compress/src/site/site.xml
trunk/compress/src/site/xdoc/index.xml
trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java
trunk/compress/src/test/java/org/dishevelled/compress/SinksTest.java
trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java
trunk/compress/src/test/java/org/dishevelled/compress/WritersTest.java
Modified: trunk/compress/HEADER.txt
===================================================================
--- trunk/compress/HEADER.txt 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/HEADER.txt 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/pom.xml
===================================================================
--- trunk/compress/pom.xml 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/pom.xml 2015-06-05 16:18:01 UTC (rev 1830)
@@ -83,7 +83,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- todo: must manually update the copyright dates here -->
- <bottom>Copyright (c) 2014 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
+ <bottom>Copyright (c) 2014-2015 held jointly by the individual authors. Licensed under the <a href="http://www.fsf.org/licensing/licenses/lgpl.html">GNU Lesser General Public License<a> (LGPL).</bottom>
</configuration>
</plugin>
<plugin>
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Compress.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Compress.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Compress.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Readers.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Readers.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Readers.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Sinks.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Sinks.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Sinks.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Sources.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Sources.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Sources.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Writers.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Writers.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Writers.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/main/java/org/dishevelled/compress/package-info.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/package-info.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/main/java/org/dishevelled/compress/package-info.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/site/site.xml
===================================================================
--- trunk/compress/src/site/site.xml 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/site/site.xml 2015-06-05 16:18:01 UTC (rev 1830)
@@ -2,7 +2,7 @@
<!--
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/site/xdoc/index.xml
===================================================================
--- trunk/compress/src/site/xdoc/index.xml 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/site/xdoc/index.xml 2015-06-05 16:18:01 UTC (rev 1830)
@@ -2,7 +2,7 @@
<!--
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/test/java/org/dishevelled/compress/SinksTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/SinksTest.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/test/java/org/dishevelled/compress/SinksTest.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
Modified: trunk/compress/src/test/java/org/dishevelled/compress/WritersTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/WritersTest.java 2015-06-05 16:12:19 UTC (rev 1829)
+++ trunk/compress/src/test/java/org/dishevelled/compress/WritersTest.java 2015-06-05 16:18:01 UTC (rev 1830)
@@ -1,7 +1,7 @@
/*
dsh-compress Compression utility classes.
- Copyright (c) 2014 held jointly by the individual authors.
+ Copyright (c) 2014-2015 held jointly by the individual authors.
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-06-05 16:12:21
|
Revision: 1829
http://sourceforge.net/p/dishevelled/code/1829
Author: heuermh
Date: 2015-06-05 16:12:19 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
adding compressedInputStream and related, update commons-compress dependency version to 1.9
Modified Paths:
--------------
trunk/compress/pom.xml
trunk/compress/src/build/conf/checkstyle.xml
trunk/compress/src/main/java/org/dishevelled/compress/Readers.java
trunk/compress/src/main/java/org/dishevelled/compress/Sources.java
trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java
trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java
trunk/compress/src/test/resources/org/dishevelled/compress/example.txt
trunk/compress/src/test/resources/org/dishevelled/compress/example.txt.bz2
trunk/compress/src/test/resources/org/dishevelled/compress/example.txt.gz
trunk/parent/pom.xml
Modified: trunk/compress/pom.xml
===================================================================
--- trunk/compress/pom.xml 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/compress/pom.xml 2015-06-05 16:12:19 UTC (rev 1829)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>7-SNAPSHOT</version>
+ <version>9-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-compress</artifactId>
Modified: trunk/compress/src/build/conf/checkstyle.xml
===================================================================
--- trunk/compress/src/build/conf/checkstyle.xml 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/compress/src/build/conf/checkstyle.xml 2015-06-05 16:12:19 UTC (rev 1829)
@@ -115,8 +115,7 @@
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!-- <module name="AvoidInlineConditionals"/> -->
-<!-- <!--<module name="DoubleCheckedLocking"/>-->
- -->
+ <!--<module name="DoubleCheckedLocking"/>-->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation"/>
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Readers.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Readers.java 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Readers.java 2015-06-05 16:12:19 UTC (rev 1829)
@@ -28,6 +28,7 @@
import static org.dishevelled.compress.Compress.isBzip2File;
import static org.dishevelled.compress.Compress.isGzipFile;
+import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -38,6 +39,9 @@
import javax.annotation.Nullable;
+import org.apache.commons.compress.compressors.CompressorException;
+import org.apache.commons.compress.compressors.CompressorStreamFactory;
+
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
@@ -60,6 +64,74 @@
/**
+ * Create and return a new buffered reader for the specified input stream.
+ *
+ * @since 1.1
+ * @param inputStream input stream, must not be null
+ * @return a new buffered reader for the specified input stream
+ * @throws IOException if an I/O error occurs
+ */
+ public static BufferedReader inputStreamReader(final InputStream inputStream) throws IOException
+ {
+ checkNotNull(inputStream);
+ return new BufferedReader(new InputStreamReader(inputStream));
+ }
+
+ /**
+ * Create and return a new buffered reader for the specified compressed file,
+ * autodetecting the compression type from the first few bytes of the file.
+ *
+ * @since 1.1
+ * @param file file, must not be null
+ * @return a new buffered reader for the specified file
+ * @throws IOException if an I/O error occurs
+ */
+ public static BufferedReader compressedFileReader(final File file) throws IOException
+ {
+ checkNotNull(file);
+ return compressedInputStreamReader(new FileInputStream(file));
+ }
+
+ /**
+ * Create and return a new buffered reader for the specified compressed input stream,
+ * autodetecting the compression type from the first few bytes of the stream.
+ *
+ * @since 1.1
+ * @param inputStream input stream, must not be null
+ * @return a new buffered reader for the specified input stream
+ * @throws IOException if an I/O error occurs
+ */
+ public static BufferedReader compressedInputStreamReader(final InputStream inputStream) throws IOException
+ {
+ checkNotNull(inputStream);
+ BufferedInputStream bufferedInputStream = inputStream instanceof BufferedInputStream ? (BufferedInputStream) inputStream : new BufferedInputStream(inputStream);
+ try
+ {
+ return new BufferedReader(new InputStreamReader(new CompressorStreamFactory().createCompressorInputStream(bufferedInputStream)));
+ }
+ catch (CompressorException e)
+ {
+ System.out.println("caught " + e);
+ //bufferedInputStream.reset();
+ return inputStreamReader(bufferedInputStream);
+ }
+ }
+
+ /**
+ * Create and return a new buffered reader for the specified gzip compressed file.
+ *
+ * @since 1.1
+ * @param file gzip compressed file, must not be null
+ * @return a new buffered reader for the specified gzip compressed file
+ * @throws IOException if an I/O error occurs
+ */
+ public static BufferedReader gzipFileReader(final File file) throws IOException
+ {
+ checkNotNull(file);
+ return gzipInputStreamReader(new FileInputStream(file));
+ }
+
+ /**
* Create and return a new buffered reader for the specified gzip compressed input stream.
*
* @param inputStream gzip compressed input stream, must not be null
@@ -73,6 +145,20 @@
}
/**
+ * Create and return a new buffered reader for the specified bzip2 compressed file.
+ *
+ * @since 1.1
+ * @param file bzip2 compressed file, must not be null
+ * @return a new buffered reader for the specified bzip2 compressed file
+ * @throws IOException if an I/O error occurs
+ */
+ public static BufferedReader bzip2FileReader(final File file) throws IOException
+ {
+ checkNotNull(file);
+ return bzip2InputStreamReader(new FileInputStream(file));
+ }
+
+ /**
* Create and return a new buffered reader for the specified bzip2 compressed input stream.
*
* @param inputStream bzip2 compressed input stream, must not be null
@@ -98,15 +184,15 @@
{
if (file == null)
{
- return new BufferedReader(new InputStreamReader(System.in));
+ return compressedInputStreamReader(System.in);
}
else if (isGzipFile(file))
{
- return new BufferedReader(new InputStreamReader(new GzipCompressorInputStream(new FileInputStream(file))));
+ return gzipFileReader(file);
}
else if (isBzip2File(file))
{
- return new BufferedReader(new InputStreamReader(new BZip2CompressorInputStream(new FileInputStream(file))));
+ return bzip2FileReader(file);
}
return new BufferedReader(new FileReader(file));
}
Modified: trunk/compress/src/main/java/org/dishevelled/compress/Sources.java
===================================================================
--- trunk/compress/src/main/java/org/dishevelled/compress/Sources.java 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/compress/src/main/java/org/dishevelled/compress/Sources.java 2015-06-05 16:12:19 UTC (rev 1829)
@@ -28,11 +28,8 @@
import static org.dishevelled.compress.Compress.isBzip2File;
import static org.dishevelled.compress.Compress.isGzipFile;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.IOException;
import java.io.Reader;
@@ -43,10 +40,6 @@
import com.google.common.io.CharSource;
import com.google.common.io.Files;
-import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
-
-import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-
/**
* File and input stream sources with support for gzip and bzip2 compression.
*
@@ -67,22 +60,45 @@
/**
* Create and return a new char source for the specified input stream.
*
- * @param inputStream input stream
+ * @since 1.1
+ * @param inputStream input stream, must not be null
* @return a new char source for the specified input stream
*/
- private static CharSource inputStreamCharSource(final InputStream inputStream)
+ public static CharSource inputStreamCharSource(final InputStream inputStream)
{
+ checkNotNull(inputStream);
return new CharSource()
{
@Override
public Reader openStream() throws IOException
{
- return new BufferedReader(new InputStreamReader(inputStream));
+ return Readers.inputStreamReader(inputStream);
}
};
}
/**
+ * Create and return a new char source for the specified compressed input stream,
+ * autodetecting the compression type from the first few bytes of the stream.
+ *
+ * @since 1.1
+ * @param inputStream input stream, must not be null
+ * @return a new char source for the specified input stream
+ */
+ public static CharSource compressedInputStreamCharSource(final InputStream inputStream)
+ {
+ checkNotNull(inputStream);
+ return new CharSource()
+ {
+ @Override
+ public Reader openStream() throws IOException
+ {
+ return Readers.compressedInputStreamReader(inputStream);
+ }
+ };
+ }
+
+ /**
* Create and return a new char source for the specified gzip compressed input stream.
*
* @param inputStream gzip compressed input stream, must not be null
@@ -96,7 +112,7 @@
@Override
public Reader openStream() throws IOException
{
- return new BufferedReader(new InputStreamReader(new GzipCompressorInputStream(inputStream)));
+ return Readers.gzipInputStreamReader(inputStream);
}
};
}
@@ -115,7 +131,7 @@
@Override
public Reader openStream() throws IOException
{
- return new BufferedReader(new InputStreamReader(new BZip2CompressorInputStream(inputStream)));
+ return Readers.bzip2InputStreamReader(inputStream);
}
};
}
@@ -133,7 +149,7 @@
@Override
public Reader openStream() throws IOException
{
- return new BufferedReader(new InputStreamReader(new GzipCompressorInputStream(new FileInputStream(file))));
+ return Readers.gzipFileReader(file);
}
};
}
@@ -151,7 +167,7 @@
@Override
public Reader openStream() throws IOException
{
- return new BufferedReader(new InputStreamReader(new BZip2CompressorInputStream(new FileInputStream(file))));
+ return Readers.bzip2FileReader(file);
}
};
}
@@ -185,7 +201,7 @@
checkNotNull(charset);
if (file == null)
{
- return inputStreamCharSource(System.in);
+ return compressedInputStreamCharSource(System.in);
}
else if (isGzipFile(file))
{
Modified: trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/compress/src/test/java/org/dishevelled/compress/ReadersTest.java 2015-06-05 16:12:19 UTC (rev 1829)
@@ -23,11 +23,18 @@
*/
package org.dishevelled.compress;
+import static org.dishevelled.compress.Readers.bzip2FileReader;
import static org.dishevelled.compress.Readers.bzip2InputStreamReader;
+import static org.dishevelled.compress.Readers.compressedFileReader;
+import static org.dishevelled.compress.Readers.compressedInputStreamReader;
+import static org.dishevelled.compress.Readers.gzipFileReader;
import static org.dishevelled.compress.Readers.gzipInputStreamReader;
+import static org.dishevelled.compress.Readers.inputStreamReader;
import static org.dishevelled.compress.Readers.reader;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.BufferedReader;
import java.io.File;
@@ -47,6 +54,7 @@
public final class ReadersTest
{
+ /* hangs waiting on System.in
@Test
public void testReaderNullFile() throws IOException
{
@@ -55,6 +63,7 @@
assertNotNull(reader);
}
}
+ */
@Test
public void testReaderFile() throws IOException
@@ -62,7 +71,7 @@
File file = File.createTempFile("readersTest", ".txt");
try (BufferedReader reader = reader(file))
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -77,7 +86,7 @@
}
try (BufferedReader reader = reader(file))
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@@ -92,12 +101,33 @@
}
try (BufferedReader reader = reader(file))
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
file.delete();
}
@Test(expected=NullPointerException.class)
+ public void testGzipFileReaderNullFile() throws IOException
+ {
+ gzipFileReader(null);
+ }
+
+ @Test
+ public void testGzipFileReader() throws IOException
+ {
+ File file = File.createTempFile("readersTest", ".gz");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt.gz"), outputStream);
+ }
+ try (BufferedReader reader = gzipFileReader(file))
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test(expected=NullPointerException.class)
public void testGzipInputStreamReaderNullInputStream() throws IOException
{
gzipInputStreamReader(null);
@@ -108,11 +138,32 @@
{
try (InputStream inputStream = ReadersTest.class.getResourceAsStream("example.txt.gz"); BufferedReader reader = gzipInputStreamReader(inputStream))
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
}
@Test(expected=NullPointerException.class)
+ public void testBzip2FileReaderNullFile() throws IOException
+ {
+ bzip2FileReader(null);
+ }
+
+ @Test
+ public void testBzip2FileReader() throws IOException
+ {
+ File file = File.createTempFile("readersTest", ".bz2");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt.bz2"), outputStream);
+ }
+ try (BufferedReader reader = bzip2FileReader(file))
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test(expected=NullPointerException.class)
public void testBzip2InputStreamReaderNullInputStream() throws IOException
{
bzip2InputStreamReader(null);
@@ -123,7 +174,113 @@
{
try (InputStream inputStream = ReadersTest.class.getResourceAsStream("example.txt.bz2"); BufferedReader reader = bzip2InputStreamReader(inputStream))
{
- assertNotNull(reader);
+ assertValidReader(reader);
}
}
+
+ @Test(expected=NullPointerException.class)
+ public void testInputStreamReaderNullInputStream() throws IOException
+ {
+ inputStreamReader(null);
+ }
+
+ @Test
+ public void testInputStreamReader() throws IOException
+ {
+ try (InputStream inputStream = ReadersTest.class.getResourceAsStream("example.txt"); BufferedReader reader = inputStreamReader(inputStream))
+ {
+ assertValidReader(reader);
+ }
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testCompressedFileReaderNullFile() throws IOException
+ {
+ compressedFileReader(null);
+ }
+
+ @Test
+ public void testCompressedFileReaderPlainText() throws IOException
+ {
+ File file = File.createTempFile("readersTest", ".txt");
+ try (BufferedReader reader = compressedFileReader(file))
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test
+ public void testCompressedFileReaderGzip() throws IOException
+ {
+ File file = File.createTempFile("readersTest", ".gz");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt.gz"), outputStream);
+ }
+ try (BufferedReader reader = compressedFileReader(file))
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test
+ public void testCompressedFileReaderBzip2() throws IOException
+ {
+ File file = File.createTempFile("readersTest", ".bz2");
+ try (FileOutputStream outputStream = new FileOutputStream(file))
+ {
+ Resources.copy(SourcesTest.class.getResource("example.txt.bz2"), outputStream);
+ }
+ try (BufferedReader reader = bzip2FileReader(file))
+ {
+ assertValidReader(reader);
+ }
+ file.delete();
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testCompressedInputStreamReaderNullInputStream() throws IOException
+ {
+ compressedInputStreamReader(null);
+ }
+
+ @Test
+ public void testCompressedInputStreamReaderPlainText() throws IOException
+ {
+ try (InputStream inputStream = ReadersTest.class.getResourceAsStream("example.txt"); BufferedReader reader = compressedInputStreamReader(inputStream))
+ {
+ assertValidReader(reader);
+ }
+ }
+
+ @Test
+ public void testCompressedInputStreamReaderGzip() throws IOException
+ {
+ try (InputStream inputStream = ReadersTest.class.getResourceAsStream("example.txt.gz"); BufferedReader reader = compressedInputStreamReader(inputStream))
+ {
+ assertValidReader(reader);
+ }
+ }
+
+ @Test
+ public void testCompressedInputStreamReaderBzip2() throws IOException
+ {
+ try (InputStream inputStream = ReadersTest.class.getResourceAsStream("example.txt.bz2"); BufferedReader reader = compressedInputStreamReader(inputStream))
+ {
+ assertValidReader(reader);
+ }
+ }
+
+ static void assertValidReader(final BufferedReader reader) throws IOException {
+ assertNotNull(reader);
+
+ int lineNumber = 0;
+ for (String line = null; (line = reader.readLine()) != null; ) {
+ assertTrue(line.startsWith("example"));
+ lineNumber++;
+ }
+ assertEquals(5, lineNumber);
+ }
}
Modified: trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java
===================================================================
--- trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/compress/src/test/java/org/dishevelled/compress/SourcesTest.java 2015-06-05 16:12:19 UTC (rev 1829)
@@ -49,6 +49,7 @@
public final class SourcesTest
{
+ /* hangs waiting on System.in
@Test
public void testCharSourceNullFile() throws IOException
{
@@ -57,6 +58,7 @@
assertNotNull(reader);
}
}
+ */
@Test
public void testCharSourceFile() throws IOException
Modified: trunk/compress/src/test/resources/org/dishevelled/compress/example.txt
===================================================================
--- trunk/compress/src/test/resources/org/dishevelled/compress/example.txt 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/compress/src/test/resources/org/dishevelled/compress/example.txt 2015-06-05 16:12:19 UTC (rev 1829)
@@ -1 +1,5 @@
-example
+example0
+example1
+example2
+example3
+example4
Modified: trunk/compress/src/test/resources/org/dishevelled/compress/example.txt.bz2
===================================================================
(Binary files differ)
Modified: trunk/compress/src/test/resources/org/dishevelled/compress/example.txt.gz
===================================================================
(Binary files differ)
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2015-05-07 16:33:02 UTC (rev 1828)
+++ trunk/parent/pom.xml 2015-06-05 16:12:19 UTC (rev 1829)
@@ -199,7 +199,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.8.1</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-05-07 16:33:03
|
Revision: 1828
http://sourceforge.net/p/dishevelled/code/1828
Author: heuermh
Date: 2015-05-07 16:33:02 +0000 (Thu, 07 May 2015)
Log Message:
-----------
updating dependency versions
Modified Paths:
--------------
trunk/variation/pom.xml
Modified: trunk/variation/pom.xml
===================================================================
--- trunk/variation/pom.xml 2015-04-16 16:37:54 UTC (rev 1827)
+++ trunk/variation/pom.xml 2015-05-07 16:33:02 UTC (rev 1828)
@@ -53,7 +53,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-genomics</artifactId>
- <version>v1beta2-rev33-1.19.0</version>
+ <version>v1beta2-rev39-1.20.0</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-04-16 16:37:57
|
Revision: 1827
http://sourceforge.net/p/dishevelled/code/1827
Author: heuermh
Date: 2015-04-16 16:37:54 +0000 (Thu, 16 Apr 2015)
Log Message:
-----------
adding thumbnail cache
Modified Paths:
--------------
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/AbstractThumbnailManager.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/ThumbnailManager.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailListCellRenderer.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailRenderer.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailTableCellRenderer.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LastModifiedCache.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailListCellRenderer.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailRenderer.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailTableCellRenderer.java
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/package-info.java
trunk/thumbnail-examples/src/main/java/org/dishevelled/thumbnail/examples/ThumbnailExample.java
Added Paths:
-----------
trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailCache.java
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/AbstractThumbnailManager.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/AbstractThumbnailManager.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/AbstractThumbnailManager.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -111,6 +111,7 @@
this.directory = directory;
normalDirectory = new File(this.directory, "normal");
largeDirectory = new File(this.directory, "large");
+ // todo: fail directory should be application specific; e.g. fail/dsh-thumbnail-1.0/
failDirectory = new File(this.directory, "fail");
normalDirectory.mkdirs();
largeDirectory.mkdirs();
@@ -179,6 +180,8 @@
throw new IllegalArgumentException("uri must not be null");
}
+ // todo: check fail directory here
+
File thumbnailFile = new File(thumbnailDirectory, DigestUtils.md5Hex(uri.toString()) + ".png");
if (thumbnailFile.exists())
{
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/ThumbnailManager.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/ThumbnailManager.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/ThumbnailManager.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -52,7 +52,7 @@
*
* @param uri URI for the original image, must not be null
* @param modificationTime modification time for the original image
- * @return a normal size (128x128 pixel) thumbnail image for the specified URI
+ * @return a large size (256x256 pixel) thumbnail image for the specified URI
* @throws IOException if an I/O error occurs
*/
BufferedImage createLargeThumbnail(final URI uri, final long modificationTime) throws IOException;
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailListCellRenderer.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailListCellRenderer.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailListCellRenderer.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -26,9 +26,6 @@
import java.awt.Component;
import java.awt.Image;
-import java.io.File;
-import java.io.IOException;
-
import java.net.URI;
import javax.swing.DefaultListCellRenderer;
@@ -36,8 +33,6 @@
import javax.swing.JLabel;
import javax.swing.JList;
-import org.dishevelled.thumbnail.ThumbnailManager;
-
/**
* List cell renderer that displays the large thumbnail for a given URI.
*
@@ -45,30 +40,26 @@
*/
public final class LargeThumbnailListCellRenderer extends DefaultListCellRenderer
{
- /** Last modified cache. */
- private final LastModifiedCache lastModifiedCache;
+ /** Thumbnail cache. */
+ private final ThumbnailCache thumbnailCache;
- /** Thumbnail manager. */
- private final ThumbnailManager thumbnailManager;
-
/** ImageIcon wrapper for thumbnail image. */
private transient ImageIcon imageIcon;
/**
- * Create a new large thumbnail list cell renderer with the specified thumbnail manager.
+ * Create a new large thumbnail list cell renderer with the specified thumbnail cache.
*
- * @param thumbnailManager thumbnail manager, must not be null
+ * @param thumbnailCache thumbnail cache, must not be null
*/
- public LargeThumbnailListCellRenderer(final ThumbnailManager thumbnailManager)
+ public LargeThumbnailListCellRenderer(final ThumbnailCache thumbnailCache)
{
super();
- if (thumbnailManager == null)
+ if (thumbnailCache == null)
{
- throw new IllegalArgumentException("thumbnailManager must not be null");
+ throw new IllegalArgumentException("thumbnailCache must not be null");
}
- this.thumbnailManager = thumbnailManager;
- lastModifiedCache = LastModifiedCache.getInstance();
+ this.thumbnailCache = thumbnailCache;
}
@@ -84,23 +75,16 @@
if (value instanceof URI)
{
URI uri = (URI) value;
- try
+ Image thumbnail = thumbnailCache.getLargeThumbnail(uri);
+ if (imageIcon == null)
{
- Image thumbnail = thumbnailManager.createLargeThumbnail(uri, lastModifiedCache.get(uri));
- if (imageIcon == null)
- {
- imageIcon = new ImageIcon(thumbnail);
- }
- else
- {
- imageIcon.setImage(thumbnail);
- }
- label.setIcon(imageIcon);
+ imageIcon = new ImageIcon(thumbnail);
}
- catch (IOException e)
+ else
{
- // ignore
+ imageIcon.setImage(thumbnail);
}
+ label.setIcon(imageIcon);
}
return label;
}
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailRenderer.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailRenderer.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailRenderer.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -26,17 +26,12 @@
import java.awt.Component;
import java.awt.Image;
-import java.io.File;
-import java.io.IOException;
-
import java.net.URI;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.Renderer;
-import org.dishevelled.thumbnail.ThumbnailManager;
-
/**
* Renderer that displays the large thumbnail for a given URI.
*
@@ -44,12 +39,9 @@
*/
public final class LargeThumbnailRenderer implements Renderer
{
- /** Last modified cache. */
- private final LastModifiedCache lastModifiedCache;
+ /** Thumbnail cache. */
+ private final ThumbnailCache thumbnailCache;
- /** Thumbnail manager. */
- private final ThumbnailManager thumbnailManager;
-
/** JLabel delegate. */
private final JLabel delegate = new JLabel();
@@ -58,19 +50,18 @@
/**
- * Create a new large thumbnail renderer with the specified thumbnail manager.
+ * Create a new large thumbnail renderer with the specified thumbnail cache.
*
- * @param thumbnailManager thumbnail manager, must not be null
+ * @param thumbnailCache thumbnail cache, must not be null
*/
- public LargeThumbnailRenderer(final ThumbnailManager thumbnailManager)
+ public LargeThumbnailRenderer(final ThumbnailCache thumbnailCache)
{
super();
- if (thumbnailManager == null)
+ if (thumbnailCache == null)
{
- throw new IllegalArgumentException("thumbnailManager must not be null");
+ throw new IllegalArgumentException("thumbnailCache must not be null");
}
- this.thumbnailManager = thumbnailManager;
- lastModifiedCache = LastModifiedCache.getInstance();
+ this.thumbnailCache = thumbnailCache;
}
@@ -86,23 +77,16 @@
if (value instanceof URI)
{
URI uri = (URI) value;
- try
+ Image thumbnail = thumbnailCache.getLargeThumbnail(uri);
+ if (imageIcon == null)
{
- Image thumbnail = thumbnailManager.createLargeThumbnail(uri, lastModifiedCache.get(uri));
- if (imageIcon == null)
- {
- imageIcon = new ImageIcon(thumbnail);
- }
- else
- {
- imageIcon.setImage(thumbnail);
- }
- delegate.setIcon(imageIcon);
+ imageIcon = new ImageIcon(thumbnail);
}
- catch (IOException e)
+ else
{
- // ignore
+ imageIcon.setImage(thumbnail);
}
+ delegate.setIcon(imageIcon);
}
}
}
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailTableCellRenderer.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailTableCellRenderer.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LargeThumbnailTableCellRenderer.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -26,9 +26,6 @@
import java.awt.Component;
import java.awt.Image;
-import java.io.File;
-import java.io.IOException;
-
import java.net.URI;
import javax.swing.ImageIcon;
@@ -37,8 +34,6 @@
import javax.swing.table.DefaultTableCellRenderer;
-import org.dishevelled.thumbnail.ThumbnailManager;
-
/**
* Table cell renderer that displays the large thumbnail for a given URI.
*
@@ -46,30 +41,26 @@
*/
public final class LargeThumbnailTableCellRenderer extends DefaultTableCellRenderer
{
- /** Last modified cache. */
- private final LastModifiedCache lastModifiedCache;
+ /** Thumbnail cache. */
+ private final ThumbnailCache thumbnailCache;
- /** Thumbnail manager. */
- private final ThumbnailManager thumbnailManager;
-
/** ImageIcon wrapper for thumbnail image. */
private transient ImageIcon imageIcon;
/**
- * Create a new large thumbnail table cell renderer with the specified thumbnail manager.
+ * Create a new large thumbnail table cell renderer with the specified thumbnail cache.
*
- * @param thumbnailManager thumbnail manager, must not be null
+ * @param thumbnailCache thumbnail cache, must not be null
*/
- public LargeThumbnailTableCellRenderer(final ThumbnailManager thumbnailManager)
+ public LargeThumbnailTableCellRenderer(final ThumbnailCache thumbnailCache)
{
super();
- if (thumbnailManager == null)
+ if (thumbnailCache == null)
{
- throw new IllegalArgumentException("thumbnailManager must not be null");
+ throw new IllegalArgumentException("thumbnailCache must not be null");
}
- this.thumbnailManager = thumbnailManager;
- lastModifiedCache = LastModifiedCache.getInstance();
+ this.thumbnailCache = thumbnailCache;
}
@@ -86,23 +77,16 @@
if (value instanceof URI)
{
URI uri = (URI) value;
- try
+ Image thumbnail = thumbnailCache.getLargeThumbnail(uri);
+ if (imageIcon == null)
{
- Image thumbnail = thumbnailManager.createLargeThumbnail(uri, lastModifiedCache.get(uri));
- if (imageIcon == null)
- {
- imageIcon = new ImageIcon(thumbnail);
- }
- else
- {
- imageIcon.setImage(thumbnail);
- }
- label.setIcon(imageIcon);
+ imageIcon = new ImageIcon(thumbnail);
}
- catch (IOException e)
+ else
{
- // ignore
+ imageIcon.setImage(thumbnail);
}
+ label.setIcon(imageIcon);
}
return label;
}
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LastModifiedCache.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LastModifiedCache.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/LastModifiedCache.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -39,7 +39,6 @@
import java.nio.file.WatchService;
import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import com.google.common.cache.CacheBuilder;
@@ -56,7 +55,7 @@
final class LastModifiedCache
{
/** Executor service. */
- private final ExecutorService executorService = Executors.newFixedThreadPool(1);
+ private final ExecutorService executorService;
/** File system watcher. */
private final WatchService watcher;
@@ -83,9 +82,17 @@
/**
* Create a new last modified cache.
+ *
+ * @param executorService executor service, must not be null
*/
- LastModifiedCache()
+ LastModifiedCache(final ExecutorService executorService)
{
+ if (executorService == null)
+ {
+ throw new IllegalArgumentException("executorService must not be null");
+ }
+ this.executorService = executorService;
+
try
{
watcher = FileSystems.getDefault().newWatchService();
@@ -196,24 +203,4 @@
{
return (WatchEvent<T>) event;
}
-
- // todo: consider using lang3.concurrent initializer instead
- /**
- * Return the last modified cache.
- *
- * @return the last modified cache
- */
- static LastModifiedCache getInstance()
- {
- return LastModifiedCacheHolder.lastModifiedCache;
- }
-
- /**
- * Initialization on demand holder.
- */
- static class LastModifiedCacheHolder
- {
- /** Last modified cache. */
- static LastModifiedCache lastModifiedCache = new LastModifiedCache();
- }
}
Added: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailCache.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailCache.java (rev 0)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailCache.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -0,0 +1,232 @@
+/*
+
+ dsh-thumbnail Implementation of the freedesktop.org thumbnail specification.
+ Copyright (c) 2013-2015 held jointly by the individual authors.
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 3 of the License, or (at
+ your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; with out even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+ > http://www.fsf.org/licensing/licenses/lgpl.html
+ > http://www.opensource.org/licenses/lgpl-license.php
+
+*/
+package org.dishevelled.thumbnail.swing;
+
+import java.awt.Component;
+
+import java.awt.image.BufferedImage;
+
+import java.io.IOException;
+
+import java.net.URI;
+
+import java.util.List;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.SwingUtilities;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListenableFutureTask;
+import com.google.common.util.concurrent.Futures;
+
+import org.dishevelled.thumbnail.ThumbnailManager;
+
+/**
+ * Thumbnail cache.
+ *
+ * @author Michael Heuer
+ */
+public final class ThumbnailCache
+{
+ /** Empty image. */
+ private static final BufferedImage EMPTY_IMAGE = new BufferedImage(128, 128, BufferedImage.TYPE_INT_ARGB);
+
+ /** Empty large image. */
+ private static final BufferedImage EMPTY_LARGE_IMAGE = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB);
+
+ /** Thumbnail manager. */
+ private final ThumbnailManager thumbnailManager;
+
+ /** List of components to repaint. */
+ private final List<Component> repaint;
+
+ /** Executor service. */
+ private final ExecutorService executorService;
+
+ /** Last modified cache. */
+ private final LastModifiedCache lastModifiedCache;
+
+ /** Cache of thumbnails keyed by URI, allowing for asynchronous refresh. */
+ private final LoadingCache<URI, BufferedImage> cache = CacheBuilder.newBuilder()
+ .maximumSize(100000)
+ .refreshAfterWrite(10, TimeUnit.MILLISECONDS)
+ .build(new CacheLoader<URI, BufferedImage>()
+ {
+ @Override
+ public BufferedImage load(final URI uri)
+ {
+ System.out.println(System.nanoTime() + " returning empty image for URI " + uri);
+ return EMPTY_IMAGE;
+ }
+
+ @Override
+ public ListenableFuture<BufferedImage> reload(final URI uri, final BufferedImage image)
+ {
+ if (image.equals(EMPTY_IMAGE))
+ {
+ ListenableFutureTask<BufferedImage> task = ListenableFutureTask.create(new Callable<BufferedImage>()
+ {
+ @Override
+ public BufferedImage call() throws IOException {
+ System.out.println(System.nanoTime() + " creating thumbnail for URI " + uri);
+ return thumbnailManager.createThumbnail(uri, lastModifiedCache.get(uri));
+ }
+ });
+ task.addListener(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ for (Component component : repaint)
+ {
+ System.out.println(" repainting " + component);
+ component.repaint();
+ }
+ }
+ });
+ }
+ }, executorService);
+ executorService.execute(task);
+ return task;
+ }
+ System.out.println(System.nanoTime() + " returning immediate future thumbnail for URI " + uri);
+ return Futures.immediateFuture(image);
+ }
+ });
+
+ /** Cache of large thumbnails keyed by URI, allowing for asynchronous refresh. */
+ private final LoadingCache<URI, BufferedImage> largeCache = CacheBuilder.newBuilder()
+ .maximumSize(100000)
+ .refreshAfterWrite(10, TimeUnit.MILLISECONDS)
+ .build(new CacheLoader<URI, BufferedImage>()
+ {
+ @Override
+ public BufferedImage load(final URI uri)
+ {
+ System.out.println(System.nanoTime() + " returning empty image for URI " + uri);
+ return EMPTY_IMAGE;
+ }
+
+ @Override
+ public ListenableFuture<BufferedImage> reload(final URI uri, final BufferedImage image)
+ {
+ if (image.equals(EMPTY_IMAGE))
+ {
+ ListenableFutureTask<BufferedImage> task = ListenableFutureTask.create(new Callable<BufferedImage>()
+ {
+ @Override
+ public BufferedImage call() throws IOException {
+ System.out.println(System.nanoTime() + " creating thumbnail for URI " + uri);
+ return thumbnailManager.createLargeThumbnail(uri, lastModifiedCache.get(uri));
+ }
+ });
+ executorService.execute(task);
+ return task;
+ }
+ System.out.println(System.nanoTime() + " returning immediate future thumbnail for URI " + uri);
+ return Futures.immediateFuture(image);
+ }
+ });
+
+ /**
+ * Create a new thumbnail cache with the specified thumbnail manager.
+ *
+ * @param thumbnailManager thumbnail manager, must not be null
+ */
+ public ThumbnailCache(final ThumbnailManager thumbnailManager)
+ {
+ if (thumbnailManager == null)
+ {
+ throw new IllegalArgumentException("thumbnailManager must not be null");
+ }
+ this.thumbnailManager = thumbnailManager;
+
+ repaint = new CopyOnWriteArrayList<Component>();
+ executorService = Executors.newCachedThreadPool();
+ lastModifiedCache = new LastModifiedCache(executorService);
+ }
+
+
+ /**
+ * Repaint the specified component on reload of thumbnail images.
+ *
+ * @param component component to repaint on reload of thumbnail images, must not be null
+ */
+ public void add(final Component component)
+ {
+ if (component == null)
+ {
+ throw new IllegalArgumentException("component must not be null");
+ }
+ repaint.add(component);
+ }
+
+ /**
+ * Remove the specified component from the list of components to repaint on reload of thumbnail images.
+ *
+ * @param component component to remove from the list of components to repaint on reload of thumbnail images
+ */
+ public void remove(final Component component)
+ {
+ repaint.remove(component);
+ }
+
+ /**
+ * Return a normal size (128x128 pixel) thumbnail image for the specified URI. The thumbnail
+ * image will not be null but may be an empty image; call again after repaint.
+ *
+ * @param uri URI for the original image, must not be null
+ * @return a normal size (128x128 pixel) thumbnail image for the specified URI
+ */
+ public BufferedImage getThumbnail(final URI uri)
+ {
+ return cache.getUnchecked(uri);
+ }
+
+ /**
+ * Return a large size (256x256 pixel) thumbnail image for the specified URI. The thumbnail
+ * image will not be null but may be an empty image; call again after repaint.
+ *
+ * @param uri URI for the original image, must not be null
+ * @return a large size (256x256 pixel) thumbnail image for the specified URI
+ */
+ public BufferedImage getLargeThumbnail(final URI uri)
+ {
+ return largeCache.getUnchecked(uri);
+ }
+}
Property changes on: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailCache.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailListCellRenderer.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailListCellRenderer.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailListCellRenderer.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -26,9 +26,6 @@
import java.awt.Component;
import java.awt.Image;
-import java.io.File;
-import java.io.IOException;
-
import java.net.URI;
import javax.swing.DefaultListCellRenderer;
@@ -36,8 +33,6 @@
import javax.swing.JLabel;
import javax.swing.JList;
-import org.dishevelled.thumbnail.ThumbnailManager;
-
/**
* List cell renderer that displays the thumbnail for a given URI.
*
@@ -45,30 +40,26 @@
*/
public final class ThumbnailListCellRenderer extends DefaultListCellRenderer
{
- /** Last modified cache. */
- private final LastModifiedCache lastModifiedCache;
+ /** Thumbnail cache. */
+ private final ThumbnailCache thumbnailCache;
- /** Thumbnail manager. */
- private final ThumbnailManager thumbnailManager;
-
/** ImageIcon wrapper for thumbnail image. */
private transient ImageIcon imageIcon;
/**
- * Create a new thumbnail list cell renderer with the specified thumbnail manager.
+ * Create a new thumbnail list cell renderer with the specified thumbnail cache.
*
- * @param thumbnailManager thumbnail manager, must not be null
+ * @param thumbnailCache thumbnail cache, must not be null
*/
- public ThumbnailListCellRenderer(final ThumbnailManager thumbnailManager)
+ public ThumbnailListCellRenderer(final ThumbnailCache thumbnailCache)
{
super();
- if (thumbnailManager == null)
+ if (thumbnailCache == null)
{
- throw new IllegalArgumentException("thumbnailManager must not be null");
+ throw new IllegalArgumentException("thumbnailCache must not be null");
}
- this.thumbnailManager = thumbnailManager;
- lastModifiedCache = LastModifiedCache.getInstance();
+ this.thumbnailCache = thumbnailCache;
}
@@ -84,23 +75,16 @@
if (value instanceof URI)
{
URI uri = (URI) value;
- try
+ Image thumbnail = thumbnailCache.getThumbnail(uri);
+ if (imageIcon == null)
{
- Image thumbnail = thumbnailManager.createThumbnail(uri, lastModifiedCache.get(uri));
- if (imageIcon == null)
- {
- imageIcon = new ImageIcon(thumbnail);
- }
- else
- {
- imageIcon.setImage(thumbnail);
- }
- label.setIcon(imageIcon);
+ imageIcon = new ImageIcon(thumbnail);
}
- catch (IOException e)
+ else
{
- // ignore
+ imageIcon.setImage(thumbnail);
}
+ label.setIcon(imageIcon);
}
return label;
}
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailRenderer.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailRenderer.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailRenderer.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -26,17 +26,12 @@
import java.awt.Component;
import java.awt.Image;
-import java.io.File;
-import java.io.IOException;
-
import java.net.URI;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.Renderer;
-import org.dishevelled.thumbnail.ThumbnailManager;
-
/**
* Renderer that displays the thumbnail for a given URI.
*
@@ -44,12 +39,9 @@
*/
public final class ThumbnailRenderer implements Renderer
{
- /** Last modified cache. */
- private final LastModifiedCache lastModifiedCache;
+ /** Thumbnail cache. */
+ private final ThumbnailCache thumbnailCache;
- /** Thumbnail manager. */
- private final ThumbnailManager thumbnailManager;
-
/** JLabel delegate. */
private final JLabel delegate = new JLabel();
@@ -58,19 +50,18 @@
/**
- * Create a new thumbnail renderer with the specified thumbnail manager.
+ * Create a new thumbnail renderer with the specified thumbnail cache.
*
- * @param thumbnailManager thumbnail manager, must not be null
+ * @param thumbnailCache thumbnail cache, must not be null
*/
- public ThumbnailRenderer(final ThumbnailManager thumbnailManager)
+ public ThumbnailRenderer(final ThumbnailCache thumbnailCache)
{
super();
- if (thumbnailManager == null)
+ if (thumbnailCache == null)
{
- throw new IllegalArgumentException("thumbnailManager must not be null");
+ throw new IllegalArgumentException("thumbnailCache must not be null");
}
- this.thumbnailManager = thumbnailManager;
- lastModifiedCache = LastModifiedCache.getInstance();
+ this.thumbnailCache = thumbnailCache;
}
@@ -86,23 +77,16 @@
if (value instanceof URI)
{
URI uri = (URI) value;
- try
+ Image thumbnail = thumbnailCache.getThumbnail(uri);
+ if (imageIcon == null)
{
- Image thumbnail = thumbnailManager.createThumbnail(uri, lastModifiedCache.get(uri));
- if (imageIcon == null)
- {
- imageIcon = new ImageIcon(thumbnail);
- }
- else
- {
- imageIcon.setImage(thumbnail);
- }
- delegate.setIcon(imageIcon);
+ imageIcon = new ImageIcon(thumbnail);
}
- catch (IOException e)
+ else
{
- // ignore
+ imageIcon.setImage(thumbnail);
}
+ delegate.setIcon(imageIcon);
}
}
}
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailTableCellRenderer.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailTableCellRenderer.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/ThumbnailTableCellRenderer.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -26,9 +26,6 @@
import java.awt.Component;
import java.awt.Image;
-import java.io.File;
-import java.io.IOException;
-
import java.net.URI;
import javax.swing.ImageIcon;
@@ -37,8 +34,6 @@
import javax.swing.table.DefaultTableCellRenderer;
-import org.dishevelled.thumbnail.ThumbnailManager;
-
/**
* Table cell renderer that displays the thumbnail for a given URI.
*
@@ -46,30 +41,26 @@
*/
public final class ThumbnailTableCellRenderer extends DefaultTableCellRenderer
{
- /** Last modified cache. */
- private final LastModifiedCache lastModifiedCache;
+ /** Thumbnail cache. */
+ private final ThumbnailCache thumbnailCache;
- /** Thumbnail manager. */
- private final ThumbnailManager thumbnailManager;
-
/** ImageIcon wrapper for thumbnail image. */
private transient ImageIcon imageIcon;
/**
- * Create a new thumbnail table cell renderer with the specified thumbnail manager.
+ * Create a new thumbnail table cell renderer with the specified thumbnail cache.
*
- * @param thumbnailManager thumbnail manager, must not be null
+ * @param thumbnailCache thumbnail cache, must not be null
*/
- public ThumbnailTableCellRenderer(final ThumbnailManager thumbnailManager)
+ public ThumbnailTableCellRenderer(final ThumbnailCache thumbnailCache)
{
super();
- if (thumbnailManager == null)
+ if (thumbnailCache == null)
{
- throw new IllegalArgumentException("thumbnailManager must not be null");
+ throw new IllegalArgumentException("thumbnailCache must not be null");
}
- this.thumbnailManager = thumbnailManager;
- lastModifiedCache = LastModifiedCache.getInstance();
+ this.thumbnailCache = thumbnailCache;
}
@@ -86,23 +77,16 @@
if (value instanceof URI)
{
URI uri = (URI) value;
- try
+ Image thumbnail = thumbnailCache.getThumbnail(uri);
+ if (imageIcon == null)
{
- Image thumbnail = thumbnailManager.createThumbnail(uri, lastModifiedCache.get(uri));
- if (imageIcon == null)
- {
- imageIcon = new ImageIcon(thumbnail);
- }
- else
- {
- imageIcon.setImage(thumbnail);
- }
- label.setIcon(imageIcon);
+ imageIcon = new ImageIcon(thumbnail);
}
- catch (IOException e)
+ else
{
- // ignore
+ imageIcon.setImage(thumbnail);
}
+ label.setIcon(imageIcon);
}
return label;
}
Modified: trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/package-info.java
===================================================================
--- trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/package-info.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail/src/main/java/org/dishevelled/thumbnail/swing/package-info.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -24,5 +24,23 @@
/**
* Lightweight components for thumbnails.
+ *
+ * <p>
+ * All the components in this package use {@link ThumbnailCache} for performance. The same
+ * thumbnail cache should be used for more than one component. For example,
+ * <pre>
+ * ThumbnailManager manager = new XdgThumbnailManager();
+ * ThumbnailCache cache = new ThumbnailCache(manager);
+ *
+ * JList<URI> list = new JList<URI>();
+ * list.setCellRenderer(new ThumbnailListCellRenderer(cache));
+ * JTable table = new JTable();
+ * table.setDefaultCellRenderer(URI.class, new ThumbnailTableCellRenderer(cache));
+ *
+ * // repaint components on reload of thumbnail images
+ * cache.add(list);
+ * cache.add(table);
+ * </pre>
+ * </p>
*/
package org.dishevelled.thumbnail.swing;
Modified: trunk/thumbnail-examples/src/main/java/org/dishevelled/thumbnail/examples/ThumbnailExample.java
===================================================================
--- trunk/thumbnail-examples/src/main/java/org/dishevelled/thumbnail/examples/ThumbnailExample.java 2015-04-07 15:41:18 UTC (rev 1826)
+++ trunk/thumbnail-examples/src/main/java/org/dishevelled/thumbnail/examples/ThumbnailExample.java 2015-04-16 16:37:54 UTC (rev 1827)
@@ -49,8 +49,10 @@
import org.dishevelled.eventlist.view.CountLabel;
import org.dishevelled.eventlist.view.ElementsList;
+import org.dishevelled.thumbnail.ThumbnailManager;
import org.dishevelled.thumbnail.XdgThumbnailManager;
+import org.dishevelled.thumbnail.swing.ThumbnailCache;
import org.dishevelled.thumbnail.swing.ThumbnailListCellRenderer;
/**
@@ -61,7 +63,7 @@
public final class ThumbnailExample extends JPanel implements Runnable
{
/** Count of URIs. */
- private final CountLabel<URI> count;
+ //private final CountLabel<URI> count;
/** List of URIs. */
private final UriList list;
@@ -85,7 +87,7 @@
setLayout(new BorderLayout());
setBorder(new EmptyBorder(12, 12, 12, 12));
- add("North", createCountPanel());
+ //add("North", createCountPanel());
add("Center", list);
}
@@ -149,8 +151,11 @@
UriList(final EventList<URI> eventList)
{
super(eventList);
+ ThumbnailManager thumbnailManager = new XdgThumbnailManager();
+ ThumbnailCache thumbnailCache = new ThumbnailCache(thumbnailManager);
getLabel().setText("Thumbnails");
- getList().setCellRenderer(new ThumbnailListCellRenderer(new XdgThumbnailManager()));
+ getList().setCellRenderer(new ThumbnailListCellRenderer(thumbnailCache));
+ thumbnailCache.add(getList());
getPasteAction().setEnabled(false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-04-07 15:41:20
|
Revision: 1826
http://sourceforge.net/p/dishevelled/code/1826
Author: heuermh
Date: 2015-04-07 15:41:18 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
updating ensembl-rest-client dependency version to 2.0
Modified Paths:
--------------
trunk/variation/pom.xml
Modified: trunk/variation/pom.xml
===================================================================
--- trunk/variation/pom.xml 2015-04-06 21:04:48 UTC (rev 1825)
+++ trunk/variation/pom.xml 2015-04-07 15:41:18 UTC (rev 1826)
@@ -53,7 +53,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-genomics</artifactId>
- <version>v1beta2-rev13-1.19.0</version>
+ <version>v1beta2-rev33-1.19.0</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
@@ -63,6 +63,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -73,7 +77,7 @@
<dependency>
<groupId>com.github.heuermh.ensemblrestclient</groupId>
<artifactId>ensembl-rest-client</artifactId>
- <version>2.0-rc2</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
@@ -196,17 +200,17 @@
<dependency>
<groupId>org.nmdp.ngs</groupId>
<artifactId>ngs-range</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.nmdp.ngs</groupId>
<artifactId>ngs-variant</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.12</version>
</dependency>
<!--
@@ -220,17 +224,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.7</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.7</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.7.7</version>
+ <version>1.7.12</version>
</dependency>
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-04-06 21:04:49
|
Revision: 1825
http://sourceforge.net/p/dishevelled/code/1825
Author: heuermh
Date: 2015-04-06 21:04:48 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
update bdg-formats dependency version to 0.5.0
Modified Paths:
--------------
trunk/variation/pom.xml
Modified: trunk/variation/pom.xml
===================================================================
--- trunk/variation/pom.xml 2015-03-27 05:07:52 UTC (rev 1824)
+++ trunk/variation/pom.xml 2015-04-06 21:04:48 UTC (rev 1825)
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.bdgenomics.bdg-formats</groupId>
<artifactId>bdg-formats</artifactId>
- <version>0.4.0</version>
+ <version>0.5.0</version>
</dependency>
<dependency>
<groupId>org.dishevelled</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-03-27 05:07:59
|
Revision: 1824
http://sourceforge.net/p/dishevelled/code/1824
Author: heuermh
Date: 2015-03-27 05:07:52 +0000 (Fri, 27 Mar 2015)
Log Message:
-----------
update parent dependency version to 9-SNAPSHOT
Modified Paths:
--------------
trunk/variation/pom.xml
trunk/variation-cytoscape3-app/pom.xml
Modified: trunk/variation/pom.xml
===================================================================
--- trunk/variation/pom.xml 2015-03-27 04:30:13 UTC (rev 1823)
+++ trunk/variation/pom.xml 2015-03-27 05:07:52 UTC (rev 1824)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>9-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-variation</artifactId>
Modified: trunk/variation-cytoscape3-app/pom.xml
===================================================================
--- trunk/variation-cytoscape3-app/pom.xml 2015-03-27 04:30:13 UTC (rev 1823)
+++ trunk/variation-cytoscape3-app/pom.xml 2015-03-27 05:07:52 UTC (rev 1824)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.dishevelled</groupId>
<artifactId>dsh-parent</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>9-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>dsh-variation-cytoscape3-app</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-03-27 04:30:15
|
Revision: 1823
http://sourceforge.net/p/dishevelled/code/1823
Author: heuermh
Date: 2015-03-27 04:30:13 +0000 (Fri, 27 Mar 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/bitset/pom.xml
Modified: trunk/bitset/pom.xml
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-03-27 04:30:11
|
Revision: 1822
http://sourceforge.net/p/dishevelled/code/1822
Author: heuermh
Date: 2015-03-27 04:30:10 +0000 (Fri, 27 Mar 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag dsh-bitset-3.0
Added Paths:
-----------
tags/dsh-bitset-3.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-03-27 04:30:06
|
Revision: 1821
http://sourceforge.net/p/dishevelled/code/1821
Author: heuermh
Date: 2015-03-27 04:30:05 +0000 (Fri, 27 Mar 2015)
Log Message:
-----------
[maven-release-plugin] prepare release dsh-bitset-3.0
Modified Paths:
--------------
trunk/bitset/pom.xml
Modified: trunk/bitset/pom.xml
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-03-27 04:20:54
|
Revision: 1820
http://sourceforge.net/p/dishevelled/code/1820
Author: heuermh
Date: 2015-03-27 04:20:46 +0000 (Fri, 27 Mar 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/parent/pom.xml
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2015-03-27 04:20:42 UTC (rev 1819)
+++ trunk/parent/pom.xml 2015-03-27 04:20:46 UTC (rev 1820)
@@ -11,7 +11,7 @@
<artifactId>dsh-parent</artifactId>
<packaging>pom</packaging>
<name>dishevelled.org parent</name>
- <version>8</version>
+ <version>9-SNAPSHOT</version>
<description>dishevelled.org parent</description>
<url>http://www.dishevelled.org/parent</url>
<inceptionYear>2009</inceptionYear>
@@ -44,9 +44,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-8</connection>
- <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-8</developerConnection>
- <url>https://svn.code.sf.net/p/dishevelled/code/tags/dsh-parent-8</url>
+ <connection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/parent</connection>
+ <developerConnection>scm:svn|https://svn.code.sf.net/p/dishevelled/code/trunk/parent</developerConnection>
+ <url>https://svn.code.sf.net/p/dishevelled/code/trunk/parent</url>
</scm>
<organization>
<name>dishevelled.org</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-03-27 04:20:44
|
Revision: 1819
http://sourceforge.net/p/dishevelled/code/1819
Author: heuermh
Date: 2015-03-27 04:20:42 +0000 (Fri, 27 Mar 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag dsh-parent-8
Added Paths:
-----------
tags/dsh-parent-8/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
474 messages has been excluded from this view by a project administrator.