You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2017/11/14 14:39:28 UTC
[incubator-netbeans] 01/01: Merge pull request #274 from
dbalek/dbalek/after_donation
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 5d0b08cbbdc463da4eb0fa5613b8a3746729ed22
Merge: 6ee4827 389bf2b
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Tue Nov 14 15:39:25 2017 +0100
Merge pull request #274 from dbalek/dbalek/after_donation
Backport of dbalek's fixes made after Apr 22, 2017
debugger.jpda/nbproject/project.properties | 2 +-
editor.completion/nbproject/project.properties | 2 +-
.../modules/editor/completion/CompletionImpl.java | 8 +-
.../editor/completion/CompletionLayout.java | 2 +
.../editor/completion/MulticaretHandler.java | 126 +++++++++++++++++++++
editor.indent/nbproject/project.xml | 2 +-
.../netbeans/modules/editor/indent/IndentImpl.java | 43 ++++---
.../org/netbeans/api/editor/caret/EditorCaret.java | 8 +-
editor.settings/manifest.mf | 2 +-
.../api/editor/settings/SimpleValueNames.java | 7 ++
.../wizard/fromdb/JavaPersistenceGenerator.java | 17 ++-
.../java/completion/JavaCompletionTask.java | 6 +-
.../modules/editor/java/JavaCompletionItem.java | 2 +-
.../editor/java/MethodParamsTipPaintComponent.java | 17 ++-
.../modules/java/hints/AssignResultToVariable.java | 2 +-
.../modules/java/hints/errors/ImportClass.java | 2 +-
.../java/stackanalyzer/StackLineAnalyser.java | 28 +++--
.../netbeans/api/java/source/CompilationInfo.java | 3 +-
.../modules/java/source/PostFlowAnalysis.java | 30 ++---
.../java/source/indexing/JavaCustomIndexer.java | 50 ++++----
.../modules/java/source/parsing/JavacParser.java | 25 ++--
.../modules/java/source/pretty/WidthEstimator.java | 3 +
.../modules/java/source/save/Reformatter.java | 78 +++++++++++--
.../modules/java/source/save/Reindenter.java | 17 +--
.../modules/java/source/save/FormatingTest.java | 28 ++++-
.../org/netbeans/modules/java/ui/Bundle.properties | 1 +
.../org/netbeans/modules/java/ui/FmtBraces.form | 100 ++++++++++------
.../org/netbeans/modules/java/ui/FmtBraces.java | 71 ++++++------
.../api/java/source/ui/ElementJavadoc.java | 2 +-
.../lib/nbjavac/services/NBParserFactory.java | 4 +-
libs.javacapi/external/binaries-list | 2 +-
libs.javacapi/nbproject/project.properties | 2 +-
libs.javacimpl/external/binaries-list | 2 +-
libs.javacimpl/nbproject/project.properties | 2 +-
libs.javacimpl/nbproject/project.xml | 2 +-
options.editor/manifest.mf | 2 +-
options.editor/nbproject/project.xml | 18 +--
.../modules/options/indentation/Bundle.properties | 3 +
.../options/indentation/IndentationPanel.form | 67 +++++++----
.../options/indentation/IndentationPanel.java | 71 ++++++++----
.../java/plugins/MoveClassTransformer.java | 3 +-
41 files changed, 608 insertions(+), 254 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.