diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e93d3bca..006aa977 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,13 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'gradle' - name: Grant execute permission for gradlew @@ -46,4 +46,4 @@ jobs: # Drafts your next Release notes as Pull Requests are merged into "master" uses: release-drafter/release-drafter@v5 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 055a9ecb..50de025a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,15 +9,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 5 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'gradle' - name: Grant execute permission for gradlew @@ -74,4 +74,4 @@ jobs: TAG=${GITHUB_REF/refs\/tags\//} bash .github/scripts/update-javadoc.sh "$TAG" env: - PAT: ${{ secrets.PAT }} \ No newline at end of file + PAT: ${{ secrets.PAT }} diff --git a/.lgtm.yml b/.lgtm.yml index eb5f4c9b..315deaa8 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -1,4 +1,4 @@ extraction: java: index: - java_version: 11 + java_version: 17 diff --git a/build.gradle b/build.gradle index 87f7704e..e8f4ff6b 100644 --- a/build.gradle +++ b/build.gradle @@ -84,4 +84,4 @@ nexusPublishing { password = project.hasProperty('sonatypePassword') ? project.property('sonatypePassword') : '' } } -} \ No newline at end of file +} diff --git a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/Grid.java b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/Grid.java index bc9d56d4..06b0cf43 100644 --- a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/Grid.java +++ b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/Grid.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013, 2018 ControlsFX + * Copyright (c) 2013, 2023 ControlsFX * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,6 +29,7 @@ import java.util.Collection; import javafx.beans.property.BooleanProperty; import javafx.collections.ObservableList; +import javafx.event.Event; import javafx.event.EventHandler; import javafx.event.EventType; @@ -241,7 +242,7 @@ public interface Grid { * @param eventHandler the handler to register * @throws NullPointerException if the event type or handler is null */ - public void addEventHandler(EventType eventType, EventHandler eventHandler); + public void addEventHandler(EventType eventType, EventHandler eventHandler); /** * Unregisters a previously registered event handler from this Grid. One @@ -254,5 +255,5 @@ public interface Grid { * @param eventHandler the handler to unregister * @throws NullPointerException if the event type or handler is null */ - public void removeEventHandler(EventType eventType, EventHandler eventHandler); -} \ No newline at end of file + public void removeEventHandler(EventType eventType, EventHandler eventHandler); +} diff --git a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/GridBase.java b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/GridBase.java index 643da579..ba2a9358 100644 --- a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/GridBase.java +++ b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/GridBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013, 2018 ControlsFX + * Copyright (c) 2013, 2023 ControlsFX * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -423,14 +423,12 @@ public boolean isCellDisplaySelection(int row, int column) { } /** {@inheritDoc} */ - @Override - public void addEventHandler(EventType eventType, EventHandler eventHandler) { + public void addEventHandler(EventType eventType, EventHandler eventHandler) { eventHandlerManager.addEventHandler(eventType, eventHandler); } /** {@inheritDoc} */ - @Override - public void removeEventHandler(EventType eventType, EventHandler eventHandler) { + public void removeEventHandler(EventType eventType, EventHandler eventHandler) { eventHandlerManager.removeEventHandler(eventType, eventHandler); } diff --git a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCell.java b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCell.java index f662b3e9..b86cd906 100644 --- a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCell.java +++ b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCell.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014, 2018 ControlsFX + * Copyright (c) 2014, 2023 ControlsFX * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,8 +68,8 @@ public interface SpreadsheetCell { */ public static final EventType CORNER_EVENT_TYPE = new EventType<>("CornerEventType" + UUID.randomUUID().toString()); //$NON-NLS-1$ - - /** + + /** * This enum states the four different corner available for positioning * some elements in a cell. */ @@ -405,7 +405,7 @@ public static enum CornerPosition { * @return the tooltip associated with this {@code SpreadsheetCell} */ public Optional getTooltip(); - + /** * Registers an event handler to this SpreadsheetCell. * @@ -413,8 +413,8 @@ public static enum CornerPosition { * @param eventHandler the handler to register * @throws NullPointerException if the event type or handler is null */ - public void addEventHandler(EventType eventType, EventHandler eventHandler); - + public void addEventHandler(EventType eventType, EventHandler eventHandler); + /** * Unregisters a previously registered event handler from this * SpreadsheetCell. @@ -423,5 +423,8 @@ public static enum CornerPosition { * @param eventHandler the handler to unregister * @throws NullPointerException if the event type or handler is null */ - public void removeEventHandler(EventType eventType, EventHandler eventHandler); + public void removeEventHandler(EventType eventType, EventHandler eventHandler); + + } + diff --git a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCellBase.java b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCellBase.java index f4240967..912ef233 100644 --- a/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCellBase.java +++ b/controlsfx/src/main/java/org/controlsfx/control/spreadsheet/SpreadsheetCellBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013, 2016, 2018 ControlsFX + * Copyright (c) 2013, 2023 ControlsFX * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -596,36 +596,20 @@ public final int hashCode() { result = prime * result + Objects.hashCode(getStyleClass()); return result; } - - /** - * Registers an event handler to this SpreadsheetCell. The SpreadsheetCell class allows - * registration of listeners which will be notified when a corner state of - * the editable state of this SpreadsheetCell have changed. - * - * @param eventType the type of the events to receive by the handler - * @param eventHandler the handler to register - * @throws NullPointerException if the event type or handler is null - */ + + /** {@inheritDoc} */ @Override - public void addEventHandler(EventType eventType, EventHandler eventHandler) { - eventHandlerManager.addEventHandler(eventType, eventHandler); + public void addEventHandler(EventType eventType, EventHandler eventHandler) { + eventHandlerManager.addEventHandler(eventType, eventHandler); } - /** - * Unregisters a previously registered event handler from this SpreadsheetCell. One - * handler might have been registered for different event types, so the - * caller needs to specify the particular event type from which to - * unregister the handler. - * - * @param eventType the event type from which to unregister - * @param eventHandler the handler to unregister - * @throws NullPointerException if the event type or handler is null - */ + /** {@inheritDoc} */ @Override - public void removeEventHandler(EventType eventType, EventHandler eventHandler) { - eventHandlerManager.removeEventHandler(eventType, eventHandler); + public void removeEventHandler(EventType eventType, EventHandler eventHandler) { + eventHandlerManager.removeEventHandler(eventType, eventHandler); } - + + /*************************************************************************** * * Private Implementation @@ -690,7 +674,6 @@ private boolean setMask(boolean flag, int position) { } /** - * @param mask * @param position * @return whether the specified bit position is true. */ diff --git a/controlsfx/src/main/java/org/controlsfx/control/textfield/AutoCompletionBinding.java b/controlsfx/src/main/java/org/controlsfx/control/textfield/AutoCompletionBinding.java index 70d66c3f..179a90f7 100644 --- a/controlsfx/src/main/java/org/controlsfx/control/textfield/AutoCompletionBinding.java +++ b/controlsfx/src/main/java/org/controlsfx/control/textfield/AutoCompletionBinding.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014, 2016, 2020 ControlsFX + * Copyright (c) 2014, 2023 ControlsFX * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -547,7 +547,7 @@ public String getName() { * @param eventHandler the handler to register * @throws NullPointerException if the event type or handler is null */ - public void addEventHandler(EventType eventType, EventHandler eventHandler) { + public void addEventHandler(EventType eventType, EventHandler eventHandler) { eventHandlerManager.addEventHandler(eventType, eventHandler); } @@ -562,7 +562,7 @@ public void addEventHandler(EventType eventType, EventHandl * @param eventHandler the handler to unregister * @throws NullPointerException if the event type or handler is null */ - public void removeEventHandler(EventType eventType, EventHandler eventHandler) { + public void removeEventHandler(EventType eventType, EventHandler eventHandler) { eventHandlerManager.removeEventHandler(eventType, eventHandler); } diff --git a/gradle.properties b/gradle.properties index 68f3e965..73a86fa5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group = org.controlsfx controlsfx_version = 11.1.3-SNAPSHOT fxsampler_version = 1.0.12-SNAPSHOT -javafx_version = 13 \ No newline at end of file +javafx_version = 17