Permalink
Browse files

First Jalopy since move to JDK 1.5. We now only support the

commercial version from TRIEMAX, because the old open-source version
doesn't support JDK 1.5.  As part of this, updated Jalopy settings
to match new maintainer's style preferences.

Also, add SerializationTest.java, which I forgot to add in my last commit.


git-svn-id: https://jgrapht.svn.sourceforge.net/svnroot/jgrapht/trunk@397 4a7320f3-3611-0410-a4d0-ef7ff04b8906
  • Loading branch information...
John V Sichi
John V Sichi committed Sep 5, 2005
1 parent 8f452d7 commit 464c88a91a2ade3733e41de50c76dac4259d9ea6
Showing with 8,107 additions and 7,185 deletions.
  1. +12 −5 build.xml
  2. +0 −387 etc/jalopy-settings.xml
  3. +161 −157 etc/triemax-jalopy-settings.xml
  4. +18 −18 src/org/_3pq/jgrapht/DirectedGraph.java
  5. +29 −28 src/org/_3pq/jgrapht/Edge.java
  6. +8 −4 src/org/_3pq/jgrapht/EdgeFactory.java
  7. +120 −158 src/org/_3pq/jgrapht/Graph.java
  8. +122 −106 src/org/_3pq/jgrapht/GraphHelper.java
  9. +12 −10 src/org/_3pq/jgrapht/LabeledElement.java
  10. +13 −12 src/org/_3pq/jgrapht/ListenableGraph.java
  11. +11 −9 src/org/_3pq/jgrapht/UndirectedGraph.java
  12. +8 −4 src/org/_3pq/jgrapht/VertexFactory.java
  13. +5 −3 src/org/_3pq/jgrapht/WeightedGraph.java
  14. +96 −84 src/org/_3pq/jgrapht/alg/BronKerboschCliqueFinder.java
  15. +101 −101 src/org/_3pq/jgrapht/alg/ConnectivityInspector.java
  16. +69 −58 src/org/_3pq/jgrapht/alg/CycleDetector.java
  17. +58 −42 src/org/_3pq/jgrapht/alg/DijkstraShortestPath.java
  18. +142 −135 src/org/_3pq/jgrapht/alg/StrongConnectivityInspector.java
  19. +44 −45 src/org/_3pq/jgrapht/alg/VertexCovers.java
  20. +44 −31 src/org/_3pq/jgrapht/alg/util/VertexDegreeComparator.java
  21. +50 −44 src/org/_3pq/jgrapht/demo/HelloJGraphT.java
  22. +85 −74 src/org/_3pq/jgrapht/demo/JGraphAdapterDemo.java
  23. +65 −63 src/org/_3pq/jgrapht/demo/PerformanceDemo.java
  24. +44 −33 src/org/_3pq/jgrapht/edge/DefaultEdge.java
  25. +17 −7 src/org/_3pq/jgrapht/edge/DirectedEdge.java
  26. +28 −13 src/org/_3pq/jgrapht/edge/DirectedWeightedEdge.java
  27. +42 −34 src/org/_3pq/jgrapht/edge/EdgeFactories.java
  28. +17 −7 src/org/_3pq/jgrapht/edge/UndirectedEdge.java
  29. +28 −13 src/org/_3pq/jgrapht/edge/UndirectedWeightedEdge.java
  30. +31 −11 src/org/_3pq/jgrapht/event/ConnectedComponentTraversalEvent.java
  31. +24 −9 src/org/_3pq/jgrapht/event/EdgeTraversalEvent.java
  32. +23 −8 src/org/_3pq/jgrapht/event/GraphChangeEvent.java
  33. +24 −8 src/org/_3pq/jgrapht/event/GraphEdgeChangeEvent.java
  34. +14 −11 src/org/_3pq/jgrapht/event/GraphListener.java
  35. +23 −9 src/org/_3pq/jgrapht/event/GraphVertexChangeEvent.java
  36. +14 −11 src/org/_3pq/jgrapht/event/TraversalListener.java
  37. +23 −11 src/org/_3pq/jgrapht/event/TraversalListenerAdapter.java
  38. +13 −9 src/org/_3pq/jgrapht/event/VertexSetListener.java
  39. +23 −8 src/org/_3pq/jgrapht/event/VertexTraversalEvent.java
  40. +124 −78 src/org/_3pq/jgrapht/experimental/GraphReader.java
  41. +100 −82 src/org/_3pq/jgrapht/experimental/GraphSquare.java
  42. +52 −30 src/org/_3pq/jgrapht/experimental/GraphTests.java
  43. +60 −54 src/org/_3pq/jgrapht/experimental/MandatedGraph.java
  44. +67 −47 src/org/_3pq/jgrapht/experimental/PartiteRandomGraphGenerator.java
  45. +74 −56 src/org/_3pq/jgrapht/experimental/ProximityIterator.java
  46. +41 −24 src/org/_3pq/jgrapht/experimental/RandomGraphHelper.java
  47. +35 −23 src/org/_3pq/jgrapht/experimental/ShortestPathIterator.java
  48. +42 −22 src/org/_3pq/jgrapht/experimental/UniformRandomGraphGenerator.java
  49. +33 −45 src/org/_3pq/jgrapht/experimental/UpdateAuthority.java
  50. +92 −80 src/org/_3pq/jgrapht/experimental/alg/DijkstraAlgorithm.java
  51. +33 −22 src/org/_3pq/jgrapht/experimental/alg/DijkstraShortestPathAlgorithm.java
  52. +10 −4 src/org/_3pq/jgrapht/experimental/alg/MinimumSpanningTreeAlgorithm.java
  53. +44 −32 src/org/_3pq/jgrapht/experimental/alg/NearestNeighborTSPAlgorithm.java
  54. +30 −18 src/org/_3pq/jgrapht/experimental/alg/PrimMinSpanTreeAlgorithm.java
  55. +11 −5 src/org/_3pq/jgrapht/experimental/alg/ShortestPathAlgorithm.java
  56. +11 −4 src/org/_3pq/jgrapht/experimental/alg/TravellingSalespersonAlgorithm.java
  57. +23 −11 src/org/_3pq/jgrapht/experimental/alg/WeightedGraphAlgorithm.java
  58. +61 −51 src/org/_3pq/jgrapht/experimental/heap/AbstractHeap.java
  59. +47 −39 src/org/_3pq/jgrapht/experimental/heap/AbstractHeapFactory.java
  60. +109 −83 src/org/_3pq/jgrapht/experimental/heap/BinaryHeap.java
  61. +12 −7 src/org/_3pq/jgrapht/experimental/heap/ElementPeer.java
  62. +167 −151 src/org/_3pq/jgrapht/experimental/heap/FibonacciHeap.java
  63. +23 −22 src/org/_3pq/jgrapht/experimental/heap/Heap.java
  64. +13 −8 src/org/_3pq/jgrapht/experimental/heap/HeapElement.java
  65. +38 −38 src/org/_3pq/jgrapht/experimental/heap/HeapFactory.java
  66. +41 −30 src/org/_3pq/jgrapht/experimental/heap/HeapVertex.java
  67. +494 −480 src/org/_3pq/jgrapht/ext/JGraphModelAdapter.java
  68. +70 −62 src/org/_3pq/jgrapht/ext/VisioExporter.java
  69. +25 −13 src/org/_3pq/jgrapht/generate/EmptyGraphGenerator.java
  70. +25 −19 src/org/_3pq/jgrapht/generate/GraphGenerator.java
  71. +43 −25 src/org/_3pq/jgrapht/generate/LinearGraphGenerator.java
  72. +30 −20 src/org/_3pq/jgrapht/generate/RingGraphGenerator.java
  73. +59 −45 src/org/_3pq/jgrapht/generate/WheelGraphGenerator.java
  74. +414 −416 src/org/_3pq/jgrapht/graph/AbstractBaseGraph.java
  75. +60 −52 src/org/_3pq/jgrapht/graph/AbstractGraph.java
  76. +84 −83 src/org/_3pq/jgrapht/graph/AsUndirectedGraph.java
  77. +22 −16 src/org/_3pq/jgrapht/graph/DefaultDirectedGraph.java
  78. +25 −19 src/org/_3pq/jgrapht/graph/DefaultDirectedWeightedGraph.java
  79. +191 −173 src/org/_3pq/jgrapht/graph/DefaultListenableGraph.java
  80. +19 −12 src/org/_3pq/jgrapht/graph/DirectedMultigraph.java
  81. +21 −14 src/org/_3pq/jgrapht/graph/DirectedPseudograph.java
  82. +25 −14 src/org/_3pq/jgrapht/graph/DirectedSubgraph.java
  83. +19 −12 src/org/_3pq/jgrapht/graph/DirectedWeightedMultigraph.java
  84. +25 −16 src/org/_3pq/jgrapht/graph/DirectedWeightedSubgraph.java
  85. +16 −10 src/org/_3pq/jgrapht/graph/EdgeListFactory.java
  86. +90 −84 src/org/_3pq/jgrapht/graph/GraphDelegator.java
  87. +18 −10 src/org/_3pq/jgrapht/graph/ListenableDirectedGraph.java
  88. +20 −12 src/org/_3pq/jgrapht/graph/ListenableDirectedWeightedGraph.java
  89. +18 −10 src/org/_3pq/jgrapht/graph/ListenableUndirectedGraph.java
  90. +20 −12 src/org/_3pq/jgrapht/graph/ListenableUndirectedWeightedGraph.java
  91. +19 −11 src/org/_3pq/jgrapht/graph/Multigraph.java
  92. +19 −11 src/org/_3pq/jgrapht/graph/Pseudograph.java
  93. +19 −12 src/org/_3pq/jgrapht/graph/SimpleDirectedGraph.java
  94. +21 −13 src/org/_3pq/jgrapht/graph/SimpleDirectedWeightedGraph.java
  95. +19 −11 src/org/_3pq/jgrapht/graph/SimpleGraph.java
  96. +19 −11 src/org/_3pq/jgrapht/graph/SimpleWeightedGraph.java
  97. +243 −255 src/org/_3pq/jgrapht/graph/Subgraph.java
  98. +25 −14 src/org/_3pq/jgrapht/graph/UndirectedSubgraph.java
  99. +25 −16 src/org/_3pq/jgrapht/graph/UndirectedWeightedSubgraph.java
  100. +18 −9 src/org/_3pq/jgrapht/graph/UnmodifiableDirectedGraph.java
  101. +63 −57 src/org/_3pq/jgrapht/graph/UnmodifiableGraph.java
  102. +18 −9 src/org/_3pq/jgrapht/graph/UnmodifiableUndirectedGraph.java
  103. +19 −11 src/org/_3pq/jgrapht/graph/WeightedMultigraph.java
  104. +21 −13 src/org/_3pq/jgrapht/graph/WeightedPseudograph.java
  105. +64 −62 src/org/_3pq/jgrapht/traverse/AbstractGraphIterator.java
  106. +38 −26 src/org/_3pq/jgrapht/traverse/BreadthFirstIterator.java
  107. +116 −96 src/org/_3pq/jgrapht/traverse/ClosestFirstIterator.java
  108. +172 −163 src/org/_3pq/jgrapht/traverse/CrossComponentIterator.java
  109. +38 −27 src/org/_3pq/jgrapht/traverse/DepthFirstIterator.java
  110. +24 −23 src/org/_3pq/jgrapht/traverse/GraphIterator.java
  111. +75 −68 src/org/_3pq/jgrapht/traverse/TopologicalOrderIterator.java
  112. +269 −275 src/org/_3pq/jgrapht/util/FibonacciHeap.java
  113. +93 −85 src/org/_3pq/jgrapht/util/ModifiableInteger.java
  114. +43 −28 testsrc/org/_3pq/jgrapht/AllTests.java
  115. +23 −14 testsrc/org/_3pq/jgrapht/EnhancedTestCase.java
  116. +24 −14 testsrc/org/_3pq/jgrapht/alg/AllAlgTests.java
  117. +48 −42 testsrc/org/_3pq/jgrapht/alg/BronKerboschCliqueFinderTest.java
  118. +178 −173 testsrc/org/_3pq/jgrapht/alg/ConnectivityInspectorTest.java
  119. +70 −65 testsrc/org/_3pq/jgrapht/alg/CycleDetectorTest.java
  120. +87 −67 testsrc/org/_3pq/jgrapht/alg/DijkstraShortestPathTest.java
  121. +49 −44 testsrc/org/_3pq/jgrapht/alg/VertexCoversTest.java
  122. +21 −11 testsrc/org/_3pq/jgrapht/edge/AllEdgeTests.java
  123. +40 −32 testsrc/org/_3pq/jgrapht/edge/DefaultEdgeTest.java
  124. +17 −11 testsrc/org/_3pq/jgrapht/edge/DirectedEdgeTest.java
  125. +19 −12 testsrc/org/_3pq/jgrapht/edge/UndirectedEdgeTest.java
  126. +43 −33 testsrc/org/_3pq/jgrapht/experimental/alg/DijkstraShortestPathAlgorithmTest.java
  127. +20 −10 testsrc/org/_3pq/jgrapht/generate/AllGenerateTests.java
  128. +79 −73 testsrc/org/_3pq/jgrapht/generate/GraphGeneratorTest.java
  129. +25 −16 testsrc/org/_3pq/jgrapht/graph/AllGraphTests.java
  130. +85 −74 testsrc/org/_3pq/jgrapht/graph/AsUndirectedGraphTest.java
  131. +31 −22 testsrc/org/_3pq/jgrapht/graph/CloneTest.java
  132. +81 −72 testsrc/org/_3pq/jgrapht/graph/DefaultDirectedGraphTest.java
  133. +124 −114 testsrc/org/_3pq/jgrapht/graph/ListenableGraphTest.java
  134. +119 −0 testsrc/org/_3pq/jgrapht/graph/SerializationTest.java
  135. +222 −221 testsrc/org/_3pq/jgrapht/graph/SimpleDirectedGraphTest.java
  136. +82 −72 testsrc/org/_3pq/jgrapht/graph/SubgraphTest.java
  137. +82 −75 testsrc/org/_3pq/jgrapht/traverse/AbstractGraphIteratorTest.java
  138. +24 −14 testsrc/org/_3pq/jgrapht/traverse/AllTraverseTests.java
  139. +23 −18 testsrc/org/_3pq/jgrapht/traverse/BreadthFirstIteratorTest.java
  140. +30 −23 testsrc/org/_3pq/jgrapht/traverse/ClosestFirstIteratorTest.java
  141. +21 −17 testsrc/org/_3pq/jgrapht/traverse/DepthFirstIteratorTest.java
  142. +23 −20 testsrc/org/_3pq/jgrapht/traverse/IgnoreDirectionTest.java
  143. +50 −45 testsrc/org/_3pq/jgrapht/traverse/TopologicalOrderIteratorTest.java
