archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7033809: Rename "disjunctive" to "union" in javax.lang.model

Browse source 
Reviewed-by: mcimadamore, jjg
This commit is contained in:
Joe Darcy 2011-04-06 19:30:57 -07:00
parent 243b526b99
commit 777c93481f
24 changed files with 55 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
langtools/src/share/classes/com/sun/source/tree/Tree.java
View file

@ -232,9 +232,9 @@ public interface Tree {
PARAMETERIZED_TYPE(ParameterizedTypeTree.class),
/**
* Used for instances of {@link DisjunctiveTypeTree}.
* Used for instances of {@link UnionTypeTree}.
*/
DISJUNCTIVE_TYPE(DisjunctiveTypeTree.class),
UNION_TYPE(UnionTypeTree.class),
/**
* Used for instances of {@link TypeCastTree}.

2
langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java
View file

@ -95,7 +95,7 @@ public interface TreeVisitor<R,P> {
R visitCompilationUnit(CompilationUnitTree node, P p);
R visitTry(TryTree node, P p);
R visitParameterizedType(ParameterizedTypeTree node, P p);
R visitDisjunctiveType(DisjunctiveTypeTree node, P p);
R visitUnionType(UnionTypeTree node, P p);
R visitArrayType(ArrayTypeTree node, P p);
R visitTypeCast(TypeCastTree node, P p);
R visitPrimitiveType(PrimitiveTypeTree node, P p);

7
langtools/src/share/classes/com/sun/source/tree/DisjunctiveTypeTree.java → langtools/src/share/classes/com/sun/source/tree/UnionTypeTree.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -28,13 +28,12 @@ package com.sun.source.tree;
import java.util.List;
/**
* A tree node for a disjunctive type expression in a multicatch var declaration.
*
* A tree node for a union type expression in a multicatch var declaration.
*
* @author Maurizio Cimadamore
*
* @since 1.7
*/
public interface DisjunctiveTypeTree extends Tree {
public interface UnionTypeTree extends Tree {
List<? extends Tree> getTypeAlternatives();
}

2
langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
View file

@ -228,7 +228,7 @@ public class SimpleTreeVisitor <R,P> implements TreeVisitor<R,P> {
return defaultAction(node, p);
}
public R visitDisjunctiveType(DisjunctiveTypeTree node, P p) {
public R visitUnionType(UnionTypeTree node, P p) {
return defaultAction(node, p);
}

2
langtools/src/share/classes/com/sun/source/util/TreeScanner.java
View file

@ -355,7 +355,7 @@ public class TreeScanner<R,P> implements TreeVisitor<R,P> {
return r;
}
public R visitDisjunctiveType(DisjunctiveTypeTree node, P p) {
public R visitUnionType(UnionTypeTree node, P p) {
return scan(node.getTypeAlternatives(), p);
}