You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/07/17 07:18:42 UTC
svn commit: r677502 - in
/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata:
./ sat/
Author: ogusakov
Date: Wed Jul 16 22:18:41 2008
New Revision: 677502
URL: http://svn.apache.org/viewvc?rev=677502&view=rev
Log:
moved TreeNode comparators to appropriate package
Added:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAComparator.java (contents, props changed)
- copied, changed from r677499, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAComparator.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAVComparator.java (contents, props changed)
- copied, changed from r677499, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAVComparator.java
Removed:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAComparator.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAVComparator.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAComparator.java (from r677499, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAComparator.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAComparator.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAComparator.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAComparator.java&r1=677499&r2=677502&rev=677502&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAComparator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAComparator.java Wed Jul 16 22:18:41 2008
@@ -1,17 +1,14 @@
-package org.apache.maven.mercury.metadata.sat;
+package org.apache.maven.mercury.metadata;
import java.util.Comparator;
-import org.apache.maven.mercury.metadata.MetadataTreeNode;
-
-
/**
* utility class for DefaultSatSolver. Assumes good data - no null's
*
* @author Oleg Gusakov
* @version $Id$
*/
-class MetadataTreeNodeGAComparator
+public class MetadataTreeNodeGAComparator
implements Comparator<MetadataTreeNode>
{
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAComparator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAVComparator.java (from r677499, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAVComparator.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAVComparator.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAVComparator.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAVComparator.java&r1=677499&r2=677502&rev=677502&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/MetadataTreeNodeGAVComparator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAVComparator.java Wed Jul 16 22:18:41 2008
@@ -1,17 +1,14 @@
-package org.apache.maven.mercury.metadata.sat;
+package org.apache.maven.mercury.metadata;
import java.util.Comparator;
-import org.apache.maven.mercury.metadata.MetadataTreeNode;
-
-
/**
* utility class for DefaultSatSolver. Assumes good data - no null's
*
* @author Oleg Gusakov
* @version $Id$
*/
-class MetadataTreeNodeGAVComparator
+public class MetadataTreeNodeGAVComparator
implements Comparator<MetadataTreeNode>
{
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAVComparator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java?rev=677502&r1=677501&r2=677502&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java Wed Jul 16 22:18:41 2008
@@ -12,6 +12,8 @@
import org.apache.maven.mercury.ArtifactScopeEnum;
import org.apache.maven.mercury.metadata.ArtifactMetadata;
import org.apache.maven.mercury.metadata.MetadataTreeNode;
+import org.apache.maven.mercury.metadata.MetadataTreeNodeGAComparator;
+import org.apache.maven.mercury.metadata.MetadataTreeNodeGAVComparator;
import org.sat4j.core.Vec;
import org.sat4j.core.VecInt;
import org.sat4j.pb.IPBSolver;