[eclipse-wtp] 02/06: Merge tag 'upstream/3.5.2'

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-wtp.

commit e39d0e32dd6bad04ba64ec1f884665ef011f8b4c
Merge: a0ffcca 8877318
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Mar 8 17:18:05 2014 +0100

    Merge tag 'upstream/3.5.2'
    
    Upstream version 3.5.2

 .../META-INF/MANIFEST.MF                           |     2 +-
 .../internal/resources/VirtualResource.java        |     2 +-
 org.eclipse.wst.common_core.feature/feature.xml    |     2 +-
 org.eclipse.wst.common_ui.feature/feature.xml      |     2 +-
 org.eclipse.wst.css.core/META-INF/MANIFEST.MF      |     2 +-
 .../document/CSSDeclarationItemParser.java         |     1 +
 .../internal/metamodelimpl/CSSProfileImpl.java     |    69 +-
 .../internal/metamodelimpl/ProfileHandler.java     |    12 +-
 org.eclipse.wst.html.core/META-INF/MANIFEST.MF     |     2 +-
 .../contentmodel/HTML5AttributeCollection.java     |     2 +-
 .../preferences/HTMLCorePreferenceInitializer.java |     8 +-
 .../preferences/HTMLCorePreferenceNames.java       |    22 +-
 .../internal/validate/HTMLAttributeValidator.java  |    93 +-
 .../html/core/internal/validate/StringMatcher.java |   232 +
 org.eclipse.wst.jsdt.core/META-INF/MANIFEST.MF     |     2 +-
 org.eclipse.wst.jsdt.core/grammar/js.g             |    21 +-
 .../eclipse/wst/jsdt/core/infer/InferEngine.java   |   125 +
 .../wst/jsdt/core/infer/InferrenceManager.java     |     4 +-
 .../jsdt/internal/compiler/DelegateASTVisitor.java |     6 +-
 .../wst/jsdt/internal/compiler/parser/Parser.java  | 14249 +++++++++----------
 .../compiler/parser/ParserBasicInformation.java    |    36 +-
 .../wst/jsdt/internal/compiler/parser/Scanner.java |     1 -
 .../internal/compiler/parser/TerminalTokens.java   |    60 +-
 .../internal/compiler/problem/ProblemReporter.java |     9 +-
 .../jsdt/internal/core/search/IndexSelector.java   |     4 +-
 .../wst/jsdt/internal/core/util/PublicScanner.java |    10 +-
 .../concepts/rhino_debug/cpt-include-and-debug.htm |    28 -
 .../reference/rhino_debug/ref-common-tab.htm       |    12 +-
 .../reference/rhino_debug/ref-include-tab.htm      |    11 +-
 .../reference/rhino_debug/ref-main-tab.htm         |    12 +-
 .../rhino_debug/ref-rhino-launch-shortcut.htm      |    12 +-
 .../reference/rhino_debug/ref-rhino-tab-group.htm  |    12 +-
 .../reference/rhino_debug/ref-source-tab.htm       |    12 +-
 .../tasks/rhino_debug/tsk-debug-multi-script.htm   |    28 -
 .../tasks/rhino_debug/tsk-debug-single-script.htm  |    28 -
 org.eclipse.wst.jsdt.doc/tocconcepts.xml           |     4 +-
 org.eclipse.wst.jsdt.doc/toctasks.xml              |     4 +-
 org.eclipse.wst.jsdt.feature/feature.xml           |     2 +-
 org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF       |     2 +-
 .../jsdt/internal/corext/dom/ScopeAnalyzer.java    |     4 +-
 .../structure/ChangeSignatureRefactoring.java      |     4 +-
 .../wst/jsdt/internal/ui/actions/ActionUtil.java   |     6 +-
 .../ui/javaeditor/OverrideIndicatorManager.java    |     6 +-
 .../internal/ui/text/FastJavaPartitionScanner.java |    30 +-
 .../internal/ui/text/correction/ASTResolving.java  |     4 +-
 .../correction/AdvancedQuickAssistProcessor.java   |     5 +-
 org.eclipse.wst.server.core/META-INF/MANIFEST.MF   |     2 +-
 .../eclipse/wst/server/core/internal/Server.java   |    17 +-
 .../META-INF/MANIFEST.MF                           |     2 +-
 .../serverAdapterSites.xml                         |     2 +-
 org.eclipse.wst.server.ui/META-INF/MANIFEST.MF     |     2 +-
 .../wst/server/ui/internal/ImageResource.java      |    10 +-
 .../internal/view/servers/RestartModuleAction.java |     6 +-
 .../wizard/fragment/NewServerWizardFragment.java   |    22 +-
 org.eclipse.wst.server_core.feature/feature.xml    |     2 +-
 org.eclipse.wst.server_ui.feature/feature.xml      |     2 +-
 .../HTMLTokenizer/devel/JSPTokenizer.jflex         |     4 +-
 org.eclipse.wst.sse.core/META-INF/MANIFEST.MF      |     2 +-
 .../core/internal/encoding/CommonCharsetNames.java |    85 +-
 org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF        |     2 +-
 org.eclipse.wst.sse.ui/plugin.xml                  |     5 +
 .../eclipse/wst/sse/ui/StructuredTextEditor.java   |     3 +-
 .../StructuredContentAssistProcessor.java          |    11 +-
 .../CompoundContentAssistProcessor.java            |     1 -
 .../contentassist/StructuredContentAssistant.java  |     1 -
 .../ConfigurableContentOutlinePage.java            |   127 +-
 .../ui/internal/spelling/SpellcheckStrategy.java   |    14 +-
 org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF |     2 +-
 .../preferences/ValidationPreferencePage.java      |     5 +-
 .../preferences/ValidationPropertyPage.java        |     5 +-
 org.eclipse.wst.web_core.feature/feature.xml       |     2 +-
 org.eclipse.wst.web_ui.feature/feature.xml         |     2 +-
 org.eclipse.wst.xml_core.feature/feature.xml       |     2 +-
 org.eclipse.wst.xml_ui.feature/feature.xml         |     2 +-
 74 files changed, 8040 insertions(+), 7506 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git