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

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 01406155c851f2bac2563288d1b94c135e70e6f3
Merge: cf4164e e57396b
Author: Jaroslav Tulach <jaroslav.tul...@oracle.com>
AuthorDate: Thu Nov 9 09:10:01 2017 +0100

    Merge pull request #259 from sdedic/sdedic/netbeans-bugfixes
    
    Bringing in Svatopluk Dědic's changes made since Apr 22, 2017 in the 
original NetBeans repository

 core.windows/manifest.mf                           |   2 +-
 .../netbeans/core/windows/WindowManagerImpl.java   |   8 +
 .../modules/editor/fold/ui/FoldViewFactory.java    |   7 +-
 .../org/netbeans/api/editor/caret/EditorCaret.java |  89 +++++++++--
 .../netbeans/modules/java/completion/BaseTask.java |  32 +++-
 .../java/editor/imports/ComputeImports.java        |  63 ++++++--
 .../modules/java/hints/AssignResultToVariable.java |   9 ++
 .../modules/java/hints/errors/ImportClass.java     | 177 +++++++++++++++++++--
 .../modules/java/hints/errors/Utilities.java       |  16 ++
 .../java/hints/introduce/FieldValidator.java       | 148 ++++++++++++++---
 .../java/hints/introduce/IntroduceFieldFix.java    |   2 +-
 .../java/hints/introduce/IntroduceFieldPanel.java  |   8 +-
 .../java/hints/introduce/IntroduceMethodFix.java   |   2 +-
 .../java/hints/introduce/IntroduceMethodPanel.java |   4 +-
 .../java/hints/introduce/IntroduceVariableFix.java |   2 +-
 .../java/hints/introduce/MemberSearchResult.java   |  54 +++++++
 .../modules/java/hints/introduce/TreeUtils.java    |   9 +-
 .../java/hints/suggestions/TooStrongCast.java      |   6 +-
 .../java/j2semodule/resources/build-impl.xsl       |   2 +-
 .../modules/java/source/pretty/VeryPretty.java     |   8 +-
 .../javafx2/editor/fxml/FXMLEditAction.java        |   3 -
 .../javafx2/editor/fxml/FXMLOpenAction.java        |   3 -
 .../modules/jshell/editor/CompletionFilter.java    |   3 +-
 .../modules/jshell/env/JShellEnvironment.java      |  37 +++--
 .../modules/jshell/j2se/JShellStartupExtender.java |   4 +-
 .../modules/jshell/launch/ShellLaunchManager.java  |   2 +-
 .../modules/jshell/maven/MavenShellLauncher.java   |   9 +-
 .../modules/jshell/navigation/SnippetNodes.java    |  13 +-
 .../modules/jshell/parsing/JShellLexer.java        |  14 +-
 .../modules/jshell/parsing/SnippetRegistry.java    |   6 +-
 .../modules/jshell/project/REPLAction2.java        |   5 +
 .../modules/jshell/project/ShellProjectUtils.java  |  78 ++++++++-
 .../modules/jshell/support/ShellSession.java       |   9 +-
 .../modules/jshell/tool/JShellLauncher.java        |   7 +-
 .../netbeans/modules/jshell/tool/JShellTool.java   |  22 ++-
 .../netbeans/modules/jshell/tool/l10n.properties   |   6 +-
 .../org/openide/filesystems/MemoryFileSystem.java  |  24 +++
 openide.windows/apichanges.xml                     |  15 ++
 openide.windows/manifest.mf                        |   2 +-
 .../src/org/openide/windows/ModeSelector.java      |  49 ++++++
 .../java/plugins/InlineMethodTransformer.java      |  26 ++-
 .../refactoring/java/plugins/JavaPluginUtils.java  |   2 +-
 .../ReplaceConstructorWithBuilderPlugin.java       |   1 +
 .../ReplaceConstructorWithFactoryPlugin.java       |   1 +
 .../java/ui/ChangeParametersAction.java            |   2 +-
 .../java/ui/EncapsulateFieldAction.java            |   2 +-
 .../java/ui/ExtractInterfaceAction.java            |   2 +-
 .../java/ui/ExtractSuperclassAction.java           |   2 +-
 .../refactoring/java/ui/InnerToOuterAction.java    |   2 +-
 .../refactoring/java/ui/InvertBooleanAction.java   |   2 +-
 .../modules/refactoring/java/ui/PullUpAction.java  |   2 +-
 .../refactoring/java/ui/PushDownAction.java        |   2 +-
 .../ui/ReplaceConstructorWithBuilderAction.java    |   2 +-
 .../ui/ReplaceConstructorWithFactoryAction.java    |   2 +-
 .../refactoring/java/ui/UseSuperTypeAction.java    |   2 +-
 .../modules/refactoring/java/test/InlineTest.java  |  76 ++++++++-
 .../completion/util/CompletionContextImpl.java     |  30 +++-
 .../xml/schema/completion/util/CompletionUtil.java |  32 +++-
 .../modules/xml/text/api/dom/XMLSyntaxSupport.java |  12 +-
 .../xml/text/completion/XMLCompletionProvider.java |   4 +-
 .../modules/xml/text/resources/Bundle.properties   |   4 +-
 .../modules/xml/text/resources/XML-fontsColors.xml |   4 +-
 .../xml/text/resources/XMLEditor-fontsColors.xml   |  75 ---------
 63 files changed, 991 insertions(+), 257 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"comm...@netbeans.apache.org" <comm...@netbeans.apache.org>.

Reply via email to