Skip to content

Correction for split package issue #233 #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philippecade wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Correction for split package issue #233 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fcad72
Update version number to 2.1.1
jrtom Sep 7, 2016
4552895
Move graph-impl implementation in own package to avoid split package
philippecade Jun 27, 2019
1a037a1
Change version number from 2.1.1 to 2.2.0
philippecade Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jung-algorithms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.jung</groupId>
<artifactId>jung-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.2.0</version>
</parent>
<artifactId>jung-algorithms</artifactId>
<name>JUNG - Algorithms</name>
Expand Down
2 changes: 1 addition & 1 deletion ...lgorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestBicomponentClusterer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import junit.framework.TestSuite;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.UndirectedGraph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;


/**
Expand Down
2 changes: 1 addition & 1 deletion ...ithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestEdgeBetweennessClusterer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.SparseMultigraph;
import edu.uci.ics.jung.graph.impl.SparseMultigraph;


/**
Expand Down
2 changes: 1 addition & 1 deletion ...orithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/WeakComponentClustererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import junit.framework.TestCase;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.util.TestGraphs;
import edu.uci.ics.jung.graph.impl.util.TestGraphs;

public class WeakComponentClustererTest extends TestCase {

Expand Down
2 changes: 1 addition & 1 deletion ...ithms/src/test/java/edu/uci/ics/jung/algorithms/filters/impl/TestKNeighborhoodFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import edu.uci.ics.jung.algorithms.filters.KNeighborhoodFilter;
import edu.uci.ics.jung.algorithms.filters.KNeighborhoodFilter.EdgeType;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;


public class TestKNeighborhoodFilter extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/flows/TestEdmondsKarpMaxFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.util.EdgeType;

/**
Expand Down
4 changes: 2 additions & 2 deletions jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/TestLattice2D.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.UndirectedGraph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;


public class TestLattice2D extends TestCase {
Expand Down
12 changes: 6 additions & 6 deletions ...ithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestBarabasiAlbert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedSparseGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.SparseGraph;
import edu.uci.ics.jung.graph.SparseMultigraph;
import edu.uci.ics.jung.graph.UndirectedSparseGraph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.SparseGraph;
import edu.uci.ics.jung.graph.impl.SparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.util.EdgeType;
import edu.uci.ics.jung.graph.util.Pair;
import junit.framework.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/edu/uci/ics/jung/algorithms/generators/random/TestEppsteinPowerLawGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.SparseMultigraph;
import edu.uci.ics.jung.graph.impl.SparseMultigraph;

/**
* @author Scott White
Expand Down
2 changes: 1 addition & 1 deletion ...lgorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestErdosRenyi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.UndirectedGraph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;


public class TestErdosRenyi extends TestCase {
Expand Down
4 changes: 2 additions & 2 deletions ...ithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestBetweennessCentrality.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseGraph;
import edu.uci.ics.jung.graph.UndirectedGraph;
import edu.uci.ics.jung.graph.UndirectedSparseGraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;

/**
* @author Scott White
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestKStepMarkov.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;


/**
Expand Down
2 changes: 1 addition & 1 deletion ...-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestWeightedNIPaths.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;

/**
* @author Scott White, adapted to jung2 by Tom Nelson
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayout2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import edu.uci.ics.jung.algorithms.layout.util.VisRunner;
import edu.uci.ics.jung.algorithms.util.IterativeContext;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.util.TestGraphs;
import edu.uci.ics.jung.graph.impl.util.TestGraphs;

public class FRLayout2Test extends TestCase {

Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayoutTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import edu.uci.ics.jung.algorithms.layout.util.VisRunner;
import edu.uci.ics.jung.algorithms.util.IterativeContext;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.util.TestGraphs;
import edu.uci.ics.jung.graph.impl.util.TestGraphs;

public class FRLayoutTest extends TestCase {

Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/metrics/TestTriad.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import junit.framework.TestCase;
import edu.uci.ics.jung.algorithms.metrics.TriadicCensus;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;

public class TestTriad extends TestCase {

Expand Down
2 changes: 1 addition & 1 deletion ...gorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestBetweennessCentrality.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import com.google.common.base.Function;

import edu.uci.ics.jung.graph.DirectedSparseGraph;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;


/**
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITSWithPriors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import junit.framework.TestSuite;
import edu.uci.ics.jung.algorithms.scoring.util.ScoringUtils;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;


/**
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestKStepMarkov.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import edu.uci.ics.jung.algorithms.scoring.util.ScoringUtils;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;

public class TestKStepMarkov extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRank.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;

/**
* @author Joshua O'Madadhain
Expand Down
2 changes: 1 addition & 1 deletion ...-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRankWithPriors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import edu.uci.ics.jung.algorithms.scoring.util.ScoringUtils;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;


/**
Expand Down
2 changes: 1 addition & 1 deletion jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestVoltageScore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.google.common.base.Functions;

import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;

/**
* @author jrtom
Expand Down
2 changes: 1 addition & 1 deletion ...rithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestBFSDistanceLabeler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import junit.framework.TestSuite;
import edu.uci.ics.jung.algorithms.shortestpath.BFSDistanceLabeler;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;

/**
* @author Scott White, adapted to jung2 by Tom Nelson
Expand Down
6 changes: 3 additions & 3 deletions ...s/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestPrimMinimumSpanningTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import junit.framework.TestCase;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.DelegateTree;
import edu.uci.ics.jung.graph.Tree;
import edu.uci.ics.jung.graph.UndirectedGraph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DelegateTree;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;

public class TestPrimMinimumSpanningTree extends TestCase {

Expand Down
4 changes: 2 additions & 2 deletions jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestShortestPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

import edu.uci.ics.jung.algorithms.util.Indexer;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.UndirectedGraph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;


/**
Expand Down
4 changes: 2 additions & 2 deletions ...ms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestUnweightedShortestPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

import edu.uci.ics.jung.algorithms.util.Indexer;
import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.UndirectedGraph;
import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;

/**
* @author Scott White
Expand Down
2 changes: 1 addition & 1 deletion jung-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.jung</groupId>
<artifactId>jung-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.2.0</version>
</parent>
<artifactId>jung-api</artifactId>
<name>JUNG - API</name>
Expand Down
2 changes: 1 addition & 1 deletion jung-graph-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.jung</groupId>
<artifactId>jung-parent</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.2.0</version>
</parent>
<artifactId>jung-graph-impl</artifactId>
<name>JUNG - Graph Implementations</name>
Expand Down
3 changes: 2 additions & 1 deletion ...edu/uci/ics/jung/graph/AbstractGraph.java → ...ci/ics/jung/graph/impl/AbstractGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
* "license.txt" or
* https://github.com/jrtom/jung/blob/master/LICENSE for a description.
*/
package edu.uci.ics.jung.graph;
package edu.uci.ics.jung.graph.impl;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

