Skip to content

Commit 0f66aaf

Browse files
committed
Rename FlagSet to AbstractFlagSet
1 parent bfbf223 commit 0f66aaf

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/main/java/org/lmdbjava/FlagSet.java renamed to src/main/java/org/lmdbjava/AbstractFlagSet.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*
1616
* @param <T>
1717
*/
18-
public abstract class FlagSet<T extends Enum<T> & MaskedFlag> implements Iterable<T> {
18+
public abstract class AbstractFlagSet<T extends Enum<T> & MaskedFlag> implements Iterable<T> {
1919

2020
private final Set<T> flags;
2121
private final int mask;
2222

23-
protected FlagSet(final EnumSet<T> flags) {
23+
protected AbstractFlagSet(final EnumSet<T> flags) {
2424
Objects.requireNonNull(flags);
2525
this.mask = MaskedFlag.mask(flags);
2626
this.flags = Collections.unmodifiableSet(Objects.requireNonNull(flags));
@@ -74,7 +74,7 @@ public Iterator<T> iterator() {
7474
public boolean equals(Object object) {
7575
if (this == object) return true;
7676
if (object == null || getClass() != object.getClass()) return false;
77-
FlagSet<?> flagSet = (FlagSet<?>) object;
77+
AbstractFlagSet<?> flagSet = (AbstractFlagSet<?>) object;
7878
return mask == flagSet.mask && Objects.equals(flags, flagSet.flags);
7979
}
8080

@@ -100,12 +100,12 @@ public String toString() {
100100

101101

102102
/**
103-
* A builder for creating a {@link FlagSet}.
103+
* A builder for creating a {@link AbstractFlagSet}.
104104
*
105-
* @param <E> The type of flag to be held in the {@link FlagSet}
106-
* @param <S> The type of the {@link FlagSet} implementation.
105+
* @param <E> The type of flag to be held in the {@link AbstractFlagSet}
106+
* @param <S> The type of the {@link AbstractFlagSet} implementation.
107107
*/
108-
public static class Builder<E extends Enum<E> & MaskedFlag, S extends FlagSet<E>> {
108+
public static class Builder<E extends Enum<E> & MaskedFlag, S extends AbstractFlagSet<E>> {
109109

110110
final Class<E> type;
111111
final EnumSet<E> enumSet;

src/main/java/org/lmdbjava/DbiBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public DbiBuilderStage3<T> withIteratorComparator(final Comparator<T> comparator
222222
public static class DbiBuilderStage3<T> {
223223

224224
private final DbiBuilderStage2<T> dbiBuilderStage2;
225-
private final FlagSet.Builder<DbiFlags, DbiFlagSet> flagSetBuilder = DbiFlagSet.builder();
225+
private final AbstractFlagSet.Builder<DbiFlags, DbiFlagSet> flagSetBuilder = DbiFlagSet.builder();
226226
private Txn<T> txn = null;
227227

228228
private DbiBuilderStage3(DbiBuilderStage2<T> dbiBuilderStage2) {

src/main/java/org/lmdbjava/DbiFlagSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.EnumSet;
44
import java.util.Objects;
55

6-
public class DbiFlagSet extends FlagSet<DbiFlags> {
6+
public class DbiFlagSet extends AbstractFlagSet<DbiFlags> {
77

88
public static final DbiFlagSet EMPTY = new DbiFlagSet(EnumSet.noneOf(DbiFlags.class));
99

src/main/java/org/lmdbjava/PutFlagSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.EnumSet;
44
import java.util.Objects;
55

6-
public class PutFlagSet extends FlagSet<PutFlags> {
6+
public class PutFlagSet extends AbstractFlagSet<PutFlags> {
77

88
public static final PutFlagSet EMPTY = new PutFlagSet(EnumSet.noneOf(PutFlags.class));
99

0 commit comments

Comments
 (0)