Skip to content

Commit

Permalink
Inherit doc is an inline tag
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmay committed Jan 20, 2017
1 parent d6b96cc commit d794320
Show file tree
Hide file tree
Showing 135 changed files with 322 additions and 322 deletions.
34 changes: 17 additions & 17 deletions base/core/src/main/java/org/openscience/cdk/DynamicFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -831,15 +831,15 @@ private ObjectBasedKey(Class<?> intf, Object[] params) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<?> intf() {
return intf;
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<?> type(int i) {
Expand All @@ -848,7 +848,7 @@ public Class<?> type(int i) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public int n() {
Expand Down Expand Up @@ -880,23 +880,23 @@ private ClassBasedKey(Class<?> intf, Class<?>[] params) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<?> intf() {
return intf;
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<?> type(int i) {
return params[i];
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public int n() {
Expand Down Expand Up @@ -934,7 +934,7 @@ public static abstract class ConstructorKey implements Comparable<ConstructorKey
public abstract int n();

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public boolean equals(Object o) {
Expand Down Expand Up @@ -977,7 +977,7 @@ public boolean isUniform() {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public int hashCode() {
Expand Down Expand Up @@ -1031,7 +1031,7 @@ public boolean isAssignable(ConstructorKey candidate) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public String toString() {
Expand All @@ -1056,7 +1056,7 @@ public String toString() {
protected static class DefaultInterfaceProvider implements InterfaceProvider {

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<?>[] getInterfaces(Class<?> c) {
Expand Down Expand Up @@ -1115,7 +1115,7 @@ private ModifiedCreator(Creator<T> parent, CreationModifier<T> modifier) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public T create(Object[] objects) throws InvocationTargetException, IllegalAccessException,
Expand All @@ -1126,7 +1126,7 @@ public T create(Object[] objects) throws InvocationTargetException, IllegalAcces
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<T> getDeclaringClass() {
Expand Down Expand Up @@ -1184,7 +1184,7 @@ public BasicCreator(Class<T> c) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<T> getDeclaringClass() {
Expand Down Expand Up @@ -1214,7 +1214,7 @@ public ArrayWrapCreator(Creator<T> parent) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public T create(Object[] objects) throws InvocationTargetException, IllegalAccessException,
Expand All @@ -1223,7 +1223,7 @@ public T create(Object[] objects) throws InvocationTargetException, IllegalAcces
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<T> getDeclaringClass() {
Expand Down Expand Up @@ -1251,7 +1251,7 @@ private ReflectionCreator(Constructor<T> constructor) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public T create(Object[] objects) throws InvocationTargetException, IllegalAccessException,
Expand All @@ -1260,7 +1260,7 @@ public T create(Object[] objects) throws InvocationTargetException, IllegalAcces
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public Class<T> getDeclaringClass() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ int indexOf(int x, int y) {
return -1;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public String toString() {
StringBuilder sb = new StringBuilder((4 + n) * m);
Expand Down
22 changes: 11 additions & 11 deletions base/core/src/main/java/org/openscience/cdk/graph/Cycles.java
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ int[][] apply(int[][] graph, int length) throws Intractable {
*/
abstract int[][] apply(int[][] graph, int length) throws Intractable;

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule) throws Intractable {
return find(molecule, molecule.getAtomCount());
Expand Down Expand Up @@ -855,7 +855,7 @@ public Cycles find(IAtomContainer molecule, int length) throws Intractable {
return new Cycles(walks.toArray(new int[walks.size()][0]), molecule, bondMap);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule, int[][] graph, int length) throws Intractable {

Expand Down Expand Up @@ -980,19 +980,19 @@ private AllUpToLength(int length) {
this.predefinedLength = length;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule) throws Intractable {
return find(molecule, molecule.getAtomCount());
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule, int length) throws Intractable {
return find(molecule, GraphUtil.toAdjList(molecule), length);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule, int[][] graph, int length) throws Intractable {
RingSearch ringSearch = new RingSearch(molecule, graph);
Expand Down Expand Up @@ -1057,19 +1057,19 @@ private Fallback(CycleFinder primary, CycleFinder auxiliary) {
this.auxiliary = auxiliary;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule) throws Intractable {
return find(molecule, molecule.getAtomCount());
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule, int length) throws Intractable {
return find(molecule, GraphUtil.toAdjList(molecule), length);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule, int[][] graph, int length) throws Intractable {
try {
Expand Down Expand Up @@ -1098,19 +1098,19 @@ private Unchorded(CycleFinder primary) {
this.primary = primary;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule) throws Intractable {
return find(molecule, molecule.getAtomCount());
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule, int length) throws Intractable {
return find(molecule, GraphUtil.toAdjList(molecule), length);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public Cycles find(IAtomContainer molecule, int[][] graph, int length) throws Intractable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,25 +195,25 @@ private MyCycle(int[] path) {
super(null, path);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
BitSet edges(int[] path) {
return initial.toEdgeVector(path);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int[][] family() {
return new int[][]{path()};
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int sizeOfFamily() {
return 1;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public String toString() {
return Arrays.toString(path());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ private Tuple(int u, int v) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public boolean equals(Object o) {
Expand All @@ -385,7 +385,7 @@ public boolean equals(Object o) {
}

/**
* @inheritDoc
*{@inheritDoc}
*/
@Override
public int hashCode() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -563,13 +563,13 @@ class EvenCycle extends Cycle {
this.y = y;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
BitSet edges(int[] path) {
return toEdgeVector(path);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int[][] family() {

Expand All @@ -586,7 +586,7 @@ int[][] family() {
return paths;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int sizeOfFamily() {
return paths.nPathsTo(p) * paths.nPathsTo(q);
Expand All @@ -609,13 +609,13 @@ class OddCycle extends Cycle {
z = pathToZ[pathToY.length - 1];
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
BitSet edges(int[] path) {
return toEdgeVector(path);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int[][] family() {
int[][] pathsToY = paths.pathsTo(y);
Expand All @@ -631,7 +631,7 @@ int[][] family() {
return paths;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int sizeOfFamily() {
return paths.nPathsTo(y) * paths.nPathsTo(z);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private void add(final PathEdge edge) {
graph[v].add(edge);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
public int degree(final int x) {
return graph[x].size();
Expand Down Expand Up @@ -159,7 +159,7 @@ private List<PathEdge> combine(final List<PathEdge> edges, final int x) {
return reduced;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
void remove(final int x, final List<int[]> cycles) {

Expand Down Expand Up @@ -285,13 +285,13 @@ static final class SimpleEdge extends PathEdge {
super(u, v, EMPTY_SET);
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
ArrayBuilder reconstruct(ArrayBuilder ab) {
return ab.append(other(ab.prev()));
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int len() {
return 2;
Expand Down Expand Up @@ -321,13 +321,13 @@ static final class ReducedEdge extends PathEdge {
this.f = f;
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
ArrayBuilder reconstruct(ArrayBuilder ab) {
return u == ab.prev() ? f.reconstruct(e.reconstruct(ab)) : e.reconstruct(f.reconstruct(ab));
}

/** @inheritDoc */
/**{@inheritDoc} */
@Override
int len() {
return xs.cardinality() + 2;
Expand Down
Loading

0 comments on commit d794320

Please sign in to comment.