Commit 1399fe7d authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch '249-fix-an-error-in-javadoc' into 'master' 

Resolve "Fix an error in javadoc"

Closes #249

See merge request grp-fidentis/analyst2!267
parents 58085ab8 d1a6a86c

.gitlab-ci.yml

+7 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ variables: 
  POSTGRES_PASSWORD: "postgres"

  POSTGRES_HOST_AUTH_METHOD: trust

  MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -Dcheckstyle.fail=false"

  MAVEN_JAVADOC_OPTS: "-Dauthor=false -DskipTests -DadditionalJOption=-Xdoclint:none"

  MAVEN_JAVADOC_OPTS: "-Dauthor=false -DadditionalJOption=-Xdoclint:none"



stages:

    - build
@@ -30,7 +30,12 @@ stages: 
build-and-test-job:

  stage: build

  script:

    - mvn clean install javadoc:javadoc javadoc:aggregate $MAVEN_CLI_OPTS MAVEN_JAVADOC_OPTS -Ptest;

    - mvn clean install javadoc:javadoc javadoc:aggregate $MAVEN_JAVADOC_OPTS $MAVEN_CLI_OPTS -Ptest;

#    - >

#      mvn clean install $MAVEN_CLI_OPTS -Ptest;

#      if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then

#        mvn javadoc:javadoc javadoc:aggregate $MAVEN_JAVADOC_OPTS

#      fi

  tags:

    - shared-fi

  rules:

GUI/src/main/java/cz/fidentis/analyst/gui/builder/PanelBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ public class PanelBuilder { 
     * Adds SingleAxisAnimationPanel used for scaling.

     *

     * @param animator the RotationAnimator of the panel

     * @param actionthe the ActionListener for the panel

     * @param action the ActionListener for the panel

     * @return this panel builder

     */

    public PanelBuilder addSingleAxisAnimationPanel(RotationAnimator animator, ActionListener action) {