Skip to content

Commit 7016402

Browse files
nymanjensnetdpb
authored andcommitted
Make incidentEdgeOrder() public for [Value]Graph
RELNOTES=`graph`: Allow setting a stable incident edge order by calling the newly added method `[Value]Graph.Builder.incidentEdgeOrder(ElementOrder.stable())`. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=288715042
1 parent cde576e commit 7016402

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

android/guava/src/com/google/common/graph/ElementOrder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ public static <S> ElementOrder<S> unordered() {
116116
* </ul>
117117
* </ul>
118118
*/
119-
// TODO(b/142723300): Make this method public
120-
static <S> ElementOrder<S> stable() {
119+
public static <S> ElementOrder<S> stable() {
121120
return new ElementOrder<S>(Type.STABLE, null);
122121
}
123122

android/guava/src/com/google/common/graph/GraphBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ public <N1 extends N> GraphBuilder<N1> nodeOrder(ElementOrder<N1> nodeOrder) {
155155
* @throws IllegalArgumentException if {@code incidentEdgeOrder} is not either {@code
156156
* ElementOrder.unordered()} or {@code ElementOrder.stable()}.
157157
*/
158-
// TODO(b/142723300): Make this method public
159-
<N1 extends N> GraphBuilder<N1> incidentEdgeOrder(ElementOrder<N1> incidentEdgeOrder) {
158+
public <N1 extends N> GraphBuilder<N1> incidentEdgeOrder(ElementOrder<N1> incidentEdgeOrder) {
160159
checkArgument(
161160
incidentEdgeOrder.type() == ElementOrder.Type.UNORDERED
162161
|| incidentEdgeOrder.type() == ElementOrder.Type.STABLE,

android/guava/src/com/google/common/graph/ValueGraphBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ public <N1 extends N> ValueGraphBuilder<N1, V> nodeOrder(ElementOrder<N1> nodeOr
159159
* @throws IllegalArgumentException if {@code incidentEdgeOrder} is not either {@code
160160
* ElementOrder.unordered()} or {@code ElementOrder.stable()}.
161161
*/
162-
// TODO(b/142723300): Make this method public
163-
<N1 extends N> ValueGraphBuilder<N1, V> incidentEdgeOrder(ElementOrder<N1> incidentEdgeOrder) {
162+
public <N1 extends N> ValueGraphBuilder<N1, V> incidentEdgeOrder(
163+
ElementOrder<N1> incidentEdgeOrder) {
164164
checkArgument(
165165
incidentEdgeOrder.type() == ElementOrder.Type.UNORDERED
166166
|| incidentEdgeOrder.type() == ElementOrder.Type.STABLE,

guava/src/com/google/common/graph/ElementOrder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ public static <S> ElementOrder<S> unordered() {
115115
* </ul>
116116
* </ul>
117117
*/
118-
// TODO(b/142723300): Make this method public
119-
static <S> ElementOrder<S> stable() {
118+
public static <S> ElementOrder<S> stable() {
120119
return new ElementOrder<S>(Type.STABLE, null);
121120
}
122121

guava/src/com/google/common/graph/GraphBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ public <N1 extends N> GraphBuilder<N1> nodeOrder(ElementOrder<N1> nodeOrder) {
155155
* @throws IllegalArgumentException if {@code incidentEdgeOrder} is not either {@code
156156
* ElementOrder.unordered()} or {@code ElementOrder.stable()}.
157157
*/
158-
// TODO(b/142723300): Make this method public
159-
<N1 extends N> GraphBuilder<N1> incidentEdgeOrder(ElementOrder<N1> incidentEdgeOrder) {
158+
public <N1 extends N> GraphBuilder<N1> incidentEdgeOrder(ElementOrder<N1> incidentEdgeOrder) {
160159
checkArgument(
161160
incidentEdgeOrder.type() == ElementOrder.Type.UNORDERED
162161
|| incidentEdgeOrder.type() == ElementOrder.Type.STABLE,

guava/src/com/google/common/graph/ValueGraphBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ public <N1 extends N> ValueGraphBuilder<N1, V> nodeOrder(ElementOrder<N1> nodeOr
159159
* @throws IllegalArgumentException if {@code incidentEdgeOrder} is not either {@code
160160
* ElementOrder.unordered()} or {@code ElementOrder.stable()}.
161161
*/
162-
// TODO(b/142723300): Make this method public
163-
<N1 extends N> ValueGraphBuilder<N1, V> incidentEdgeOrder(ElementOrder<N1> incidentEdgeOrder) {
162+
public <N1 extends N> ValueGraphBuilder<N1, V> incidentEdgeOrder(
163+
ElementOrder<N1> incidentEdgeOrder) {
164164
checkArgument(
165165
incidentEdgeOrder.type() == ElementOrder.Type.UNORDERED
166166
|| incidentEdgeOrder.type() == ElementOrder.Type.STABLE,

0 commit comments

Comments
 (0)