You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/02/11 22:38:18 UTC

[netbeans] 01/01: Merge pull request #1913 from apache/master

This is an automated email from the ASF dual-hosted git repository.

skygo pushed a commit to branch release113
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit e6797e81ac82d087d9a95c36b9b8f93523945d16
Merge: 090a214 f79f2a6
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Tue Feb 11 23:38:03 2020 +0100

    Merge pull request #1913 from apache/master
    
    sync master to release 113 branch for beta3

 .../newproject/SimpleApplicationProjectWizard.java |   2 +-
 .../newproject/SimpleLibraryProjectWizard.java     |   4 +-
 .../web/newproject/ServerSelectionPanelVisual.java |   7 +
 .../newproject/WebApplicationProjectWizard.java    |   2 +-
 .../netbeans/modules/gradle/spi/GradleFiles.java   |   6 +-
 .../netbeans/modules/defaults/BlueTheme-editor.xml |   2 +
 .../modules/defaults/CityLights-editor.xml         |   2 +
 .../modules/defaults/NetBeans55-editor.xml         |   2 +
 .../modules/defaults/NetBeansEarth-editor.xml      |   2 +
 .../netbeans/modules/lsp/client/LSPBindings.java   |   4 +-
 .../client/bindings/CompletionProviderImpl.java    |   4 +-
 .../common/singlesourcefile/CompileProcess.java    |  37 +-
 .../api/common/singlesourcefile/DebugProcess.java  |  46 +-
 .../api/common/singlesourcefile/JPDAStart.java     |  32 -
 .../SingleJavaSourceDebugActionProvider.java       |   4 +-
 .../codegen/RemoveSurroundingCodeAction.java       |  42 +-
 .../java/editor/resources/Bundle.properties        |   4 +
 .../editor/resources/fontsColors-highlighting.xml  |  27 +
 .../modules/java/editor/resources/layer.xml        |  17 +-
 .../hints/errors/ImplementAllAbstractMethods.java  |  11 +-
 .../java/hints/jdk/AnnotationProcessors.java       |   4 +-
 .../source/parsing/ParameterNameProviderImpl.java  |  71 +-
 .../java/source/pretty/ImportAnalysis2.java        |  22 +-
 .../modules/java/source/save/CasualDiff.java       |   7 +-
 .../java/source/save/PositionEstimator.java        |   4 +-
 .../libs/springframework/spring-framework300.xml   |   2 +-
 .../libs/springframework/spring-framework400.xml   |   2 +-
 .../libs/springframework/spring-framework500.xml   |   1 +
 .../java/plugins/FindUsagesVisitor.java            |   2 +-
 .../multitabs/impl/ProjectColorTabDecorator.java   |   8 +-
 .../org/netbeans/core/windows/view/EditorView.java |  14 +
 platform/janitor/nbproject/project.xml             |  17 +
 .../org/netbeans/modules/janitor/Bundle.properties |   4 +
 .../src/org/netbeans/modules/janitor/Janitor.java  |  57 +-
 .../modules/janitor/JanitorOptionsController.java  |  91 +++
 .../modules/janitor/JanitorOptionsPanel.form       | 120 +++
 .../modules/janitor/JanitorOptionsPanel.java       | 146 ++++
 .../org/netbeans/modules/janitor/JanitorPanel.form |  79 ++
 .../org/netbeans/modules/janitor/JanitorPanel.java |  85 ++
 .../masterfs/watcher/windows/WindowsNotifier.java  |   4 +-
 .../netbeans/swing/laf/dark/DarkMetalTheme.java    |  17 +-
 .../netbeans/swing/laf/dark/DarkNimbusTheme.java   |  18 +-
 .../netbeans/swing/laf/flatlaf/Bundle.properties   |   1 +
 .../swing/laf/flatlaf/FlatDarkLaf.properties       |  37 +-
 .../netbeans/swing/laf/flatlaf/FlatLaf.properties  |  10 +-
 .../swing/laf/flatlaf/FlatLightLaf.properties      |   7 +-
 .../flatlaf/fontscolors/FlatLafDark-highlights.xml |   2 +
 .../fontscolors/FlatLafLight-annotations.xml       | 121 +++
 .../fontscolors/FlatLafLight-highlights.xml        |  59 ++
 .../fontscolors/FlatLafLight-tokenColorings.xml    |  44 ++
 .../src/org/netbeans/swing/laf/flatlaf/layer.xml   |  20 +-
 .../swing/laf/flatlaf/ui/FlatToolbarDragger.java   |  81 ++
 .../src/org/openide/actions/HeapView.java          | 873 ++++-----------------
 .../src/org/openide/awt/HtmlLabelUI.java           |   2 +-
 .../src/org/openide/awt/Toolbar.java               |   6 +-
 .../src/org/openide/util/CachedHiDPIIcon.java      |  16 +-
 .../src/org/openide/util/FilteredIcon.java         |  14 +
 .../src/org/openide/util/ImageUtilities.java       |  25 +-
 .../src/org/openide/util/ImageUtilitiesTest.java   |  52 ++
 59 files changed, 1435 insertions(+), 967 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists