/*
 *  CPAchecker is a tool for configurable software verification.
 *  This file is part of CPAchecker.
 *
 *  Copyright (C) 2007-2015  Dirk Beyer
 *  All rights reserved.
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 *
 *  CPAchecker web page:
 *    http://cpachecker.sosy-lab.org
 */
/**
 * Solver-independent tests and test utilities for the solver API.
 */
@javax.annotation.ParametersAreNonnullByDefault
// TODO: Should be ReturnValuesAreNonnullByDefault in next version of SoSy-Lab Common
@org.sosy_lab.common.annotations.FieldsAreNonnullByDefault
package org.sosy_lab.solver.test;
@@ -932,94 +932,8 @@
 ult%0A
-// TODO: Should be ReturnValuesAreNonnullByDefault in next version of SoSy-Lab Common%0A
 @org
@@ -965,13 +965,19 @@
 ons.
-Field
+ReturnValue
 sAre

Fix annotation for FindBugs