View
@@ -135,7 +135,7 @@
<property name="checkstyle.jar" value="${lib.dir}/${checkstyle.jar.name}"/>
<property name="build.file" value="${basedir}/${build.file.name}"/>
<property name="checkstyle.settings" value="${etc.dir}/checkstyle-settings.xml"/>
- <property name="jalopy.settings" value="${etc.dir}/jalopy-settings.xml"/>
+ <property name="jalopy.settings" value="${etc.dir}/triemax-jalopy-settings.xml"/>
<!-- Classpath for building functional sources. -->
<path id="build.classpath">
@@ -157,6 +157,13 @@
<pathelement location="${testbuild.dir}"/>
</path>
<property name="test.classpath" refid="test.classpath"/>
+
+ <!-- Classpath for running experimental code. -->
+ <path id="exp.classpath">
+ <pathelement path="${test.classpath}"/>
+ <pathelement location="${expbuild.dir}"/>
+ </path>
+ <property name="exp.classpath" refid="exp.classpath"/>
</target>
@@ -283,18 +290,18 @@ See http://ant.apache.org/manual/OptionalTasks/junit.html for more.
<!-- Run jalopy on source code -->
<!-- NOTE: requires manual installation of .jars in lib/jalopy -->
- <target name="jalopy" depends="compile"
- description="Runs jalopy on all source code (see WARNING comment).">
+ <target name="jalopy" depends="exp.compile"
+ description="Runs jalopy on all source code.">
<taskdef name="jalopy"
- classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+ classname="com.triemax.JalopyTask">
<classpath>
<fileset dir="${basedir}/lib/jalopy">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef>
<jalopy backup="true" convention="${jalopy.settings}"
- classpathref="testbuild.classpath" history="FILE">
+ classpathref="exp.classpath" history="CRC32">
<fileset dir="${basedir}">
<include name="src/**/*.java"/>
<include name="testsrc/**/*.java"/>
Oops, something went wrong.

0 comments on commit 464c88a

Please sign in to comment.