import edu.uci.ics.jung.graph.Graph;
import edu.uci.ics.jung.graph.util.EdgeType;
import edu.uci.ics.jung.graph.util.Pair;

Expand Down
2 changes: 1 addition & 1 deletion ...ci/ics/jung/graph/AbstractTypedGraph.java → ...s/jung/graph/impl/AbstractTypedGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Created on Sep 1, 2008
*
*/
package edu.uci.ics.jung.graph;
package edu.uci.ics.jung.graph.impl;

import java.util.Collection;
import java.util.Collections;
Expand Down
6 changes: 5 additions & 1 deletion ...du/uci/ics/jung/graph/DelegateForest.java → ...i/ics/jung/graph/impl/DelegateForest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
package edu.uci.ics.jung.graph;
package edu.uci.ics.jung.graph.impl;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.Forest;
import edu.uci.ics.jung.graph.GraphDecorator;
import edu.uci.ics.jung.graph.Tree;
import edu.uci.ics.jung.graph.util.EdgeType;
import edu.uci.ics.jung.graph.util.Pair;
import edu.uci.ics.jung.graph.util.TreeUtils;
Expand Down
5 changes: 4 additions & 1 deletion .../edu/uci/ics/jung/graph/DelegateTree.java → ...uci/ics/jung/graph/impl/DelegateTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uci.ics.jung.graph;
package edu.uci.ics.jung.graph.impl;

import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -9,6 +9,9 @@

import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.GraphDecorator;
import edu.uci.ics.jung.graph.Tree;
import edu.uci.ics.jung.graph.util.EdgeType;
import edu.uci.ics.jung.graph.util.Pair;

Expand Down
4 changes: 3 additions & 1 deletion ...raph/DirectedOrderedSparseMultigraph.java → ...impl/DirectedOrderedSparseMultigraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* "license.txt" or
* https://github.com/jrtom/jung/blob/master/LICENSE for a description.
*/
package edu.uci.ics.jung.graph;
package edu.uci.ics.jung.graph.impl;

import java.util.Collection;
import java.util.Collections;
Expand All @@ -19,6 +19,8 @@

import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.MultiGraph;
import edu.uci.ics.jung.graph.util.Pair;


Expand Down
3 changes: 2 additions & 1 deletion ...i/ics/jung/graph/DirectedSparseGraph.java → .../jung/graph/impl/DirectedSparseGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* "license.txt" or
* https://github.com/jrtom/jung/blob/master/LICENSE for a description.
*/
package edu.uci.ics.jung.graph;
package edu.uci.ics.jung.graph.impl;

import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -20,6 +20,7 @@

import com.google.common.base.Supplier;

import edu.uci.ics.jung.graph.DirectedGraph;
import edu.uci.ics.jung.graph.util.EdgeType;
import edu.uci.ics.jung.graph.util.Pair;

Expand Down
Loading