diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml new file mode 100644 index 00000000..cbda6d49 --- /dev/null +++ b/.config/checkstyle/checkstyle.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.config/checkstyle/suppressions.xml b/.config/checkstyle/suppressions.xml new file mode 100644 index 00000000..16d385e3 --- /dev/null +++ b/.config/checkstyle/suppressions.xml @@ -0,0 +1,6 @@ + + + + diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 3ec17440..2d5f3e8f 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -6,10 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' pull_request: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' env: PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }} @@ -21,14 +27,14 @@ jobs: strategy: matrix: - java: [17] + java: [17, 21] distribution: [temurin] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -56,8 +62,29 @@ jobs: fi - name: Upload demo files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: demo-files-java-${{ matrix.java }} path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar if-no-files-found: error + + code-style: + runs-on: ubuntu-latest + + strategy: + matrix: + java: [17] + distribution: [temurin] + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + cache: 'maven' + + - name: Run Checkstyle + run: mvn -B checkstyle:check -P checkstyle -T2C diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 124a1b0f..ae1e113e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,10 @@ jobs: check_code: # Validates the code runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -52,7 +52,7 @@ jobs: outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure Git run: | @@ -107,11 +107,14 @@ jobs: ``` + ### Additional notes + * [Spring-Boot] You may have to include ``software/xdev`` inside [``vaadin.whitelisted-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages) + publish_central: # Publish the code to central runs-on: ubuntu-latest needs: [prepare_release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Init Git and pull run: | @@ -120,7 +123,7 @@ jobs: git pull - name: Set up JDK Apache Maven Central - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' @@ -143,7 +146,7 @@ jobs: runs-on: ubuntu-latest needs: [prepare_release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Init Git and pull run: | @@ -152,7 +155,7 @@ jobs: git pull - name: Setup - Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -163,7 +166,7 @@ jobs: working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Upload licenses - Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dependencies-licenses path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site @@ -197,7 +200,7 @@ jobs: runs-on: ubuntu-latest needs: [publish_central] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Init Git and pull run: | @@ -223,9 +226,12 @@ jobs: git push origin - name: pull-request - uses: repo-sync/pull-request@v2 - with: - destination_branch: "develop" - pr_title: "Sync back" - pr_body: "An automated PR to sync changes back" - + env: + GH_TOKEN: ${{ github.token }} + run: | + gh_pr_up() { + gh pr create "$@" || gh pr edit "$@" + } + gh_pr_up -B "develop" \ + --title "Sync back" \ + --body "An automated PR to sync changes back" diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 171b60df..76002238 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -6,14 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' pull_request: types: [opened, synchronize, reopened] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' env: SONARCLOUD_ORG: ${{ github.event.organization.login }} @@ -26,12 +28,12 @@ jobs: # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 3e44f39c..0bf57796 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -10,10 +10,10 @@ jobs: publish_central: # Publish the code to central runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK OSSRH - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 5dadb2b1..2bd1095a 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Required because otherwise there are always changes detected when executing diff/rev-list fetch-depth: 0 @@ -81,12 +81,13 @@ jobs: echo "abort=0" >> $GITHUB_OUTPUT - name: pull-request - uses: repo-sync/pull-request@v2 if: steps.main.outputs.abort == 0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - source_branch: ${{ env.UPDATE_BRANCH }} - destination_branch: ${{ steps.main.outputs.current_branch }} - pr_title: "Update from template" - pr_body: "An automated PR to sync changes from the template into this repo" - + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh_pr_up() { + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@") + } + gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ + --title "Update from template" \ + --body "An automated PR to sync changes from the template into this repo" diff --git a/.gitignore b/.gitignore index 3e7a31d2..8c3a5297 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,8 @@ vite.generated.ts /*/frontend/generated/ /*/frontend/index.html /*/src/main/dev-bundle/ +/*/src/main/bundles/ +*.lock #custom .flattened-pom.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index f68c2122..9a5d4ffe 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -1,7 +1,7 @@ - 10.1 + 10.12.5 JavaOnlyWithTests true true @@ -13,7 +13,7 @@ (bundled) (bundled) - $PROJECT_DIR$/config/checkstyle/checkstyle.xml + $PROJECT_DIR$/.config/checkstyle/checkstyle.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ffd40bda..65b8cb49 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -17,6 +17,8 @@ + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 59245d83..71ef781d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.2 +* Fixed not working translations on preview step #153 +* Updated dependencies + ## 3.0.1 * Fixed compilation problems due to missing ``ecj`` dependency #98 * Updated dependencies diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76c51c21..0940f827 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https:// ### Software Requirements You should have the following things installed: * Git -* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/)) +* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/)) * Maven ### Recommended setup diff --git a/README.md b/README.md index 031337b6..07dc4479 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ GridExporter
Show example - ![demo](assets/demo.gif) + ![demo](assets/demo.avif)
## Support diff --git a/assets/demo.avif b/assets/demo.avif new file mode 100644 index 00000000..0b75c6af Binary files /dev/null and b/assets/demo.avif differ diff --git a/assets/demo.gif b/assets/demo.gif deleted file mode 100644 index 44bff703..00000000 Binary files a/assets/demo.gif and /dev/null differ diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml deleted file mode 100644 index 710e3e68..00000000 --- a/config/checkstyle/checkstyle.xml +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 80802b4b..e676ee33 100644 --- a/pom.xml +++ b/pom.xml @@ -26,4 +26,23 @@ repo + + + + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + true + + + + + + diff --git a/vaadin-grid-exporter-demo/pom.xml b/vaadin-grid-exporter-demo/pom.xml index 890eef51..398df24b 100644 --- a/vaadin-grid-exporter-demo/pom.xml +++ b/vaadin-grid-exporter-demo/pom.xml @@ -26,9 +26,9 @@ software.xdev.vaadin.Application - 24.1.2 + 24.3.2 - 3.1.1 + 3.2.1 @@ -117,7 +117,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} @@ -178,6 +178,34 @@ + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + + - diff --git a/vaadin-grid-exporter-demo/src/main/java/software/xdev/vaadin/gridexport/example/DemoView.java b/vaadin-grid-exporter-demo/src/main/java/software/xdev/vaadin/gridexport/example/DemoView.java index 4a00bea2..6e4d7282 100644 --- a/vaadin-grid-exporter-demo/src/main/java/software/xdev/vaadin/gridexport/example/DemoView.java +++ b/vaadin-grid-exporter-demo/src/main/java/software/xdev/vaadin/gridexport/example/DemoView.java @@ -49,17 +49,17 @@ public DemoView() ); this.grExamples - .addColumn(Example::getRoute) + .addColumn(Example::route) .setHeader("Route") .setFlexGrow(1); this.grExamples - .addColumn(Example::getName) + .addColumn(Example::name) .setHeader("Name") .setFlexGrow(1); this.grExamples - .addColumn(Example::getDesc) + .addColumn(Example::desc) .setHeader("Description") .setFlexGrow(1); @@ -88,34 +88,8 @@ protected void onAttach(final AttachEvent attachEvent) ); } - static class Example + record Example(String route, String name, String desc) { - private final String route; - private final String name; - private final String desc; - - public Example(final String route, final String name, final String desc) - { - super(); - this.route = route; - this.name = name; - this.desc = desc; - } - - public String getRoute() - { - return this.route; - } - - public String getName() - { - return this.name; - } - - public String getDesc() - { - return this.desc; - } } static GridExportLocalizationConfig germanLocalizationConfig() diff --git a/vaadin-grid-exporter/pom.xml b/vaadin-grid-exporter/pom.xml index bec6c5cf..625ecf87 100644 --- a/vaadin-grid-exporter/pom.xml +++ b/vaadin-grid-exporter/pom.xml @@ -50,7 +50,7 @@ false - 24.1.2 + 24.3.2 @@ -108,13 +108,13 @@ com.xdev-software dynamicreports-core-for-grid-exporter - 1.0.3 + 1.1.0 org.junit.jupiter junit-jupiter - 5.9.3 + 5.10.1 test @@ -124,7 +124,7 @@ com.mycila license-maven-plugin - 4.2 + 4.3 ${project.organization.url} @@ -168,7 +168,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 attach-javadocs @@ -234,7 +234,7 @@ maven-surefire-plugin - 3.1.2 + 3.2.5 @@ -282,5 +282,34 @@ + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + + diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/components/wizard/step/WizardStep.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/components/wizard/step/WizardStep.java index 0460cea6..5f0e5f20 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/components/wizard/step/WizardStep.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/components/wizard/step/WizardStep.java @@ -32,7 +32,7 @@ default void onEnterStep(final S state) /** * Called when next is clicked and the current step is exited * @param state The current state - * @return false when the exit can't happen due to e.g. validation problems. Otherwise true. + * @return false when the exit can't happen due to e.g. validation problems. */ default boolean onProgress(final S state) { diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/JasperGridReportStyles.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/JasperGridReportStyles.java index 5e966fc4..981d4989 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/JasperGridReportStyles.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/JasperGridReportStyles.java @@ -46,6 +46,7 @@ class Default implements JasperGridReportStyles protected final StyleBuilder columnStyle = Styles.style(this.defaultStyle) .setBorder(Styles.pen1Point()); + @SuppressWarnings("checkstyle:MagicNumber") protected final SimpleStyleBuilder columnStyleHighlighted = Styles.simpleStyle() .setPadding(2) .setBackgroundColor(new Color(222, 222, 222)) // Extra light gray so that the data remains readable diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportFormat.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportFormat.java index 6fac6445..a1555622 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportFormat.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportFormat.java @@ -48,8 +48,8 @@ import software.xdev.vaadin.grid_exporter.jasper.config.title.TitleConfig; -public abstract class AbstractJasperReportFormat - > +public abstract class AbstractJasperReportFormat> extends AbstractFormat { protected final JasperGridReportStyles jasperGridReportStyles = new JasperGridReportStyles.Default(); diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportSpreadsheetFormat.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportSpreadsheetFormat.java index ab73ab07..5dcdf432 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportSpreadsheetFormat.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportSpreadsheetFormat.java @@ -25,8 +25,8 @@ import software.xdev.vaadin.grid_exporter.jasper.config.highlight.HighlightConfigComponent; -public abstract class AbstractJasperReportSpreadsheetFormat - > +public abstract class AbstractJasperReportSpreadsheetFormat> extends AbstractJasperReportFormat { protected AbstractJasperReportSpreadsheetFormat( diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportWordProcessingFormat.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportWordProcessingFormat.java index 4a60efba..ef770a3c 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportWordProcessingFormat.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/jasper/format/AbstractJasperReportWordProcessingFormat.java @@ -27,8 +27,8 @@ import software.xdev.vaadin.grid_exporter.jasper.config.title.TitleConfigComponent; -public abstract class AbstractJasperReportWordProcessingFormat - > +public abstract class AbstractJasperReportWordProcessingFormat> extends AbstractJasperReportFormat { protected AbstractJasperReportWordProcessingFormat( diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/GridExporterWizard.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/GridExporterWizard.java index d2e7aea8..c29f90c8 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/GridExporterWizard.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/GridExporterWizard.java @@ -39,7 +39,7 @@ public class GridExporterWizard extends Dialog implements AfterNavigationObse protected final Button closeButton = new Button(VaadinIcon.CLOSE.create()); protected final WizardPanel> wizardPanel = new WizardPanel<>(); protected final WizardButtonBarWithAnchor buttonBar = new WizardButtonBarWithAnchor(this.wizardPanel); - protected final PreviewStep previewStep = new PreviewStep<>(this); + protected final PreviewStep previewStep; protected final GridExportLocalizationConfig localizationConfig; @@ -48,6 +48,8 @@ public GridExporterWizard( final GridExportLocalizationConfig localizationConfig) { this.localizationConfig = Objects.requireNonNull(localizationConfig); + // Needs to be done after setting localizationConfig + this.previewStep = new PreviewStep<>(this); this.initUI(); this.registerListeners(); diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/FormatStep.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/FormatStep.java index 37e31f12..c89dcd65 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/FormatStep.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/FormatStep.java @@ -115,7 +115,9 @@ protected void showConfigComponentsFor(final Format format) } @SuppressWarnings({"unchecked", "rawtypes"}) - protected void bindConfigComponents(final GridExporterWizardState state, final boolean deleteNonMatchingFromState) + protected void bindConfigComponents( + final GridExporterWizardState state, + final boolean deleteNonMatchingFromState) { for(final SpecificConfigComponent component : this.configComponents) { diff --git a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/PreviewStep.java b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/PreviewStep.java index 5f0a39fa..4d2f417e 100644 --- a/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/PreviewStep.java +++ b/vaadin-grid-exporter/src/main/java/software/xdev/vaadin/grid_exporter/wizard/steps/PreviewStep.java @@ -25,6 +25,7 @@ import com.vaadin.flow.server.StreamResource; import com.vaadin.flow.shared.Registration; +import software.xdev.vaadin.grid_exporter.GridExportLocalizationConfig; import software.xdev.vaadin.grid_exporter.Translator; import software.xdev.vaadin.grid_exporter.format.Format; import software.xdev.vaadin.grid_exporter.wizard.GridExporterWizardState; @@ -37,7 +38,7 @@ public class PreviewStep extends AbstractGridExportWizardStepComposite