This is an automated email from the git hooks/post-receive script. misterc-guest pushed a commit to branch master in repository libjung-java.
commit f40aa3ac5601beab2d53ba249b607254f1317688 Author: Michael R. Crusoe <[email protected]> Date: Sat Feb 21 23:05:49 2015 -0500 build the rest of the libraries --- debian/control | 7 +- debian/javabuild | 14 +-- debian/patches/use-apache-commons-collections | 167 ++++++++++++++++++++++++++ debian/rules | 7 +- 4 files changed, 184 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 5611890..5946b65 100644 --- a/debian/control +++ b/debian/control @@ -5,10 +5,13 @@ Section: contrib/java Priority: optional Build-Depends: debhelper (>= 9), javahelper, - unzip + unzip, + libjai-core-java Build-Depends-Indep: default-jdk, libcolt-java, - libcommons-collections4-java + libcommons-collections4-java, + libjava3d-java, + libvecmath-java Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/libjung-java.git Vcs-Git: git://anonscm.debian.org/debian-med/libjung-java.git diff --git a/debian/javabuild b/debian/javabuild index 7df3ac1..baae4f0 100644 --- a/debian/javabuild +++ b/debian/javabuild @@ -1,11 +1,11 @@ jung-api-2.0.1.jar jung-api-2.0.1-sources jung-algorithms-2.0.1.jar jung-algorithms-2.0.1-sources jung-graph-impl-2.0.1.jar jung-graph-impl-2.0.1-sources -jung-io-2.0.1.jar jung-io-2.0.1-sources.jar -jung-jai-2.0.1.jar jung-jai-2.0.1-sources.jar -jung-jai-samples-2.0.1.jar jung-jai-samples-2.0.1-sources.jar -jung-samples-2.0.1.jar jung-samples-2.0.1-sources.jar -jung-visualization-2.0.1.jar jung-visualization-2.0.1-sources.jar -jung-3d-2.0.1.jar jung-3d-2.0.1-sources.jar -jung-3d-demos-2.0.1.jar jung-3d-demos-2.0.1-sources.jar +jung-io-2.0.1.jar jung-io-2.0.1-sources +jung-visualization-2.0.1.jar jung-visualization-2.0.1-sources +jung-jai-2.0.1.jar jung-jai-2.0.1-sources +jung-jai-samples-2.0.1.jar jung-jai-samples-2.0.1-sources +jung-samples-2.0.1.jar jung-samples-2.0.1-sources +jung-3d-2.0.1.jar jung-3d-2.0.1-sources +jung-3d-demos-2.0.1.jar jung-3d-demos-2.0.1-sources diff --git a/debian/patches/use-apache-commons-collections b/debian/patches/use-apache-commons-collections index 181ec19..5494a7f 100644 --- a/debian/patches/use-apache-commons-collections +++ b/debian/patches/use-apache-commons-collections @@ -111,3 +111,170 @@ and http://commons.apache.org/proper/commons-collections/release_4_0.html /** * create a Forest from the supplied Graph and supplied Factory, which +--- a/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/CachingLayout.java ++++ b/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/CachingLayout.java +@@ -39,8 +39,8 @@ + + public CachingLayout(Layout<V, E> delegate) { + super(delegate); +- this.locationMap = LazyMap.<V,Point2D>decorate(new HashMap<V,Point2D>(), +- new ChainedTransformer<V, Point2D>(new Transformer[]{delegate, CloneTransformer.cloneTransformer()})); ++ this.locationMap = LazyMap.lazyMap(new HashMap<V,Point2D>(), ++ ChainedTransformer.chainedTransformer(new Transformer[]{delegate, CloneTransformer.cloneTransformer()})); + } + + @Override +--- a/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/ObservableCachingLayout.java ++++ b/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/ObservableCachingLayout.java +@@ -47,8 +47,8 @@ + + public ObservableCachingLayout(Layout<V, E> delegate) { + super(delegate); +- this.locationMap = LazyMap.<V,Point2D>decorate(new HashMap<V,Point2D>(), +- new ChainedTransformer<V, Point2D>(new Transformer[]{delegate, CloneTransformer.cloneTransformer()})); ++ this.locationMap = LazyMap.lazyMap(new HashMap<V,Point2D>(), ++ ChainedTransformer.chainedTransformer(new Transformer[]{delegate, CloneTransformer.cloneTransformer()})); + } + + /** +--- a/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/ClusteringDemo.java ++++ b/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/ClusteringDemo.java +@@ -80,10 +80,10 @@ + // Factory<Graph<Number,Number>> graphFactory; + + Map<Number,Paint> vertexPaints = +- LazyMap.<Number,Paint>decorate(new HashMap<Number,Paint>(), ++ LazyMap.lazyMap(new HashMap<Number,Paint>(), + new ConstantTransformer(Color.white)); + Map<Number,Paint> edgePaints = +- LazyMap.<Number,Paint>decorate(new HashMap<Number,Paint>(), ++ LazyMap.lazyMap(new HashMap<Number,Paint>(), + new ConstantTransformer(Color.blue)); + + public final Color[] similarColors = +@@ -154,7 +154,7 @@ + vv = new VisualizationViewer<Number,Number>(layout); + vv.setBackground( Color.white ); + //Tell the renderer to use our own customized color rendering +- vv.getRenderContext().setVertexFillPaintTransformer(MapTransformer.<Number,Paint>getInstance(vertexPaints)); ++ vv.getRenderContext().setVertexFillPaintTransformer(MapTransformer.mapTransformer(vertexPaints)); + vv.getRenderContext().setVertexDrawPaintTransformer(new Transformer<Number,Paint>() { + public Paint transform(Number v) { + if(vv.getPickedVertexState().isPicked(v)) { +@@ -165,7 +165,7 @@ + } + }); + +- vv.getRenderContext().setEdgeDrawPaintTransformer(MapTransformer.<Number,Paint>getInstance(edgePaints)); ++ vv.getRenderContext().setEdgeDrawPaintTransformer(MapTransformer.mapTransformer(edgePaints)); + + vv.getRenderContext().setEdgeStrokeTransformer(new Transformer<Number,Stroke>() { + protected final Stroke THIN = new BasicStroke(1); +--- a/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java ++++ b/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java +@@ -90,7 +90,7 @@ + vv.getRenderContext().setVertexLabelTransformer( + // this chains together Transformers so that the html tags + // are prepended to the toString method output +- new ChainedTransformer<String,String>(new Transformer[]{ ++ ChainedTransformer.chainedTransformer(new Transformer[]{ + new ToStringLabeller<String>(), + new Transformer<String,String>() { + public String transform(String input) { +--- a/jung-3d-2.0.1-sources/edu/uci/ics/jung/algorithms/layout3d/SpringLayout.java ++++ b/jung-3d-2.0.1-sources/edu/uci/ics/jung/algorithms/layout3d/SpringLayout.java +@@ -159,7 +159,7 @@ + + try { + for(E e : graph.getEdges()) { +- SpringEdgeData<E> sed = getSpringData(e); ++ SpringEdgeData<E> sed = getSpringEData(e); + calcEdgeLength(sed, lengthFunction); + } + } catch(ConcurrentModificationException cme) { +@@ -184,7 +184,7 @@ + step++; + try { + for(V v : getGraph().getVertices()) { +- SpringVertexData svd = getSpringData(v); ++ SpringVertexData svd = getSpringVData(v); + // System.err.println("svd = "+svd); + if (svd == null) { + continue; +@@ -224,7 +224,7 @@ + double vz = p1.getZ() - p2.getZ(); + double len = Math.sqrt(vx * vx + vy * vy + vz * vz); + +- SpringEdgeData<E> sed = getSpringData(e); ++ SpringEdgeData<E> sed = getSpringEData(e); + if (sed == null) { + continue; + } +@@ -243,8 +243,8 @@ + double dy = f * vy; + double dz = f * vz; + SpringVertexData v1D, v2D; +- v1D = getSpringData(v1); +- v2D = getSpringData(v2); ++ v1D = getSpringVData(v1); ++ v2D = getSpringVData(v2); + + sed.f = f; + +@@ -265,7 +265,7 @@ + for (V v : getGraph().getVertices()) { + if (isLocked(v)) continue; + +- SpringVertexData svd = getSpringData(v); ++ SpringVertexData svd = getSpringVData(v); + if(svd == null) continue; + double dx = 0, dy = 0, dz = 0; + +@@ -308,7 +308,7 @@ + try { + for (V v : getGraph().getVertices()) { + if (isLocked(v)) continue; +- SpringVertexData vd = getSpringData(v); ++ SpringVertexData vd = getSpringVData(v); + if(vd == null) continue; + Point3f xyd = transform(v); + +@@ -352,11 +352,11 @@ + } + } + +- public SpringVertexData getSpringData(V v) { ++ public SpringVertexData getSpringVData(V v) { + return springVertexData.get(v); + } + +- public SpringEdgeData<E> getSpringData(E e) { ++ public SpringEdgeData<E> getSpringEData(E e) { + return springEdgeData.get(e); + } + +@@ -477,4 +477,4 @@ + // locations.clear(); + // initialize(); + } +-} +\ No newline at end of file ++} +--- a/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/GraphEditorDemo.java ++++ b/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/GraphEditorDemo.java +@@ -146,11 +146,11 @@ + vv = new VisualizationViewer<Number,Number>(layout); + vv.setBackground(Color.white); + +- vv.getRenderContext().setVertexLabelTransformer(MapTransformer.<Number,String>getInstance( +- LazyMap.<Number,String>decorate(new HashMap<Number,String>(), new ToStringLabeller<Number>()))); ++ vv.getRenderContext().setVertexLabelTransformer(MapTransformer.mapTransformer( ++ LazyMap.lazyMap(new HashMap<Number,String>(), new ToStringLabeller<Number>()))); + +- vv.getRenderContext().setEdgeLabelTransformer(MapTransformer.<Number,String>getInstance( +- LazyMap.<Number,String>decorate(new HashMap<Number,String>(), new ToStringLabeller<Number>()))); ++ vv.getRenderContext().setEdgeLabelTransformer(MapTransformer.mapTransformer( ++ LazyMap.lazyMap(new HashMap<Number,String>(), new ToStringLabeller<Number>()))); + + vv.setVertexToolTipTransformer(vv.getRenderContext().getVertexLabelTransformer()); + diff --git a/debian/rules b/debian/rules index 0033b25..e8c5a6e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ DH_VERBOSE := 1 export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/commons-collections4.jar:/usr/share/java/colt.jar:./jung-api-2.0.1.jar +export CLASSPATH=/usr/share/java/commons-collections4.jar:/usr/share/java/colt.jar:/usr/share/java/jai_core-1.1.4.jar:/usr/share/java/j3dcore.jar:/usr/share/java/vecmath.jar:/usr/share/java/j3dutils.jar:./jung-api-2.0.1.jar:./jung-algorithms-2.0.1.jar:./jung-visualization-2.0.1.jar:./jung-graph-impl-2.0.1.jar:./jung-3d-2.0.1.jar %: dh $@ --with javahelper @@ -19,7 +19,10 @@ override_dh_auto_build: -e 's/LazyMap.decorate/LazyMap.lazyMap/' \ -e 's/MapTransformer.getInstance/MapTransformer.mapTransformer/' \ -e 's/ChainedTransformer.getInstance/ChainedTransformer.chainedTransformer/' \ - -e 's/CloneTransformer.getInstance/CloneTransformer.cloneTransformer/' ; \ + -e 's/CloneTransformer.getInstance/CloneTransformer.cloneTransformer/' \ + -e 's/CloneTransformer.<Point2D>getInstance/CloneTransformer.cloneTransformer/' \ + -e 's/OrPredicate.getInstance/OrPredicate.orPredicate/' \ + -e 's/TruePredicate.getInstance/TruePredicate.truePredicate/' ; \ cd ..; done; patch -p1 < debian/patches/use-apache-commons-collections dh_auto_build -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libjung-java.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
