Progress:
In progressChanges

Summary

  1. Automated merge with main-silver
  2. Merge of http://hg.netbeans.org/web-main/
  3. Automated merge with http://hg.netbeans.org/web-main/
  4. Fix for BZ#213013 - "Restful java client" wizard maps to wrong resource location if changed on server .
  5. Automated merge with main-silver
  6. Merge of http://hg.netbeans.org/cnd-main/
  7. fixed Bug 207681 - Navigator does not show the list of subroutines in fortran file
  8. Automated merge with main-silver
  9. Bug 211687 "It is not clear what actual value is used for C/C++ file standard property" fix.
  10. Merge of http://hg.netbeans.org/cnd-main/
  11. fixed Bug #212999 NullPointerException at java.lang.String.replace
  12. Merge of http://hg.netbeans.org/web-main/
  13. Imrpoved type hints.
  14. Typo.
  15. Automated merge with http://hg.netbeans.org/web-main/
  16. VariousUtils.getFullyQualifiedName uses proper type name resolver.
  17. Some tests have problem on Mac, but tested behavior works porperly in runtime.
  18. Processing of type elements is more deterministic.
  19. Merge of http://hg.netbeans.org/cnd-main/
  20. Bug 213000 "UI hang in new project wizard" additional fix.
  21. Merge of http://hg.netbeans.org/web-main/
  22. Automated merge with http://hg.netbeans.org/web-main
  23. #212664 - No CC for inline CSS style (without prefix)
  24. Merge of http://hg.netbeans.org/cnd-main/
  25. fixing Bug #157324 In C++ make it easy to build and run a single file - fix tab of compile&debug action
  26. Bug 213000 "UI hang in new project wizard" fix.
Changeset 222820:886f8dc9718c by ffjre@netbeans.org:
Automated merge with main-silver
Changeset 222819:bb51c0e293a1 by ffjre@netbeans.org:
Merge of http://hg.netbeans.org/web-main/
Changeset 222818:a937cbbd220c by Denis Anisimov :
Automated merge with http://hg.netbeans.org/web-main/
Changeset 222817:f57d61bd6615 by Denis Anisimov :
Fix for BZ#213013 - "Restful java client" wizard maps to wrong resource location if changed on server .
The file was modifiedwebsvc.rest/src/org/netbeans/modules/websvc/rest/client/ClientJavaSourceHelper.java (diff)
The file was modifiedwebsvc.rest/src/org/netbeans/modules/websvc/rest/projects/WebProjectRestSupport.java (diff)
The file was modifiedwebsvc.restapi/src/org/netbeans/modules/websvc/rest/spi/WebRestSupport.java (diff)
Changeset 222816:c95e42e4d92e by ffjre@netbeans.org:
Automated merge with main-silver
Changeset 222815:5dfb00bedde5 by ffjre@netbeans.org:
Merge of http://hg.netbeans.org/cnd-main/
Changeset 222814:05ac84e1410a by Nikolay Krasilnikov :
fixed Bug 207681 - Navigator does not show the list of subroutines in fortran file
The file was addedcnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug207681.f.dat
The file was addedcnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug207681.f.err
The file was addedcnd.modelimpl/test/unit/data/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug207681.f
The file was modifiedcnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilter.java (diff)
The file was modifiedcnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilterEx.java (diff)
The file was modifiedcnd.modelimpl/external/binaries-list (diff)
The file was modifiedcnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/FortranParserEx.java (diff)
The file was modifiedcnd.modelimpl/test/unit/src/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest.java (diff)
Changeset 222813:a4d430d8feb9 by ffjre@netbeans.org:
Automated merge with main-silver
Changeset 222812:00d01659fa01 by igor_nikiforov :
Bug 211687 "It is not clear what actual value is used for C/C++ file standard property" fix.
The file was modifiedcnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties (diff)
The file was modifiedcnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/CCCompilerConfiguration.java (diff)
The file was modifiedcnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/CCompilerConfiguration.java (diff)
The file was modifiedcnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/ui/IntNodeProp.java (diff)
Changeset 222811:698f0eec6f2d by ffjre@netbeans.org:
Merge of http://hg.netbeans.org/cnd-main/
Changeset 222810:63498d32cd9a by Alexander Simon :
fixed Bug #212999 NullPointerException at java.lang.String.replace
The file was modifiedcnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/ExecuteCommand.java (diff)
Changeset 222809:f79d9a920fe1 by ffjre@netbeans.org:
Merge of http://hg.netbeans.org/web-main/
Changeset 222808:dff3c1ffd38d by Ondrej Brejla :
Imrpoved type hints.
The file was modifiedphp.editor/src/org/netbeans/modules/php/editor/actions/ImportDataCreator.java (diff)
Changeset 222807:ce961583f126 by Ondrej Brejla :
Typo.
The file was modifiedphp.editor/src/org/netbeans/modules/php/editor/actions/ImportDataCreator.java (diff)
Changeset 222806:f2c87d475e01 by Ondrej Brejla :
Automated merge with http://hg.netbeans.org/web-main/
Changeset 222805:d5de105f542d by Ondrej Brejla :
VariousUtils.getFullyQualifiedName uses proper type name resolver.
The file was modifiedphp.editor/src/org/netbeans/modules/php/editor/model/impl/TypeNameResolver.java (diff)
The file was modifiedphp.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java (diff)
Changeset 222804:d47544ffe976 by Ondrej Brejla :
Some tests have problem on Mac, but tested behavior works porperly in runtime.
The file was modifiedphp.editor/test/unit/src/org/netbeans/modules/php/editor/index/PHPIndexTest.java (diff)
The file was modifiedphp.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java (diff)
Changeset 222803:0a3865a3b131 by Ondrej Brejla :
Processing of type elements is more deterministic.
The file was modifiedphp.editor/src/org/netbeans/modules/php/editor/actions/ImportDataCreator.java (diff)
Changeset 222802:7bf524090e7c by ffjre@netbeans.org:
Merge of http://hg.netbeans.org/cnd-main/
Changeset 222801:2f65d622ca86 by igor_nikiforov :
Bug 213000 "UI hang in new project wizard" additional fix.
The file was modifiedcnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/wizards/PanelProjectLocationVisual.java (diff)
Changeset 222800:3abcc032c0dc by ffjre@netbeans.org:
Merge of http://hg.netbeans.org/web-main/
Changeset 222799:7b619c070265 by Marek Fukala :
Automated merge with http://hg.netbeans.org/web-main
Changeset 222798:5454cb32b009 by Marek Fukala :
#212664 - No CC for inline CSS style (without prefix)
The file was modifiedcss.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java (diff)
The file was modifiedcss.editor/test/unit/src/org/netbeans/modules/css/editor/csl/CssCompletionTest.java (diff)
Changeset 222797:a88625abfff1 by ffjre@netbeans.org:
Merge of http://hg.netbeans.org/cnd-main/
Changeset 222796:81bcf2ef550b by Alexander Simon :
fixing Bug #157324 In C++ make it easy to build and run a single file
- fix tab of compile&debug action
The file was modifiedcnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/debugger/actions/CompileDebugAction.java (diff)
Changeset 222795:b8c2808d9b0b by igor_nikiforov :
Bug 213000 "UI hang in new project wizard" fix.
The file was modifiedcnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/wizards/PanelProjectLocationVisual.java (diff)