diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000..d8a7d53cc --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,99 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + schedule: + - cron: '32 21 * * 2' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: java-kotlin + build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. + java: [ '17' ] + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: 'temurin' # See 'Supported distributions' for available options + java-version: ${{ matrix.java }} + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - if: matrix.build-mode == 'manual' + run: | + echo 'If you are using a "manual" build mode for one or more of the' \ + 'languages you are analyzing, replace this with the commands to build' \ + 'your code, for example:' + echo ' make bootstrap' + echo ' make release' + exit 1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/releng/org.eclipse.nebula.nebula-parent/pom.xml b/releng/org.eclipse.nebula.nebula-parent/pom.xml index 09f50993f..77f720195 100644 --- a/releng/org.eclipse.nebula.nebula-parent/pom.xml +++ b/releng/org.eclipse.nebula.nebula-parent/pom.xml @@ -35,8 +35,8 @@ Contributors: https://download.eclipse.org/releases/latest - 11 - 11 + 17 + 17 jacoco diff --git a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java index 868128312..7ce76c1a0 100644 --- a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java +++ b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java @@ -5,7 +5,7 @@ * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ - * + * * SPDX-License-Identifier: EPL-2.0 * * Contributors: @@ -102,7 +102,7 @@ public class GridColumn extends Item { private int headerHeight = NOT_CALCULATED_YET; - int getFooterHeight(GC gc) + int getFooterHeight(final GC gc) { if(footerHeight == NOT_CALCULATED_YET) { footerHeight = getFooterRenderer().computeSize(gc, getWidth(), SWT.DEFAULT, this).y; @@ -110,7 +110,7 @@ int getFooterHeight(GC gc) return footerHeight; } - int getHeaderHeight(GC gc) + int getHeaderHeight(final GC gc) { if(headerHeight == NOT_CALCULATED_YET) { headerHeight = getHeaderRenderer().computeSize(gc, getWidth(), SWT.DEFAULT, this).y; @@ -213,7 +213,7 @@ int getHeaderHeight(GC gc) * subclass * */ - public GridColumn(Grid parent, int style) { + public GridColumn(final Grid parent, final int style) { this(parent, style, -1); } @@ -242,7 +242,7 @@ public GridColumn(Grid parent, int style) { * subclass * */ - public GridColumn(Grid parent, int style, int index) { + public GridColumn(final Grid parent, final int style, final int index) { super(parent, style, index); init(parent, style, index); @@ -272,7 +272,7 @@ public GridColumn(Grid parent, int style, int index) { * subclass * */ - public GridColumn(GridColumnGroup parent, int style) { + public GridColumn(final GridColumnGroup parent, final int style) { super(parent.getParent(), style, parent.getNewColumnIndex()); init(parent.getParent(), style, parent.getNewColumnIndex()); @@ -282,8 +282,8 @@ public GridColumn(GridColumnGroup parent, int style) { group.newColumn(this, -1); } - private void init(Grid table, int style, int index) { - this.parent = table; + private void init(final Grid table, final int style, final int index) { + parent = table; table.newColumn(this, index); @@ -303,25 +303,26 @@ private void init(Grid table, int style, int index) { public void dispose() { if (!parent.isDisposing()) { parent.removeColumn(this); - if (group != null) + if (group != null) { group.removeColumn(this); + } - if (controlEditor != null ) { - controlEditor.dispose(); - } + if (controlEditor != null ) { + controlEditor.dispose(); + } } - if(cellRenderer != null) - { - cellRenderer.setDisplay(null); - cellRenderer = null; - } + if(cellRenderer != null) + { + cellRenderer.setDisplay(null); + cellRenderer = null; + } - if(headerRenderer != null) - { - headerRenderer.setDisplay(null); - headerRenderer = null; - } + if(headerRenderer != null) + { + headerRenderer.setDisplay(null); + headerRenderer = null; + } super.dispose(); } @@ -409,12 +410,12 @@ public int getWidth() { * thread that created the receiver * */ - public void setWidth(int width) { + public void setWidth(final int width) { checkWidget(); setWidth(width, true); } - void setWidth(int width, boolean redraw) { + void setWidth(final int width, final boolean redraw) { int widthToSet = Math.max(minimumWidth, width); if (parent.getColumnScrolling()) { /* @@ -422,7 +423,7 @@ void setWidth(int width, boolean redraw) { * can't scroll all to the right */ int availableVisibleWidthForColumns = parent.getClientArea().width; - if (IS_MAC && availableVisibleWidthForColumns == 1 && parent.getClientArea().height == 1) { + if (IS_MAC && availableVisibleWidthForColumns == 1 && parent.getClientArea().height <= 1) { // One sets column width before the grid size has been layouted availableVisibleWidthForColumns = width; } @@ -458,7 +459,7 @@ void setWidth(int width, boolean redraw) { * thread that created the receiver * */ - public void setSort(int style) { + public void setSort(final int style) { checkWidget(); sortStyle = style; parent.redraw(); @@ -500,12 +501,12 @@ public int getSort() { * thread that created the receiver * */ - public void addSelectionListener(SelectionListener listener) { + public void addSelectionListener(final SelectionListener listener) { checkWidget(); if (listener == null) { SWT.error(SWT.ERROR_NULL_ARGUMENT); } - this.addListener(SWT.Selection, new TypedListener(listener)); + addListener(SWT.Selection, new TypedListener(listener)); } /** @@ -524,7 +525,7 @@ public void addSelectionListener(SelectionListener listener) { * thread that created the receiver * */ - public void removeSelectionListener(SelectionListener listener) { + public void removeSelectionListener(final SelectionListener listener) { checkWidget(); this.removeListener(SWT.Selection, listener); } @@ -533,12 +534,12 @@ public void removeSelectionListener(SelectionListener listener) { * Fires selection listeners. */ void fireListeners() { - Event e = new Event(); - e.display = this.getDisplay(); + final Event e = new Event(); + e.display = getDisplay(); e.item = this; e.widget = parent; - this.notifyListeners(SWT.Selection, e); + notifyListeners(SWT.Selection, e); } /** @@ -559,8 +560,8 @@ void fireListeners() { public boolean isVisible() { checkWidget(); if (group != null) { - if ((group.getExpanded() && !isDetail()) - || (!group.getExpanded() && !isSummary())) { + if (group.getExpanded() && !isDetail() + || !group.getExpanded() && !isSummary()) { return false; } } @@ -597,10 +598,10 @@ public boolean getVisible() { * thread that created the receiver * */ - public void setVisible(boolean visible) { + public void setVisible(final boolean visible) { checkWidget(); - boolean before = isVisible(); + final boolean before = isVisible(); this.visible = visible; @@ -615,23 +616,23 @@ public void setVisible(boolean visible) { * Move focus to the next visible column on the right * (or left if it is not possible) */ - if (parent.getFocusColumn() == this) { - GridItem focusItem = parent.getFocusItem(); + if (parent.getFocusColumn() == this) { + final GridItem focusItem = parent.getFocusItem(); if (focusItem != null) { GridColumn column = parent.getVisibleColumn_DegradeRight(focusItem, this); - if (column != null) + if (column != null) { parent.setFocusColumn(column); - else { + } else { column = parent.getVisibleColumn_DegradeLeft(focusItem, this); - if (column != null) + if (column != null) { parent.setFocusColumn(column); + } } } } - GridColumn[] colsOrdered = parent.getColumnsInOrder(); - for (int i = 0; i < colsOrdered.length; i++) { - GridColumn column = colsOrdered[i]; + final GridColumn[] colsOrdered = parent.getColumnsInOrder(); + for (final GridColumn column : colsOrdered) { if (column != this && column.isVisible()) { column.fireMoved(); } @@ -655,7 +656,7 @@ public void setVisible(boolean visible) { public void pack() { checkWidget(); - GC gc = new GC(parent); + final GC gc = new GC(parent); int newWidth = getHeaderRenderer().computeSize(gc, SWT.DEFAULT, SWT.DEFAULT, this).x; @@ -667,7 +668,7 @@ public void pack() { { for (int i = topIndex; i < bottomIndex; i++) { - GridItem item = parent.getItem(i); + final GridItem item = parent.getItem(i); if (item.isVisible()) { newWidth = Math.max(newWidth, getCellRenderer().computeSize(gc, SWT.DEFAULT, SWT.DEFAULT, item).x); @@ -684,7 +685,7 @@ public void pack() { { for (int i = 0; i < parent.getItemCount(); i++) { - GridItem item = parent.getItem(i); + final GridItem item = parent.getItem(i); if (item.isVisible()) { newWidth = Math.max(newWidth, getCellRenderer().computeSize(gc, SWT.DEFAULT, SWT.DEFAULT, item).x); @@ -749,7 +750,7 @@ public boolean isCheck() { * thread that created the receiver * */ - public void setCellRenderer(GridCellRenderer cellRenderer) { + public void setCellRenderer(final GridCellRenderer cellRenderer) { checkWidget(); this.cellRenderer = cellRenderer; @@ -769,7 +770,7 @@ public void setCellRenderer(GridCellRenderer cellRenderer) { * thread that created the receiver * */ - public void setHeaderRenderer(GridHeaderRenderer headerRenderer) { + public void setHeaderRenderer(final GridHeaderRenderer headerRenderer) { checkWidget(); this.headerRenderer = headerRenderer; initHeaderRenderer(); @@ -788,7 +789,7 @@ public void setHeaderRenderer(GridHeaderRenderer headerRenderer) { * thread that created the receiver * */ - public void setFooterRenderer(GridFooterRenderer footerRenderer) { + public void setFooterRenderer(final GridFooterRenderer footerRenderer) { checkWidget(); this.footerRenderer = footerRenderer; initFooterRenderer(); @@ -812,12 +813,12 @@ public void setFooterRenderer(GridFooterRenderer footerRenderer) { * thread that created the receiver * */ - public void addControlListener(ControlListener listener) { + public void addControlListener(final ControlListener listener) { checkWidget(); if (listener == null) { SWT.error(SWT.ERROR_NULL_ARGUMENT); } - TypedListener typedListener = new TypedListener(listener); + final TypedListener typedListener = new TypedListener(listener); addListener(SWT.Resize, typedListener); addListener(SWT.Move, typedListener); } @@ -839,7 +840,7 @@ public void addControlListener(ControlListener listener) { * thread that created the receiver * */ - public void removeControlListener(ControlListener listener) { + public void removeControlListener(final ControlListener listener) { checkWidget(); if (listener == null) { SWT.error(SWT.ERROR_NULL_ARGUMENT); @@ -852,24 +853,24 @@ public void removeControlListener(ControlListener listener) { * Fires moved event. */ void fireMoved() { - Event e = new Event(); - e.display = this.getDisplay(); + final Event e = new Event(); + e.display = getDisplay(); e.item = this; e.widget = parent; - this.notifyListeners(SWT.Move, e); + notifyListeners(SWT.Move, e); } /** * Fires resized event. */ void fireResized() { - Event e = new Event(); - e.display = this.getDisplay(); + final Event e = new Event(); + e.display = getDisplay(); e.item = this; e.widget = parent; - this.notifyListeners(SWT.Resize, e); + notifyListeners(SWT.Resize, e); } /** @@ -885,7 +886,7 @@ void fireResized() { * thread that created the receiver * */ - public void setTree(boolean tree) { + public void setTree(final boolean tree) { checkWidget(); this.tree = tree; @@ -923,7 +924,7 @@ public int getAlignment() { * thread that created the receiver * */ - public void setAlignment(int alignment) { + public void setAlignment(final int alignment) { checkWidget(); cellRenderer.setAlignment(alignment); } @@ -940,26 +941,26 @@ public void setAlignment(int alignment) { * thread that created the receiver * */ - public int getVerticalAlignment() { - checkWidget(); - return cellRenderer.getVerticalAlignment(); - } - - /** - * Sets the column's vertical text alignment. - * - * @param alignment SWT.TOP (default), SWT.CENTER, SWT.BOTTOM - * @throws org.eclipse.swt.SWTException - * - */ - public void setVerticalAlignment(int alignment) { - checkWidget(); - cellRenderer.setVerticalAlignment(alignment); - } + public int getVerticalAlignment() { + checkWidget(); + return cellRenderer.getVerticalAlignment(); + } + + /** + * Sets the column's vertical text alignment. + * + * @param alignment SWT.TOP (default), SWT.CENTER, SWT.BOTTOM + * @throws org.eclipse.swt.SWTException + * + */ + public void setVerticalAlignment(final int alignment) { + checkWidget(); + cellRenderer.setVerticalAlignment(alignment); + } /** @@ -992,7 +993,7 @@ public boolean getMoveable() { * thread that created the receiver * */ - public void setMoveable(boolean moveable) { + public void setMoveable(final boolean moveable) { checkWidget(); this.moveable = moveable; parent.redraw(); @@ -1028,7 +1029,7 @@ public boolean getResizeable() { * thread that created the receiver * */ - public void setResizeable(boolean resizeable) { + public void setResizeable(final boolean resizeable) { checkWidget(); this.resizeable = resizeable; } @@ -1084,7 +1085,7 @@ public boolean isDetail() { * thread that created the receiver * */ - public void setDetail(boolean detail) { + public void setDetail(final boolean detail) { checkWidget(); this.detail = detail; } @@ -1122,7 +1123,7 @@ public boolean isSummary() { * thread that created the receiver * */ - public void setSummary(boolean summary) { + public void setSummary(final boolean summary) { checkWidget(); this.summary = summary; } @@ -1133,13 +1134,13 @@ public void setSummary(boolean summary) { * @return bounds of the column header */ Rectangle getBounds() { - Rectangle bounds = new Rectangle(0, 0, 0, 0); + final Rectangle bounds = new Rectangle(0, 0, 0, 0); if (!isVisible()) { return bounds; } - Point loc = parent.getOrigin(this, null); + final Point loc = parent.getOrigin(this, null); bounds.x = loc.x; bounds.y = loc.y; bounds.width = getWidth(); @@ -1162,7 +1163,7 @@ protected boolean isTableCheck() { * @param tableCheck * the tableCheck to set */ - protected void setTableCheck(boolean tableCheck) { + protected void setTableCheck(final boolean tableCheck) { this.tableCheck = tableCheck; cellRenderer.setCheck(tableCheck || check); @@ -1198,7 +1199,7 @@ public boolean getCellSelectionEnabled() { * thread that created the receiver * */ - public void setCellSelectionEnabled(boolean cellSelectionEnabled) { + public void setCellSelectionEnabled(final boolean cellSelectionEnabled) { checkWidget(); this.cellSelectionEnabled = cellSelectionEnabled; } @@ -1253,12 +1254,12 @@ public boolean getCheckable() { * thread that created the receiver * */ - public void setCheckable(boolean checkable) { + public void setCheckable(final boolean checkable) { checkWidget(); this.checkable = checkable; } - void setColumnIndex(int newIndex) { + void setColumnIndex(final int newIndex) { cellRenderer.setColumn(newIndex); } @@ -1295,7 +1296,7 @@ public boolean getWordWrap() { * thread that created the receiver * */ - public void setWordWrap(boolean wordWrap) { + public void setWordWrap(final boolean wordWrap) { checkWidget(); cellRenderer.setWordWrap(wordWrap); parent.redraw(); @@ -1310,7 +1311,7 @@ public void setWordWrap(boolean wordWrap) { * Set to true to wrap the text, false otherwise * @see #getHeaderWordWrap() */ - public void setHeaderWordWrap(boolean wordWrap) { + public void setHeaderWordWrap(final boolean wordWrap) { checkWidget(); headerRenderer.setWordWrap(wordWrap); parent.redraw(); @@ -1335,28 +1336,23 @@ public boolean getHeaderWordWrap() { * @param control * the control to be displayed in the header */ - public void setHeaderControl(Control control) { - if (this.controlEditor == null) { - this.controlEditor = new GridHeaderEditor(this); - this.controlEditor.initColumn(); + public void setHeaderControl(final Control control) { + if (controlEditor == null) { + controlEditor = new GridHeaderEditor(this); + controlEditor.initColumn(); } - this.controlEditor.setEditor(control); + controlEditor.setEditor(control); getParent().recalculateHeader(); if (control != null) { // We need to realign if multiple editors are set it is possible // that // a later one needs more space - control.getDisplay().asyncExec(new Runnable() { - - @Override - public void run() { - if (GridColumn.this.controlEditor != null - && GridColumn.this.controlEditor.getEditor() != null) { - GridColumn.this.controlEditor.layout(); - } + control.getDisplay().asyncExec(() -> { + if (controlEditor != null + && controlEditor.getEditor() != null) { + controlEditor.layout(); } - }); } } @@ -1365,8 +1361,8 @@ public void run() { * @return the current header control */ public Control getHeaderControl() { - if (this.controlEditor != null) { - return this.controlEditor.getEditor(); + if (controlEditor != null) { + return controlEditor.getEditor(); } return null; } @@ -1387,9 +1383,9 @@ public String getHeaderTooltip() { * * @param tooltip the tooltip text */ - public void setHeaderTooltip(String tooltip) { + public void setHeaderTooltip(final String tooltip) { checkWidget(); - this.headerTooltip = tooltip; + headerTooltip = tooltip; } /** @@ -1412,11 +1408,12 @@ public void setHeaderTooltip(String tooltip) { * thread that created the receiver * */ - public void setFooterImage(Image image) { + public void setFooterImage(final Image image) { checkWidget(); - if (image != null && image.isDisposed()) + if (image != null && image.isDisposed()) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); - this.footerImage = image; + } + footerImage = image; } /** @@ -1437,11 +1434,12 @@ public void setFooterImage(Image image) { * thread that created the receiver * */ - public void setFooterText(String string) { + public void setFooterText(final String string) { checkWidget(); - if (string == null) + if (string == null) { SWT.error(SWT.ERROR_NULL_ARGUMENT); - this.footerText = string; + } + footerText = string; } /** @@ -1509,7 +1507,7 @@ public Font getHeaderFont() { * * @param font */ - public void setHeaderFont(Font font) { + public void setHeaderFont(final Font font) { checkWidget(); headerFont = font; } @@ -1541,7 +1539,7 @@ public Font getFooterFont() { * * @param font */ - public void setFooterFont(Font font) { + public void setFooterFont(final Font font) { checkWidget(); footerFont = font; } @@ -1559,7 +1557,7 @@ public int getMinimumWidth() { * @param minimumWidth * the minimum width */ - public void setMinimumWidth(int minimumWidth) { + public void setMinimumWidth(final int minimumWidth) { this.minimumWidth = Math.max(0, minimumWidth); if( minimumWidth > getWidth() ) { setWidth(minimumWidth, true);