This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit c2ea8f1a9aeb79392583102e456cd912364db399 Merge: b54acfa 80ad48b Author: Matthias Bläsing <[email protected]> AuthorDate: Sun Nov 11 14:54:50 2018 +0100 [NETBEANS-1658] Merge branch 'nio-backout' Reviewed via: https://github.com/apache/incubator-netbeans/pull/1000 platform/core.netigso/nbproject/project.properties | 2 +- .../src/org/netbeans/core/netigso/Netigso.java | 12 +-- .../core/network/proxy/NbProxySelector.java | 10 +- .../core/network/proxy/kde/KdeNetworkProxy.java | 17 +++- platform/core.osgi/nbproject/project.properties | 2 +- .../core/osgi/OSGiInstalledFileLocator.java | 24 +++-- platform/core.output2/nbproject/project.properties | 2 +- .../org/netbeans/core/output2/AbstractLines.java | 45 +++++---- .../src/org/netbeans/core/output2/Controller.java | 4 +- .../core.startup.base/nbproject/project.properties | 2 +- .../core/startup/layers/ArchiveURLMapper.java | 17 ++-- .../startup/layers/NbinstURLStreamHandler.java | 9 +- .../core/startup/layers/SystemFileSystemTest.java | 16 ++-- .../core/startup/logging/MessagesHandler.java | 9 +- .../netbeans/core/startup/logging/NbLogging.java | 12 +-- .../src/org/netbeans/JarClassLoader.java | 104 ++++++--------------- .../o.n.bootstrap/src/org/netbeans/Stamps.java | 68 +++++++++----- platform/o.n.bootstrap/src/org/netbeans/Util.java | 25 ++--- .../src/org/openide/filesystems/JarFileSystem.java | 22 +++-- .../org/openide/filesystems/LocalFileSystem.java | 27 ++---- 20 files changed, 206 insertions(+), 223 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
