diff options
Diffstat (limited to 'bundles/org.eclipse.wst.html.ui')
119 files changed, 0 insertions, 15428 deletions
diff --git a/bundles/org.eclipse.wst.html.ui/.classpath b/bundles/org.eclipse.wst.html.ui/.classpath deleted file mode 100644 index ce55878876..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.classpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="src-html-validation"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> - <accessrules> - <accessrule kind="accessible" pattern="org/eclipse/wst/**"/> - </accessrules> - </classpathentry> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/bundles/org.eclipse.wst.html.ui/.cvsignore b/bundles/org.eclipse.wst.html.ui/.cvsignore deleted file mode 100644 index e4239f5540..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -bin -htmleditor.jar -temp.folder -build.xml -@dot -src.zip -javaCompiler...args diff --git a/bundles/org.eclipse.wst.html.ui/.options b/bundles/org.eclipse.wst.html.ui/.options deleted file mode 100644 index 6d015ff08a..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.options +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.html.ui/projectionperf=false diff --git a/bundles/org.eclipse.wst.html.ui/.project b/bundles/org.eclipse.wst.html.ui/.project deleted file mode 100644 index 38bee736ad..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.html.ui</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index afa5c91352..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Apr 04 03:36:32 EDT 2006 -eclipse.preferences.version=1 -encoding/<project>=ISO-8859-1 diff --git a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 7ec5750225..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Apr 17 01:48:39 EDT 2006 -eclipse.preferences.version=1 -line.separator=\r\n diff --git a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ecc10e439c..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,79 +0,0 @@ -#Wed Mar 28 03:26:40 EDT 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=ignore -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=error -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 301c7adde6..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Mon Apr 17 01:48:39 EDT 2006 -eclipse.preferences.version=1 -internal.default.compliance=default -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/> diff --git a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index c59368c5e1..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Apr 04 03:36:32 EDT 2006 -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fc522bba76..0000000000 --- a/bundles/org.eclipse.wst.html.ui/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,16 +0,0 @@ -#Mon Apr 17 02:01:33 EDT 2006 -compilers.incompatible-environment=0 -compilers.p.build=0 -compilers.p.deprecated=1 -compilers.p.illegal-att-value=0 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=0 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=0 -compilers.p.unknown-element=0 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.p.unused-element-or-attribute=0 -compilers.use-project=true -eclipse.preferences.version=1 diff --git a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF deleted file mode 100644 index 6fd034fb77..0000000000 --- a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,52 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true -Bundle-Version: 1.0.600.qualifier -Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Export-Package: org.eclipse.wst.html.internal.validation;x-internal:=true, - org.eclipse.wst.html.ui, - org.eclipse.wst.html.ui.internal;x-internal:=true, - org.eclipse.wst.html.ui.internal.autoedit;x-internal:=true, - org.eclipse.wst.html.ui.internal.contentassist;x-internal:=true, - org.eclipse.wst.html.ui.internal.contentoutline;x-internal:=true, - org.eclipse.wst.html.ui.internal.contentproperties.ui;x-internal:=true, - org.eclipse.wst.html.ui.internal.correction;x-internal:=true, - org.eclipse.wst.html.ui.internal.derived;x-internal:=true, - org.eclipse.wst.html.ui.internal.edit.ui;x-internal:=true, - org.eclipse.wst.html.ui.internal.editor;x-internal:=true, - org.eclipse.wst.html.ui.internal.handlers;x-internal:=true, - org.eclipse.wst.html.ui.internal.hyperlink;x-internal:=true, - org.eclipse.wst.html.ui.internal.preferences;x-internal:=true, - org.eclipse.wst.html.ui.internal.preferences.ui;x-internal:=true, - org.eclipse.wst.html.ui.internal.registry;x-internal:=true, - org.eclipse.wst.html.ui.internal.search;x-internal:=true, - org.eclipse.wst.html.ui.internal.style;x-internal:=true, - org.eclipse.wst.html.ui.internal.taginfo;x-internal:=true, - org.eclipse.wst.html.ui.internal.templates;x-internal:=true, - org.eclipse.wst.html.ui.internal.text;x-internal:=true, - org.eclipse.wst.html.ui.internal.wizard;x-internal:=true, - org.eclipse.wst.html.ui.views.contentoutline -Import-Package: com.ibm.icu.util; version="3.8", - com.ibm.icu.text; version="3.8" -Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.wst.sse.ui;bundle-version="[1.2.0,1.4.0)", - org.eclipse.wst.xml.ui;bundle-version="[1.1.100,1.2.0)", - org.eclipse.wst.css.ui;bundle-version="[1.0.500,1.1.0)", - org.eclipse.wst.sse.core;bundle-version="[1.1.500,1.2.0)", - org.eclipse.wst.css.core;bundle-version="[1.1.400,1.2.0)", - org.eclipse.wst.html.core;bundle-version="[1.1.400,1.2.0)", - org.eclipse.wst.xml.core;bundle-version="[1.1.500,1.2.0)", - org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.wst.validation;bundle-version="[1.2.100,1.3.0)", - org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)";resolution:=optional, - org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)";resolution:=optional -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/bundles/org.eclipse.wst.html.ui/about.html b/bundles/org.eclipse.wst.html.ui/about.html deleted file mode 100644 index 2199df3f05..0000000000 --- a/bundles/org.eclipse.wst.html.ui/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>June, 2008</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/bundles/org.eclipse.wst.html.ui/build.properties b/bundles/org.eclipse.wst.html.ui/build.properties deleted file mode 100644 index be98a59124..0000000000 --- a/bundles/org.eclipse.wst.html.ui/build.properties +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################### -# Copyright (c) 2004, 2005 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = plugin.xml,\ - icons/,\ - plugin.properties,\ - templates/,\ - META-INF/,\ - .,\ - about.html -bin.excludes = bin/**,\ - @dot/**,\ - temp.folder/** -source.. = src/,\ - src-html-validation/ diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/dtool16/newhtml_wiz.gif b/bundles/org.eclipse.wst.html.ui/icons/full/dtool16/newhtml_wiz.gif Binary files differdeleted file mode 100644 index 8175aa93fb..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/dtool16/newhtml_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/etool16/newhtml_wiz.gif b/bundles/org.eclipse.wst.html.ui/icons/full/etool16/newhtml_wiz.gif Binary files differdeleted file mode 100644 index 976e18d7cd..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/etool16/newhtml_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif Binary files differdeleted file mode 100644 index 75ebdb8586..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/table.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/table.gif Binary files differdeleted file mode 100644 index b99b45cac1..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/table.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-anchor.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-anchor.gif Binary files differdeleted file mode 100644 index f58992d6c8..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-anchor.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-body.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-body.gif Binary files differdeleted file mode 100644 index 005fa99b46..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-body.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-button.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-button.gif Binary files differdeleted file mode 100644 index d143fcf621..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-button.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-font.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-font.gif Binary files differdeleted file mode 100644 index bbb40cb3f1..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-font.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-form.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-form.gif Binary files differdeleted file mode 100644 index 3b139588c1..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-form.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-generic.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-generic.gif Binary files differdeleted file mode 100644 index 65f516e80a..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-generic.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-html.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-html.gif Binary files differdeleted file mode 100644 index fb39ba6f9e..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-html.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-image-map.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-image-map.gif Binary files differdeleted file mode 100644 index ef3235d170..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-image-map.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-image.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-image.gif Binary files differdeleted file mode 100644 index a988c1d5fb..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-image.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-jsp.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-jsp.gif Binary files differdeleted file mode 100644 index 4084602119..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-jsp.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-template.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-template.gif Binary files differdeleted file mode 100644 index 5d1f81b6d4..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-template.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-title.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-title.gif Binary files differdeleted file mode 100644 index b129090b16..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag-title.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag.gif b/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag.gif Binary files differdeleted file mode 100644 index 5e7fb33399..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/obj16/tag.gif +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/icons/full/wizban/newhfile_wiz.png b/bundles/org.eclipse.wst.html.ui/icons/full/wizban/newhfile_wiz.png Binary files differdeleted file mode 100644 index a4fa448496..0000000000 --- a/bundles/org.eclipse.wst.html.ui/icons/full/wizban/newhfile_wiz.png +++ /dev/null diff --git a/bundles/org.eclipse.wst.html.ui/plugin.properties b/bundles/org.eclipse.wst.html.ui/plugin.properties deleted file mode 100644 index 5d09597f3b..0000000000 --- a/bundles/org.eclipse.wst.html.ui/plugin.properties +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -providerName=Eclipse Web Tools Platform -pluginName=HTML UI Source Editor -HTML_Source_Page_Editor.name=HTML Editor -WEB.name=Web -HTML_Files.name=HTML Files -HTML_Source.name=Editor -HTML_Content_Assist.name=Content Assist -HTML_Templates.name=Templates -HTML_Styles.name=Styles -HTML_Syntax_Coloring=Syntax Coloring -HTML_Typing=Typing -HTML_Validation=Validation -HTML_Property_validation=HTML Syntax -WebContentSettings.name=Web Content Settings -Device_Profile_Entry_Provider_Extension.name=Device Profile Entry Provider Extension -All_HTML_context_type_Extension_Element.name=All HTML -HTML_New_context_type_Extension_Element.name=New HTML -HTML_Tag_context_type_Extension_Element.name=HTML Tag -HTML_Attribute_context_type_Extension_Element.name=HTML Attribute -HTML_Attribute_value_context_type_Extension_Element.name=HTML Attribute value -HTML_Syntax_Validator.name=HTML Syntax Validator -############################################################################### -#org.eclipse.ui.newWizards extension point -_UI_WIZARD_NAME = HTML File -_UI_WIZARD_CREATE_NEW_FILE = Create a new HTML file -## -AddTask.label=Add &Task... -AddTask.tooltip=Add Task... -AddBookmark.label=Add Boo&kmark... -AddBookmark.tooltip=Add Bookmark... -SelectRuler.label=Select Ruler -## -CleanupDocument_label=Cleanup Document... -CleanupDocument_tooltip=Cleanup Document -ToggleComment_label=Toggle Comment -ToggleComment_tooltip=Toggle Comment -AddBlockComment_label=Add Block Comment -AddBlockComment_tooltip=Add Block Comment -RemoveBlockComment_label=Remove Block Comment -RemoveBlockComment_tooltip=Remove Block Comment -FindOccurrences_label=Occurrences in File -StructureSelectEnclosing_label=Enclosing Element -StructureSelectEnclosing_tooltip=Expand selection to include enclosing element -StructureSelectNext_label=Next Element -StructureSelectNext_tooltip=Expand selection to include next sibling -StructureSelectPrevious_label=Previous Element -StructureSelectPrevious_tooltip=Expand selection to include previous sibling -StructureSelectHistory_label=Restore Last Selection -StructureSelectHistory_tooltip=Restore last selection -## -preferenceKeywords.files=editor html creating saving files suffix specified encoding iana loading -preferenceKeywords.source=editor html source formatting line width split multiple attributes new clear blank indent tabs spaces size content assist automatically suggestions prompt characters inserted strategy lax strict markup case code generation tag names capitalization uppercase lowercase -preferenceKeywords.contentassist=html editor content code assist complete completion insert overwrite single proposal common prefix automatically import fill argument name guess alphabetical hide auto activation trigger category categories separate specific -preferenceKeywords.templates=editor html templates snippet macros -preferenceKeywords.styles=editor html style customize syntax highlighting type text content foreground background bold color -preferenceKeywords.webcontent=editor html web content settings profile style document type doctype public system css -preferenceKeywords.severities=html errors warnings ignore options severity severities suppress project specific projectspecific -## -HTML_Editors_target_name=HTML Editors - -scope.structured.text.editor.html.name=Editing HTML Source -scope.structured.text.editor.html.description=Editing HTML Source -scope.structured.text.editor.html.occurrences.name=HTML Source Occurrences -scope.structured.text.editor.html.occurrences.description=HTML Source Occurrences - -Colors.scriptAreaBorder=Script Area Border -hyperlinkDetector.anchor.name=Anchors -hyperlink.target.script.name=HTML Client Script -hyperlink.target.eventhandler.name=HTML Event Handlers - -proposalCategory.htmlTags=HTML Tag Proposals -proposalCategory.htmlTemplates=HTML Template Proposals - -HideComments.label=Comments -HideComments.description=Hides Comments
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml deleted file mode 100644 index fcca90e9ea..0000000000 --- a/bundles/org.eclipse.wst.html.ui/plugin.xml +++ /dev/null @@ -1,750 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - <extension-point id="deviceProfileEntryProvider" name="%Device_Profile_Entry_Provider_Extension.name" schema="schema/deviceProfileEntryProvider.exsd"/> - - <extension point="org.eclipse.ui.editors"> - <editor - name="%HTML_Source_Page_Editor.name" - icon="$nl$/icons/full/obj16/sourceEditor.gif" - contributorClass="org.eclipse.wst.html.ui.internal.edit.ui.ActionContributorHTML" - class="org.eclipse.wst.sse.ui.StructuredTextEditor" - symbolicFontName="org.eclipse.wst.sse.ui.textfont" - id="org.eclipse.wst.html.core.htmlsource.source"> - <contentTypeBinding - contentTypeId="org.eclipse.wst.html.core.htmlsource" /> - </editor> - </extension> - <extension point="org.eclipse.wst.sse.ui.editorConfiguration"> - <sourceViewerConfiguration - class="org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML" - target="org.eclipse.wst.html.core.htmlsource" /> - <contentOutlineConfiguration - class="org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration" - target="org.eclipse.wst.html.core.htmlsource" /> - <quickOutlineConfiguration - class="org.eclipse.wst.xml.ui.internal.quickoutline.XMLQuickOutlineConfiguration" - target="org.eclipse.wst.html.core.htmlsource"/> - <propertySheetConfiguration - class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration" - target="org.eclipse.wst.html.core.htmlsource" /> - <documentationTextHover - class="org.eclipse.wst.html.ui.internal.taginfo.HTMLTagInfoHoverProcessor" - target="org.eclipse.wst.html.HTML_DEFAULT"> - </documentationTextHover> - <provisionalConfiguration - type="sourceeditingtexttools" - class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools" - target="org.eclipse.wst.html.core.htmlsource" /> - <provisionalConfiguration - type="characterpairmatcher" - class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher" - target="org.eclipse.wst.html.core.htmlsource" /> - <provisionalConfiguration - type="foldingstrategy" - class="org.eclipse.wst.xml.ui.internal.projection.XMLFoldingStrategy" - target="org.eclipse.wst.html.core.htmlsource" /> - <provisionalConfiguration - type="org.eclipse.jface.text.quickassist.IQuickAssistProcessor" - class="org.eclipse.wst.xml.ui.internal.correction.XMLQuickAssistProcessor" - target="org.eclipse.wst.html.HTML_DEFAULT" /> - <provisionalConfiguration - type="autoeditstrategy" - class="org.eclipse.wst.html.ui.internal.autoedit.StructuredAutoEditStrategyHTML" - target="org.eclipse.wst.html.HTML_DEFAULT, org.eclipse.wst.html.HTML_DECLARATION" /> - <provisionalDefinition - type="preferencepages" - value="org.eclipse.wst.html.ui.preferences.html, org.eclipse.wst.html.ui.preferences.source, org.eclipse.wst.html.ui.preferences.templates, org.eclipse.wst.html.ui.preferences.styles,org.eclipse.wst.html.ui.preferences.validation, org.eclipse.wst.html.ui.preferences.contentassist" - target="org.eclipse.wst.html.core.htmlsource" /> - <provisionalDefinition - type="spellingregions" - value="XML_COMMENT_TEXT, XML_CONTENT" - target="org.eclipse.wst.html.core.htmlsource" /> - <provisionalDefinition - type="activecontexts" - value="org.eclipse.wst.html.core.htmlsource, org.eclipse.wst.html.occurrences, org.eclipse.core.runtime.xml, org.eclipse.wst.xml.navigation, org.eclipse.wst.xml.selection, org.eclipse.wst.sse.comments" - target="org.eclipse.wst.html.core.htmlsource" /> - </extension> - <extension - point="org.eclipse.core.filebuffers.annotationModelCreation"> - <factory - contentTypeId="org.eclipse.wst.html.core.htmlsource" - class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" /> - </extension> - <extension - point="org.eclipse.wst.sse.ui.adapterFactoryDescription"> - <adapterFactoryDescription - class="org.eclipse.wst.html.ui.internal.registry.AdapterFactoryProviderForHTML"> - <contentType id="org.eclipse.wst.html.core.htmlsource" /> - </adapterFactoryDescription> - </extension> - <extension point="org.eclipse.ui.preferencePages"> - <page - name="%WEB.name" - class="org.eclipse.wst.html.ui.internal.preferences.ui.EmptyFilePreferencePage" - id="org.eclipse.wst.html.ui.preferences.web"> - </page> - <!-- HTML PREFERENCE PAGES--> - <page - name="%HTML_Files.name" - category="org.eclipse.wst.html.ui.preferences.web" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLFilesPreferencePage" - id="org.eclipse.wst.html.ui.preferences.html"> - <keywordReference id="org.eclipse.wst.html.ui.files"/> - </page> - <page - name="%HTML_Source.name" - category="org.eclipse.wst.html.ui.preferences.html" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLSourcePreferencePage" - id="org.eclipse.wst.html.ui.preferences.source"> - <keywordReference id="org.eclipse.wst.html.ui.source"/> - </page> - <page - category="org.eclipse.wst.html.ui.preferences.source" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLContentAssistPreferencePage" - id="org.eclipse.wst.html.ui.preferences.contentassist" - name="%HTML_Content_Assist.name"> - <keywordReference - id="org.eclipse.wst.html.ui.contentassist"> - </keywordReference> - </page> - <page - name="%HTML_Templates.name" - category="org.eclipse.wst.html.ui.preferences.source" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLTemplatePreferencePage" - id="org.eclipse.wst.html.ui.preferences.templates"> - <keywordReference id="org.eclipse.wst.html.ui.templates"/> - </page> - <page - name="%HTML_Syntax_Coloring" - category="org.eclipse.wst.html.ui.preferences.source" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLSyntaxColoringPage" - id="org.eclipse.wst.html.ui.preferences.styles"> - <keywordReference id="org.eclipse.wst.html.ui.styles"/> - </page> - <page - name="%HTML_Validation" - category="org.eclipse.wst.html.ui.preferences.html" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLValidationPreferencePage" - id="org.eclipse.wst.html.ui.preferences.validation"> - </page> - <page - name="%HTML_Typing" - category="org.eclipse.wst.html.ui.preferences.source" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLTypingPreferencePage" - id="org.eclipse.wst.html.ui.preferences.typing"> - </page> - </extension> - <!-- Web content settings --> - <extension point="org.eclipse.ui.propertyPages"> - <!-- for dynamic web project --> - <page - name="%WebContentSettings.name" - class="org.eclipse.wst.html.ui.internal.contentproperties.ui.ProjectWebContentSettingsPropertyPage" - id="org.eclipse.wst.html.ui.dynamicprojectpropertypage"> - <enabledWhen> - <and> - <adapt type="org.eclipse.core.resources.IProject"> - <or> - <test - forcePluginActivation="true" - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jst.web" /> - <test - forcePluginActivation="true" - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="wst.web" /> - </or> - </adapt> - </and> - </enabledWhen> - <keywordReference id="org.eclipse.wst.html.ui.webcontent"/> - </page> - <page - name="%WebContentSettings.name" - class="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage" - id="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage"> - <enabledWhen> - <and> - <adapt type="org.eclipse.core.resources.IFile"> - <or> - <test - forcePluginActivation="true" - property="org.eclipse.core.resources.contentTypeId" - value="org.eclipse.wst.html.core.htmlsource" /> - <test - forcePluginActivation="true" - property="org.eclipse.core.resources.contentTypeId" - value="org.eclipse.jst.jsp.core.jspsource" /> - <test - forcePluginActivation="true" - property="org.eclipse.core.resources.contentTypeId" - value="org.eclipse.jst.jsp.core.jspfragmentsource" /> - <test - forcePluginActivation="true" - property="org.eclipse.core.resources.contentTypeId" - value="org.eclipse.jst.jsp.core.cssjspfragmentsource" /> - </or> - </adapt> - </and> - </enabledWhen> - <keywordReference id="org.eclipse.wst.html.ui.webcontent"/> - </page> - <page - name="%HTML_Property_validation" - class="org.eclipse.wst.html.ui.internal.preferences.ui.HTMLValidationPreferencePage" - id="org.eclipse.wst.html.ui.propertyPage.project.validation" - category="ValidationPropertiesPage"> - <enabledWhen> - <adapt type="org.eclipse.core.resources.IProject"> - - </adapt> - </enabledWhen> - </page> - </extension> - - <!-- Keywords for preference and properties pages --> - <extension point="org.eclipse.ui.keywords"> - <keyword - label="%preferenceKeywords.files" - id="org.eclipse.wst.html.ui.files"/> - <keyword - label="%preferenceKeywords.source" - id="org.eclipse.wst.html.ui.source"/> - <keyword - label="%preferenceKeywords.contentassist" - id="org.eclipse.wst.html.ui.contentassist"/> - <keyword - label="%preferenceKeywords.templates" - id="org.eclipse.wst.html.ui.templates"/> - <keyword - label="%preferenceKeywords.styles" - id="org.eclipse.wst.html.ui.styles"/> - <keyword - label="%preferenceKeywords.webcontent" - id="org.eclipse.wst.html.ui.webcontent"/> - <keyword - label="%preferenceKeywords.severities" - id="org.eclipse.wst.html.ui.severities"/> - </extension> - - <!-- Editor actionsets --> - <extension point="org.eclipse.ui.actionSetPartAssociations"> - <actionSetPartAssociation - targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation"> - <part id="org.eclipse.wst.html.core.htmlsource.source"> - </part> - </actionSetPartAssociation> - <actionSetPartAssociation - targetID="org.eclipse.ui.NavigateActionSet"> - <part id="org.eclipse.wst.html.core.htmlsource.source"> - </part> - </actionSetPartAssociation> - </extension> - - <!-- Templates --> - <extension point="org.eclipse.ui.editors.templates"> - <contextType - name="%All_HTML_context_type_Extension_Element.name" - class="org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeHTML" - id="html_all"> - </contextType> - <contextType - name="%HTML_New_context_type_Extension_Element.name" - class="org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeHTML" - id="html_new"> - </contextType> - <contextType - name="%HTML_Tag_context_type_Extension_Element.name" - class="org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeHTML" - id="html_tag"> - </contextType> - <contextType - name="%HTML_Attribute_context_type_Extension_Element.name" - class="org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeHTML" - id="html_attribute"> - </contextType> - <contextType - name="%HTML_Attribute_value_context_type_Extension_Element.name" - class="org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeHTML" - id="html_attribute_value"> - </contextType> - <include - file="templates/htmldefault-templates.xml" - translations="$nl$/templates/htmldefault-templates.properties"> - </include> - </extension> - - <!-- Define the HTML Contexts --> - <extension point="org.eclipse.ui.contexts"> - <context - name="%scope.structured.text.editor.html.name" - parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope" - description="%scope.structured.text.editor.html.description" - id="org.eclipse.wst.html.core.htmlsource"> - </context> - <context - name="%scope.structured.text.editor.html.occurrences.name" - parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope" - description="%scope.structured.text.editor.html.occurrences.description" - id="org.eclipse.wst.html.occurrences"> - </context> - </extension> - - <!-- initialize html ui preferences --> - <extension point="org.eclipse.core.runtime.preferences"> - <initializer - class="org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceInitializer" /> - </extension> - - <!--======================================================================================--> - <!-- Document provider for ExternalFileEditorInput --> - <!--======================================================================================--> - <extension point="org.eclipse.ui.editors.documentProviders"> - <provider - inputTypes="org.eclipse.wst.html.ui.internal.hyperlink.ExternalFileEditorInput" - class="org.eclipse.ui.editors.text.TextFileDocumentProvider" - id="org.eclipse.wst.html.ui.internal.ExternalFileDocumentProvider"> - </provider> - </extension> - - <!--======================================================================================--> - <!-- Workbench validation --> - <!--======================================================================================--> - <extension id="HTMLValidator" name="%HTML_Syntax_Validator.name" point="org.eclipse.wst.validation.validatorV2"> - <validator - build="true" - class="org.eclipse.wst.html.internal.validation.HTMLValidator" - manual="true" - sourceid="org.eclipse.wst.html.ui.internal.validation.htmlsyntaxvalidator" - version="1" - markerId="org.eclipse.wst.html.core.validationMarker"> - <include> - <rules> - <contentType id="org.eclipse.wst.html.core.htmlsource"></contentType> - <fileext caseSensitive="false" ext="html"/> - <fileext caseSensitive="false" ext="xhtml"/> - <fileext caseSensitive="false" ext="htm"/> - <fileext caseSensitive="false" ext="htpl"/> - <fileext caseSensitive="false" ext="wml"/> - </rules> - </include> - <group id="org.eclipse.wst.sse.core.structuredModelGroup"/> - </validator> - </extension> - - <!--======================================================================================--> - <!-- As you type validation --> - <!--======================================================================================--> - - <extension point="org.eclipse.wst.sse.ui.sourcevalidation"> - <validator - scope="total" - class="org.eclipse.wst.html.internal.validation.HTMLValidator" - id="org.eclipse.wst.html.ui.internal.validation.htmlsyntaxvalidator"> - <contentTypeIdentifier - id="org.eclipse.wst.html.core.htmlsource"> - <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/> - <partitionType id="org.eclipse.wst.html.HTML_DECLARATION"/> - <partitionType id="org.eclipse.wst.html.HTML_COMMENT"/> - <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/> - <partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/> - </contentTypeIdentifier> - </validator> - </extension> - - <!-- New HTML wizard --> - <extension point="org.eclipse.ui.newWizards"> - <wizard - id="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard" - name="%_UI_WIZARD_NAME" - class="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard" - category="org.eclipse.wst.web.ui" - icon="$nl$/icons/full/etool16/newhtml_wiz.gif"> - <description>%_UI_WIZARD_CREATE_NEW_FILE</description> - <selection class="org.eclipse.core.resources.IResource" /> - </wizard> - </extension> - - <!-- Add new HTML wizard to Common Navigator --> - <extension - id="org.eclipse.wst.html.commonWizard.newHTML" - point="org.eclipse.ui.navigator.navigatorContent"> - <commonWizard - menuGroupId="org.eclipse.wst.web.ui" - type="new" - wizardId="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard"> - <enablement> - <or> - <adapt type="org.eclipse.core.resources.IResource"> - <or> - <test - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="wst.web"/> - <test - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jst.web"/> - </or> - </adapt> - </or> - </enablement> - </commonWizard> - </extension> - - <extension point="org.eclipse.ui.popupMenus"> - <viewerContribution - targetID="org.eclipse.wst.html.core.htmlsource.source.RulerContext" - id="org.eclipse.ui.texteditor.ruler.context.actions"> - <action - label="%AddTask.label" - helpContextId="org.eclipse.ui.AddTask_action_context" - class="org.eclipse.ui.texteditor.TaskRulerAction" - tooltip="%AddTask.tooltip" - menubarPath="additions" - id="org.eclipse.ui.texteditor.TaskRulerAction"> - </action> - <action - label="%AddBookmark.label" - helpContextId="org.eclipse.ui.bookmark_action_context" - class="org.eclipse.ui.texteditor.BookmarkRulerAction" - tooltip="%AddBookmark.tooltip" - menubarPath="additions" - id="org.eclipse.ui.texteditor.BookmarkRulerAction"> - </action> - </viewerContribution> - </extension> - - <extension point="org.eclipse.ui.editorActions"> - <!-- <editorContribution - id="org.eclipse.wst.html.core.htmlsource.source.editorActions" - targetID="org.eclipse.wst.html.core.htmlsource.source"> - <action - id="CleanupDocument" - label="%CleanupDocument_label" - definitionId="org.eclipse.wst.sse.ui.cleanup.document" - tooltip="%CleanupDocument_tooltip" - class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupActionHTMLDelegate" - actionID="CleanupDocument"> - </action> - <action - id="ToggleComment" - label="%ToggleComment_label" - definitionId="org.eclipse.wst.sse.ui.toggle.comment" - tooltip="%ToggleComment_tooltip" - class="org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXMLDelegate" - actionID="ToggleComment"> - </action> - <action - id="AddBlockComment" - label="%AddBlockComment_label" - definitionId="org.eclipse.wst.sse.ui.add.block.comment" - tooltip="%AddBlockComment_tooltip" - class="org.eclipse.wst.xml.ui.internal.actions.AddBlockCommentActionXMLDelegate" - actionID="AddBlockComment"> - </action> - <action - id="RemoveBlockComment" - label="%RemoveBlockComment_label" - definitionId="org.eclipse.wst.sse.ui.remove.block.comment" - tooltip="%RemoveBlockComment_tooltip" - class="org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXMLDelegate" - actionID="RemoveBlockComment"> - </action> - <action - id="FindOccurrences" - label="%FindOccurrences_label" - definitionId="org.eclipse.wst.sse.ui.search.find.occurrences" - class="org.eclipse.wst.html.ui.internal.search.HTMLFindOccurrencesActionDelegate" - actionID="FindOccurrences"> - </action> - <action - id="StructureSelectEnclosing" - label="%StructureSelectEnclosing_label" - definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing" - tooltip="%StructureSelectEnclosing_tooltip" - class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate" - actionID="StructureSelectEnclosing"> - </action> - <action - id="StructureSelectNext" - label="%StructureSelectNext_label" - definitionId="org.eclipse.wst.sse.ui.structure.select.next" - tooltip="%StructureSelectNext_tooltip" - class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate" - actionID="StructureSelectNext"> - </action> - <action - id="StructureSelectPrevious" - label="%StructureSelectPrevious_label" - definitionId="org.eclipse.wst.sse.ui.structure.select.previous" - tooltip="%StructureSelectPrevious_tooltip" - class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate" - actionID="StructureSelectPrevious"> - </action> - <action - id="StructureSelectHistory" - label="%StructureSelectHistory_label" - definitionId="org.eclipse.wst.sse.ui.structure.select.last" - tooltip="%StructureSelectHistory_tooltip" - class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate" - actionID="StructureSelectHistory"> - </action> - </editorContribution>--> - <editorContribution - targetID="org.eclipse.wst.html.core.htmlsource.source" - id="org.eclipse.wst.html.core.htmlsource.ruler.actions"> - <action - label="%AddBookmark.label" - helpContextId="org.eclipse.ui.bookmark_action_context" - class="org.eclipse.ui.texteditor.BookmarkRulerAction" - actionID="RulerDoubleClick" - id="org.eclipse.ui.texteditor.BookmarkRulerAction"/> - <action - label="%SelectRuler.label" - class="org.eclipse.ui.texteditor.SelectRulerAction" - actionID="RulerClick" - id="org.eclipse.ui.texteditor.SelectRulerAction"/> - </editorContribution> - </extension> - - <extension - point="org.eclipse.ui.handlers"> - <handler - class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupDocumentHandler" - commandId="org.eclipse.wst.sse.ui.cleanup.document"> - <activeWhen> - <reference - definitionId="org.eclipse.wst.html.ui.htmlSourceContributions.definition"> - </reference> - </activeWhen> - <enabledWhen> - <reference - definitionId="org.eclipse.wst.html.ui.htmlSourceContributions.definition"> - </reference> - </enabledWhen> - </handler> - <handler - class="org.eclipse.wst.html.ui.internal.handlers.HTMLFindOccurrencesHandler" - commandId="org.eclipse.wst.sse.ui.search.find.occurrences"> - <activeWhen> - <reference - definitionId="org.eclipse.wst.html.ui.occurrences"> - </reference> - </activeWhen> - <enabledWhen> - <reference - definitionId="org.eclipse.wst.html.ui.occurrences"> - </reference> - </enabledWhen> - </handler> - - </extension> - - <extension - point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets"> - <target - id="org.eclipse.wst.html.core.htmlsource" - name="%HTML_Editors_target_name"/> - <target - id="org.eclipse.wst.html.SCRIPT" - name="%hyperlink.target.script.name"/> - <target - id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER" - name="%hyperlink.target.eventhandler.name"/> - </extension> - - <extension - point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors"> - <hyperlinkDetector - class="org.eclipse.wst.html.ui.internal.hyperlink.AnchorHyperlinkDetector" - id="org.eclipse.wst.html.ui.internal.hyperlink.AnchorHyperlinkDetector" - name="%hyperlinkDetector.anchor.name" - targetId="org.eclipse.core.runtime.xml"> - </hyperlinkDetector> - - </extension> - - <extension point="org.eclipse.core.expressions.definitions"> - <definition id="org.eclipse.wst.html.ui.htmlSourceContributions.definition"> - <with variable="activeContexts"> - <iterate operator="or"> - <equals value="org.eclipse.wst.html.core.htmlsource"/> - </iterate> - </with> - </definition> - </extension> - - <extension point="org.eclipse.core.expressions.definitions"> - <definition id="org.eclipse.wst.html.ui.occurrences"> - <with variable="activeContexts"> - <iterate operator="or"> - <equals value="org.eclipse.wst.html.occurrences"/> - </iterate> - </with> - </definition> - </extension> - - <!-- Define theme - Many of the color overrides and definitions come from - the XML plugin --> - <extension - point="org.eclipse.ui.themes"> - <theme - id="org.eclipse.ui.ide.systemDefault"> - <colorOverride - id="SCRIPT_AREA_BORDER" - value="COLOR_LIST_FOREGROUND"> - </colorOverride> - </theme> - <colorDefinition - id="SCRIPT_AREA_BORDER" - isEditable="false" - label="%Colors.scriptAreaBorder" - value="191, 95, 63"> - </colorDefinition> - </extension> - - <!-- Enable the FormatHandler for HTML Content Type --> - <extension point="org.eclipse.ui.handlers"> - <handler - class="org.eclipse.wst.sse.ui.internal.handlers.FormatHandler" - commandId="org.eclipse.wst.sse.ui.format"> - <activeWhen> - <reference definitionId="org.eclipse.wst.html.ui.htmlContentType.definition"></reference> - </activeWhen> - <enabledWhen> - <reference definitionId="org.eclipse.wst.html.ui.htmlContentType.definition"></reference> - </enabledWhen> - </handler> - </extension> - - <extension - point="org.eclipse.wst.sse.ui.commentingStrategy"> - <blockCommentingStrategy - prefix="<!--" - suffix="-->"> - <contentType - id="org.eclipse.wst.html.core.htmlsource" - associatedCommentPartitionTypeID="org.eclipse.wst.html.HTML_COMMENT"> - <requiredPartitionTypes> - <partitionType - id="org.eclipse.wst.html.HTML_DEFAULT"> - </partitionType> - <partitionType - id="org.eclipse.wst.html.HTML_DECLARATION"> - </partitionType> - <partitionType - id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"> - </partitionType> - <partitionType - id="org.eclipse.wst.xml.XML_PI"> - </partitionType> - </requiredPartitionTypes> - <allowablePartitionTypes - anyPartitionType="false"> - <partitionType - id="org.eclipse.wst.css.STYLE"> - </partitionType> - <partitionType - id="org.eclipse.wst.html.SCRIPT"> - </partitionType> - </allowablePartitionTypes> - </contentType> - </blockCommentingStrategy> - </extension> - <!-- Set up a definition for HTML Content Types --> - <extension point="org.eclipse.core.expressions.definitions"> - <definition id="org.eclipse.wst.html.ui.htmlContentType.definition"> - <iterate ifEmpty="false"> - <adapt type="org.eclipse.core.resources.IFile"> - <!-- Force property tester to load, should not cause entire plug-in to start --> - <test property="org.eclipse.wst.sse.core.resources.contentTypeId" - value="org.eclipse.wst.html.core.htmlsource" forcePluginActivation="true"/> - </adapt> - </iterate> - </definition> - </extension> - <extension point="org.eclipse.wst.sse.ui.characterPairing"> - <inserter class="org.eclipse.wst.html.ui.internal.text.CharacterPairInserter" id="org.eclipse.wst.html.ui.inserter"> - <contentTypeIdentifier - id="org.eclipse.wst.html.core.htmlsource" - partitions="org.eclipse.wst.html.HTML_DEFAULT"> - </contentTypeIdentifier> - </inserter> - </extension> - <extension - point="org.eclipse.wst.sse.ui.completionProposal"> - <proposalCategory - icon="icons/full/obj16/tag-generic.gif" - id="org.eclipse.wst.html.ui.proposalCategory.htmlTags" - name="%proposalCategory.htmlTags"> - </proposalCategory> - <proposalCategory - icon="icons/full/obj16/tag-template.gif" - id="org.eclipse.wst.html.ui.proposalCategory.htmlTemplates" - name="%proposalCategory.htmlTemplates"> - </proposalCategory> - <proposalComputer - activate="false" - categoryId="org.eclipse.wst.html.ui.proposalCategory.htmlTags" - class="org.eclipse.wst.html.ui.internal.contentassist.HTMLTagsCompletionProposalComputer" - id="org.eclipse.wst.html.ui.proposalComputer.htmlTags"> - <contentType - id="org.eclipse.wst.html.core.htmlsource"> - <partitionType - id="org.eclipse.wst.html.HTML_DEFAULT"> - </partitionType> - </contentType> - </proposalComputer> - <proposalComputer - activate="false" - categoryId="org.eclipse.wst.html.ui.proposalCategory.htmlTemplates" - class="org.eclipse.wst.html.ui.internal.contentassist.HTMLTemplatesCompletionProposalComputer" - id="org.eclipse.wst.html.ui.proposalComputer.htmlTemplates"> - <contentType - id="org.eclipse.wst.html.core.htmlsource"> - <partitionType - id="org.eclipse.wst.html.HTML_DEFAULT"> - </partitionType> - </contentType> - </proposalComputer> - <proposalComputerExtendedActivation - id="org.eclipse.wst.css.ui.proposalComputer.css"> - <contentType - id="org.eclipse.wst.html.core.htmlsource"> - <partitionType - id="org.eclipse.wst.css.STYLE"> - </partitionType> - </contentType> - </proposalComputerExtendedActivation> - <proposalComputerExtendedActivation - id="org.eclipse.wst.css.ui.proposalComputer.cssTemplates"> - <contentType - id="org.eclipse.wst.html.core.htmlsource"> - <partitionType - id="org.eclipse.wst.css.STYLE"> - </partitionType> - </contentType> - </proposalComputerExtendedActivation> - </extension> - <extension - point="org.eclipse.wst.sse.ui.completionProposalCategoriesConfiguration"> - <categoriesConfiguration - class="org.eclipse.wst.html.ui.internal.preferences.HTMLCompletionProposalCategoriesConfiguration" - contentTypeID="org.eclipse.wst.html.core.htmlsource"> - </categoriesConfiguration> - </extension> - -<extension - point="org.eclipse.wst.sse.ui.outlineFilters"> - <filter - targetId="org.eclipse.wst.html.ui.OutlinePage" - name="%HideComments.label" - enabled="false" - description="%HideComments.description" - class="org.eclipse.wst.xml.ui.views.contentoutline.XMLCommentFilter" - id="org.eclipse.wst.html.ui.views.contentoutline.XMLCommentFilter"> - </filter> -</extension> - -</plugin> diff --git a/bundles/org.eclipse.wst.html.ui/schema/deviceProfileEntryProvider.exsd b/bundles/org.eclipse.wst.html.ui/schema/deviceProfileEntryProvider.exsd deleted file mode 100644 index 742f82f5ab..0000000000 --- a/bundles/org.eclipse.wst.html.ui/schema/deviceProfileEntryProvider.exsd +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.wst.html.ui"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.wst.html.ui" id="deviceProfileEntryProvider" name="Device Profile Entry Provider Extension"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="deviceProfileEntryProvider"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="deviceProfileEntryProvider"> - <complexType> - <attribute name="class" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute kind="java"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - <b>This extension point is deprecated and should not be used by any other plugins.</b> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright (c) 2000, 2005 IBM Corporation and others.<br> -All rights reserved. This program and the accompanying materials are made -available under the terms of the Eclipse Public License v1.0 which accompanies -this distribution, and is available at <a -href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> - </documentation> - </annotation> - -</schema> diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationReporter.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationReporter.java deleted file mode 100644 index 4d1068c47c..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationReporter.java +++ /dev/null @@ -1,150 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.internal.validation; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.wst.html.core.internal.validate.MessageFactory; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.validate.ErrorInfo; -import org.eclipse.wst.sse.core.internal.validate.ValidationMessage; -import org.eclipse.wst.sse.core.internal.validate.ValidationReporter; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.eclipse.wst.validation.internal.provisional.core.IValidator; - -public class HTMLValidationReporter implements ValidationReporter { - - private IValidator owner = null; - private IReporter reporter = null; - private IFile file = null; - private IStructuredModel model = null; - private HTMLValidationResult result = null; - private MessageFactory fFactory = null; - - /** - */ - public HTMLValidationReporter(IValidator owner, IReporter reporter, IFile file, IStructuredModel model) { - super(); - this.owner = owner; - this.reporter = reporter; - this.file = file; - this.model = model; - fFactory = new MessageFactory(file != null ? file.getProject() : null); - } - - /** - */ - public void clear() { - if (this.file == null) - return; - - this.result = null; - - if (this.reporter != null) { - this.reporter.removeAllMessages(this.owner, this.file); - } - else { - // remove by myself? - String id = HTMLValidator.class.getName(); - try { - // TaskListHelper API changed - // TaskListHelper.getTaskList().removeAllTasks(id, this.file, - // null); - TaskListHelper.getTaskList().removeAllTasks(this.file, id, null); - } - catch (CoreException ex) { - } - } - } - - - /** - */ - public HTMLValidationResult getResult() { - if (this.result == null) - this.result = new HTMLValidationResult(); - return this.result; - } - - /** - */ - public void report(ValidationMessage message) { - if (message == null || message.getSeverity() == ValidationMessage.IGNORE) - return; - IMessage mes = translateMessage(message); - - if (this.reporter != null) { - this.reporter.addMessage(this.owner, mes); - } - else { - if (this.file == null) - return; - - // add by myself? - String id = HTMLValidator.class.getName(); - String location = Integer.toString(mes.getLineNumber()); - String name = ""; //$NON-NLS-1$ - IPath filePath = this.file.getFullPath(); - if (filePath != null) { - name = filePath.toString(); - } - try { - TaskListHelper.getTaskList().addTask(id, this.file, location, mes.getId(), mes.getText(), mes.getSeverity(), name, mes.getGroupName(), mes.getOffset(), mes.getLength()); - } - catch (CoreException ex) { - } - } - } - - /** - * Translate ValidationMessage to IMessage and generate result log - */ - private IMessage translateMessage(ValidationMessage message) { - int severity = IMessage.LOW_SEVERITY; - HTMLValidationResult result = getResult(); - switch (message.getSeverity()) { - case ValidationMessage.ERROR : - severity = IMessage.HIGH_SEVERITY; - result.addError(); - break; - case ValidationMessage.WARNING : - severity = IMessage.NORMAL_SEVERITY; - result.addWarning(); - break; - case ValidationMessage.INFORMATION : - result.addInformation(); - break; - default : -// result.addInformation(); - break; - } - - IMessage mes = new LocalizedMessage(severity, message.getMessage(), this.file); - mes.setOffset(message.getOffset()); - mes.setLength(message.getLength()); - if (this.model != null) { - IStructuredDocument flatModel = this.model.getStructuredDocument(); - if (flatModel != null) { - int line = flatModel.getLineOfOffset(message.getOffset()); - mes.setLineNo(line + 1); - } - } - - return mes; - } - - public void report(ErrorInfo info) { - report(fFactory.createMessage(info)); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationResult.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationResult.java deleted file mode 100644 index 26c5f0861e..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationResult.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.internal.validation; - -public class HTMLValidationResult { - private int errors = 0; - private int warnings = 0; - private int informations = 0; - - /** - */ - public HTMLValidationResult() { - } - - /** - */ - public void addError() { - this.errors++; - } - - /** - */ - public void addInformation() { - this.informations++; - } - - /** - */ - public void addWarning() { - this.warnings++; - } - - /** - */ - public int getErrors() { - return this.errors; - } - - /** - */ - public int getInformations() { - return this.informations; - } - - /** - */ - public int getWarnings() { - return this.warnings; - } - - /** - */ - public boolean isValid() { - return (this.errors == 0 && this.warnings == 0 && this.informations == 0); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationWorkbenchHelper.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationWorkbenchHelper.java deleted file mode 100644 index 90bfde5134..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationWorkbenchHelper.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.internal.validation; - -import org.eclipse.core.resources.IFile; -import org.eclipse.wst.validation.internal.operations.WorkbenchContext; - -public class HTMLValidationWorkbenchHelper extends WorkbenchContext { - /** - */ - public HTMLValidationWorkbenchHelper() { - super(); - } - - /** - * When an IValidator associates a target object with an IMessage, the - * WorkbenchReporter eventually resolves that target object with an - * IResource. Sometimes more than one target object resolves to the same - * IResource (usually the IProject, which is the default IResource when an - * IFile cannot be found). This method is called, by the - * WorkbenchReporter, so that the WorkbenchReporter can distinguish - * between the IMessages which are on the same IResource, but refer to - * different target objects. This is needed for the - * removeAllMessages(IValidator, Object) method, so that when one target - * object removes all of its messages, that it doesn't remove another - * target object's messages. - * - * This method may return null only if object is null. Otherwise, an id - * which can uniquely identify a particular object must be returned. The - * id needs to be unique only within one particular IValidator. - */ - public String getTargetObjectName(Object object) { - if (object == null) - return null; - if (object instanceof IFile) - return getPortableName((IFile) object); - return object.toString(); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java deleted file mode 100644 index 5d0e44c3f7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java +++ /dev/null @@ -1,565 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.internal.validation; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.filebuffers.ITextFileBuffer; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.content.IContentDescription; -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.core.runtime.content.IContentTypeManager; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeConstants; -import org.eclipse.wst.html.core.internal.validate.HTMLValidationAdapterFactory; -import org.eclipse.wst.html.ui.internal.Logger; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.FileBufferModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.util.URIResolver; -import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter; -import org.eclipse.wst.sse.core.utils.StringUtils; -import org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator; -import org.eclipse.wst.validation.AbstractValidator; -import org.eclipse.wst.validation.ValidationResult; -import org.eclipse.wst.validation.ValidationState; -import org.eclipse.wst.validation.internal.core.Message; -import org.eclipse.wst.validation.internal.core.ValidationException; -import org.eclipse.wst.validation.internal.operations.IWorkbenchContext; -import org.eclipse.wst.validation.internal.operations.WorkbenchReporter; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.eclipse.wst.validation.internal.provisional.core.IValidationContext; -import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob; -import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.w3c.dom.Text; - -public class HTMLValidator extends AbstractValidator implements IValidatorJob, ISourceValidator, IExecutableExtension { - private static final String ORG_ECLIPSE_WST_HTML_CORE_HTMLSOURCE = "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$ - - static boolean shouldValidate(IFile file) { - IResource resource = file; - do { - if (resource.isDerived() || resource.isTeamPrivateMember() || !resource.isAccessible() || (resource.getName().charAt(0) == '.' && resource.getType() == IResource.FOLDER)) { - return false; - } - resource = resource.getParent(); - } - while ((resource.getType() & IResource.PROJECT) == 0); - return true; - } - - private IDocument fDocument; - private IContentTypeManager fContentTypeManager; - private IContentType[] fOtherSupportedContentTypes = null; - private String[] fAdditionalContentTypesIDs = null; - private IContentType fHTMLContentType; - - public HTMLValidator() { - super(); - fContentTypeManager = Platform.getContentTypeManager(); - fHTMLContentType = fContentTypeManager.getContentType(ORG_ECLIPSE_WST_HTML_CORE_HTMLSOURCE); - } - - /** - */ - public void cleanup(IReporter reporter) { - // nothing to do - } - - /** - * Gets list of content types this validator is interested in - * - * @return All HTML-related content types - */ - private IContentType[] getOtherSupportedContentTypes() { - if (fOtherSupportedContentTypes == null) { - List contentTypes = new ArrayList(3); - if (fAdditionalContentTypesIDs != null) { - for (int i = 0; i < fAdditionalContentTypesIDs.length; i++) { - IContentType type = Platform.getContentTypeManager().getContentType(fAdditionalContentTypesIDs[i]); - if (type != null) { - contentTypes.add(type); - } - } - } - fOtherSupportedContentTypes = (IContentType[]) contentTypes.toArray(new IContentType[contentTypes.size()]); - } - return fOtherSupportedContentTypes; - } - - - /** - */ - protected IDOMModel getModel(IProject project, IFile file) { - if (project == null || file == null) - return null; - if (!file.exists()) - return null; - if (!canHandle(file)) - return null; - - IStructuredModel model = null; - IModelManager manager = StructuredModelManager.getModelManager(); - try { - file.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor()); - } - catch (CoreException e) { - Logger.logException(e); - } - try { - try { - model = manager.getModelForRead(file); - } - catch (UnsupportedEncodingException ex) { - // retry ignoring META charset for invalid META charset - // specification - // recreate input stream, because it is already partially read - model = manager.getModelForRead(file, new String(), null); - } - } - catch (UnsupportedEncodingException ex) { - } - catch (IOException ex) { - } - catch (CoreException e) { - Logger.logException(e); - } - - if (model == null) - return null; - if (!(model instanceof IDOMModel)) { - releaseModel(model); - return null; - } - return (IDOMModel) model; - } - - /** - */ - protected HTMLValidationReporter getReporter(IReporter reporter, IFile file, IDOMModel model) { - return new HTMLValidationReporter(this, reporter, file, model); - } - - /** - * Check file extension to validate - */ - private boolean canHandle(IFile file) { - boolean result = false; - if (file != null) { - try { - IContentDescription contentDescription = file.getContentDescription(); - if (contentDescription != null) { - IContentType fileContentType = contentDescription.getContentType(); - if (fileContentType.isKindOf(fHTMLContentType)) { - result = true; - } - else { - IContentType[] otherTypes = getOtherSupportedContentTypes(); - for (int i = 0; i < otherTypes.length; i++) { - result = result || fileContentType.isKindOf(otherTypes[i]); - } - } - } - else if (fHTMLContentType != null) { - result = fHTMLContentType.isAssociatedWith(file.getName()); - } - } - catch (CoreException e) { - // should be rare, but will ignore to avoid logging "encoding - // exceptions" and the like here. - // Logger.logException(e); - } - } - return result; - } - - /** - */ - private boolean hasHTMLFeature(IDOMDocument document) { - DocumentTypeAdapter adapter = (DocumentTypeAdapter) document.getAdapterFor(DocumentTypeAdapter.class); - if (adapter == null) - return false; - return adapter.hasFeature(HTMLDocumentTypeConstants.HTML); - } - - /** - */ - protected void releaseModel(IStructuredModel model) { - if (model != null) - model.releaseFromRead(); - } - - /** - */ - public void validate(IValidationContext helper, IReporter reporter) { - if (helper == null) - return; - if ((reporter != null) && (reporter.isCancelled() == true)) { - throw new OperationCanceledException(); - } - String[] deltaArray = helper.getURIs(); - if (deltaArray != null && deltaArray.length > 0) { - validateDelta(helper, reporter); - } - else { - validateFull(helper, reporter); - } - } - - /** - * This validate call is for the ISourceValidator partial document - * validation approach - * - * @param dirtyRegion - * @param helper - * @param reporter - * @see org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator - */ - public void validate(IRegion dirtyRegion, IValidationContext helper, IReporter reporter) { - - if (helper == null || fDocument == null) - return; - - if ((reporter != null) && (reporter.isCancelled() == true)) { - throw new OperationCanceledException(); - } - - IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(fDocument); - if (model == null) - return; // error - - try { - - IDOMDocument document = null; - if (model instanceof IDOMModel) { - document = ((IDOMModel) model).getDocument(); - } - - if (document == null || !hasHTMLFeature(document)) { - // handled in finally clause - // model.releaseFromRead(); - return; //ignore - } - - IPath filePath = null; - IFile file = null; - - ITextFileBuffer fb = FileBufferModelManager.getInstance().getBuffer(fDocument); - if (fb != null) { - filePath = fb.getLocation(); - - if (filePath.segmentCount() > 1) { - file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath); - if (!file.isAccessible()) { - file = null; - } - } - } - else { - filePath = new Path(model.getId()); - } - - // this will be the wrong region if it's Text (instead of Element) - // we don't know how to validate Text - IndexedRegion ir = getCoveringNode(dirtyRegion); // model.getIndexedRegion(dirtyRegion.getOffset()); - if (ir instanceof Text) { - while (ir != null && ir instanceof Text) { - // it's assumed that this gets the IndexedRegion to - // the right of the end offset - ir = model.getIndexedRegion(ir.getEndOffset()); - } - } - - if (ir instanceof INodeNotifier) { - - INodeAdapterFactory factory = HTMLValidationAdapterFactory.getInstance(); - ValidationAdapter adapter = (ValidationAdapter) factory.adapt((INodeNotifier) ir); - if (adapter == null) - return; // error - - if (reporter != null) { - HTMLValidationReporter rep = null; - rep = getReporter(reporter, file, (IDOMModel) model); - rep.clear(); - adapter.setReporter(rep); - - Message mess = new LocalizedMessage(IMessage.LOW_SEVERITY, filePath.toString().substring(1)); - reporter.displaySubtask(this, mess); - } - adapter.validate(ir); - } - } - finally { - if (model != null) - model.releaseFromRead(); - } - } - - private IndexedRegion getCoveringNode(IRegion dirtyRegion) { - - IndexedRegion largestRegion = null; - if(fDocument instanceof IStructuredDocument) { - IStructuredDocumentRegion[] regions = ((IStructuredDocument) fDocument).getStructuredDocumentRegions(dirtyRegion.getOffset(), dirtyRegion.getLength()); - largestRegion = getLargest(regions); - } - return largestRegion; - } - protected IndexedRegion getLargest(IStructuredDocumentRegion[] sdRegions) { - - if(sdRegions == null || sdRegions.length == 0) - return null; - - IndexedRegion currentLargest = getCorrespondingNode(sdRegions[0]); - for (int i = 0; i < sdRegions.length; i++) { - if(!sdRegions[i].isDeleted()) { - IndexedRegion corresponding = getCorrespondingNode(sdRegions[i]); - - if(currentLargest instanceof Text) - currentLargest = corresponding; - - if(corresponding != null) { - if(!(corresponding instanceof Text)) { - if (corresponding.getStartOffset() <= currentLargest.getStartOffset() - && corresponding.getEndOffset() >= currentLargest.getEndOffset() ) - currentLargest = corresponding; - } - } - - } - } - return currentLargest; - } - protected IndexedRegion getCorrespondingNode(IStructuredDocumentRegion sdRegion) { - IStructuredModel sModel = StructuredModelManager.getModelManager().getExistingModelForRead(fDocument); - IndexedRegion indexedRegion = null; - try { - if (sModel != null) - indexedRegion = sModel.getIndexedRegion(sdRegion.getStart()); - } finally { - if (sModel != null) - sModel.releaseFromRead(); - } - return indexedRegion; - } - - /** - * @see org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator - */ - public void connect(IDocument document) { - fDocument = document; - } - - /** - * @see org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator - */ - public void disconnect(IDocument document) { - fDocument = null; - } - - /** - */ - protected HTMLValidationResult validate(IDOMModel model, IFile file) { - IProject prj = null; - if (file != null) { - prj = file.getProject(); - } - if ((prj == null) && (model != null)) { - URIResolver res = model.getResolver(); - if (res != null) { - prj = res.getProject(); - } - } - final WorkbenchReporter reporter = new WorkbenchReporter(prj, new NullProgressMonitor()); - return validate(reporter, file, model); - } - - /** - */ - private HTMLValidationResult validate(IReporter reporter, IFile file, IDOMModel model) { - if (file == null || model == null) - return null; // error - IDOMDocument document = model.getDocument(); - if (document == null) - return null; // error - if (!hasHTMLFeature(document)) - return null; // ignore - - INodeAdapterFactory factory = HTMLValidationAdapterFactory.getInstance(); - ValidationAdapter adapter = (ValidationAdapter) factory.adapt(document); - if (adapter == null) - return null; // error - - HTMLValidationReporter rep = getReporter(reporter, file, model); - rep.clear(); - adapter.setReporter(rep); - adapter.validate(document); - return rep.getResult(); - } - - /** - */ - private void validateContainer(IValidationContext helper, IReporter reporter, IContainer container) { - try { - IResource[] resourceArray = container.members(false); - for (int i = 0; i < resourceArray.length; i++) { - IResource resource = resourceArray[i]; - if (resource == null || reporter.isCancelled()) - continue; - if (resource instanceof IFile) { - Message message = new LocalizedMessage(IMessage.LOW_SEVERITY, resource.getFullPath().toString().substring(1)); - reporter.displaySubtask(this, message); - validateFile(helper, reporter, (IFile) resource); - } - else if (resource instanceof IContainer) { - validateContainer(helper, reporter, (IContainer) resource); - } - } - } - catch (CoreException ex) { - } - } - - /** - */ - private void validateDelta(IValidationContext helper, IReporter reporter) { - String[] deltaArray = helper.getURIs(); - for (int i = 0; i < deltaArray.length; i++) { - String delta = deltaArray[i]; - if (delta == null) - continue; - - if (reporter != null) { - Message message = new LocalizedMessage(IMessage.LOW_SEVERITY, delta.substring(1)); - reporter.displaySubtask(this, message); - } - - IResource resource = getResource(delta); - if (resource == null || !(resource instanceof IFile)) - continue; - validateFile(helper, reporter, (IFile) resource); - } - } - - /** - */ - private void validateFile(IValidationContext helper, IReporter reporter, IFile file) { - if ((reporter != null) && (reporter.isCancelled() == true)) { - throw new OperationCanceledException(); - } - if (!shouldValidate(file)) { - return; - } - IDOMModel model = getModel(file.getProject(), file); - if (model == null) - return; - - try { - validate(reporter, file, model); - } - finally { - releaseModel(model); - } - } - - /** - */ - private void validateFull(IValidationContext helper, IReporter reporter) { - IProject project = null; - String[] fileDelta = helper.getURIs(); - if (helper instanceof IWorkbenchContext) { - IWorkbenchContext wbHelper = (IWorkbenchContext) helper; - project = wbHelper.getProject(); - } - else if(fileDelta.length > 0){ - // won't work for project validation (b/c nothing in file delta) - project = getResource(fileDelta[0]).getProject(); - } - if (project == null) - return; - validateContainer(helper, reporter, project); - } - - /* - * added to get rid or dependency on IWorkbenchHelper - * - */ - public IResource getResource(String delta) { - Path path = new Path(delta); - if (path.segmentCount() > 1) - return ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if (path.segmentCount() == 1) - return ResourcesPlugin.getWorkspace().getRoot().getProject(delta); - return null; - } - - public ISchedulingRule getSchedulingRule(IValidationContext helper) { - return null; - } - - public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException { - // Exception catching was removed, see - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=123600 - IStatus status = Status.OK_STATUS; - validate(helper, reporter); - return status; - } - - /** - * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, - * java.lang.String, java.lang.Object) - */ - public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { - fAdditionalContentTypesIDs = new String[0]; - if (data != null) { - if (data instanceof String && data.toString().length() > 0) { - fAdditionalContentTypesIDs = StringUtils.unpack(data.toString()); - } - } - } - - public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) { - if (resource.getType() != IResource.FILE) - return null; - ValidationResult result = new ValidationResult(); - IReporter reporter = result.getReporter(monitor); - validateFile(null, reporter, (IFile) resource); - return result; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/LocalizedMessage.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/LocalizedMessage.java deleted file mode 100644 index 1e3872945f..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/LocalizedMessage.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.internal.validation; - -import java.util.Locale; - -import org.eclipse.core.resources.IResource; -import org.eclipse.wst.validation.internal.core.Message; - -/** - * copied from org.eclipse.wst.validation.internal.operations.LocalizedMessage - * - * This class is provided for validators which run only in Eclipse and whose messages, because they - * come from another tool, are already localized. LocalizedMessage cannot be used by any validator - * which needs to run in both WebSphere and Eclipse. - */ -public class LocalizedMessage extends Message { - private String _message = null; - - public LocalizedMessage(int severity, String messageText) { - this(severity, messageText, null); - } - - public LocalizedMessage(int severity, String messageText, IResource targetObject) { - this(severity, messageText, (Object) targetObject); - } - - public LocalizedMessage(int severity, String messageText, Object targetObject) { - super(null, severity, null); - setLocalizedMessage(messageText); - setTargetObject(targetObject); - } - - public void setLocalizedMessage(String message) { - _message = message; - } - - public String getLocalizedMessage() { - return _message; - } - - public String getText() { - return getLocalizedMessage(); - } - - public String getText(ClassLoader cl) { - return getLocalizedMessage(); - } - - public String getText(Locale l) { - return getLocalizedMessage(); - } - - public String getText(Locale l, ClassLoader cl) { - return getLocalizedMessage(); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/TaskListHelper.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/TaskListHelper.java deleted file mode 100644 index 71ede2d9d7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/TaskListHelper.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.internal.validation; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; - -/** - * - * Class to help this Problem's list. - * - */ -class TaskListHelper { - private static TaskListHelper _taskListHelper = null; - - public static TaskListHelper getTaskList() { - if (_taskListHelper == null) { - _taskListHelper = new TaskListHelper(); - } - return _taskListHelper; - } - - /** - * This method adds a message to a resource in the task list. - */ - public void addTask(String pluginId, IResource resource, String location, String messageId, String message, int markerType, String targetObjectName, String groupName, int offset, int length) throws CoreException { - TaskListUtility.addTask(pluginId, resource, location, messageId, message, markerType, targetObjectName, groupName, offset, length); - } - - /** - * This method removes all messages from a resource in the task list. - */ - public void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException { - TaskListUtility.removeAllTasks(resource, owner, objectName); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/TaskListUtility.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/TaskListUtility.java deleted file mode 100644 index 3de0a92f1b..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/TaskListUtility.java +++ /dev/null @@ -1,436 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.internal.validation; - -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; - -/** - * This class must be called only by the validation framework. - * - * This singleton interacts with the eclipse workbench's Task list. - * TaskListUtility adds and removes tasks from the list. - * - * This class must not be called outside of an IWorkspaceRunnable or - * IRunnableWithProgress. Many resource deltas can be generated by the methods - * in this class. - * - * This came from TaskListUtility - */ -public class TaskListUtility { - // private static final String PLUGIN_ID = ValidationPlugin.PLUGIN_ID; - private static final String PLUGIN_ID = HTMLUIPlugin.ID; - private static final String VALIDATION_MARKER = PLUGIN_ID + ".problemmarker"; //$NON-NLS-1$ // The extension which is used to add validation markers to the task list - private static final String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$ // The IValidator who owns the IMarker on the task list - private static final String VALIDATION_MARKER_SEVERITY = "validationSeverity"; //$NON-NLS-1$ // one of the IMessage values - private static final String VALIDATION_MARKER_TARGETOBJECT = "targetObject"; //$NON-NLS-1$ // When more than one target object resolves to the same IResource, this field identifies which targetObject owns a particular message. - private static final String VALIDATION_MARKER_GROUP = "groupName"; //$NON-NLS-1$ // For incremental validation, this field associates a message with a group, so that a subset of messages may be removed from a file. - private static final String VALIDATION_MARKER_MESSAGEID = "messageId"; //$NON-NLS-1$ // Persist the message id of the message, not just the translated text. - private static final int DEPTH_INFINITE = IResource.DEPTH_INFINITE; - private static final int DEPTH_ZERO = IResource.DEPTH_ZERO; - private final static IMarker[] NO_MARKERS = new IMarker[0]; - - /** - * This method adds a message to a resource in the task list. - */ - public static IMarker addTask(String pluginId, IResource resource, String location, String messageId, String message, int markerType, String targetObjectName, String groupName, int offset, int length) throws CoreException { - if ((message == null) || (resource == null)) { - return null; - } - - int severity = getSeverity(markerType); - - // Allow duplicate entries in the task list. - // Prior to a full validation, the validation framework will remove - // all messages owned - // by a validator before it is executed. - // Prior to an incremental validation, the validation framework will - // remove all messages, - // on each of the changed resources, owned by a validator before it is - // invoked. - // - // It is up to the validator to make sure that it is not adding the - // same message - // in more than one place, and also to clear out any old messages - // which are not cleared - // by the validation framework. - IMarker item = resource.createMarker(VALIDATION_MARKER); // add a - // validation - // marker - - // For performance reasons, replace the multiple setAttribute - // calls above with a single setAttributes call. - boolean offsetSet = ((offset != IMessage.OFFSET_UNSET) && (length != IMessage.OFFSET_UNSET)); - int size = (offsetSet) ? 10 : 8; // add CHAR_START, CHAR_END only - // if the offset is set. If the - // offset is set, it takes - // precendence over the line - // number. (eclipse's rule, not - // mine.) - String[] attribNames = new String[size]; - Object[] attribValues = new Object[size]; - - // Very first thing, add the owner. That way, if the code dies - // before things are persisted, hopefully this marker will be - // persisted. - // Hopefully, eclipse WILL persist this field, as requested. - attribNames[0] = VALIDATION_MARKER_OWNER; - attribValues[0] = pluginId; - attribNames[1] = VALIDATION_MARKER_SEVERITY; // this validation - // severity is stored, - // in addition to the - // marker severity, to - // enable more than - // one severity of - // message to be - // displayed. e.g. - // ERROR | WARNING - // (using binary OR). - // The IMarker - // constants are - // regular decimal - // constants. - attribValues[1] = new Integer(markerType); - attribNames[2] = VALIDATION_MARKER_TARGETOBJECT; // to distinguish - // between - // messages which - // are registered - // on an - // IResource, but - // against - // different - // target objects - attribValues[2] = ((targetObjectName == null) ? "" : targetObjectName); //$NON-NLS-1$ - attribNames[3] = VALIDATION_MARKER_GROUP; - attribValues[3] = ((groupName == null) ? "" : groupName); //$NON-NLS-1$ - attribNames[4] = IMarker.MESSAGE; - attribValues[4] = message; - attribNames[5] = VALIDATION_MARKER_MESSAGEID; - attribValues[5] = messageId; - - attribNames[6] = IMarker.SEVERITY; // IMarker.SEVERITY_ERROR, - // IMarker.SEVERITY_WARNING, - // IMarker.SEVERITY_INFO - attribValues[6] = new Integer(severity); - try { - // If the location is a line number, store it as a line number - Integer lineNumber = Integer.valueOf(location); - attribNames[7] = IMarker.LINE_NUMBER; - attribValues[7] = lineNumber; - } - catch (NumberFormatException exc) { - // Otherwise, store it as a text location - attribNames[7] = IMarker.LOCATION; - attribValues[7] = location; - } - - if (offsetSet) { - attribNames[8] = IMarker.CHAR_START; - attribValues[8] = new Integer(offset); - attribNames[9] = IMarker.CHAR_END; - attribValues[9] = new Integer(offset + length); - } - - item.setAttributes(attribNames, attribValues); - - return item; - } - - /** - * Given one of the SeverityEnum severities, return the IMarker severity - * int that is its equivalent. - */ - private static int getSeverity(int severityEnumValue) { - switch (severityEnumValue) { - case (IMessage.HIGH_SEVERITY) : { - return IMarker.SEVERITY_ERROR; - } - - case (IMessage.LOW_SEVERITY) : { - return IMarker.SEVERITY_INFO; - } - - case (IMessage.NORMAL_SEVERITY) : { - return IMarker.SEVERITY_WARNING; - } - - case (IMessage.ALL_MESSAGES) : - case (IMessage.ERROR_AND_WARNING) : - default : { - // assume it's a warning. - return IMarker.SEVERITY_WARNING; - } - } - } - - private static int getDepth(IResource resource) { - if (resource instanceof IProject) { - return DEPTH_INFINITE; // DEPTH_INFINITE means get this project's - // markers, and the markers belonging to - // the project's children. - } - else if (resource instanceof IWorkspaceRoot) { - // Needed for the ValidationMigrator when it checks for orphan - // tasks. - return DEPTH_INFINITE; // DEPTH_INFINITE means get all of the - // markers in the workspace - } - - return DEPTH_ZERO; // DEPTH_ZERO means just this resource, not its - // children - } - - private static IMarker[] getValidationTasks(IResource resource, int severity, int depth) { - IMarker[] tempMarkers = null; - int validCount = 0; - try { - IMarker[] allMarkers = null; - try { - allMarkers = resource.findMarkers(VALIDATION_MARKER, false, depth); // false - // means - // only - // consider - // PROBLEM_MARKER, - // not - // variants - // of - // PROBLEM_MARKER. - // Since - // addTask - // only - // adds - // PROBLEM_MARKER, - // we - // don't - // need - // to - // consider - // its - // subtypes. - } - catch (CoreException exc) { - // Logger logger = - // ValidationPlugin.getPlugin().getMsgLogger(); - // if (logger.isLoggingLevel(Level.SEVERE)) { - // LogEntry entry = ValidationPlugin.getLogEntry(); - // entry.setSourceID("TaskListUtility.getValidationTasks(IResource, - // int)"); //$NON-NLS-1$ - // entry.setTargetException(exc); - // logger.write(Level.SEVERE, entry); - // } - return NO_MARKERS; - } - - // Now filter in the markers, based on severity type. - if (allMarkers.length != 0) { - tempMarkers = new IMarker[allMarkers.length]; - for (int i = 0; i < allMarkers.length; i++) { - IMarker marker = allMarkers[i]; - Integer filterSeverity = (Integer) marker.getAttribute(VALIDATION_MARKER_SEVERITY); - if (filterSeverity == null) { - // odd...marker wasn't created correctly. How could - // this happen? - // Default to the current severity and add it to the - // list. - try { - marker.setAttribute(IMarker.SEVERITY, getSeverity(severity)); - } - catch (CoreException exc) { - // Logger logger = - // ValidationPlugin.getPlugin().getMsgLogger(); - // if (logger.isLoggingLevel(Level.SEVERE)) { - // LogEntry entry = - // ValidationPlugin.getLogEntry(); - // entry.setSourceID("TaskListUtility.getValidationTasks(int, - // IResource, int)"); //$NON-NLS-1$ - // entry.setTargetException(exc); - // logger.write(Level.SEVERE, entry); - // } - continue; - } - catch (Exception exc) { - // Logger logger = - // ValidationPlugin.getPlugin().getMsgLogger(); - // if (logger.isLoggingLevel(Level.SEVERE)) { - // LogEntry entry = - // ValidationPlugin.getLogEntry(); - // entry.setSourceID("TaskListUtility.getValidationTasks(int, - // IResource, int)"); //$NON-NLS-1$ - // entry.setTargetException(exc); - // logger.write(Level.SEVERE, entry); - // } - continue; - } - } - else if ((severity & filterSeverity.intValue()) == 0) { - continue; - } - tempMarkers[validCount++] = marker; - } - } - } - catch (CoreException exc) { - // Logger logger = ValidationPlugin.getPlugin().getMsgLogger(); - // if (logger.isLoggingLevel(Level.SEVERE)) { - // LogEntry entry = ValidationPlugin.getLogEntry(); - // entry.setSourceID("TaskListUtility.getValidationTasks(int, - // IResource, int)"); //$NON-NLS-1$ - // entry.setTargetException(exc); - // logger.write(Level.SEVERE, entry); - // } - } - - if (validCount == 0) { - return NO_MARKERS; - } - - IMarker[] validMarkers = new IMarker[validCount]; - System.arraycopy(tempMarkers, 0, validMarkers, 0, validCount); - return validMarkers; - } - - private static IMarker[] getValidationTasks(IResource resource, String[] messageOwners, int depth) { - IMarker[] markers = getValidationTasks(resource, IMessage.ALL_MESSAGES, depth); - if (markers.length == 0) { - return NO_MARKERS; - } - - IMarker[] temp = new IMarker[markers.length]; - int validCount = 0; - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - - try { - Object owner = marker.getAttribute(VALIDATION_MARKER_OWNER); - if ((owner == null) || !(owner instanceof String)) { - // The ValidationMigrator will remove any "unowned" - // validation markers. - continue; - } - - for (int j = 0; j < messageOwners.length; j++) { - String messageOwner = messageOwners[j]; - if (((String) owner).equals(messageOwner)) { - temp[validCount++] = marker; - break; - } - } - } - catch (CoreException exc) { - // Logger logger = - // ValidationPlugin.getPlugin().getMsgLogger(); - // if (logger.isLoggingLevel(Level.SEVERE)) { - // LogEntry entry = ValidationPlugin.getLogEntry(); - // entry.setSourceID("TaskListUtility.getValidationTasks(project, - // String[])"); //$NON-NLS-1$ - // entry.setTargetException(exc); - // logger.write(Level.SEVERE, entry); - // } - return NO_MARKERS; - } - } - - IMarker[] result = new IMarker[validCount]; - System.arraycopy(temp, 0, result, 0, validCount); - return result; - } - - /** - * This method retrieves all validation tasks from the resource. If depth - * is INFINITE, child tasks are returned as well. Only the tasks which are - * owned by the specified messageOwner, and apply to the named IMessage's - * target object (objectName) will be returned. - */ - private static IMarker[] getValidationTasks(IResource resource, String[] messageOwner, String objectName, String groupName, int depth) throws CoreException { - if ((messageOwner == null) || (resource == null)) { - return NO_MARKERS; - } - - int validCount = 0; - IMarker[] validList = null; - IMarker[] markers = getValidationTasks(resource, messageOwner, depth); - if (markers != null) { - validList = new IMarker[markers.length]; - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - - // If more than one target object resolves to the same - // resource, removing one target's - // messages should not remove the other target object's - // messages. - if (objectName != null) { - Object targetObject = marker.getAttribute(VALIDATION_MARKER_TARGETOBJECT); - if ((targetObject == null) || !(targetObject instanceof String) || !(((String) targetObject).equals(objectName))) { - continue; - } - } - - if (groupName != null) { - Object group = marker.getAttribute(VALIDATION_MARKER_GROUP); - if ((group == null) || !(group instanceof String) || !(((String) group).equals(groupName))) { - continue; - } - } - - validList[validCount++] = marker; - } - } - - if (validCount == 0) { - return NO_MARKERS; - } - - IMarker[] result = new IMarker[validCount]; - System.arraycopy(validList, 0, result, 0, validCount); - return result; - } - - /** - * This method removes all messages from a resource in the task list. - */ - public static void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException { - removeAllTasks(resource, new String[]{owner}, objectName); - } - - public static void removeAllTasks(IResource resource, String[] owners, String objectName) throws CoreException { - removeAllTasks(resource, owners, objectName, getDepth(resource)); - } - - protected static void removeAllTasks(IResource resource, String[] owners, String objectName, int depth) throws CoreException { - removeTaskSubset(resource, owners, objectName, null, depth); // null - // means - // no - // group - // name - } - - /** - * This method removes a subset of tasks from the project, including child - * tasks. Every task which belongs to the group, identified by groupName, - * will be removed. - */ - protected static void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName, int depth) throws CoreException { - if ((owners == null) || (resource == null)) { - return; - } - - IMarker[] allTasks = getValidationTasks(resource, owners, objectName, groupName, depth); - if (allTasks.length > 0) { - ResourcesPlugin.getWorkspace().deleteMarkers(allTasks); - } - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java deleted file mode 100644 index a38409f1f9..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java +++ /dev/null @@ -1,269 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Vector; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.ITextDoubleClickStrategy; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.text.formatter.IContentFormatter; -import org.eclipse.jface.text.formatter.MultiPassContentFormatter; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.wst.css.core.text.ICSSPartitions; -import org.eclipse.wst.css.ui.internal.style.LineStyleProviderForEmbeddedCSS; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML; -import org.eclipse.wst.html.core.text.IHTMLPartitions; -import org.eclipse.wst.html.ui.internal.autoedit.AutoEditStrategyForTabs; -import org.eclipse.wst.html.ui.internal.contentassist.HTMLStructuredContentAssistProcessor; -import org.eclipse.wst.html.ui.internal.style.LineStyleProviderForHTML; -import org.eclipse.wst.sse.core.text.IStructuredPartitions; -import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; -import org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy; -import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; -import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML; -import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML; -import org.eclipse.wst.xml.core.text.IXMLPartitions; -import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML; -import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider; -import org.w3c.dom.Attr; -import org.w3c.dom.Node; - -/** - * Configuration for a source viewer which shows HTML content. - * <p> - * Clients can subclass and override just those methods which must be specific - * to their needs. - * </p> - * - * @see org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration - * @since 1.0 - */ -public class StructuredTextViewerConfigurationHTML extends StructuredTextViewerConfiguration { - /* - * One instance per configuration because not sourceviewer-specific and - * it's a String array - */ - private String[] fConfiguredContentTypes; - /* - * One instance per configuration - */ - private LineStyleProvider fLineStyleProviderForEmbeddedCSS; - /* - * One instance per configuration - */ - private LineStyleProvider fLineStyleProviderForHTML; - /* - * One instance per configuration - */ - private StructuredTextViewerConfiguration fXMLSourceViewerConfiguration; - private ILabelProvider fStatusLineLabelProvider; - - /** - * Create new instance of StructuredTextViewerConfigurationHTML - */ - public StructuredTextViewerConfigurationHTML() { - // Must have empty constructor to createExecutableExtension - super(); - } - - public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) { - List allStrategies = new ArrayList(0); - - IAutoEditStrategy[] superStrategies = super.getAutoEditStrategies(sourceViewer, contentType); - for (int i = 0; i < superStrategies.length; i++) { - allStrategies.add(superStrategies[i]); - } - - // be sure this is added last in list, so it has a change to modify - // previous results. - // add auto edit strategy that handles when tab key is pressed - allStrategies.add(new AutoEditStrategyForTabs()); - - return (IAutoEditStrategy[]) allStrategies.toArray(new IAutoEditStrategy[allStrategies.size()]); - } - - public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { - if (fConfiguredContentTypes == null) { - String[] xmlTypes = StructuredTextPartitionerForXML.getConfiguredContentTypes(); - String[] htmlTypes = StructuredTextPartitionerForHTML.getConfiguredContentTypes(); - fConfiguredContentTypes = new String[2 + xmlTypes.length + htmlTypes.length]; - - fConfiguredContentTypes[0] = IStructuredPartitions.DEFAULT_PARTITION; - fConfiguredContentTypes[1] = IStructuredPartitions.UNKNOWN_PARTITION; - - int index = 0; - System.arraycopy(xmlTypes, 0, fConfiguredContentTypes, index += 2, xmlTypes.length); - System.arraycopy(htmlTypes, 0, fConfiguredContentTypes, index += xmlTypes.length, htmlTypes.length); - } - - return fConfiguredContentTypes; - } - - protected IContentAssistProcessor[] getContentAssistProcessors( - ISourceViewer sourceViewer, String partitionType) { - - IContentAssistProcessor processor = new HTMLStructuredContentAssistProcessor( - this.getContentAssistant(), partitionType, sourceViewer); - return new IContentAssistProcessor[]{processor}; - } - - public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) { - IContentFormatter formatter = super.getContentFormatter(sourceViewer); - // super was unable to create a formatter, probably because - // sourceViewer does not have document set yet, so just create a - // generic one - if (!(formatter instanceof MultiPassContentFormatter)) - formatter = new MultiPassContentFormatter(getConfiguredDocumentPartitioning(sourceViewer), IHTMLPartitions.HTML_DEFAULT); - ((MultiPassContentFormatter) formatter).setMasterStrategy(new StructuredFormattingStrategy(new HTMLFormatProcessorImpl())); - - return formatter; - } - - public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) { - if (contentType == IHTMLPartitions.HTML_DEFAULT) { - // use xml's doubleclick strategy - return getXMLSourceViewerConfiguration().getDoubleClickStrategy(sourceViewer, IXMLPartitions.XML_DEFAULT); - } - else - return super.getDoubleClickStrategy(sourceViewer, contentType); - - } - - public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) { - Vector vector = new Vector(); - - // prefix[0] is either '\t' or ' ' x tabWidth, depending on preference - Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences(); - int indentationWidth = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE); - String indentCharPref = preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR); - boolean useSpaces = HTMLCorePreferenceNames.SPACE.equals(indentCharPref); - - for (int i = 0; i <= indentationWidth; i++) { - StringBuffer prefix = new StringBuffer(); - boolean appendTab = false; - - if (useSpaces) { - for (int j = 0; j + i < indentationWidth; j++) - prefix.append(' '); - - if (i != 0) - appendTab = true; - } - else { - for (int j = 0; j < i; j++) - prefix.append(' '); - - if (i != indentationWidth) - appendTab = true; - } - - if (appendTab) { - prefix.append('\t'); - vector.add(prefix.toString()); - // remove the tab so that indentation - tab is also an indent - // prefix - prefix.deleteCharAt(prefix.length() - 1); - } - vector.add(prefix.toString()); - } - - vector.add(""); //$NON-NLS-1$ - - return (String[]) vector.toArray(new String[vector.size()]); - } - - public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) { - LineStyleProvider[] providers = null; - - // workaround IXMLPartitions.XML_PI - if (partitionType == IHTMLPartitions.HTML_DEFAULT || partitionType == IHTMLPartitions.HTML_COMMENT || partitionType == IHTMLPartitions.HTML_DECLARATION || partitionType == IXMLPartitions.XML_PI) { - providers = new LineStyleProvider[]{getLineStyleProviderForHTML()}; - } - else if (partitionType == ICSSPartitions.STYLE || partitionType == ICSSPartitions.COMMENT) { - providers = new LineStyleProvider[]{getLineStyleProviderForEmbeddedCSS()}; - } - - return providers; - } - - private LineStyleProvider getLineStyleProviderForEmbeddedCSS() { - if (fLineStyleProviderForEmbeddedCSS == null) { - fLineStyleProviderForEmbeddedCSS = new LineStyleProviderForEmbeddedCSS(); - } - return fLineStyleProviderForEmbeddedCSS; - } - - private LineStyleProvider getLineStyleProviderForHTML() { - if (fLineStyleProviderForHTML == null) { - fLineStyleProviderForHTML = new LineStyleProviderForHTML(); - } - return fLineStyleProviderForHTML; - } - - public ILabelProvider getStatusLineLabelProvider(ISourceViewer sourceViewer) { - if (fStatusLineLabelProvider == null) { - fStatusLineLabelProvider = new JFaceNodeLabelProvider() { - public String getText(Object element) { - if (element == null) - return null; - - StringBuffer s = new StringBuffer(); - Node node = (Node) element; - while (node != null) { - if (node.getNodeType() != Node.DOCUMENT_NODE) { - s.insert(0, super.getText(node)); - } - - if (node.getNodeType() == Node.ATTRIBUTE_NODE) - node = ((Attr) node).getOwnerElement(); - else - node = node.getParentNode(); - - if (node != null && node.getNodeType() != Node.DOCUMENT_NODE) { - s.insert(0, IPath.SEPARATOR); - } - } - return s.toString(); - } - - }; - } - return fStatusLineLabelProvider; - } - - private StructuredTextViewerConfiguration getXMLSourceViewerConfiguration() { - if (fXMLSourceViewerConfiguration == null) { - fXMLSourceViewerConfiguration = new StructuredTextViewerConfigurationXML(); - } - return fXMLSourceViewerConfiguration; - } - - protected Map getHyperlinkDetectorTargets(ISourceViewer sourceViewer) { - Map targets = super.getHyperlinkDetectorTargets(sourceViewer); - targets.put(ContentTypeIdForHTML.ContentTypeID_HTML, null); - - // also add xml since there could be xml content in html - // (just hope the hyperlink detectors will do additional checking) - targets.put(ContentTypeIdForXML.ContentTypeID_XML, null); - return targets; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIMessages.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIMessages.java deleted file mode 100644 index e1f4b83fda..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIMessages.java +++ /dev/null @@ -1,212 +0,0 @@ -/********************************************************************** - * Copyright (c) 2005, 2011 IBM Corporation and others. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ -package org.eclipse.wst.html.ui.internal; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.osgi.util.NLS; - -/** - * Strings used by HTML UI - * - * @plannedfor 1.0 - */ -public class HTMLUIMessages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.wst.html.ui.internal.HTMLUIPluginResources";//$NON-NLS-1$ - private static ResourceBundle fResourceBundle; - - static { - // load message values from bundle file - NLS.initializeMessages(BUNDLE_NAME, HTMLUIMessages.class); - } - - private HTMLUIMessages() { - // cannot create new instance of this class - } - - public static ResourceBundle getResourceBundle() { - try { - if (fResourceBundle == null) - fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME); - } - catch (MissingResourceException x) { - fResourceBundle = null; - } - return fResourceBundle; - } - - public static String Sample_HTML_doc; - public static String HTMLFilesPreferencePage_0; - public static String _UI_WIZARD_NEW_TITLE; - public static String _UI_WIZARD_NEW_HEADING; - public static String _UI_WIZARD_NEW_DESCRIPTION; - public static String _ERROR_FILENAME_MUST_END_HTML; - public static String _WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT; - public static String ResourceGroup_nameExists; - public static String NewHTMLTemplatesWizardPage_0; - public static String NewHTMLTemplatesWizardPage_1; - public static String NewHTMLTemplatesWizardPage_2; - public static String NewHTMLTemplatesWizardPage_3; - public static String NewHTMLTemplatesWizardPage_4; - public static String NewHTMLTemplatesWizardPage_5; - public static String NewHTMLTemplatesWizardPage_6; - public static String NewHTMLTemplatesWizardPage_7; - public static String Creating_files_encoding; - public static String CleanupDocument_label; // resource bundle - public static String CleanupDocument_tooltip; // resource bundle - public static String CleanupDocument_description; // resource bundle - public static String ToggleComment_label; // resource bundle - public static String ToggleComment_tooltip; // resource bundle - public static String ToggleComment_description; // resource bundle - public static String Add_inline; - public static String AddBlockComment_label; // resource bundle - public static String AddBlockComment_tooltip; // resource bundle - public static String AddBlockComment_description; // resource bundle - public static String Remove_inline; - public static String RemoveBlockComment_label; // resource bundle - public static String RemoveBlockComment_tooltip; // resource bundle - public static String RemoveBlockComment_description; // resource bundle - public static String FindOccurrences_label; // resource bundle - public static String Creating_files; - public static String Elements_Dialog_message; - public static String Elements_Dialog_title; - public static String Encoding_desc; - public static String UI_Description_of_role_of_following_DOCTYPE; - public static String UI_Default_HTML_DOCTYPE_ID___1; - public static String UI_Public_ID; - public static String UI_System_ID; - public static String UI_none; - public static String UI_CSS_profile___2; - public static String WebContentSettingsPropertyPage_0; - public static String ProjectWebContentSettingsPropertyPage_0; - - public static String Auto_Activation_UI_; - public static String Auto_Activation_Delay; - public static String Automatically_make_suggest_UI_; - public static String Prompt_when_these_characte_UI_; - public static String Cycling_UI_; - public static String Formatting_UI_; - public static String Line_width__UI_; - public static String Split_multiple_attributes; - public static String Align_final_bracket; - public static String Indent_using_tabs; - public static String Indent_using_spaces; - public static String Indentation_size; - public static String Indentation_size_tip; - public static String Inline_elements_table_label; - public static String Clear_all_blank_lines_UI_; - public static String Preferred_markup_case_UI_; - public static String Tag_names__UI_; - public static String Tag_names_Upper_case_UI_; - public static String Tag_names_Lower_case_UI_; - public static String Attribute_names__UI_; - public static String Attribute_names_Upper_case_UI_; - public static String Attribute_names_Lower_case_UI_; - public static String Cleanup_UI_; - public static String Tag_name_case_for_HTML_UI_; - public static String Tag_name_case_As_is_UI_; - public static String Tag_name_case_Lower_UI_; - public static String Tag_name_case_Upper_UI_; - public static String Attribute_name_case_for_HTML_UI_; - public static String Attribute_name_case_As_is_UI_; - public static String Attribute_name_case_Lower_UI_; - public static String Attribute_name_case_Upper_UI_; - public static String Insert_required_attributes_UI_; - public static String Insert_missing_tags_UI_; - public static String Quote_attribute_values_UI_; - public static String Format_source_UI_; - public static String Convert_EOL_codes_UI_; - public static String EOL_Windows_UI; - public static String EOL_Unix_UI; - public static String EOL_Mac_UI; - public static String SyntaxColoringPage_0; - public static String SyntaxColoringPage_2; - public static String SyntaxColoringPage_3; - public static String SyntaxColoringPage_4; - public static String SyntaxColoringPage_5; - public static String SyntaxColoringPage_6; - - // below are possibly unused strings that may be deleted - public static String HTMLFilesPreferencePage_1; - public static String HTMLFilesPreferencePage_2; - public static String HTMLFilesPreferencePage_3; - // above are possibly unused strings that may be deleted - public static String EmptyFilePreferencePage_0; - public static String _UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK; - - // HTML Typing Preferences - public static String HTMLTyping_Auto_Complete; - public static String HTMLTyping_Auto_Remove; - public static String HTMLTyping_Complete_Comments; - public static String HTMLTyping_Complete_End_Tags; - public static String HTMLTyping_Remove_End_Tags; - public static String HTMLTyping_Close_Strings; - public static String HTMLTyping_Close_Brackets; - - // below are the strings for the validation page - public static String Validation_description; - public static String Validation_Warning; - public static String Validation_Error; - public static String Validation_Ignore; - public static String Expandable_label_attributes; - public static String Expandable_label_elements; - public static String Expandable_label_document_type; - public static String Expandable_label_text; - public static String Expandable_label_comment; - public static String Expandable_label_cdata; - public static String Expandable_label_pi; - public static String Expandable_label_entity_ref; - - public static String HTMLValidationPreferencePage_0; - public static String HTMLValidationPreferencePage_1; - public static String HTMLValidationPreferencePage_10; - public static String HTMLValidationPreferencePage_11; - public static String HTMLValidationPreferencePage_12; - public static String HTMLValidationPreferencePage_13; - public static String HTMLValidationPreferencePage_14; - public static String HTMLValidationPreferencePage_15; - public static String HTMLValidationPreferencePage_16; - public static String HTMLValidationPreferencePage_17; - public static String HTMLValidationPreferencePage_18; - public static String HTMLValidationPreferencePage_19; - public static String HTMLValidationPreferencePage_2; - public static String HTMLValidationPreferencePage_20; - public static String HTMLValidationPreferencePage_21; - public static String HTMLValidationPreferencePage_22; - public static String HTMLValidationPreferencePage_23; - public static String HTMLValidationPreferencePage_24; - public static String HTMLValidationPreferencePage_25; - public static String HTMLValidationPreferencePage_26; - public static String HTMLValidationPreferencePage_27; - public static String HTMLValidationPreferencePage_28; - public static String HTMLValidationPreferencePage_29; - public static String HTMLValidationPreferencePage_3; - public static String HTMLValidationPreferencePage_30; - public static String HTMLValidationPreferencePage_31; - public static String HTMLValidationPreferencePage_32; - public static String HTMLValidationPreferencePage_33; - public static String HTMLValidationPreferencePage_34; - public static String HTMLValidationPreferencePage_35; - public static String HTMLValidationPreferencePage_36; - public static String HTMLValidationPreferencePage_37; - public static String HTMLValidationPreferencePage_4; - public static String HTMLValidationPreferencePage_5; - public static String HTMLValidationPreferencePage_6; - public static String HTMLValidationPreferencePage_7; - public static String HTMLValidationPreferencePage_8; - public static String HTMLValidationPreferencePage_9; - - - - // Hyperlinks - public static String Hyperlink_line; - public static String Open; -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPlugin.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPlugin.java deleted file mode 100644 index 6d049337ad..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPlugin.java +++ /dev/null @@ -1,98 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal; - -import java.io.IOException; - -import org.eclipse.jface.text.templates.ContextTypeRegistry; -import org.eclipse.jface.text.templates.persistence.TemplateStore; -import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry; -import org.eclipse.ui.editors.text.templates.ContributionTemplateStore; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames; -import org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeIdsHTML; -import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry; -import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl; - -/** - * The main plugin class to be used in the desktop. - */ -public class HTMLUIPlugin extends AbstractUIPlugin { - public final static String ID = "org.eclipse.wst.html.ui"; //$NON-NLS-1$ - - protected static HTMLUIPlugin instance = null; - - /** - * The template store for the html editor. - */ - private TemplateStore fTemplateStore; - - /** - * The template context type registry for the html editor. - */ - private ContextTypeRegistry fContextTypeRegistry; - - public HTMLUIPlugin() { - super(); - instance = this; - } - - public static HTMLUIPlugin getDefault() { - return instance; - } - - public synchronized static HTMLUIPlugin getInstance() { - return instance; - } - - public AdapterFactoryRegistry getAdapterFactoryRegistry() { - return AdapterFactoryRegistryImpl.getInstance(); - - } - - /** - * Returns the template store for the html editor templates. - * - * @return the template store for the html editor templates - */ - public TemplateStore getTemplateStore() { - if (fTemplateStore == null) { - fTemplateStore = new ContributionTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), HTMLUIPreferenceNames.TEMPLATES_KEY); - - try { - fTemplateStore.load(); - } catch (IOException e) { - Logger.logException(e); - } - } - return fTemplateStore; - } - - /** - * Returns the template context type registry for the html plugin. - * - * @return the template context type registry for the html plugin - */ - public ContextTypeRegistry getTemplateContextRegistry() { - if (fContextTypeRegistry == null) { - ContributionContextTypeRegistry registry = new ContributionContextTypeRegistry(); - registry.addContextType(TemplateContextTypeIdsHTML.ALL); - registry.addContextType(TemplateContextTypeIdsHTML.NEW); - registry.addContextType(TemplateContextTypeIdsHTML.TAG); - registry.addContextType(TemplateContextTypeIdsHTML.ATTRIBUTE); - registry.addContextType(TemplateContextTypeIdsHTML.ATTRIBUTE_VALUE); - - fContextTypeRegistry = registry; - } - - return fContextTypeRegistry; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties deleted file mode 100644 index d148dd8f95..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties +++ /dev/null @@ -1,183 +0,0 @@ -############################################################################### -# Copyright (c) 2004, 2011 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference -############################################################################### -## The following line is a sample HTML document. Please translate only the following parts: -## HTML Highlighting Preferences -## we need a flaming logo -Sample_HTML_doc=<!DOCTYPE html\n\tPUBLIC \"-//W3C/DTD/ HTML 4.01 Transitional//EN\"\n\t\"http://www.w3.org/TR/html4/loose.dtd\">\n<html>\n\t<head>\n\t\t<meta content=\"text/html\">\n\t\t<title>HTML Highlighting Preferences</title>\n\t</head>\n<body>\n\t<!--\n\t\twe need a flaming logo!\n\t-->\n\t<p>three spaces</p>\n</body>\n</html> - -HTMLFilesPreferencePage_0=Loading files -# -_UI_WIZARD_NEW_TITLE = New HTML File -_UI_WIZARD_NEW_HEADING = HTML -_UI_WIZARD_NEW_DESCRIPTION = Create a new HTML file. -_ERROR_FILENAME_MUST_END_HTML = The file name must end in one of the following extensions {0}. -_WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT = Files created outside of the Web Content folder will not be included in your deployed Web application. -ResourceGroup_nameExists = The same name already exists. -NewHTMLTemplatesWizardPage_0=Select HTML Template -NewHTMLTemplatesWizardPage_1=Select a template as initial content in the HTML page. -NewHTMLTemplatesWizardPage_2=Name -NewHTMLTemplatesWizardPage_3=Description -NewHTMLTemplatesWizardPage_4=&Use HTML Template -NewHTMLTemplatesWizardPage_5=&Preview: -NewHTMLTemplatesWizardPage_6=Templates are 'New HTML' templates found in the <a>HTML Templates</a> preference page. -NewHTMLTemplatesWizardPage_7=&Templates: -# -Creating_files_encoding=Creating files encoding preference -# Copied from sse.ui -CleanupDocument_label=Cleanup Document... -CleanupDocument_tooltip=Cleanup Document -CleanupDocument_description=Cleanup Document -ToggleComment_label=Toggle Comment -ToggleComment_tooltip=Toggle Comment -ToggleComment_description=Toggle Comment -Add_inline=A&dd... -AddBlockComment_label=Add Block Comment -AddBlockComment_tooltip=Add Block Comment -AddBlockComment_description=Add Block Comment -Remove_inline=&Remove -RemoveBlockComment_label=Remove Block Comment -RemoveBlockComment_tooltip=Remove Block Comment -RemoveBlockComment_description=Remove Block Comment -FindOccurrences_label=Occurrences in File -Creating_files=Creating files -Elements_Dialog_message=&Select elements to treat as inline. -Elements_Dialog_title=Add Elements -Encoding_desc=The following encoding will apply: -## HTML Source preference page -Auto_Activation_UI_=Auto Activation -Auto_Activation_Delay=Auto activation dela&y (ms): -Automatically_make_suggest_UI_=Automatically ma&ke suggestions -Prompt_when_these_characte_UI_=P&rompt when these characters are inserted: -Cycling_UI_=Cycling -Formatting_UI_=Formatting -Line_width__UI_=Line &width: -Split_multiple_attributes=Split &multiple attributes each on a new line -Align_final_bracket=&Align final bracket in multi-line element tags -Indent_using_tabs=&Indent using tabs -Indent_using_spaces=I&ndent using spaces -Indentation_size=Inden&tation size: -Indentation_size_tip=Indentation size -Inline_elements_table_label=Inline &Elements: -Clear_all_blank_lines_UI_=Clear all &blank lines -Preferred_markup_case_UI_=Preferred markup case for content assist, and code generation -Tag_names__UI_=Tag names: -Tag_names_Upper_case_UI_=&Uppercase -Tag_names_Lower_case_UI_=&Lowercase -Attribute_names__UI_=Attribute names: -Attribute_names_Upper_case_UI_=U&ppercase -Attribute_names_Lower_case_UI_=L&owercase -Cleanup_UI_=Cleanup -Tag_name_case_for_HTML_UI_=Tag name case for HTML: -Tag_name_case_As_is_UI_=&As-is -Tag_name_case_Lower_UI_=&Lower -Tag_name_case_Upper_UI_=&Upper -Attribute_name_case_for_HTML_UI_=Attribute name case for HTML: -Attribute_name_case_As_is_UI_=A&s-is -Attribute_name_case_Lower_UI_=L&ower -Attribute_name_case_Upper_UI_=U&pper -Insert_required_attributes_UI_=Insert &required attributes -Insert_missing_tags_UI_=&Insert missing tags -Quote_attribute_values_UI_=&Quote attribute values -Format_source_UI_=&Format source -Convert_EOL_codes_UI_=Convert line &delimiters to -EOL_Windows_UI=&Windows -EOL_Unix_UI=U&NIX -EOL_Mac_UI=&Mac - -# web content settings -UI_Description_of_role_of_following_DOCTYPE=Use the following default document type when no DOCTYPE is declared in a file: -UI_Default_HTML_DOCTYPE_ID___1=Document type: -UI_Public_ID=Public ID: -UI_System_ID=System ID: -UI_none=none -UI_CSS_profile___2=CSS profile: -WebContentSettingsPropertyPage_0=The properties used that cannot or are not specified in web files. The project setting is used if you specify "none." -ProjectWebContentSettingsPropertyPage_0=These values are used when the corresponding properties are not specified within a web page. -SyntaxColoringPage_0=S&yntax Element: -SyntaxColoringPage_2=Enable -SyntaxColoringPage_3=&Bold -SyntaxColoringPage_4=&Italic -SyntaxColoringPage_5=&Strikethrough -SyntaxColoringPage_6=&Underline -# below are possibly unused strings that may be deleted -HTMLFilesPreferencePage_1=Add this suffix (if not specified): -HTMLFilesPreferencePage_2=Insert DOCTYPE declaration -HTMLFilesPreferencePage_3=Insert GENERATOR with META tag -EmptyFilePreferencePage_0=Expand the tree to edit preferences for a specific feature. -_UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK=HTML editing preferences. Note that some preferences may be set on the <a>{0}</a> preference page. -# above are possibly unused strings that may be deleted - -# HTML Typing Preference Page -HTMLTyping_Auto_Complete=Automatically close -HTMLTyping_Auto_Remove=Automatically remove -HTMLTyping_Complete_Comments=&Comments -HTMLTyping_Close_Strings=A&ttribute values -HTMLTyping_Close_Brackets=(Parentheses) and [square] brac&kets -HTMLTyping_Complete_End_Tags=&End tags -HTMLTyping_Remove_End_Tags=E&nd tags when creating empty self-closing tags - - -# Validation strings -Validation_description=Select the severity level for the following validation problems: -Validation_Warning=Warning -Validation_Error=Error -Validation_Ignore=Ignore -Expandable_label_attributes=Attributes -Expandable_label_elements=Elements -Expandable_label_document_type=Document Type -Expandable_label_text=Text Regions -Expandable_label_comment=Comments -Expandable_label_cdata=CDATA Sections -Expandable_label_pi=Processing Instructions -Expandable_label_entity_ref=Entity References - -HTMLValidationPreferencePage_0=Undefined attribute name: -HTMLValidationPreferencePage_1=Undefined attribute value: -HTMLValidationPreferencePage_10=Start-tag uses invalid case: -HTMLValidationPreferencePage_11=End tag uses invalid case: -HTMLValidationPreferencePage_12=Missing start tag: -HTMLValidationPreferencePage_13=Missing end tag: -HTMLValidationPreferencePage_14=Unnecessary end tag: -HTMLValidationPreferencePage_15=Invalid directive: -HTMLValidationPreferencePage_16=Invalid tag location: -HTMLValidationPreferencePage_17=Duplicate tag: -HTMLValidationPreferencePage_18=Coexistence: -HTMLValidationPreferencePage_19=Unclosed start tag: -HTMLValidationPreferencePage_2=Attribute name using wrong case character: -HTMLValidationPreferencePage_20=Unclosed end tag: -HTMLValidationPreferencePage_21=Invalid empty element tag: -HTMLValidationPreferencePage_22=Duplicate DOCTYPE declaration: -HTMLValidationPreferencePage_23=Invalid location: -HTMLValidationPreferencePage_24=DOCTYPE declaration unclosed: -HTMLValidationPreferencePage_25=Invalid text string: -HTMLValidationPreferencePage_26=Invalid characters used in text string: -HTMLValidationPreferencePage_27=Invalid location: -HTMLValidationPreferencePage_28=Unclosed comment: -HTMLValidationPreferencePage_29=Invalid location: -HTMLValidationPreferencePage_3=Invalid attribute name: -HTMLValidationPreferencePage_30=Unclosed CDATA section: -HTMLValidationPreferencePage_31=Invalid location: -HTMLValidationPreferencePage_32=Unclosed processing instruction: -HTMLValidationPreferencePage_33=Invalid location: -HTMLValidationPreferencePage_34=Unknown entity: -HTMLValidationPreferencePage_4=Invalid attribute: -HTMLValidationPreferencePage_5=Multiple values specified for an attribute: -HTMLValidationPreferencePage_6=Attribute value using wrong case character: -HTMLValidationPreferencePage_7=Unclosed attribute value: -HTMLValidationPreferencePage_8=Unknown tag name: -HTMLValidationPreferencePage_9=Invalid tag name: -HTMLValidationPreferencePage_35=Attribute value refers to missing resource: -HTMLValidationPreferencePage_36=Invalid location of text in tag: -HTMLValidationPreferencePage_37=Missing attribute equals sign character: - -Hyperlink_line={0}={1} : line {2} -Open=Open ''{0}'' diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/Logger.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/Logger.java deleted file mode 100644 index 580f3fe80e..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/Logger.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal; - - - -import com.ibm.icu.util.StringTokenizer; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.osgi.framework.Bundle; - - -/** - * Small convenience class to log messages to plugin's log file and also, if - * desired, the console. This class should only be used by classes in this - * plugin. Other plugins should make their own copy, with appropriate ID. - */ -public class Logger { - private static final String PLUGIN_ID = "org.eclipse.wst.html.ui"; //$NON-NLS-1$ - - public static final int ERROR = IStatus.ERROR; // 4 - public static final int ERROR_DEBUG = 200 + ERROR; - public static final int INFO = IStatus.INFO; // 1 - public static final int INFO_DEBUG = 200 + INFO; - - public static final int OK = IStatus.OK; // 0 - - public static final int OK_DEBUG = 200 + OK; - - private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$ - public static final int WARNING = IStatus.WARNING; // 2 - public static final int WARNING_DEBUG = 200 + WARNING; - - /** - * Adds message to log. - * - * @param level - * severity level of the message (OK, INFO, WARNING, ERROR, - * OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG) - * @param message - * text to add to the log - * @param exception - * exception thrown - */ - protected static void _log(int level, String message, Throwable exception) { - if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) { - if (!isDebugging()) - return; - } - - int severity = IStatus.OK; - switch (level) { - case INFO_DEBUG : - case INFO : - severity = IStatus.INFO; - break; - case WARNING_DEBUG : - case WARNING : - severity = IStatus.WARNING; - break; - case ERROR_DEBUG : - case ERROR : - severity = IStatus.ERROR; - } - message = (message != null) ? message : "null"; //$NON-NLS-1$ - Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception); - Bundle bundle = Platform.getBundle(PLUGIN_ID); - if (bundle != null) - Platform.getLog(bundle).log(statusObj); - } - - /** - * Prints message to log if category matches /debug/tracefilter option. - * - * @param message - * text to print - * @param category - * category of the message, to be compared with - * /debug/tracefilter - */ - protected static void _trace(String category, String message, Throwable exception) { - if (isTracing(category)) { - message = (message != null) ? message : "null"; //$NON-NLS-1$ - Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception); - Bundle bundle = Platform.getBundle(PLUGIN_ID); - if (bundle != null) - Platform.getLog(bundle).log(statusObj); - } - } - - /** - * @return true if the platform is debugging - */ - public static boolean isDebugging() { - return Platform.inDebugMode(); - } - - /** - * Determines if currently tracing a category - * - * @param category - * @return true if tracing category, false otherwise - */ - public static boolean isTracing(String category) { - if (!isDebugging()) - return false; - - String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION); - if (traceFilter != null) { - StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$ - while (tokenizer.hasMoreTokens()) { - String cat = tokenizer.nextToken().trim(); - if (category.equals(cat)) { - return true; - } - } - } - return false; - } - - public static void log(int level, String message) { - _log(level, message, null); - } - - public static void log(int level, String message, Throwable exception) { - _log(level, message, exception); - } - - public static void logException(String message, Throwable exception) { - _log(ERROR, message, exception); - } - - public static void logException(Throwable exception) { - _log(ERROR, exception.getMessage(), exception); - } - - public static void trace(String category, String message) { - _trace(category, message, null); - } - - public static void traceException(String category, String message, Throwable exception) { - _trace(category, message, exception); - } - - public static void traceException(String category, Throwable exception) { - _trace(category, exception.getMessage(), exception); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/autoedit/AutoEditStrategyForTabs.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/autoedit/AutoEditStrategyForTabs.java deleted file mode 100644 index bc89ee54c6..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/autoedit/AutoEditStrategyForTabs.java +++ /dev/null @@ -1,188 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * - *******************************************************************************/ - -package org.eclipse.wst.html.ui.internal.autoedit; - -import org.eclipse.core.runtime.Preferences; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.ConfigurableLineTracker; -import org.eclipse.jface.text.DocumentCommand; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ILineTracker; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.ui.texteditor.ITextEditorExtension3; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.ui.internal.Logger; - -/** - * AutoEditStrategy to handle characters inserted when Tab key is pressed - */ -public class AutoEditStrategyForTabs implements IAutoEditStrategy { - private final String TAB_CHARACTER = "\t"; //$NON-NLS-1$ - - public void customizeDocumentCommand(IDocument document, DocumentCommand command) { - // if not in smart insert mode just ignore - if (!isSmartInsertMode()) - return; - - // spaces for tab character - if (command.length == 0 && command.text != null && command.text.length() > 0 && command.text.indexOf(TAB_CHARACTER) != -1) - smartInsertForTab(command, document); - } - - /** - * Insert spaces for tabs - * - * @param command - */ - private void smartInsertForTab(DocumentCommand command, IDocument document) { - // tab key was pressed. now check preferences to see if need to insert - // spaces instead of tab - int indentationWidth = getIndentationWidth(); - if (indentationWidth > -1) { - String originalText = command.text; - StringBuffer newText = new StringBuffer(originalText); - - // determine where in line this command begins - int lineOffset = -1; - try { - IRegion lineInfo = document.getLineInformationOfOffset(command.offset); - lineOffset = command.offset - lineInfo.getOffset(); - } catch (BadLocationException e) { - Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e); - } - - ILineTracker lineTracker = getLineTracker(document, originalText); - - int startIndex = 0; - int index = newText.indexOf(TAB_CHARACTER); - while (index != -1) { - String indent = getIndentString(indentationWidth, lineOffset, lineTracker, index); - - // replace \t character with spaces - newText.replace(index, index + 1, indent); - if (lineTracker != null) { - try { - lineTracker.replace(index, 1, indent); - } catch (BadLocationException e) { - // if something goes wrong with replacing text, just - // reset to current string - lineTracker.set(newText.toString()); - Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e); - } - } - - startIndex = index + indent.length(); - index = newText.indexOf(TAB_CHARACTER, startIndex); - } - command.text = newText.toString(); - } - } - - /** - * Calculate number of spaces for next tab stop - */ - private String getIndentString(int indentationWidth, int lineOffset, ILineTracker lineTracker, int index) { - int indentSize = indentationWidth; - int offsetInLine = -1; - if (lineTracker != null) { - try { - IRegion lineInfo = lineTracker.getLineInformationOfOffset(index); - if (lineInfo.getOffset() == 0 && lineOffset > -1) - offsetInLine = lineOffset + index; - else - offsetInLine = index - lineInfo.getOffset(); - } catch (BadLocationException e) { - Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e); - } - } else { - if (lineOffset > -1) { - offsetInLine = lineOffset + index; - } - } - if (offsetInLine > -1 && indentationWidth > 0) { - int remainder = offsetInLine % indentationWidth; - indentSize = indentationWidth - remainder; - } - - StringBuffer indent = new StringBuffer(); - for (int i = 0; i < indentSize; i++) - indent.append(' '); - return indent.toString(); - } - - /** - * Set up a line tracker for text within command if text is multi-line - */ - private ILineTracker getLineTracker(IDocument document, String originalText) { - ConfigurableLineTracker lineTracker = null; - int[] delims = TextUtilities.indexOf(document.getLegalLineDelimiters(), originalText, 0); - if (delims[0] != -1 || delims[1] != -1) { - lineTracker = new ConfigurableLineTracker(document.getLegalLineDelimiters()); - lineTracker.set(originalText); - } - return lineTracker; - } - - /** - * Return true if active editor is in smart insert mode, false otherwise - * - * @return - */ - private boolean isSmartInsertMode() { - boolean isSmartInsertMode = false; - - ITextEditor textEditor = null; - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window != null) { - IWorkbenchPage page = window.getActivePage(); - if (page != null) { - IEditorPart editor = page.getActiveEditor(); - if (editor != null) { - if (editor instanceof ITextEditor) - textEditor = (ITextEditor)editor; - else - textEditor = (ITextEditor)editor.getAdapter(ITextEditor.class); - } - } - } - - // check if smart insert mode - if (textEditor instanceof ITextEditorExtension3 && ((ITextEditorExtension3) textEditor).getInsertMode() == ITextEditorExtension3.SMART_INSERT) - isSmartInsertMode = true; - return isSmartInsertMode; - } - - /** - * Returns indentation width if using spaces for indentation, -1 otherwise - * - * @return - */ - private int getIndentationWidth() { - int width = -1; - - Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences(); - if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR))) - width = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE); - - return width; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/autoedit/StructuredAutoEditStrategyHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/autoedit/StructuredAutoEditStrategyHTML.java deleted file mode 100644 index af18a5b38e..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/autoedit/StructuredAutoEditStrategyHTML.java +++ /dev/null @@ -1,369 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.autoedit; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.DocumentCommand; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.IDocument; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.ui.texteditor.ITextEditorExtension3; -import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry; -import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; -import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; -import org.eclipse.wst.xml.ui.internal.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * Automatically inserts closing comment tag or end tag when appropriate. - */ -public class StructuredAutoEditStrategyHTML implements IAutoEditStrategy { - /* - * NOTE: copies of this class exists in - * org.eclipse.wst.xml.ui.internal.autoedit - * org.eclipse.wst.html.ui.internal.autoedit - */ - public void customizeDocumentCommand(IDocument document, DocumentCommand command) { - Object textEditor = getActiveTextEditor(); - if (!(textEditor instanceof ITextEditorExtension3 && ((ITextEditorExtension3) textEditor).getInsertMode() == ITextEditorExtension3.SMART_INSERT)) - return; - - IStructuredModel model = null; - try { - model = StructuredModelManager.getModelManager().getExistingModelForRead(document); - if (model != null) { - if (command.text != null) { - smartInsertCloseElement(command, document, model); - smartInsertForComment(command, document, model); - smartInsertForEndTag(command, document, model); - smartRemoveEndTag(command, document, model); - } - } - } - finally { - if (model != null) - model.releaseFromRead(); - } - } - - private boolean isPreferenceEnabled(String key) { - return (key != null && HTMLUIPlugin.getDefault().getPreferenceStore().getBoolean(key)); - } - - private boolean isCommentNode(IDOMNode node) { - return (node != null && node instanceof IDOMElement && ((IDOMElement) node).isCommentTag()); - } - - private boolean isDocumentNode(IDOMNode node) { - return (node != null && node.getNodeType() == Node.DOCUMENT_NODE); - } - - /** - * Attempts to clean up an end-tag if a start-tag is converted into an empty-element - * tag (e.g., <node />) and the original element was empty. - * - * @param command the document command describing the change - * @param document the document that will be changed - * @param model the model based on the document - */ - private void smartRemoveEndTag(DocumentCommand command, IDocument document, IStructuredModel model) { - try { - // An opening tag is now a self-terminated end-tag - if ("/".equals(command.text) && ">".equals(document.get(command.offset, 1)) && command.length == 0 && isPreferenceEnabled(HTMLUIPreferenceNames.TYPING_REMOVE_END_TAGS)) { //$NON-NLS-1$ //$NON-NLS-2$ - IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset); - if (node != null && !node.hasChildNodes()) { - IStructuredDocumentRegion region = node.getFirstStructuredDocumentRegion(); - if(region.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN && command.offset <= region.getEnd()) { - - /* if the region before the command offset is a an attribute value region - * check to see if it has both and opening and closing quote - */ - ITextRegion prevTextRegion = region.getRegionAtCharacterOffset(command.offset-1); - boolean inUnclosedAttValueRegion = false; - if(prevTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { - //get the text of the attribute value region - String prevText = region.getText(prevTextRegion); - inUnclosedAttValueRegion = (prevText.startsWith("'") && ((prevText.length() == 1) || !prevText.endsWith("'"))) || - (prevText.startsWith("\"") && ((prevText.length() == 1) || !prevText.endsWith("\""))); - } - - //if command offset is in an unclosed attribute value region then done remove the end tag - if(!inUnclosedAttValueRegion) { - region = node.getEndStructuredDocumentRegion(); - if (region != null && region.isEnded()) { - document.replace(region.getStartOffset(), region.getLength(), ""); //$NON-NLS-1$ - } - } - } - } - } - } - catch (BadLocationException e) { - Logger.logException(e); - } - } - - private void smartInsertForComment(DocumentCommand command, IDocument document, IStructuredModel model) { - try { - if (command.text.equals("-") && document.getLength() >= 3 && document.get(command.offset - 3, 3).equals("<!-") && isPreferenceEnabled(HTMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS)) { //$NON-NLS-1$ //$NON-NLS-2$ - command.text += " -->"; //$NON-NLS-1$ - command.shiftsCaret = false; - command.caretOffset = command.offset + 2; - command.doit = false; - } - } - catch (BadLocationException e) { - Logger.logException(e); - } - - } - - /** - * Attempts to insert the end tag when completing a start-tag with the '>' character. - * - * @param command - * @param document - * @param model - */ - private void smartInsertCloseElement(DocumentCommand command, IDocument document, IStructuredModel model) { - try { - // Check terminating start tag, but ignore empty-element tags - if (command.text.equals(">") && document.getLength() > 0 && document.getChar(command.offset - 1) != '/' && isPreferenceEnabled(HTMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS)) { //$NON-NLS-1$ - IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset - 1); - boolean isClosedByParent = false; - // Only insert an end-tag if necessary. Because of the way the document is parsed, it is possible for a child tag with the same - // name as an ancestor to be paired with the end-tag of an ancestor, so the ancestors must be checked for an unclosed tag. - if (node != null && node.getNodeType() == Node.ELEMENT_NODE && (!node.isClosed() || (isClosedByParent = hasUnclosedAncestor(node)))) { - IStructuredDocumentRegion region = node.getEndStructuredDocumentRegion(); - if (region != null && region.getRegions().size() > 0 && region.getRegions().get(0).getType() == DOMRegionContext.XML_END_TAG_OPEN && !isClosedByParent) - return; - region = node.getStartStructuredDocumentRegion(); - if (region != null) { - ITextRegion textRegion = region.getRegionAtCharacterOffset(command.offset - 1); - if (textRegion != null && DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(textRegion.getType())) { - // Check that the command is not within a quoted attribute value - final String text = region.getText(textRegion); - final char first = text.charAt(0); - if (first == '\'' || first == '"') { - if (text.length() < 2) // Just an opening quote - return; - final char last = text.charAt(text.length() - 1); - if (last == first) { // Quote is paired - if (command.offset < region.getTextEndOffset(textRegion)) // Command is within the value - return; - } - else // Unpaired quote - return; - } - } - } - CMElementDeclaration decl = getCMElementDeclaration(node); - // If it's XHTML, always generate the end tag - if (isXHTML(node) || shouldGenerateEndTag(decl)) { - command.text += "</" + getElementName(node, command.offset) + ">"; //$NON-NLS-1$ //$NON-NLS-2$ - command.shiftsCaret = false; - command.caretOffset = command.offset + 1; - } - } - - } - } catch (BadLocationException e) { - e.printStackTrace(); - } - } - - /** - * Get the element name that will be created by closing the start tag. Defaults - * to the node's nodeName. - * @param node the node that is being edited - * @param offset the offset in the document where the start tag is closed - * @return The element name of the tag - */ - private String getElementName(IDOMNode node, int offset) { - String name = null; - - IStructuredDocumentRegion region = node.getFirstStructuredDocumentRegion(); - ITextRegion textRegion = region.getRegionAtCharacterOffset(offset); - if (textRegion != null && textRegion.getType() == DOMRegionContext.XML_TAG_NAME) { - int nameStart = region.getStartOffset(textRegion); - String regionText = region.getText(textRegion); - int length = offset - nameStart; - if (length <= regionText.length()) - name = regionText.substring(0, length); - } - - // Default to the node name - if (name == null) - name = node.getNodeName(); - return name; - } - - private void smartInsertForEndTag(DocumentCommand command, IDocument document, IStructuredModel model) { - try { - if (command.text.equals("/") && document.getLength() >= 1 && document.get(command.offset - 1, 1).equals("<") && isPreferenceEnabled(HTMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS)) { //$NON-NLS-1$ //$NON-NLS-2$ - IDOMNode parentNode = (IDOMNode) ((IDOMNode) model.getIndexedRegion(command.offset - 1)).getParentNode(); - if (isCommentNode(parentNode)) { - // loop and find non comment node parent - while (parentNode != null && isCommentNode(parentNode)) { - parentNode = (IDOMNode) parentNode.getParentNode(); - } - } - - if (!isDocumentNode(parentNode)) { - // only add end tag if one does not already exist or if - // add '/' does not create one already - IStructuredDocumentRegion endTagStructuredDocumentRegion = parentNode.getEndStructuredDocumentRegion(); - IDOMNode ancestor = parentNode; - boolean smartInsertForEnd = false; - if(endTagStructuredDocumentRegion != null) { - // Look for ancestors by the same name that are missing end tags - while((ancestor = (IDOMNode) ancestor.getParentNode()) != null) { - if(ancestor.getEndStructuredDocumentRegion() == null && parentNode.getNodeName().equals(ancestor.getNodeName())) { - smartInsertForEnd = true; - break; - } - } - } - if (endTagStructuredDocumentRegion == null || smartInsertForEnd) { - StringBuffer toAdd = new StringBuffer(parentNode.getNodeName()); - if (toAdd.length() > 0) { - toAdd.append(">"); //$NON-NLS-1$ - String suffix = toAdd.toString(); - if ((document.getLength() < command.offset + suffix.length()) || (!suffix.equals(document.get(command.offset, suffix.length())))) { - command.text += suffix; - } - } - } - } - } - } - catch (BadLocationException e) { - Logger.logException(e); - } - } - - /** - * Checks if <code>node</code> has an unclosed ancestor by the same name - * - * @param node the node to check - * @return true if <code>node</code> has an unclosed parent with the same node name - */ - private boolean hasUnclosedAncestor(IDOMNode node) { - IDOMNode parent = (IDOMNode) node.getParentNode(); - while (parent != null && parent.getNodeType() != Node.DOCUMENT_NODE && parent.getNodeName().equals(node.getNodeName())) { - if (!parent.isClosed()) - return true; - parent = (IDOMNode) parent.getParentNode(); - } - return false; - } - - /** - * Based on the content model, determine if an end tag should be generated - * @param elementDecl the content model element declaration - * @return true if the end tag should be generated; false otherwise. - */ - private boolean shouldGenerateEndTag(CMElementDeclaration elementDecl) { - if (elementDecl == null) - return false; - if (elementDecl instanceof HTMLElementDeclaration) { - if (((Boolean) elementDecl.getProperty(HTMLCMProperties.IS_JSP)).booleanValue()) { - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) - return false; - } - else { - String ommission = (String) elementDecl.getProperty(HTMLCMProperties.OMIT_TYPE); - if (ommission.equals(HTMLCMProperties.Values.OMIT_END) || ommission.equals(HTMLCMProperties.Values.OMIT_END_DEFAULT) || ommission.equals(HTMLCMProperties.Values.OMIT_END_MUST)) { - return false; - } - } - } - - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) - return false; - return true; - } - - private CMElementDeclaration getCMElementDeclaration(Node node) { - CMElementDeclaration result = null; - if (node.getNodeType() == Node.ELEMENT_NODE) { - ModelQuery modelQuery = ModelQueryUtil.getModelQuery(node.getOwnerDocument()); - if (modelQuery != null) { - result = modelQuery.getCMElementDeclaration((Element) node); - } - } - return result; - } - - /** - * Is the node part of an XHTML document - * @param node - * @return - */ - private boolean isXHTML(Node node) { - Document doc = node.getOwnerDocument(); - if (!(doc instanceof IDOMDocument)) - return false; - String typeid = ((IDOMDocument) doc).getDocumentTypeId(); - if (typeid != null) { - HTMLDocumentTypeEntry entry = HTMLDocumentTypeRegistry.getInstance().getEntry(typeid); - return (entry != null && entry.isXMLType()); - } - return false; - } - - /** - * Return the active text editor if possible, otherwise the active editor - * part. - * - * @return Object - */ - private Object getActiveTextEditor() { - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window != null) { - IWorkbenchPage page = window.getActivePage(); - if (page != null) { - IEditorPart editor = page.getActiveEditor(); - if (editor != null) { - if (editor instanceof ITextEditor) - return editor; - ITextEditor textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class); - if (textEditor != null) - return textEditor; - return editor; - } - } - } - return null; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/CustomTemplateProposal.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/CustomTemplateProposal.java deleted file mode 100644 index 6bb0f2061b..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/CustomTemplateProposal.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.templates.Template; -import org.eclipse.jface.text.templates.TemplateContext; -import org.eclipse.jface.text.templates.TemplateProposal; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.sse.core.utils.StringUtils; -import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal; - -/** - * Purpose of this class is to make the additional proposal info into content - * fit for an HTML viewer (by escaping characters) - */ -class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal { - // copies of this class exist in: - // org.eclipse.jst.jsp.ui.internal.contentassist - // org.eclipse.wst.html.ui.internal.contentassist - // org.eclipse.wst.xml.ui.internal.contentassist - - public CustomTemplateProposal(Template template, TemplateContext context, IRegion region, Image image, int relevance) { - super(template, context, region, image, relevance); - } - - public String getAdditionalProposalInfo() { - String additionalInfo = super.getAdditionalProposalInfo(); - return StringUtils.convertToHTMLContent(additionalInfo); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java deleted file mode 100644 index 63c2ced2b7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java +++ /dev/null @@ -1,511 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor; -import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument; -import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace; -import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties; -import org.eclipse.wst.html.core.text.IHTMLPartitions; -import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImageHelper; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImages; -import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames; -import org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeIdsHTML; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; -import org.eclipse.wst.sse.ui.internal.IReleasable; -import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; -import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; -import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; -import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; -import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter; -import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentModelGenerator; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentType; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * @deprecated This class is no longer used locally and will be removed in the future - * @see HTMLStructuredContentAssistProcessor - */ -public class HTMLContentAssistProcessor extends AbstractContentAssistProcessor implements IPropertyChangeListener { - private INodeAdapterFactory factoryForCSS = null; - protected IPreferenceStore fPreferenceStore = null; - protected boolean isXHTML = false; - private HTMLTemplateCompletionProcessor fTemplateProcessor = null; - private IContentAssistProcessor fJSContentAssistProcessor = null; - private List fTemplateContexts = new ArrayList(); - - public HTMLContentAssistProcessor() { - - super(); - } - - protected void addAttributeNameProposals(ContentAssistRequest contentAssistRequest) { - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.ATTRIBUTE); - super.addAttributeNameProposals(contentAssistRequest); - } - - protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.ATTRIBUTE_VALUE); - super.addAttributeValueProposals(contentAssistRequest); - } - - /** - * Add the proposals for a completely empty document - */ - protected void addEmptyDocumentProposals(ContentAssistRequest contentAssistRequest) { - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.NEW); - } - - protected void addPCDATAProposal(String nodeName, ContentAssistRequest contentAssistRequest) { - if (isXHTML) - super.addPCDATAProposal(nodeName, contentAssistRequest); - } - - protected void addStartDocumentProposals(ContentAssistRequest contentAssistRequest) { - if (isXHTML) - addEmptyDocumentProposals(contentAssistRequest); - } - - protected void addTagInsertionProposals(ContentAssistRequest contentAssistRequest, int childPosition) { - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.TAG); - super.addTagInsertionProposals(contentAssistRequest, childPosition); - } - - /** - * Adds templates to the list of proposals - * - * @param contentAssistRequest - * @param context - */ - private void addTemplates(ContentAssistRequest contentAssistRequest, String context) { - addTemplates(contentAssistRequest, context, contentAssistRequest.getReplacementBeginPosition()); - } - - /** - * Adds templates to the list of proposals - * - * @param contentAssistRequest - * @param context - * @param startOffset - */ - private void addTemplates(ContentAssistRequest contentAssistRequest, String context, int startOffset) { - if (contentAssistRequest == null) - return; - - // if already adding template proposals for a certain context type, do - // not add again - if (!fTemplateContexts.contains(context)) { - fTemplateContexts.add(context); - boolean useProposalList = !contentAssistRequest.shouldSeparate(); - - if (getTemplateCompletionProcessor() != null) { - getTemplateCompletionProcessor().setContextType(context); - ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, startOffset); - for (int i = 0; i < proposals.length; ++i) { - if (useProposalList) - contentAssistRequest.addProposal(proposals[i]); - else - contentAssistRequest.addMacro(proposals[i]); - } - } - } - } - - protected boolean beginsWith(String aString, String prefix) { - if (aString == null || prefix == null || prefix.length() == 0) - return true; - int minimumLength = Math.min(prefix.length(), aString.length()); - String beginning = aString.substring(0, minimumLength); - return beginning.equalsIgnoreCase(prefix); - } - - protected ContentAssistRequest computeCompletionProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode) { - ContentAssistRequest request = super.computeCompletionProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); - // bug115927 use original document position for all/any region templates - addTemplates(request, TemplateContextTypeIdsHTML.ALL, documentPosition); - return request; - } - - /** - * Return a list of proposed code completions based on the specified - * location within the document that corresponds to the current cursor - * position within the text-editor control. - * - * @param documentPosition - * a location within the document - * @return an array of code-assist items - */ - public ICompletionProposal[] computeCompletionProposals(ITextViewer textViewer, int documentPosition) { - fTemplateContexts.clear(); - - IndexedRegion treeNode = ContentAssistUtils.getNodeAt(textViewer, documentPosition); - IDOMNode node = (IDOMNode) treeNode; - setErrorMessage(null); - - // check if it's in a comment node - IStructuredDocument structuredDocument = (IStructuredDocument) textViewer.getDocument(); - IStructuredDocumentRegion fn = structuredDocument.getRegionAtCharacterOffset(documentPosition); - if (fn != null && fn.getType() == DOMRegionContext.XML_COMMENT_TEXT && documentPosition != fn.getStartOffset()) { - return new ICompletionProposal[0]; - } - - // CMVC 242695 - // if it's a </script> tag, bounce back to JS ca processor... - if (fn != null && fn.getType() == DOMRegionContext.XML_TAG_NAME && documentPosition == fn.getStartOffset()) { - ITextRegionList v = fn.getRegions(); - if (v.size() > 1) { - // determine that it's a close tag - if ((v.get(0)).getType() == DOMRegionContext.XML_END_TAG_OPEN) { - Iterator it = v.iterator(); - ITextRegion region = null; - // search for script tag name - while (it.hasNext()) { - region = (ITextRegion) it.next(); - if (fn.getText(region).equalsIgnoreCase("script")) { //$NON-NLS-1$ - IContentAssistProcessor jsProcessor = getJSContentAssistProcessor(); - if (jsProcessor != null) { - return jsProcessor.computeCompletionProposals(textViewer, documentPosition); - } - return new ICompletionProposal[0]; - } - } - } - } - } - - isXHTML = getXHTML(node); - - fGenerator = null; // force reload of content generator - - // handle blank HTML document case - if (treeNode == null || isViewerEmpty(textViewer)) { - // cursor is at the EOF - ICompletionProposal htmlTagProposal = getHTMLTagProposal(textViewer, documentPosition); - ICompletionProposal[] superResults = super.computeCompletionProposals(textViewer, documentPosition); - if (superResults != null && superResults.length > 0 && htmlTagProposal != null) { - ICompletionProposal[] blankHTMLDocResults = new ICompletionProposal[superResults.length + 1]; - blankHTMLDocResults[0] = htmlTagProposal; - System.arraycopy(superResults, 0, blankHTMLDocResults, 1, superResults.length); - return blankHTMLDocResults; - } - } - - if (node != null && node.getNodeType() == Node.ELEMENT_NODE) { - - // check embedded CSS proposals at the beginning of the STYLE end - // tag - Element element = (Element) node; - String tagName = element.getTagName(); - if (tagName != null && tagName.equalsIgnoreCase(HTML40Namespace.ATTR_NAME_STYLE)) {//$NON-NLS-1$ - IStructuredDocumentRegion endStructuredDocumentRegion = node.getEndStructuredDocumentRegion(); - if (endStructuredDocumentRegion != null && endStructuredDocumentRegion.getStartOffset() == documentPosition) { - IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion(); - if (startStructuredDocumentRegion != null) { - int offset = startStructuredDocumentRegion.getEndOffset(); - int pos = documentPosition - offset; - ICompletionProposal[] proposals = getCSSProposals(textViewer, pos, node, offset, (char) 0); - if (proposals != null) - return proposals; - } - } - } - - // check inline CSS proposals - // need to find attr region from sd region - IStructuredDocumentRegion sdRegion = ContentAssistUtils.getStructuredDocumentRegion(textViewer, documentPosition); - Iterator regions = sdRegion.getRegions().iterator(); - ITextRegion styleNameRegion = null; - ITextRegion styleValueRegion = null; - while (regions.hasNext()) { - styleNameRegion = (ITextRegion) regions.next(); - if (styleNameRegion.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) && sdRegion.getText(styleNameRegion).equalsIgnoreCase(HTML40Namespace.ATTR_NAME_STYLE)) { //$NON-NLS-1$ - // the next region should be "=" - if (regions.hasNext()) { - regions.next(); // skip the "=" - // next region should be attr value region - if (regions.hasNext()) { - styleValueRegion = (ITextRegion) regions.next(); - break; - } - } - } - } - - if (styleValueRegion != null) { - int offset = sdRegion.getStartOffset(styleValueRegion); - int end = sdRegion.getTextEndOffset(styleValueRegion); - if (documentPosition >= offset && documentPosition <= end) { - boolean askCSS = true; - char quote = (char) 0; - String text = sdRegion.getText(styleValueRegion); - int length = (text != null ? text.length() : 0); - if (length > 0) { - char firstChar = text.charAt(0); - if (firstChar == '"' || firstChar == '\'') { - if (documentPosition == offset) { - // before quote - askCSS = false; - } - else { - offset++; - quote = firstChar; - } - } - if (documentPosition == end) { - if (length > 1 && text.charAt(length - 1) == quote) { - // after quote - askCSS = false; - } - } - } - if (askCSS) { - int pos = documentPosition - offset; - ICompletionProposal[] proposals = getCSSProposals(textViewer, pos, node, offset, quote); - if (proposals != null) - return proposals; - } - } - } - } - - return super.computeCompletionProposals(textViewer, documentPosition); - } - - /** - * Returns true if there is no text or it's all white space, otherwise - * returns false - * - * @param treeNode - * @param textViewer - * @return boolean - */ - private boolean isViewerEmpty(ITextViewer textViewer) { - boolean isEmpty = false; - String text = textViewer.getTextWidget().getText(); - if (text == null || (text != null && text.trim().equals(""))) //$NON-NLS-1$ - isEmpty = true; - return isEmpty; - } - - /** - * @return ICompletionProposal - */ - private ICompletionProposal getHTMLTagProposal(ITextViewer viewer, int documentPosition) { - IModelManager mm = StructuredModelManager.getModelManager(); - IStructuredModel model = null; - ICompletionProposal result = null; - try { - if (mm != null) { - model = mm.getExistingModelForRead(viewer.getDocument()); - - if (model != null) { - IDOMDocument doc = ((IDOMModel) model).getDocument(); - - ModelQuery mq = ModelQueryUtil.getModelQuery(doc); - if (mq != null) { - - // XHTML requires lowercase tagname for lookup - CMDocument correspondingCMDocument = mq.getCorrespondingCMDocument(doc); - if (correspondingCMDocument != null) { - CMElementDeclaration htmlDecl = (CMElementDeclaration) correspondingCMDocument.getElements().getNamedItem(HTML40Namespace.ElementName.HTML.toLowerCase()); - if (htmlDecl != null) { - StringBuffer proposedTextBuffer = new StringBuffer(); - getContentGenerator().generateTag(doc, htmlDecl, proposedTextBuffer); - - String proposedText = proposedTextBuffer.toString(); - String requiredName = getContentGenerator().getRequiredName(doc, htmlDecl); - - CustomCompletionProposal proposal = new CustomCompletionProposal(proposedText, documentPosition, - /* start pos */ - 0, /* replace length */ - requiredName.length() + 2, /* - * cursor position - * after - * (relavtive to - * start) - */ - HTMLEditorPluginImageHelper.getInstance().getImage(HTMLEditorPluginImages.IMG_OBJ_TAG_GENERIC), requiredName, null, null, XMLRelevanceConstants.R_TAG_NAME); - result = proposal; - } - } - } - } - } - } - finally { - if (model != null) - model.releaseFromRead(); - } - return result; - } - - /** - * @see AbstractContentAssistProcessor#getContentGenerator() - */ - public XMLContentModelGenerator getContentGenerator() { - if (fGenerator == null) { - if (isXHTML) - fGenerator = XHTMLMinimalContentModelGenerator.getInstance(); - else - fGenerator = HTMLMinimalContentModelGenerator.getInstance(); - } - return fGenerator; - } - - protected ICompletionProposal[] getCSSProposals(ITextViewer viewer, int pos, IDOMNode element, int offset, char quote) { - - CSSContentAssistProcessor cssProcessor = new CSSContentAssistProcessor(); - cssProcessor.setDocumentOffset(offset); - cssProcessor.setQuoteCharOfStyleAttribute(quote); - - return cssProcessor.computeCompletionProposals(viewer, pos); - } - - protected String getEmptyTagCloseString() { - if (isXHTML) - return " />"; //$NON-NLS-1$ - return ">"; //$NON-NLS-1$ - } - - private IContentAssistProcessor getJSContentAssistProcessor() { - if (fJSContentAssistProcessor == null) { - fJSContentAssistProcessor = new StructuredTextViewerConfigurationHTML().getContentAssistant(null).getContentAssistProcessor(IHTMLPartitions.SCRIPT); - } - return fJSContentAssistProcessor; - } - - private HTMLTemplateCompletionProcessor getTemplateCompletionProcessor() { - if (fTemplateProcessor == null) { - fTemplateProcessor = new HTMLTemplateCompletionProcessor(); - } - return fTemplateProcessor; - } - - /** - * Determine if this Document is an XHTML Document. Oprates solely off of - * the Document Type declaration - */ - protected boolean getXHTML(Node node) { - if (node == null) - return false; - - Document doc = null; - if (node.getNodeType() != Node.DOCUMENT_NODE) - doc = node.getOwnerDocument(); - else - doc = ((Document) node); - - if (doc instanceof IDOMDocument) - return ((IDOMDocument) doc).isXMLType(); - - - if (doc instanceof INodeNotifier) { - ModelQueryAdapter adapter = (ModelQueryAdapter) ((INodeNotifier) doc).getAdapterFor(ModelQueryAdapter.class); - CMDocument cmdoc = null; - if (adapter != null && adapter.getModelQuery() != null) - cmdoc = adapter.getModelQuery().getCorrespondingCMDocument(doc); - if (cmdoc != null) { - // treat as XHTML unless we've got the in-code HTML content - // model - if (cmdoc instanceof HTMLCMDocument) - return false; - if (cmdoc.supports(HTMLCMProperties.IS_XHTML)) - return Boolean.TRUE.equals(cmdoc.getProperty(HTMLCMProperties.IS_XHTML)); - } - } - // this should never be reached - DocumentType docType = doc.getDoctype(); - return docType != null && docType.getPublicId() != null && docType.getPublicId().indexOf("-//W3C//DTD XHTML ") == 0; //$NON-NLS-1$ - } - - protected void init() { - getPreferenceStore().addPropertyChangeListener(this); - reinit(); - } - - protected void reinit() { - String key = HTMLUIPreferenceNames.AUTO_PROPOSE; - boolean doAuto = getPreferenceStore().getBoolean(key); - if (doAuto) { - key = HTMLUIPreferenceNames.AUTO_PROPOSE_CODE; - completionProposalAutoActivationCharacters = getPreferenceStore().getString(key).toCharArray(); - } - else { - completionProposalAutoActivationCharacters = null; - } - } - - public void release() { - if (factoryForCSS != null) { - factoryForCSS.release(); - } - if (fJSContentAssistProcessor instanceof IReleasable) { - ((IReleasable)fJSContentAssistProcessor).release(); - } - getPreferenceStore().removePropertyChangeListener(this); - super.release(); - } - - protected boolean stringsEqual(String a, String b) { - return a.equalsIgnoreCase(b); - } - - public void propertyChange(PropertyChangeEvent event) { - String property = event.getProperty(); - - if (property.compareTo(HTMLUIPreferenceNames.AUTO_PROPOSE) == 0 || property.compareTo(HTMLUIPreferenceNames.AUTO_PROPOSE_CODE) == 0) { - reinit(); - } - } - - protected IPreferenceStore getPreferenceStore() { - if (fPreferenceStore == null) - fPreferenceStore = HTMLUIPlugin.getDefault().getPreferenceStore(); - - return fPreferenceStore; - } - - public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentPosition, IndexedRegion indexedNode, ITextRegion region) { - return computeCompletionProposals(viewer, documentPosition); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java deleted file mode 100644 index 0bdd85ffdd..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java +++ /dev/null @@ -1,134 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentModelGenerator; -import org.w3c.dom.Node; - -public class HTMLMinimalContentModelGenerator extends XMLContentModelGenerator { - - private static HTMLMinimalContentModelGenerator instance = null; - protected int fTagCase; - protected int fAttrCase; - - /** - * HTMLMinimalContentModelGenerator constructor comment. - */ - private HTMLMinimalContentModelGenerator() { - super(); - } - - private void init() { - String qualifier = HTMLCorePlugin.getDefault().getBundle().getSymbolicName(); - fTagCase = Platform.getPreferencesService().getInt(qualifier, HTMLCorePreferenceNames.TAG_NAME_CASE, 0, null); - fAttrCase = Platform.getPreferencesService().getInt(qualifier, HTMLCorePreferenceNames.ATTR_NAME_CASE, 0, null); - } - - protected void generateEndTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer) { - if (elementDecl == null) - return; - if (elementDecl instanceof HTMLElementDeclaration) { - if (((Boolean) elementDecl.getProperty(HTMLCMProperties.IS_JSP)).booleanValue()) { - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) - return; - } - else { - String ommission = (String) elementDecl.getProperty(HTMLCMProperties.OMIT_TYPE); - if (ommission.equals(HTMLCMProperties.Values.OMIT_END) || ommission.equals(HTMLCMProperties.Values.OMIT_END_DEFAULT) || ommission.equals(HTMLCMProperties.Values.OMIT_END_MUST)) { - return; - } - } - } - - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) - return; - buffer.append("</" + tagName + ">"); //$NON-NLS-2$//$NON-NLS-1$ - return; - } - - private boolean shouldIgnoreCase(CMNode cmnode) { - if (!cmnode.supports(HTMLCMProperties.SHOULD_IGNORE_CASE)) - return false; - return ((Boolean) cmnode.getProperty(HTMLCMProperties.SHOULD_IGNORE_CASE)).booleanValue(); - } - - public String getRequiredName(Node ownerNode, CMNode cmnode) { - String name = super.getRequiredName(ownerNode, cmnode); - // don't change the case unless we're certain it is meaningless - if (shouldIgnoreCase(cmnode)) { - int caseVal = -1; - if (cmnode.getNodeType() == CMNode.ELEMENT_DECLARATION) - caseVal = fTagCase; - else if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) - caseVal = fAttrCase; - switch (caseVal) { - case HTMLCorePreferenceNames.LOWER : - { - name = name.toLowerCase(); - } - break; - case HTMLCorePreferenceNames.UPPER : - { - name = name.toUpperCase(); - } - break; - } - } - return name; - } - - public String getStartTagClose(Node parentNode, CMElementDeclaration elementDecl) { - String other = getOtherClose(parentNode); - if (other != null) - return other; - if (elementDecl == null) - return ">"; //$NON-NLS-1$ - if (elementDecl instanceof HTMLElementDeclaration) { - if (((Boolean) elementDecl.getProperty(HTMLCMProperties.IS_JSP)).booleanValue()) { - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) - return "/>"; //$NON-NLS-1$ - } - else { - String ommission = (String) elementDecl.getProperty(HTMLCMProperties.OMIT_TYPE); - if (ommission.equals(HTMLCMProperties.Values.OMIT_END) || ommission.equals(HTMLCMProperties.Values.OMIT_END_DEFAULT) || ommission.equals(HTMLCMProperties.Values.OMIT_END_MUST)) { - return ">"; //$NON-NLS-1$ - } - } - } - - //if not an html element and empty, assume start tag needs to be closed - else if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) { - return "/>"; //$NON-NLS-1$ - } - - return ">"; //$NON-NLS-1$ - } - - /** - * Gets the instance. - * @return Returns a HTMLMinimalContentModelGenerator - */ - public synchronized static HTMLMinimalContentModelGenerator getInstance() { - if (instance == null) - instance = new HTMLMinimalContentModelGenerator(); - instance.init(); - return instance; - } - - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java deleted file mode 100644 index 41916f9ddd..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.contentassist.ContentAssistant; -import org.eclipse.jface.text.contentassist.IContextInformationValidator; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames; -import org.eclipse.wst.sse.ui.contentassist.StructuredContentAssistProcessor; -import org.eclipse.wst.xml.ui.internal.contentassist.AttributeContextInformationPresenter; - -/** - * <p>Implementation of {@link StructuredContentAssistProcessor} for HTML documents</p> - * - * <p>This implementation will react to user preference changes for auto activation - * characters for HTML pages</p> - */ -public class HTMLStructuredContentAssistProcessor extends StructuredContentAssistProcessor { - /** the auto activation characters for this processor, set by user preference */ - private char[] fCompletionProposalAutoActivationCharacters; - - /** the context information validator for this processor */ - private IContextInformationValidator fContextInformationValidator; - - /** - * <p>Constructor</p> - * - * @param assistant {@link ContentAssistant} to use - * @param partitionTypeID the partition type this processor is for - * @param viewer {@link ITextViewer} this processor is acting in - */ - public HTMLStructuredContentAssistProcessor(ContentAssistant assistant, - String partitionTypeID, ITextViewer viewer) { - - super(assistant, partitionTypeID, viewer, HTMLUIPlugin.getDefault().getPreferenceStore()); - getAutoActivationCharacterPreferences(); - updateAutoActivationDelay(); - } - - /** - * @see org.eclipse.wst.sse.ui.contentassist.StructuredContentAssistProcessor#getContextInformationValidator() - */ - public IContextInformationValidator getContextInformationValidator() { - if (this.fContextInformationValidator == null) { - this.fContextInformationValidator = new AttributeContextInformationPresenter(); - } - return this.fContextInformationValidator; - } - - /** - * @see org.eclipse.wst.sse.ui.contentassist.StructuredContentAssistProcessor#getCompletionProposalAutoActivationCharacters() - */ - public char[] getCompletionProposalAutoActivationCharacters() { - return super.getCompletionProposalAutoActivationCharacters() != null ? super.getCompletionProposalAutoActivationCharacters() : this.fCompletionProposalAutoActivationCharacters; - } - - /** - * @see org.eclipse.wst.sse.ui.contentassist.StructuredContentAssistProcessor#propertyChange( - * org.eclipse.jface.util.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent event) { - if(event.getProperty().equals(HTMLUIPreferenceNames.AUTO_PROPOSE) || - event.getProperty().equals(HTMLUIPreferenceNames.AUTO_PROPOSE_CODE)) { - getAutoActivationCharacterPreferences(); - } - else if (event.getProperty().equals(HTMLUIPreferenceNames.AUTO_PROPOSE_DELAY)) { - updateAutoActivationDelay(); - } - } - - /** - * <p>Sets the auto activation delay in Content Assist</p> - */ - private void updateAutoActivationDelay() { - IPreferenceStore store = getPreferenceStore(); - boolean doAuto = store.getBoolean(HTMLUIPreferenceNames.AUTO_PROPOSE); - if (doAuto) { - setAutoActivationDelay(store.getInt(HTMLUIPreferenceNames.AUTO_PROPOSE_DELAY)); - } - } - - /** - * <p>Gets the auto activation character user preferences and stores them for later use</p> - */ - private void getAutoActivationCharacterPreferences() { - String key = HTMLUIPreferenceNames.AUTO_PROPOSE; - boolean doAuto = getPreferenceStore().getBoolean(key); - if (doAuto) { - key = HTMLUIPreferenceNames.AUTO_PROPOSE_CODE; - this.fCompletionProposalAutoActivationCharacters = getPreferenceStore().getString(key).toCharArray(); - } - else { - this.fCompletionProposalAutoActivationCharacters = null; - } - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTagsCompletionProposalComputer.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTagsCompletionProposalComputer.java deleted file mode 100644 index 24d72db07d..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTagsCompletionProposalComputer.java +++ /dev/null @@ -1,339 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformationValidator; -import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration; -import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument; -import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry; -import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace; -import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImageHelper; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImages; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; -import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; -import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; -import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; -import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; -import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMElementDeclarationImpl; -import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; -import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; -import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter; -import org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLModelQueryCompletionProposalComputer; -import org.eclipse.wst.xml.ui.internal.contentassist.AttributeContextInformationPresenter; -import org.eclipse.wst.xml.ui.internal.contentassist.AttributeContextInformationProvider; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentModelGenerator; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentType; -import org.w3c.dom.Node; - -/** - * <p>{@link AbstractXMLModelQueryCompletionProposalComputer} for HTML tag proposals</p> - */ -public class HTMLTagsCompletionProposalComputer extends - AbstractXMLModelQueryCompletionProposalComputer { - - /** <code>true</code> if the document the proposal request is on is XHTML */ - protected boolean isXHTML = false; - - /** the context information validator for this computer */ - private IContextInformationValidator fContextInformationValidator; - - /** - * <p>Default constructor</p> - */ - public HTMLTagsCompletionProposalComputer() { - this.fContextInformationValidator = null; - } - - /** - * <p>Determine if the document is XHTML or not, then compute the proposals</p> - * - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLCompletionProposalComputer#computeCompletionProposals(org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext, org.eclipse.core.runtime.IProgressMonitor) - */ - public List computeCompletionProposals( - CompletionProposalInvocationContext context, - IProgressMonitor monitor) { - - //determine if the content is XHTML or not - IndexedRegion treeNode = ContentAssistUtils.getNodeAt(context.getViewer(), - context.getInvocationOffset()); - IDOMNode node = (IDOMNode) treeNode; - boolean isXHTMLNode = isXHTMLNode(node); - if(this.isXHTML != isXHTMLNode) { - this.isXHTML = isXHTMLNode; - } - - //compute the completion proposals - return super.computeCompletionProposals(context, monitor); - } - - /** - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLCompletionProposalComputer#computeContextInformation(org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext, org.eclipse.core.runtime.IProgressMonitor) - */ - public List computeContextInformation( - CompletionProposalInvocationContext context, - IProgressMonitor monitor) { - - AttributeContextInformationProvider attributeInfoProvider = - new AttributeContextInformationProvider((IStructuredDocument)context.getDocument(), - (AttributeContextInformationPresenter) getContextInformationValidator()); - return Arrays.asList(attributeInfoProvider.getAttributeInformation(context.getInvocationOffset())); - } - - /** - * <p>Dependent on if the document is XHTML or not</p> - * - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLModelQueryCompletionProposalComputer#getContentGenerator() - */ - protected XMLContentModelGenerator getContentGenerator() { - if (isXHTML) { - return XHTMLMinimalContentModelGenerator.getInstance(); - } else { - return HTMLMinimalContentModelGenerator.getInstance(); - } - } - - /** - * <p>Filter out all {@link CMNode}s except those specific to HTML documents</p> - * - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLModelQueryCompletionProposalComputer#validModelQueryNode(org.eclipse.wst.xml.core.internal.contentmodel.CMNode) - */ - protected boolean validModelQueryNode(CMNode node) { - boolean isValid = false; - Object cmdoc = node.getProperty("CMDocument"); //$NON-NLS-1$ - if (cmdoc instanceof CMNode) { - String name = ((CMNode) cmdoc).getNodeName(); - isValid = name != null && name.endsWith(".dtd") && name.indexOf("html") != -1; //$NON-NLS-1$ //$NON-NLS-2$ - } - else if (node.supports(HTMLAttributeDeclaration.IS_HTML)) { - Boolean isHTML = (Boolean) node.getProperty(HTMLAttributeDeclaration.IS_HTML); - isValid = isHTML == null || isHTML.booleanValue(); - } else if(node instanceof HTMLPropertyDeclaration) { - HTMLPropertyDeclaration propDec = (HTMLPropertyDeclaration)node; - isValid = !propDec.isJSP(); - } else if (node instanceof CMAttributeDeclaration || node instanceof CMElementDeclarationImpl) { - isValid = true; - } else if(node instanceof CMElementDeclaration) { - Boolean isXHTML = ((Boolean)node.getProperty(HTMLCMProperties.IS_XHTML)); - isValid = isXHTML != null && isXHTML.booleanValue(); - } - - // Do not propose obsolete tags, regardless - if (isValid && node.supports(HTMLCMProperties.IS_OBSOLETE)) { - Boolean isObsolete = ((Boolean) node.getProperty(HTMLCMProperties.IS_OBSOLETE)); - isValid = !(isObsolete != null && isObsolete.booleanValue()); - } - - return isValid; - } - - /** - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLModelQueryCompletionProposalComputer#addEmptyDocumentProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest, org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext) - */ - protected void addEmptyDocumentProposals( - ContentAssistRequest contentAssistRequest, - CompletionProposalInvocationContext context) { - - addHTMLTagProposal(contentAssistRequest, context); - } - - /** - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLModelQueryCompletionProposalComputer#addStartDocumentProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest, org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext) - */ - protected void addStartDocumentProposals( - ContentAssistRequest contentAssistRequest, - CompletionProposalInvocationContext context) { - - //determine if XMLPI is first element - Node aNode = contentAssistRequest.getNode(); - Document owningDocument = aNode.getOwnerDocument(); - Node first = owningDocument.getFirstChild(); - boolean xmlpiIsFirstElement = ((first != null) && (first.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE)); - - //if there is an XMLPI then XHTML doctype, else HTML doctype - if (xmlpiIsFirstElement && (owningDocument.getDoctype() == null) && - isCursorAfterXMLPI(contentAssistRequest)) { - - addDocTypeProposal(contentAssistRequest, true); - } else { - addDocTypeProposal(contentAssistRequest, false); - } - } - - /** - * - * @param contentAssistRequest - * @param isXHTML - */ - private void addDocTypeProposal(ContentAssistRequest contentAssistRequest, boolean isXHTML) { - // if a DocumentElement exists, use that for the root Element name - String rootname = "unspecified"; //$NON-NLS-1$ - if (contentAssistRequest.getNode().getOwnerDocument().getDocumentElement() != null) { - rootname = contentAssistRequest.getNode().getOwnerDocument().getDocumentElement().getNodeName(); - } - - //decide which entry to use - HTMLDocumentTypeEntry entry; - if(isXHTML) { - entry = HTMLDocumentTypeRegistry.getInstance().getXHTMLDefaultEntry(); - } else { - entry = HTMLDocumentTypeRegistry.getInstance().getDefaultEntry(); - } - - //create the content assist string and proposal - String proposedText = "<!DOCTYPE " + rootname + " PUBLIC \"" + //$NON-NLS-1$ //$NON-NLS-2$ - entry.getPublicId() + "\" \"" + entry.getSystemId() + "\">"; //$NON-NLS-1$ //$NON-NLS-2$ - ICompletionProposal proposal = new CustomCompletionProposal( - proposedText, contentAssistRequest.getReplacementBeginPosition(), - contentAssistRequest.getReplacementLength(), 10, - XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_DOCTYPE), - entry.getDisplayName() + " " + HTMLUIMessages.Expandable_label_document_type, //$NON-NLS-1$ - null, null, XMLRelevanceConstants.R_DOCTYPE); - contentAssistRequest.addProposal(proposal); - } - - /** - * <p>adds HTML tag proposal for empty document</p> - * - * @param contentAssistRequest request to add proposal too - * @param context context of the completion request - */ - private void addHTMLTagProposal(ContentAssistRequest contentAssistRequest, CompletionProposalInvocationContext context) { - IStructuredModel model = null; - try { - if(context.getDocument() instanceof IStructuredDocument) { - model = StructuredModelManager.getModelManager().getModelForRead((IStructuredDocument)context.getDocument()); - } - if (model != null) { - IDOMDocument doc = ((IDOMModel) model).getDocument(); - - ModelQuery mq = ModelQueryUtil.getModelQuery(doc); - if (mq != null) { - - // XHTML requires lowercase tagname for lookup - CMDocument correspondingCMDocument = mq.getCorrespondingCMDocument(doc); - if (correspondingCMDocument != null) { - CMElementDeclaration htmlDecl = (CMElementDeclaration) correspondingCMDocument.getElements().getNamedItem(HTML40Namespace.ElementName.HTML.toLowerCase()); - if (htmlDecl != null) { - StringBuffer proposedTextBuffer = new StringBuffer(); - getContentGenerator().generateTag(doc, htmlDecl, proposedTextBuffer); - - String proposedText = proposedTextBuffer.toString(); - String requiredName = getContentGenerator().getRequiredName(doc, htmlDecl); - - IStructuredDocumentRegion region = contentAssistRequest.getDocumentRegion(); - if (region != null) { - if (region.getFirstRegion() != null && - region.getFirstRegion().getType().equals(DOMRegionContext.XML_TAG_OPEN)) { - //in order to differentiate between content assist on - //completely empty document and the one with xml open tag - proposedText = proposedText.substring(1); - } - } - if (!beginsWith(proposedText, contentAssistRequest.getMatchString())) { - return; - } - int cursorAdjustment = getCursorPositionForProposedText(proposedText); - CustomCompletionProposal proposal = new CustomCompletionProposal( - proposedText, contentAssistRequest.getReplacementBeginPosition(), - contentAssistRequest.getReplacementLength(), cursorAdjustment, - HTMLEditorPluginImageHelper.getInstance().getImage(HTMLEditorPluginImages.IMG_OBJ_TAG_GENERIC), - requiredName, null, null, XMLRelevanceConstants.R_TAG_NAME); - contentAssistRequest.addProposal(proposal); - } - } - } - } - } - finally { - if (model != null) - model.releaseFromRead(); - } - } - - /** - * Determine if this Document is an XHTML Document. Operates solely off of - * the Document Type declaration - */ - private static boolean isXHTMLNode(Node node) { - if (node == null) { - return false; - } - - Document doc = null; - if (node.getNodeType() != Node.DOCUMENT_NODE) - doc = node.getOwnerDocument(); - else - doc = ((Document) node); - - if (doc instanceof IDOMDocument) { - return ((IDOMDocument) doc).isXMLType(); - } - - if (doc instanceof INodeNotifier) { - ModelQueryAdapter adapter = (ModelQueryAdapter) ((INodeNotifier) doc).getAdapterFor(ModelQueryAdapter.class); - CMDocument cmdoc = null; - if (adapter != null && adapter.getModelQuery() != null) - cmdoc = adapter.getModelQuery().getCorrespondingCMDocument(doc); - if (cmdoc != null) { - // treat as XHTML unless we've got the in-code HTML content - // model - if (cmdoc instanceof HTMLCMDocument) - return false; - if (cmdoc.supports(HTMLCMProperties.IS_XHTML)) - return Boolean.TRUE.equals(cmdoc.getProperty(HTMLCMProperties.IS_XHTML)); - } - } - // this should never be reached - DocumentType docType = doc.getDoctype(); - return docType != null && docType.getPublicId() != null && docType.getPublicId().indexOf("-//W3C//DTD XHTML ") == 0; //$NON-NLS-1$ - } - - /** - * Returns a validator used to determine when displayed context - * information should be dismissed. May only return <code>null</code> if - * the processor is incapable of computing context information. - * - * a context information validator, or <code>null</code> if the - * processor is incapable of computing context information - */ - private IContextInformationValidator getContextInformationValidator() { - if (fContextInformationValidator == null) { - fContextInformationValidator = new AttributeContextInformationPresenter(); - } - return fContextInformationValidator; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTemplateCompletionProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTemplateCompletionProcessor.java deleted file mode 100644 index bdbba404df..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTemplateCompletionProcessor.java +++ /dev/null @@ -1,161 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.templates.ContextTypeRegistry; -import org.eclipse.jface.text.templates.Template; -import org.eclipse.jface.text.templates.TemplateCompletionProcessor; -import org.eclipse.jface.text.templates.TemplateContext; -import org.eclipse.jface.text.templates.TemplateContextType; -import org.eclipse.jface.text.templates.TemplateException; -import org.eclipse.jface.text.templates.TemplateProposal; -import org.eclipse.jface.text.templates.persistence.TemplateStore; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImageHelper; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImages; -import org.eclipse.wst.xml.ui.internal.contentassist.ReplaceNameTemplateContext; - - -/** - * <p>Completion computer for HTML templates</p> - */ -public class HTMLTemplateCompletionProcessor extends TemplateCompletionProcessor { - private static final class ProposalComparator implements Comparator { - public int compare(Object o1, Object o2) { - return ((TemplateProposal) o2).getRelevance() - ((TemplateProposal) o1).getRelevance(); - } - } - - private static final Comparator fgProposalComparator = new ProposalComparator(); - private String fContextTypeId = null; - - /* - * Copied from super class except instead of calling createContext(viewer, - * region) call createContext(viewer, region, offset) instead - */ - public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) { - - ITextSelection selection = (ITextSelection) viewer.getSelectionProvider().getSelection(); - - // adjust offset to end of normalized selection - if (selection.getOffset() == offset) - offset = selection.getOffset() + selection.getLength(); - - String prefix = extractPrefix(viewer, offset); - Region region = new Region(offset - prefix.length(), prefix.length()); - TemplateContext context = createContext(viewer, region, offset); - if (context == null) - return new ICompletionProposal[0]; - // name of the selection variables {line, word}_selection - context.setVariable("selection", selection.getText()); //$NON-NLS-1$ - - Template[] templates = getTemplates(context.getContextType().getId()); - - List matches = new ArrayList(); - for (int i = 0; i < templates.length; i++) { - Template template = templates[i]; - try { - context.getContextType().validate(template.getPattern()); - } - catch (TemplateException e) { - continue; - } - if (template.matches(prefix, context.getContextType().getId())) - matches.add(createProposal(template, context, (IRegion) region, getRelevance(template, prefix))); - } - - Collections.sort(matches, fgProposalComparator); - - return (ICompletionProposal[]) matches.toArray(new ICompletionProposal[matches.size()]); - } - - /** - * Creates a concrete template context for the given region in the - * document. This involves finding out which context type is valid at the - * given location, and then creating a context of this type. The default - * implementation returns a <code>SmartReplaceTemplateContext</code> for - * the context type at the given location. This takes the offset at which - * content assist was invoked into consideration. - * - * @param viewer - * the viewer for which the context is created - * @param region - * the region into <code>document</code> for which the - * context is created - * @param offset - * the original offset where content assist was invoked - * @return a template context that can handle template insertion at the - * given location, or <code>null</code> - */ - private TemplateContext createContext(ITextViewer viewer, IRegion region, int offset) { - // pretty much same code as super.createContext except create - // SmartReplaceTemplateContext - TemplateContextType contextType = getContextType(viewer, region); - if (contextType != null) { - IDocument document = viewer.getDocument(); - return new ReplaceNameTemplateContext(contextType, document, region.getOffset(), region.getLength(), offset); - } - return null; - } - - protected ICompletionProposal createProposal(Template template, TemplateContext context, IRegion region, int relevance) { - return new CustomTemplateProposal(template, context, region, getImage(template), relevance); - } - - protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) { - TemplateContextType type = null; - - ContextTypeRegistry registry = getTemplateContextRegistry(); - if (registry != null) - type = registry.getContextType(fContextTypeId); - - return type; - } - - protected Image getImage(Template template) { - // just return the same image for now - return HTMLEditorPluginImageHelper.getInstance().getImage(HTMLEditorPluginImages.IMG_OBJ_TAG_TEMPLATE); - } - - private ContextTypeRegistry getTemplateContextRegistry() { - return HTMLUIPlugin.getDefault().getTemplateContextRegistry(); - } - - protected Template[] getTemplates(String contextTypeId) { - Template templates[] = null; - - TemplateStore store = getTemplateStore(); - if (store != null) - templates = store.getTemplates(contextTypeId); - - return templates; - } - - private TemplateStore getTemplateStore() { - return HTMLUIPlugin.getDefault().getTemplateStore(); - } - - public void setContextType(String contextTypeId) { - fContextTypeId = contextTypeId; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTemplatesCompletionProposalComputer.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTemplatesCompletionProposalComputer.java deleted file mode 100644 index 2fe72d1e2a..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTemplatesCompletionProposalComputer.java +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeIdsHTML; -import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; -import org.eclipse.wst.xml.ui.internal.contentassist.DefaultXMLCompletionProposalComputer; - -/** - * <p>XML type proposal computer to create HTML template proposals</p> - */ -public class HTMLTemplatesCompletionProposalComputer extends - DefaultXMLCompletionProposalComputer { - - /** template processor used to create template proposals */ - private HTMLTemplateCompletionProcessor fTemplateProcessor = null; - - /** - * <p>Create the computer</p> - */ - public HTMLTemplatesCompletionProposalComputer() { - fTemplateProcessor = new HTMLTemplateCompletionProcessor(); - } - - /** - * <p>Calls super to add templates based on context and then - * adds templates not specific to a context</p> - * - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractXMLCompletionProposalComputer#computeCompletionProposals(org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext, org.eclipse.core.runtime.IProgressMonitor) - */ - public List computeCompletionProposals( - CompletionProposalInvocationContext context, - IProgressMonitor monitor) { - - //get the templates specific to the context - List proposals = new ArrayList(super.computeCompletionProposals(context, monitor)); - - //get templates not specific to the context - proposals.addAll(this.getTemplateProposals(TemplateContextTypeIdsHTML.ALL, context)); - - return proposals; - } - - /** - * @see org.eclipse.wst.xml.ui.internal.contentassist.DefaultXMLCompletionProposalComputer#addAttributeNameProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest, org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext) - */ - protected void addAttributeNameProposals( - ContentAssistRequest contentAssistRequest, - CompletionProposalInvocationContext context) { - - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.ATTRIBUTE, context); - } - - /** - * @see org.eclipse.wst.xml.ui.internal.contentassist.DefaultXMLCompletionProposalComputer#addAttributeValueProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest, org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext) - */ - protected void addAttributeValueProposals( - ContentAssistRequest contentAssistRequest, - CompletionProposalInvocationContext context) { - - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.ATTRIBUTE_VALUE, context); - } - - /** - * @see org.eclipse.wst.xml.ui.internal.contentassist.DefaultXMLCompletionProposalComputer#addEmptyDocumentProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest, org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext) - */ - protected void addEmptyDocumentProposals( - ContentAssistRequest contentAssistRequest, - CompletionProposalInvocationContext context) { - - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.NEW, context); - } - - /** - * @see org.eclipse.wst.xml.ui.internal.contentassist.DefaultXMLCompletionProposalComputer#addTagInsertionProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest, int, org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext) - */ - protected void addTagInsertionProposals( - ContentAssistRequest contentAssistRequest, int childPosition, - CompletionProposalInvocationContext context) { - - addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.TAG, context); - } - - /** - * <p>Get the template proposals from the template processor</p> - * - * @param templateContext - * @param context - * @return - */ - private List getTemplateProposals(String templateContext, - CompletionProposalInvocationContext context) { - - List templateProposals = new ArrayList(); - - if (fTemplateProcessor != null) { - fTemplateProcessor.setContextType(templateContext); - ICompletionProposal[] proposals = - fTemplateProcessor.computeCompletionProposals(context.getViewer(), context.getInvocationOffset()); - - templateProposals.addAll(Arrays.asList(proposals)); - } - - return templateProposals; - } - - /** - * Adds templates to the list of proposals - * - * @param contentAssistRequest - * @param templateContext - * @param context - */ - private void addTemplates(ContentAssistRequest contentAssistRequest, String templateContext, - CompletionProposalInvocationContext context) { - - if (contentAssistRequest != null) { - boolean useProposalList = !contentAssistRequest.shouldSeparate(); - List proposals = this.getTemplateProposals(templateContext, context); - - for (int i = 0; i < proposals.size(); ++i) { - if (useProposalList) { - contentAssistRequest.addProposal((ICompletionProposal)proposals.get(i)); - } - else { - contentAssistRequest.addMacro((ICompletionProposal)proposals.get(i)); - } - } - } - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/NoRegionContentAssistProcessorForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/NoRegionContentAssistProcessorForHTML.java deleted file mode 100644 index 748a54dd38..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/NoRegionContentAssistProcessorForHTML.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.wst.css.core.text.ICSSPartitions; -import org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor; -import org.eclipse.wst.html.core.text.IHTMLPartitions; -import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML; -import org.eclipse.wst.xml.ui.internal.contentassist.NoRegionContentAssistProcessor; - -/** - * - * @author pavery - */ -public class NoRegionContentAssistProcessorForHTML extends NoRegionContentAssistProcessor { - protected void initPartitionToProcessorMap() { - - super.initPartitionToProcessorMap(); - IContentAssistProcessor htmlProcessor = new HTMLContentAssistProcessor(); - addPartitionProcessor(IHTMLPartitions.HTML_DEFAULT, htmlProcessor); - addPartitionProcessor(IHTMLPartitions.HTML_COMMENT, htmlProcessor); - - IContentAssistProcessor jsContentAssistProcessor = new StructuredTextViewerConfigurationHTML().getContentAssistant(null).getContentAssistProcessor(IHTMLPartitions.SCRIPT); - addPartitionProcessor(IHTMLPartitions.SCRIPT, jsContentAssistProcessor); - - IContentAssistProcessor cssContentAssistProcessor = new CSSContentAssistProcessor(); - addPartitionProcessor(ICSSPartitions.STYLE, cssContentAssistProcessor); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/ReplaceNameTemplateContext.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/ReplaceNameTemplateContext.java deleted file mode 100644 index 8fba299199..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/ReplaceNameTemplateContext.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.templates.DocumentTemplateContext; -import org.eclipse.jface.text.templates.Template; -import org.eclipse.jface.text.templates.TemplateBuffer; -import org.eclipse.jface.text.templates.TemplateContextType; -import org.eclipse.jface.text.templates.TemplateException; -import org.eclipse.jface.text.templates.TemplateVariable; - -/** - * Just like DocumentTemplateContext except if an insert offset is passed in, - * during evaluation, the "prefix" before the template will be checked to see - * if it matches the template name. If so, overwrite the template name. - * Otherwise, just insert the template at the insert offset location (by not - * overwriting the prefix text) - * - * @deprecated No longer used - */ -public class ReplaceNameTemplateContext extends DocumentTemplateContext { - private int fInsertOffset = -1; - - /** - * Creates a document template context. - * - * @param type - * the context type - * @param document - * the document this context applies to - * @param offset - * the offset of the document region - * @param length - * the length of the document region - */ - public ReplaceNameTemplateContext(TemplateContextType type, IDocument document, int offset, int length) { - this(type, document, new Position(offset, length)); - } - - /** - * Creates a document template context. The supplied <code>Position</code> - * will be queried to compute the <code>getStart</code> and - * <code>getEnd</code> methods, which will therefore answer updated - * position data if it is registered with the document. - * - * @param type - * the context type - * @param document - * the document this context applies to - * @param position - * the position describing the area of the document which forms - * the template context - * @since 3.1 - */ - public ReplaceNameTemplateContext(TemplateContextType type, IDocument document, Position position) { - super(type, document, position); - } - - /** - * Creates a document template context. - * - * @param type - * the context type - * @param document - * the document this context applies to - * @param offset - * the offset of the document region - * @param length - * the length of the document region - * @param insertOffset - * the offset of the document region where insert was - * originally requested - */ - public ReplaceNameTemplateContext(TemplateContextType type, IDocument document, int offset, int length, int insertOffset) { - this(type, document, new Position(offset, length)); - fInsertOffset = insertOffset; - } - - /* - * @see org.eclipse.jface.text.templates.TemplateContext#evaluate(org.eclipse.jface.text.templates.Template) - */ - public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException { - TemplateBuffer buffer = super.evaluate(template); - if (buffer != null) { - if (fInsertOffset > -1 && fInsertOffset > getStart()) { - String prefix = getDocument().get(getStart(), fInsertOffset - getStart()); - if (!template.getName().startsWith(prefix)) { - // generate a new buffer that actually contains the - // text that was going to be overwritten - int prefixSize = prefix.length(); - TemplateVariable[] newTemplateVar = buffer.getVariables(); - for (int i =0; i < newTemplateVar.length; i++ ){ - int[] offsets = newTemplateVar[i].getOffsets(); - for (int j=0; j<offsets.length ;j++){ - offsets[j] += prefixSize; - } - } - buffer = new TemplateBuffer(prefix + buffer.getString(), newTemplateVar); - } - } - } - return buffer; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/XHTMLMinimalContentModelGenerator.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/XHTMLMinimalContentModelGenerator.java deleted file mode 100644 index 2a9607ea48..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/XHTMLMinimalContentModelGenerator.java +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentassist; - - - -import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentModelGenerator; -import org.w3c.dom.Node; - -public class XHTMLMinimalContentModelGenerator extends XMLContentModelGenerator { - - private static XHTMLMinimalContentModelGenerator instance = null; - - private XHTMLMinimalContentModelGenerator() { - super(); - } - - protected void generateEndTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer) { - if (elementDecl == null) - return; - if (elementDecl instanceof HTMLElementDeclaration) { - if (((Boolean) elementDecl.getProperty(HTMLCMProperties.IS_JSP)).booleanValue()) { - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) - return; - } - else { - String ommission = (String) elementDecl.getProperty(HTMLCMProperties.OMIT_TYPE); - if (ommission.equals(HTMLCMProperties.Values.OMIT_END) || ommission.equals(HTMLCMProperties.Values.OMIT_END_DEFAULT) || ommission.equals(HTMLCMProperties.Values.OMIT_END_MUST)) { - return; - } - } - } - - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) - return; - buffer.append("</" + tagName + ">"); //$NON-NLS-2$//$NON-NLS-1$ - return; - } - - - public String getStartTagClose(Node parentNode, CMElementDeclaration elementDecl) { - String other = getOtherClose(parentNode); - if (other != null) - return other; - if (elementDecl == null) - return ">"; //$NON-NLS-1$ - // EMPTY tag, do a self-close - if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) { - // if it's a JSP element, don't add the space since the JSP container doesn't/shouldn't care - if (elementDecl instanceof HTMLElementDeclaration && (((Boolean) elementDecl.getProperty(HTMLCMProperties.IS_JSP)).booleanValue())) - // if it's not JSP, conform to XHTML guidelines and add the space - return "/>"; //$NON-NLS-1$ - else - return " />"; //$NON-NLS-1$ - } - // not defined as EMPTY, but should be treated as such anyway - else if (elementDecl instanceof HTMLElementDeclaration) { - String ommission = (String) elementDecl.getProperty(HTMLCMProperties.OMIT_TYPE); - if (ommission.equals(HTMLCMProperties.Values.OMIT_END) || ommission.equals(HTMLCMProperties.Values.OMIT_END_DEFAULT) || ommission.equals(HTMLCMProperties.Values.OMIT_END_MUST)) { - return " />"; //$NON-NLS-1$ - } - } - - return ">"; //$NON-NLS-1$ - } - - public synchronized static XHTMLMinimalContentModelGenerator getInstance() { - if (instance == null) - instance = new XHTMLMinimalContentModelGenerator(); - return instance; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java deleted file mode 100644 index b59c9545fe..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java +++ /dev/null @@ -1,129 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentoutline; - -import org.eclipse.core.runtime.Preferences; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.wst.html.core.internal.HTMLContentBuilder; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; -import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder; -import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -/** - * - */ -public class HTMLNodeActionManager extends XMLNodeActionManager { - protected int fTagCase; - protected int fAttrCase; - - public HTMLNodeActionManager(IStructuredModel model, Viewer viewer) { - super(model, viewer); - updateCase(); - } - - /** - * If neccessary, employ a DOMContentBuilder that understands how to - * change the case of HTML tags (but NOT taglib derived tags). - */ - public DOMContentBuilder createDOMContentBuilder(Document document) { - DOMContentBuilder builder = null; - String one = fModel.getModelHandler().getAssociatedContentTypeId(); - String modelContentTypeId = fModel.getContentTypeIdentifier(); - if (one != modelContentTypeId) { - System.out.println("not equal"); //$NON-NLS-1$ - } - if (modelContentTypeId.equals(ContentTypeIdForHTML.ContentTypeID_HTML)) - builder = new HTMLContentBuilder(document); - else - builder = super.createDOMContentBuilder(document); - - return builder; - } - - private boolean shouldIgnoreCase(CMNode cmnode) { - if (!cmnode.supports(HTMLCMProperties.SHOULD_IGNORE_CASE)) - return false; - return ((Boolean) cmnode.getProperty(HTMLCMProperties.SHOULD_IGNORE_CASE)).booleanValue(); - } - - /** - * Modify the displayed menuitem label to change the case of HTML children - * but neither XML nor taglib-derived children. - */ - public String getLabel(Node parent, CMNode cmnode) { - String result = null; - // CMNode cmnode = action.getCMNode(); - // don't change the case unless we're certain it is meaningless - if (shouldIgnoreCase(cmnode)) { - String name = cmnode.getNodeName(); - if (cmnode.getNodeType() == CMNode.ELEMENT_DECLARATION) { - if (fTagCase == HTMLCorePreferenceNames.LOWER) - name = name.toLowerCase(); - else if (fTagCase == HTMLCorePreferenceNames.UPPER) - name = name.toUpperCase(); - // else do nothing - } - else if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) { - if (fAttrCase == HTMLCorePreferenceNames.LOWER) - name = name.toLowerCase(); - else if (fAttrCase == HTMLCorePreferenceNames.UPPER) - name = name.toUpperCase(); - // else do nothing - } - result = name; - } - else { - result = super.getLabel(parent, cmnode); - } - - return result; - } - - /** - * Another HTML specific detail. - */ - protected void updateCase() { - if (fModel != null) { - String modelContentTypeId = fModel.getContentTypeIdentifier(); - if (modelContentTypeId != null) { - if (modelContentTypeId.equals(ContentTypeIdForHTML.ContentTypeID_HTML)) { - Preferences prefs = HTMLCorePlugin.getDefault().getPluginPreferences(); //$NON-NLS-1$ - fTagCase = prefs.getInt(HTMLCorePreferenceNames.TAG_NAME_CASE); - fAttrCase = prefs.getInt(HTMLCorePreferenceNames.ATTR_NAME_CASE); - } - } - } - } - - public void reformat(Node newElement, boolean deep) { - try { - // tell the model that we are about to make a big model change - fModel.aboutToChangeModel(); - - // format selected node - IStructuredFormatProcessor formatProcessor = new HTMLFormatProcessorImpl(); - formatProcessor.formatNode(newElement); - } - finally { - // tell the model that we are done with the big model change - fModel.changedModel(); - } - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/JFaceNodeAdapterFactoryForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/JFaceNodeAdapterFactoryForHTML.java deleted file mode 100644 index ea1dddd581..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/JFaceNodeAdapterFactoryForHTML.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentoutline; - - - -import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; -import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; -import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; -import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory; - -/** - * An adapter factory to create JFaceNodeAdapters. Use this - * adapter factory with a JFaceAdapterContentProvider to display - * DOM nodes in a tree. - */ -public class JFaceNodeAdapterFactoryForHTML extends JFaceNodeAdapterFactory { - - - public JFaceNodeAdapterFactoryForHTML() { - this(IJFaceNodeAdapter.class, true); - } - - public JFaceNodeAdapterFactoryForHTML(Object adapterKey, boolean registerAdapters) { - super(adapterKey, registerAdapters); - } - - protected INodeAdapter createAdapter(INodeNotifier node) { - if (singletonAdapter == null) { - // create the JFaceNodeAdapter - singletonAdapter = new JFaceNodeAdapterForHTML(this); - initAdapter(singletonAdapter, node); - } - return singletonAdapter; - } - - public INodeAdapterFactory copy() { - return new JFaceNodeAdapterFactoryForHTML(getAdapterKey(), isShouldRegisterAdapter()); - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/JFaceNodeAdapterForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/JFaceNodeAdapterForHTML.java deleted file mode 100644 index 1b494c5de5..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/JFaceNodeAdapterForHTML.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentoutline; - - - -import java.util.Locale; - -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImageHelper; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImages; -import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapter; -import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory; -import org.w3c.dom.Node; - -/** - * Adapts a DOM node to a JFace viewer. - */ -public class JFaceNodeAdapterForHTML extends JFaceNodeAdapter { - - private Image createHTMLImage(String imageResourceName) { - return HTMLEditorPluginImageHelper.getInstance().getImage(imageResourceName); - } - - /** - * Constructor for JFaceNodeAdapterForHTML. - * - * @param adapterFactory - */ - public JFaceNodeAdapterForHTML(JFaceNodeAdapterFactory adapterFactory) { - super(adapterFactory); - } - - protected Image createImage(Object object) { - Image image = null; - - Node node = (Node) object; - if (node.getNodeType() == Node.ELEMENT_NODE) { - String lowerName = node.getNodeName().toLowerCase(Locale.US); - if (lowerName.equals("table") || lowerName.endsWith(":table")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TABLE); - else if (lowerName.equals("a") || lowerName.endsWith(":a")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_ANCHOR); - else if (lowerName.equals("body") || lowerName.endsWith(":body")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_BODY); - else if (lowerName.equals("button") || lowerName.endsWith(":button")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_BUTTON); - else if (lowerName.equals("font") || lowerName.endsWith(":font")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_FONT); - else if (lowerName.equals("form") || lowerName.endsWith(":form")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_FORM); - else if (lowerName.equals("html") || lowerName.endsWith(":html")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_HTML); - else if (lowerName.equals("img") || lowerName.endsWith(":img")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_IMAGE); - else if (lowerName.equals("map") || lowerName.endsWith(":map")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_IMAGE_MAP); - else if (lowerName.equals("title") || lowerName.endsWith(":title")) //$NON-NLS-1$ - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG_TITLE); - else - image = createHTMLImage(HTMLEditorPluginImages.IMG_OBJ_TAG); - } - if (image == null) { - image = super.createImage(node); - } - return image; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/AbstractDeviceProfileEntry.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/AbstractDeviceProfileEntry.java deleted file mode 100644 index b123df94ad..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/AbstractDeviceProfileEntry.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -/** - * @deprecated Not needed. See BUG118359 - */ -public class AbstractDeviceProfileEntry implements DeviceProfileEntry { - - public AbstractDeviceProfileEntry() { - super(); - } - - public String getEntryId() { - return null; - } - - public String getEntryName() { - return null; - } - - public void release() { - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/AbstractDeviceProfileEntryProvider.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/AbstractDeviceProfileEntryProvider.java deleted file mode 100644 index 664084c663..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/AbstractDeviceProfileEntryProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import java.util.Iterator; - -/** - * @deprecated Not needed. See BUG118359 - */ -public class AbstractDeviceProfileEntryProvider implements - DeviceProfileEntryProvider { - - public AbstractDeviceProfileEntryProvider() { - super(); - } - - public Iterator getDeviceProfileEntries() { - return null; - } - - public void release() { - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ContentSettingsRegistry.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ContentSettingsRegistry.java deleted file mode 100644 index 75b272d25e..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ContentSettingsRegistry.java +++ /dev/null @@ -1,173 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import java.util.Enumeration; -import java.util.Iterator; - -import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; -import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames; -import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ComboList; - -/** - * @deprecated This class only contains helper methods that you should - * actually implement yourself. - */ -public final class ContentSettingsRegistry { - - private static final String NONE = HTMLUIMessages.UI_none; - - public static String maxLengthStringInHTMLDocumentTypeRegistry = ""; //$NON-NLS-1$ - public static String maxLengthStringInCharacterCodeRegistry = ""; //$NON-NLS-1$ - - private ContentSettingsRegistry() { - } - - public static void setHTMLDocumentTypeRegistryInto(ComboList combo) { - combo.add(NONE, ""); //$NON-NLS-1$ - HTMLDocumentTypeRegistry reg = HTMLDocumentTypeRegistry.getInstance(); - Enumeration e = reg.getEntries(); - while (e.hasMoreElements()) { - HTMLDocumentTypeEntry entry = (HTMLDocumentTypeEntry) e.nextElement(); - String publicId = entry.getPublicId(); - String displayName = entry.getDisplayName(); - if (displayName != null) { - combo.add(displayName, publicId); - if (displayName.length() > maxLengthStringInHTMLDocumentTypeRegistry.length()) - maxLengthStringInHTMLDocumentTypeRegistry = displayName; - } - else - combo.add(publicId, publicId); - if (publicId.length() > maxLengthStringInHTMLDocumentTypeRegistry.length()) - maxLengthStringInHTMLDocumentTypeRegistry = publicId; - if (entry.getSystemId() == null) - continue; // if HTML entry - if (entry.getSystemId().length() > maxLengthStringInHTMLDocumentTypeRegistry.length()) - maxLengthStringInHTMLDocumentTypeRegistry = entry.getSystemId(); - } - - combo.sortByKey(1); - } - - public static void setCSSMetaModelRegistryInto(ComboList combo) { - combo.add(NONE, ""); //$NON-NLS-1$ - CSSProfileRegistry reg = CSSProfileRegistry.getInstance(); - Iterator i = reg.getProfiles(); - while (i.hasNext()) { - CSSProfile profile = (CSSProfile) i.next(); - String id = profile.getProfileID(); - String name = profile.getProfileName(); - combo.add(name, id); - } - combo.sortByKey(1); - } - - public static void setDeviceProfileRegistryInto(ComboList combo) { - combo.add(NONE, ""); //$NON-NLS-1$ - DeviceProfileEntryProvider reg = DeviceProfileEntryProviderBuilder.getEntryProvider(); - if (reg == null) { - return; - } - Iterator profiles = reg.getDeviceProfileEntries(); - if (profiles == null) { - reg.release(); - return; - } - DeviceProfileEntry entry; - while (profiles.hasNext()) { - entry = (DeviceProfileEntry) profiles.next(); - combo.add(entry.getEntryName(), entry.getEntryId()); - entry.release(); - } - reg.release(); - combo.sortByKey(1); - } - - public static String getSystemIdFrom(String publicId) { - if (publicId == null || publicId.length() == 0) - return null; - HTMLDocumentTypeRegistry reg = HTMLDocumentTypeRegistry.getInstance(); - Enumeration e = reg.getEntries(); - while (e.hasMoreElements()) { - HTMLDocumentTypeEntry entry = (HTMLDocumentTypeEntry) e.nextElement(); - if (entry.getPublicId().equals(publicId)) - return entry.getSystemId(); - } - return null; - } - - public static void setContentTypeInto(ComboList combo) { - String[] type = {"", //$NON-NLS-1$ - "application/xhtml+xml", //$NON-NLS-1$ - "application/xml", //$NON-NLS-1$ - "text/html", //$NON-NLS-1$ - "text/xml",}; //$NON-NLS-1$ - String[] displayName = {NONE, "application/xhtml+xml", //$NON-NLS-1$ - //$NON-NLS-1$ - "application/xml", //$NON-NLS-1$ - "text/html", //$NON-NLS-1$ - "text/xml",}; //$NON-NLS-1$ - for (int i = 0; i < type.length; i++) { - if (displayName[i] != null && displayName[i].length() != 0) - combo.add(displayName[i], type[i]); - else - combo.add(type[i], type[i]); - } - - } - - public static void setCharacterCodeInto(ComboList combo) { - combo.add(NONE, ""); //$NON-NLS-1$ - String max = ""; //$NON-NLS-1$ - // CommonCharsetNames encoding = new CommonCharsetNames(); - String[] charCode = CommonCharsetNames.getCommonCharsetNames(); - for (int i = 0; i < charCode.length; i++) { - String displayName = CommonCharsetNames.getDisplayString(charCode[i]); - if (displayName != null && displayName.length() != 0) { - combo.add(displayName, charCode[i]); - int n_byte = displayName.getBytes().length; - if (max.getBytes().length < n_byte) - max = displayName; - } - else - combo.add(charCode[i], charCode[i]); - } - /* - * charCode = encoding.getSupportedJavaEncodings(); for(int i=0;i<charCode.length;i++){ - * String displayName = encoding.getDisplayString(charCode[i]); if - * (displayName!=null && displayName.length()!=0) - * combo.add(displayName,charCode[i]); else - * combo.add(charCode[i],charCode[i]); } - */ - // combo.sortByKey(1); - maxLengthStringInCharacterCodeRegistry = max; - } - - public static void setLanguageInto(ComboList combo) { - String[] lang = {"", //$NON-NLS-1$ - "java", //$NON-NLS-1$ - "javascript",}; //$NON-NLS-1$ - String[] displayName = {NONE, "java", //$NON-NLS-1$ - //$NON-NLS-1$ - "javascript",}; //$NON-NLS-1$ - for (int i = 0; i < lang.length; i++) { - if (displayName[i] != null && displayName[i].length() != 0) - combo.add(displayName[i], lang[i]); - else - combo.add(lang[i], lang[i]); - } - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntry.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntry.java deleted file mode 100644 index c42cb159a3..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntry.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -/** - * <p> - * This interface is not intended to be implemented by clients directly. - * Instead, please use abstract class(AbstractDeviceProfileEntry) instead. - * </p> - * - * @deprecated Not needed. See BUG118359 - */ -public interface DeviceProfileEntry { - public String getEntryId(); - - public String getEntryName(); - - public void release(); -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntryProvider.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntryProvider.java deleted file mode 100644 index fe607798e5..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntryProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import java.util.Iterator; - -/** - * <p> - * This interface is not intended to be implemented by clients directly. - * Instead, please use abstract class(AbstractDeviceProfileEntryProvider) - * instead. - * </p> - * - * @deprecated Not needed. See BUG118359 - */ -public interface DeviceProfileEntryProvider { - public Iterator getDeviceProfileEntries(); - - public void release(); -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntryProviderBuilder.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntryProviderBuilder.java deleted file mode 100644 index 3263eaa304..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/DeviceProfileEntryProviderBuilder.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.Platform; - -/** - * @deprecated Not needed. See BUG118359 - */ -public class DeviceProfileEntryProviderBuilder { - private static final String EXTENSION_POINT_PLUGINID = "org.eclipse.wst.html.ui"; //$NON-NLS-1$ - private static final String EXTENSION_POINT_NAME = "deviceProfileEntryProvider"; //$NON-NLS-1$ - private static final String ATTR_CLASS = "class"; //$NON-NLS-1$ - - public DeviceProfileEntryProviderBuilder() { - super(); - } - static public DeviceProfileEntryProvider getEntryProvider() { - IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT_PLUGINID, EXTENSION_POINT_NAME); - if (point != null) { - IExtension extensions[] = point.getExtensions(); - if ((extensions != null) && (extensions.length > 0)) { - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement elements[] = extensions[i].getConfigurationElements(); - if ((elements != null) && (elements.length > 0)) { - for (int j = 0; j < elements.length; j++) { - IConfigurationElement config = elements[j]; - if ((config != null) && (config.getName().equals(EXTENSION_POINT_NAME) == true)) { - String className = config.getAttribute(ATTR_CLASS); - if (className != null) { - try { - DeviceProfileEntryProvider provider = (DeviceProfileEntryProvider)config.createExecutableExtension(ATTR_CLASS); - if (provider != null) { - return provider; - } - } catch (CoreException ignored) { - } - } - } - } - } - } - } - } - return null; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/HTMLContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/HTMLContentSettingsPropertyPage.java deleted file mode 100644 index 395fdedfca..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/HTMLContentSettingsPropertyPage.java +++ /dev/null @@ -1,280 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import java.util.Map; - -import org.eclipse.core.resources.IResource; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Widget; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.Logger; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.internal.contentproperties.IContentSettings; -import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ComboListOnPropertyPage; -import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ContentSettingsPropertyPage; - -/** - * @deprecated Use WebContentSettingsPropertyPage instead - */ -public final class HTMLContentSettingsPropertyPage extends ContentSettingsPropertyPage implements org.eclipse.swt.events.SelectionListener { - - - private final int N_DOCUMENT_TYPE = 0; - private final int N_CSS_PROFILE = 1; - private final int N_TARGET_DEVICE = 2; - - private Text publicIdText; - private Text systemIdText; - - public HTMLContentSettingsPropertyPage() { - super(); - numberOfCombo = 3; - numCols = 2; - numRows = 8; - combo = new ComboListOnPropertyPage[super.numberOfCombo]; - - } - - - - protected void createDocumentTypeComboBox() { - - // create description of implecit DOCTYPE - Label label = new Label(propertyPage, SWT.LEFT); - label.setText(HTMLUIMessages.UI_Description_of_role_of_following_DOCTYPE); - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = numCols; - label.setLayoutData(data); - - // create combobox - super.combo[N_DOCUMENT_TYPE] = super.createComboBoxOf(DOCUMENT_LABEL); - super.combo[this.N_DOCUMENT_TYPE].addSelectionListener(this); - // set entry list into Combo - ContentSettingsRegistry.setHTMLDocumentTypeRegistryInto(combo[N_DOCUMENT_TYPE]); - // create TextField - createIDTextField(); - if (combo[N_DOCUMENT_TYPE].getItemCount() <= 0) - return; - - String initValue = contentSettings.getProperty((IResource) super.getElement(), IContentSettings.HTML_DOCUMENT_TYPE); - // when either .contentsettings or element doesn't exist - // when attribute doesn't exists,getProperty returns empty string. - if (initValue == null) - initValue = ""; //$NON-NLS-1$ - // set init selectionItem in Combo - super.setSelectionItem(combo[N_DOCUMENT_TYPE], initValue); - this.publicIdText.setText(initValue); - if (!initValue.equals("")) {//$NON-NLS-1$ - // toro D210260 - if (ContentSettingsRegistry.getSystemIdFrom(initValue) != null) - this.systemIdText.setText(ContentSettingsRegistry.getSystemIdFrom(initValue)); - else - this.systemIdText.setText("");//$NON-NLS-1$ - } - else - this.systemIdText.setText("");//$NON-NLS-1$ - - // create separator - label = new Label(propertyPage, SWT.SEPARATOR | SWT.HORIZONTAL); - data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = numCols; - data.verticalSpan = 8; - label.setLayoutData(data); - - } - - - - protected void createCSSComboBox() { - super.combo[N_CSS_PROFILE] = super.createComboBoxOf(CSS_LABEL); - - ContentSettingsRegistry.setCSSMetaModelRegistryInto(combo[N_CSS_PROFILE]); - if (combo[N_CSS_PROFILE].getItemCount() <= 0) - return; - String initValue = contentSettings.getProperty((IResource) super.getElement(), IContentSettings.CSS_PROFILE); - // when either .contentsettings or element doesn't exist - // when attribute doesn't exists,getProperty returns empty string. - if (initValue == null) - initValue = ""; //$NON-NLS-1$ - // set init selectionItem in Combo - super.setSelectionItem(combo[N_CSS_PROFILE], initValue); - } - - - - protected void createDeviceComboBox() { - super.combo[N_TARGET_DEVICE] = super.createComboBoxOf(DEVICE_LABEL); - - ContentSettingsRegistry.setDeviceProfileRegistryInto(combo[N_TARGET_DEVICE]); - if (combo[N_TARGET_DEVICE].getItemCount() <= 0) - return; - String initValue = contentSettings.getProperty((IResource) super.getElement(), IContentSettings.DEVICE_PROFILE); - // when either .contentsettings or element doesn't exist - // when attribute doesn't exists,getProperty returns empty string. - if (initValue == null) - initValue = ""; //$NON-NLS-1$ - // set init selectionItem in Combo - super.setSelectionItem(combo[N_TARGET_DEVICE], initValue); - } - - - protected void createSettingsPageGUI() { - int type = ((IResource) getElement()).getType(); - switch (type) { - case IResource.FILE : - // composite = createComposite(propertyPage,numCols,numRows); - createDocumentTypeComboBox(); - createCSSComboBox(); - createDeviceComboBox(); - computeMaxWidthHint(); - PlatformUI.getWorkbench().getHelpSystem().setHelp(propertyPage, IHelpContextIds.WEB_CONTENT_SETTINGS_HELPID); - break; - - default : - Logger.log(Logger.WARNING, "HTMLContentSettingsPropertyPage is instantiated by resource except FILE");//$NON-NLS-1$ - break; - } - - } - - - - protected void putSelectedPropertyInto(Map properties, String valueInCombo, int index) { - - switch (index) { - case N_DOCUMENT_TYPE : - // doc type - properties.put(IContentSettings.HTML_DOCUMENT_TYPE, valueInCombo); - break; - case N_CSS_PROFILE : - // css - properties.put(IContentSettings.CSS_PROFILE, valueInCombo); - break; - case N_TARGET_DEVICE : - // device - properties.put(IContentSettings.DEVICE_PROFILE, valueInCombo); - break; - default : - Logger.log(Logger.ERROR, "Index is out of range in putSelectedPropertyInto() in class HTMLContentSettingsPropertyPage");//$NON-NLS-1$ - break; - } - - } - - protected void deleteNoneProperty(int index) { - switch (index) { - case N_DOCUMENT_TYPE : - // doc type - contentSettings.deleteProperty((IResource) super.getElement(), IContentSettings.HTML_DOCUMENT_TYPE); - break; - case N_CSS_PROFILE : - // css - contentSettings.deleteProperty((IResource) super.getElement(), IContentSettings.CSS_PROFILE); - break; - case N_TARGET_DEVICE : - // device - contentSettings.deleteProperty((IResource) super.getElement(), IContentSettings.DEVICE_PROFILE); - break; - default : - Logger.log(Logger.ERROR, "Index is out of range in deleteNoneProperty() in class HTMLContentSettingsPropertyPage");//$NON-NLS-1$ - break; - } - } - - private void createIDTextField() { - // public ID & System ID - Label publicLabel = new Label(super.propertyPage, SWT.NONE); - GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); - data.horizontalIndent = 10; - publicLabel.setLayoutData(data); - publicLabel.setText(HTMLUIMessages.UI_Public_ID); - publicIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); - data = new GridData(); - - publicIdText.setLayoutData(data); - - Label systemLabel = new Label(super.propertyPage, SWT.NONE); - data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); - data.horizontalIndent = 10; - systemLabel.setLayoutData(data); - systemLabel.setText(HTMLUIMessages.UI_System_ID); - systemIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); - data = new GridData(); - - systemIdText.setLayoutData(data); - } - - - - private void computeMaxWidthHint() { - // maxLengthString was set when HTMLDocumentTypeEntry was set in class ContentSettingsRegistry. - String maxLengthString = ContentSettingsRegistry.maxLengthStringInHTMLDocumentTypeRegistry; - String backup = this.systemIdText.getText(); - this.systemIdText.setText(maxLengthString); - int maxWidthHint = this.systemIdText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; - this.systemIdText.setText(backup); - - if (this.combo[this.N_DOCUMENT_TYPE].getLayoutData() != null) - ((GridData) this.combo[this.N_DOCUMENT_TYPE].getLayoutData()).widthHint = maxWidthHint; - if (this.publicIdText.getLayoutData() != null) - ((GridData) this.publicIdText.getLayoutData()).widthHint = maxWidthHint; - if (this.systemIdText.getLayoutData() != null) - ((GridData) this.systemIdText.getLayoutData()).widthHint = maxWidthHint; - if (this.combo[this.N_CSS_PROFILE].getLayoutData() != null) - ((GridData) this.combo[this.N_CSS_PROFILE].getLayoutData()).widthHint = maxWidthHint; - if (this.combo[this.N_TARGET_DEVICE].getLayoutData() != null) - ((GridData) this.combo[this.N_TARGET_DEVICE].getLayoutData()).widthHint = maxWidthHint; - - } - - - public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) { - } - - public void widgetSelected(org.eclipse.swt.events.SelectionEvent event) { - Widget source = event.widget; - - if (this.combo[this.N_DOCUMENT_TYPE].equals(source)) { - ComboListOnPropertyPage combo = this.combo[this.N_DOCUMENT_TYPE]; - if (combo.getSelectionIndex() < 0) - return; - if (!combo.getSelectedValue().equals("")) {//$NON-NLS-1$ - this.publicIdText.setText(combo.getSelectedValue()); - if (ContentSettingsRegistry.getSystemIdFrom(combo.getSelectedValue()) != null) - this.systemIdText.setText(ContentSettingsRegistry.getSystemIdFrom(combo.getSelectedValue())); - else - this.systemIdText.setText("");//$NON-NLS-1$ - } - else { - this.publicIdText.setText("");//$NON-NLS-1$ - this.systemIdText.setText(""); //$NON-NLS-1$ - } - - } - } - - protected void performDefaults() { - super.performDefaults(); - this.publicIdText.setText("");//$NON-NLS-1$ - this.systemIdText.setText(""); //$NON-NLS-1$ - - } - - -} - diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ProjectContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ProjectContentSettingsPropertyPage.java deleted file mode 100644 index 333c615c7f..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ProjectContentSettingsPropertyPage.java +++ /dev/null @@ -1,282 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import java.util.Map; - -import org.eclipse.core.resources.IResource; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Widget; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.Logger; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.internal.contentproperties.IContentSettings; -import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ComboListOnPropertyPage; -import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ContentSettingsPropertyPage; - -/** - * @deprecated Use ProjectHTMLContentSettingsPropertyPage instead - */ -public final class ProjectContentSettingsPropertyPage extends ContentSettingsPropertyPage implements org.eclipse.swt.events.SelectionListener { - - - private final int N_DOCUMENT_TYPE = 0; - private final int N_CSS_PROFILE = 1; - private final int N_TARGET_DEVICE = 2; - - private Text publicIdText; - private Text systemIdText; - - public ProjectContentSettingsPropertyPage() { - super(); - numberOfCombo = 3; - numCols = 2; - numRows = 8; - combo = new ComboListOnPropertyPage[super.numberOfCombo]; - - } - - - - protected void createDocumentTypeComboBox() { - - // create description of implecit DOCTYPE - Label label = new Label(propertyPage, SWT.LEFT); - label.setText(HTMLUIMessages.UI_Description_of_role_of_following_DOCTYPE); - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = numCols; - label.setLayoutData(data); - - // create combobox - super.combo[N_DOCUMENT_TYPE] = super.createComboBoxOf(DOCUMENT_LABEL); - super.combo[this.N_DOCUMENT_TYPE].addSelectionListener(this); - // set entry list into Combo - ContentSettingsRegistry.setHTMLDocumentTypeRegistryInto(combo[N_DOCUMENT_TYPE]); - // create TextField - createIDTextField(); - if (combo[N_DOCUMENT_TYPE].getItemCount() <= 0) - return; - - String initValue = contentSettings.getProperty((IResource) super.getElement(), IContentSettings.HTML_DOCUMENT_TYPE); - // when either .contentsettings or element doesn't exist - // when attribute doesn't exists,getProperty returns empty string. - if (initValue == null) - initValue = ""; //$NON-NLS-1$ - // set init selectionItem in Combo - super.setSelectionItem(combo[N_DOCUMENT_TYPE], initValue); - this.publicIdText.setText(initValue); - if (!initValue.equals("")) {//$NON-NLS-1$ - // toro D210260 - if (ContentSettingsRegistry.getSystemIdFrom(initValue) != null) - this.systemIdText.setText(ContentSettingsRegistry.getSystemIdFrom(initValue)); - else - this.systemIdText.setText("");//$NON-NLS-1$ - } - else - this.systemIdText.setText("");//$NON-NLS-1$ - - // create separator - label = new Label(propertyPage, SWT.SEPARATOR | SWT.HORIZONTAL); - data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = numCols; - data.verticalSpan = 8; - label.setLayoutData(data); - - } - - - - protected void createCSSComboBox() { - super.combo[N_CSS_PROFILE] = super.createComboBoxOf(CSS_LABEL); - - ContentSettingsRegistry.setCSSMetaModelRegistryInto(combo[N_CSS_PROFILE]); - if (combo[N_CSS_PROFILE].getItemCount() <= 0) - return; - String initValue = contentSettings.getProperty((IResource) super.getElement(), IContentSettings.CSS_PROFILE); - // when either .contentsettings or element doesn't exist - // when attribute doesn't exists,getProperty returns empty string. - if (initValue == null) - initValue = ""; //$NON-NLS-1$ - // set init selectionItem in Combo - super.setSelectionItem(combo[N_CSS_PROFILE], initValue); - } - - - - protected void createDeviceComboBox() { - super.combo[N_TARGET_DEVICE] = super.createComboBoxOf(DEVICE_LABEL); - - ContentSettingsRegistry.setDeviceProfileRegistryInto(combo[N_TARGET_DEVICE]); - if (combo[N_TARGET_DEVICE].getItemCount() <= 0) - return; - String initValue = contentSettings.getProperty((IResource) super.getElement(), IContentSettings.DEVICE_PROFILE); - // when either .contentsettings or element doesn't exist - // when attribute doesn't exists,getProperty returns empty string. - if (initValue == null) - initValue = ""; //$NON-NLS-1$ - // set init selectionItem in Combo - super.setSelectionItem(combo[N_TARGET_DEVICE], initValue); - } - - - protected void createSettingsPageGUI() { - int type = ((IResource) getElement()).getType(); - switch (type) { - case IResource.PROJECT : - // composite = createComposite(propertyPage,numCols,numRows); - createDocumentTypeComboBox(); - createCSSComboBox(); - createDeviceComboBox(); - computeMaxWidthHint(); - PlatformUI.getWorkbench().getHelpSystem().setHelp(propertyPage, IHelpContextIds.WEB_CONTENT_SETTINGS_HELPID); - break; - - default : - Logger.log(Logger.WARNING, "ProjectContentSettingsPropertyPage is instantiated by resource except PROJECT");//$NON-NLS-1$ - break; - } - - } - - - - protected void putSelectedPropertyInto(Map properties, String valueInCombo, int index) { - - switch (index) { - case N_DOCUMENT_TYPE : - // doc type - properties.put(IContentSettings.HTML_DOCUMENT_TYPE, valueInCombo); - break; - case N_CSS_PROFILE : - // css - properties.put(IContentSettings.CSS_PROFILE, valueInCombo); - break; - case N_TARGET_DEVICE : - // device - properties.put(IContentSettings.DEVICE_PROFILE, valueInCombo); - break; - default : - Logger.log(Logger.ERROR, "Index is out of range in putSelectedPropertyInto() in class ProjectContentSettingsPropertyPage");//$NON-NLS-1$ - break; - } - - } - - protected void deleteNoneProperty(int index) { - switch (index) { - case N_DOCUMENT_TYPE : - // doc type - contentSettings.deleteProperty((IResource) super.getElement(), IContentSettings.HTML_DOCUMENT_TYPE); - break; - - case N_CSS_PROFILE : - // css - contentSettings.deleteProperty((IResource) super.getElement(), IContentSettings.CSS_PROFILE); - break; - - case N_TARGET_DEVICE : - // device - contentSettings.deleteProperty((IResource) super.getElement(), IContentSettings.DEVICE_PROFILE); - break; - - default : - Logger.log(Logger.ERROR, "Index is out of range in deleteNoneProperty() in class ProjectContentSettingsPropertyPage");//$NON-NLS-1$ - break; - } - } - - private void createIDTextField() { - // public ID & System ID - Label publicLabel = new Label(super.propertyPage, SWT.NONE); - GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); - data.horizontalIndent = 10; - publicLabel.setLayoutData(data); - publicLabel.setText(HTMLUIMessages.UI_Public_ID); - publicIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); - data = new GridData(); - - publicIdText.setLayoutData(data); - - Label systemLabel = new Label(super.propertyPage, SWT.NONE); - data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); - data.horizontalIndent = 10; - systemLabel.setLayoutData(data); - systemLabel.setText(HTMLUIMessages.UI_System_ID); - systemIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); - data = new GridData(); - - systemIdText.setLayoutData(data); - } - - - - private void computeMaxWidthHint() { - // maxLengthString was set when HTMLDocumentTypeEntry was set in class - // ContentSettingsRegistry. - String maxLengthString = ContentSettingsRegistry.maxLengthStringInHTMLDocumentTypeRegistry; - String backup = this.systemIdText.getText(); - this.systemIdText.setText(maxLengthString); - int maxWidthHint = this.systemIdText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; - this.systemIdText.setText(backup); - - if (this.combo[this.N_DOCUMENT_TYPE].getLayoutData() != null) - ((GridData) this.combo[this.N_DOCUMENT_TYPE].getLayoutData()).widthHint = maxWidthHint; - if (this.publicIdText.getLayoutData() != null) - ((GridData) this.publicIdText.getLayoutData()).widthHint = maxWidthHint; - if (this.systemIdText.getLayoutData() != null) - ((GridData) this.systemIdText.getLayoutData()).widthHint = maxWidthHint; - if (this.combo[this.N_CSS_PROFILE].getLayoutData() != null) - ((GridData) this.combo[this.N_CSS_PROFILE].getLayoutData()).widthHint = maxWidthHint; - if (this.combo[this.N_TARGET_DEVICE].getLayoutData() != null) - ((GridData) this.combo[this.N_TARGET_DEVICE].getLayoutData()).widthHint = maxWidthHint; - - } - - - public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) { - } - - public void widgetSelected(org.eclipse.swt.events.SelectionEvent event) { - Widget source = event.widget; - - if (this.combo[this.N_DOCUMENT_TYPE].equals(source)) { - ComboListOnPropertyPage combo = this.combo[this.N_DOCUMENT_TYPE]; - if (combo.getSelectionIndex() < 0) - return; - if (!combo.getSelectedValue().equals("")) {//$NON-NLS-1$ - this.publicIdText.setText(combo.getSelectedValue()); - if (ContentSettingsRegistry.getSystemIdFrom(combo.getSelectedValue()) != null) - this.systemIdText.setText(ContentSettingsRegistry.getSystemIdFrom(combo.getSelectedValue())); - else - this.systemIdText.setText("");//$NON-NLS-1$ - } - else { - this.publicIdText.setText("");//$NON-NLS-1$ - this.systemIdText.setText(""); //$NON-NLS-1$ - } - - } - } - - protected void performDefaults() { - super.performDefaults(); - this.publicIdText.setText("");//$NON-NLS-1$ - this.systemIdText.setText(""); //$NON-NLS-1$ - - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ProjectWebContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ProjectWebContentSettingsPropertyPage.java deleted file mode 100644 index 6ccbe4cec4..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/ProjectWebContentSettingsPropertyPage.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; - -public class ProjectWebContentSettingsPropertyPage extends WebContentSettingsPropertyPage { - public ProjectWebContentSettingsPropertyPage() { - setDescription(HTMLUIMessages.ProjectWebContentSettingsPropertyPage_0); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/WebContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/WebContentSettingsPropertyPage.java deleted file mode 100644 index 2949fc6883..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/WebContentSettingsPropertyPage.java +++ /dev/null @@ -1,387 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.contentproperties.ui; - -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.wst.css.core.internal.contentproperties.CSSContentProperties; -import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; -import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry; -import org.eclipse.wst.html.core.internal.contentproperties.HTMLContentProperties; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry; -import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.Logger; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; - -public class WebContentSettingsPropertyPage extends PropertyPage { - private static final String SELECT_NONE = HTMLUIMessages.UI_none; - private String maxLengthStringInHTMLDocumentTypeRegistry = ""; //$NON-NLS-1$ - - private class ComboSelectionListener implements SelectionListener { - public void widgetDefaultSelected(SelectionEvent e) { - // do nothing - } - - public void widgetSelected(SelectionEvent e) { - int index = fDocumentTypeCombo.getSelectionIndex(); - String doctype = (String) fDocumentTypeIds.get(index); - updateDoctypeText(index, doctype); - } - } - - Combo fDocumentTypeCombo; - List fDocumentTypeIds; - private Text fPublicIdText; - private Text fSystemIdText; - private Combo fProfileCombo; - private List fProfileIds; - private SelectionListener fListener; - - public WebContentSettingsPropertyPage() { - super(); - setDescription(HTMLUIMessages.WebContentSettingsPropertyPage_0); - } - - private Composite createComposite(Composite parent, int numColumns) { - Composite composite = new Composite(parent, SWT.NULL); - - // GridLayout - GridLayout layout = new GridLayout(); - layout.numColumns = numColumns; - composite.setLayout(layout); - - // GridData - GridData data = new GridData(GridData.FILL, GridData.FILL, true, false); - data.horizontalIndent = 0; - composite.setLayoutData(data); - - return composite; - } - - protected Control createContents(Composite parent) { - Composite propertyPage = createComposite(parent, 2); - - createDoctypeContents(propertyPage); - createCSSProfileContents(propertyPage); - - populateValues(); - initializeValues(); - computeMaxWidthHint(); - - fListener = new ComboSelectionListener(); - fDocumentTypeCombo.addSelectionListener(fListener); - - PlatformUI.getWorkbench().getHelpSystem().setHelp(propertyPage, IHelpContextIds.WEB_CONTENT_SETTINGS_HELPID); - Dialog.applyDialogFont(parent); - return propertyPage; - } - - private void createCSSProfileContents(Composite parent) { - // CSS Profile - Label languageLabel = new Label(parent, SWT.NONE); - languageLabel.setText(HTMLUIMessages.UI_CSS_profile___2); - fProfileCombo = new Combo(parent, SWT.READ_ONLY); - GridData data = new GridData(GridData.FILL, GridData.FILL, true, false); - data.horizontalIndent = 0; - fProfileCombo.setLayoutData(data); - } - - private void createDoctypeContents(Composite parent) { - // create description of implicit DOCTYPE - Text doctypeLabel = new Text(parent, SWT.READ_ONLY); - doctypeLabel.setText(HTMLUIMessages.UI_Description_of_role_of_following_DOCTYPE); - GridData data = new GridData(GridData.FILL, GridData.FILL, true, false); - data.horizontalIndent = 0; - data.horizontalSpan = 2; - doctypeLabel.setLayoutData(data); - - // document type - Label languageLabel = new Label(parent, SWT.NONE); - languageLabel.setText(HTMLUIMessages.UI_Default_HTML_DOCTYPE_ID___1); - fDocumentTypeCombo = new Combo(parent, SWT.READ_ONLY); - data = new GridData(GridData.FILL, GridData.FILL, true, false); - data.horizontalIndent = 0; - fDocumentTypeCombo.setLayoutData(data); - - // public ID - Label publicIdLabel = new Label(parent, SWT.NONE); - publicIdLabel.setText(HTMLUIMessages.UI_Public_ID); - fPublicIdText = new Text(parent, SWT.READ_ONLY | SWT.BORDER); - data = new GridData(GridData.FILL, GridData.FILL, true, false); - data.horizontalIndent = 0; - fPublicIdText.setLayoutData(data); - - // system ID - Label systemIdLabel = new Label(parent, SWT.NONE); - systemIdLabel.setText(HTMLUIMessages.UI_System_ID); - fSystemIdText = new Text(parent, SWT.READ_ONLY | SWT.BORDER); - data = new GridData(GridData.FILL, GridData.FILL, true, false); - data.horizontalIndent = 0; - fSystemIdText.setLayoutData(data); - - // create separator - Label label = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL); - data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = 2; - data.verticalSpan = 8; - label.setLayoutData(data); - - } - - /** - * Get the resource this properties page is for - * - * @return IResource for this properties page or null if there is no - * IResource - */ - private IResource getResource() { - IResource resource = null; - IAdaptable adaptable = getElement(); - if (adaptable instanceof IResource) { - resource = (IResource) adaptable; - } else if (adaptable != null) { - Object o = adaptable.getAdapter(IResource.class); - if (o instanceof IResource) { - resource = (IResource)o; - } - } - return resource; - } - - private String getSystemIdFrom(String publicId) { - if (publicId == null || publicId.length() == 0) - return null; - HTMLDocumentTypeRegistry reg = HTMLDocumentTypeRegistry.getInstance(); - Enumeration e = reg.getEntries(); - while (e.hasMoreElements()) { - HTMLDocumentTypeEntry entry = (HTMLDocumentTypeEntry) e.nextElement(); - if (entry.getPublicId().equals(publicId)) - return entry.getSystemId(); - } - return null; - } - - private void initializeValues() { - initializeDoctypeValues(); - initializeCSSProfileValues(); - } - - private void initializeCSSProfileValues() { - int index = 0; - String profile = CSSContentProperties.getProperty(CSSContentProperties.CSS_PROFILE, getResource(), false); - if (profile != null && profile.length() > 0) { - /* - * If item is already part of combo, select it. Otherwise, select - * none. - */ - index = fProfileIds.indexOf(profile); - } - index = index >= 0 ? index : 0; - fProfileCombo.select(index); - } - - private void initializeDoctypeValues() { - int index = 0; - String doctype = HTMLContentProperties.getProperty(HTMLContentProperties.DOCUMENT_TYPE, getResource(), false); - if (doctype != null) { - /* - * If item is already part of combo, select it. Otherwise, select - * none. - */ - index = fDocumentTypeIds.indexOf(doctype); - } - - // set combobox - index = index >= 0 ? index : 0; - fDocumentTypeCombo.select(index); - - updateDoctypeText(index, doctype); - } - - void updateDoctypeText(int index, String doctype) { - if (index > 0) { - // set public/system id text - fPublicIdText.setText(doctype); - String systemId = getSystemIdFrom(doctype); - if (systemId != null) - fSystemIdText.setText(systemId); - else - fSystemIdText.setText(""); //$NON-NLS-1$ - } - else { - // set public/system id text - fPublicIdText.setText(""); //$NON-NLS-1$ - fSystemIdText.setText(""); //$NON-NLS-1$ - } - } - - private void populateValues() { - populateDoctypeValues(); - populateCSSProfileValues(); - } - - private void populateCSSProfileValues() { - fProfileIds = new ArrayList(); - // add none first - fProfileCombo.add(SELECT_NONE); - fProfileIds.add(null); - - CSSProfileRegistry reg = CSSProfileRegistry.getInstance(); - Iterator i = reg.getProfiles(); - while (i.hasNext()) { - CSSProfile profile = (CSSProfile) i.next(); - String id = profile.getProfileID(); - String name = profile.getProfileName(); - fProfileCombo.add(name); - fProfileIds.add(id); - } - } - - private void populateDoctypeValues() { - fDocumentTypeIds = new ArrayList(); - // add none first - fDocumentTypeCombo.add(SELECT_NONE); - fDocumentTypeIds.add(null); - - HTMLDocumentTypeRegistry reg = HTMLDocumentTypeRegistry.getInstance(); - Enumeration e = reg.getEntries(); - while (e.hasMoreElements()) { - HTMLDocumentTypeEntry entry = (HTMLDocumentTypeEntry) e.nextElement(); - String publicId = entry.getPublicId(); - String displayName = entry.getDisplayName(); - displayName = displayName != null ? displayName : publicId; - - fDocumentTypeCombo.add(displayName); - fDocumentTypeIds.add(publicId); - - if (displayName.length() > maxLengthStringInHTMLDocumentTypeRegistry.length()) { - maxLengthStringInHTMLDocumentTypeRegistry = displayName; - } - - if (entry.getSystemId() == null) - continue; // if HTML entry - - - if (entry.getSystemId().length() > maxLengthStringInHTMLDocumentTypeRegistry.length()) - maxLengthStringInHTMLDocumentTypeRegistry = entry.getSystemId(); - } - } - - private void computeMaxWidthHint() { - // maxLengthString was set populateDoctypeValues was called - String maxLengthString = maxLengthStringInHTMLDocumentTypeRegistry; - String backup = fSystemIdText.getText(); - fSystemIdText.setText(maxLengthString); - int maxWidthHint = fSystemIdText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; - fSystemIdText.setText(backup); - - if (fDocumentTypeCombo.getLayoutData() != null) - ((GridData) fDocumentTypeCombo.getLayoutData()).widthHint = maxWidthHint; - if (fPublicIdText.getLayoutData() != null) - ((GridData) fPublicIdText.getLayoutData()).widthHint = maxWidthHint; - if (fSystemIdText.getLayoutData() != null) - ((GridData) fSystemIdText.getLayoutData()).widthHint = maxWidthHint; - if (fProfileCombo.getLayoutData() != null) - ((GridData) fProfileCombo.getLayoutData()).widthHint = maxWidthHint; - } - - private void performCSSProfileDefaults() { - int index = fProfileCombo.indexOf(SELECT_NONE); - if (index > -1) - fProfileCombo.select(index); - - super.performDefaults(); - } - - private boolean performCSSProfileOk() { - int index = fProfileCombo.getSelectionIndex(); - if (index > -1) { - String id = (String) fProfileIds.get(index); - if (id == null || id.length() == 0 || id.equalsIgnoreCase(SELECT_NONE)) { - // if none, use null - id = null; - } - try { - CSSContentProperties.setProperty(CSSContentProperties.CSS_PROFILE, getResource(), id); - } - catch (CoreException e) { - // maybe in future, let user know there was a problem saving - // file - Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e); - } - } - return true; - } - - protected void performDefaults() { - super.performDefaults(); - - performDoctypeDefaults(); - performCSSProfileDefaults(); - } - - private void performDoctypeDefaults() { - fPublicIdText.setText("");//$NON-NLS-1$ - fSystemIdText.setText(""); //$NON-NLS-1$ - int index = fDocumentTypeCombo.indexOf(SELECT_NONE); - if (index > -1) - fDocumentTypeCombo.select(index); - } - - private boolean performDoctypeOk() { - int index = fDocumentTypeCombo.getSelectionIndex(); - if (index > -1) { - String id = (String) fDocumentTypeIds.get(index); - if (id == null || id.equalsIgnoreCase(SELECT_NONE)) { - // if none, use null - id = null; - } - try { - HTMLContentProperties.setProperty(HTMLContentProperties.DOCUMENT_TYPE, getResource(), id); - } - catch (CoreException e) { - // maybe in future, let user know there was a problem saving - // file - Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e); - } - } - return true; - } - - public boolean performOk() { - performDoctypeOk(); - performCSSProfileOk(); - - return super.performOk(); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/correction/CorrectionAssistantProviderHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/correction/CorrectionAssistantProviderHTML.java deleted file mode 100644 index 3ddb028abe..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/correction/CorrectionAssistantProviderHTML.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * - *******************************************************************************/ - -package org.eclipse.wst.html.ui.internal.correction; - -import org.eclipse.jface.text.contentassist.ContentAssistant; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.text.contentassist.IContentAssistant; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.wst.html.core.text.IHTMLPartitions; -import org.eclipse.wst.sse.ui.internal.correction.CorrectionAssistantProvider; -import org.eclipse.wst.xml.core.text.IXMLPartitions; -import org.eclipse.wst.xml.ui.internal.correction.CorrectionProcessorXML; - -/** - * Correction assistant for HTML - * - * @deprecated since 2.0 RC0 Use - * org.eclipse.jface.text.quickassist.IQuickAssistProcessor; - */ -public class CorrectionAssistantProviderHTML extends CorrectionAssistantProvider { - - public IContentAssistant getCorrectionAssistant(ISourceViewer sourceViewer) { - IContentAssistant ca = null; - - if (sourceViewer != null) { - ContentAssistant assistant = new ContentAssistant(); - - if (sourceViewer != null) { - IContentAssistProcessor correctionProcessor = new CorrectionProcessorXML(sourceViewer); - assistant.setContentAssistProcessor(correctionProcessor, IHTMLPartitions.HTML_DEFAULT); - assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_CDATA); - assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_COMMENT); - assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_DECLARATION); - assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_PI); - assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.DTD_SUBSET); - } - ca = assistant; - } - - return ca; - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/derived/SingleCharReader.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/derived/SingleCharReader.java deleted file mode 100644 index 3860bbcbcf..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/derived/SingleCharReader.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * - *******************************************************************************/ - -package org.eclipse.wst.html.ui.internal.derived; - -import java.io.IOException; -import java.io.Reader; - -/* - * Copied from org.eclipse.jdt.internal.corext.javadoc.SingleCharReader. - * Modification was made to fix statement unnecessarily nested within else - * clause warning in read(..). - */ -public abstract class SingleCharReader extends Reader { - - /** - * @see Reader#read() - */ - public abstract int read() throws IOException; - - /** - * @see Reader#read(char[],int,int) - */ - public int read(char cbuf[], int off, int len) throws IOException { - int end = off + len; - for (int i = off; i < end; i++) { - int ch = read(); - if (ch == -1) { - if (i == off) { - return -1; - } - return i - off; - } - cbuf[i] = (char) ch; - } - return len; - } - - /** - * @see Reader#ready() - */ - public boolean ready() throws IOException { - return true; - } - - /** - * Gets the content as a String - */ - public String getString() throws IOException { - StringBuffer buf = new StringBuffer(); - int ch; - while ((ch = read()) != -1) { - buf.append((char) ch); - } - return buf.toString(); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/ActionContributorHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/ActionContributorHTML.java deleted file mode 100644 index c471d0622c..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/ActionContributorHTML.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.edit.ui; - -import org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML; - -/** - * - * Instead, use SourcePageActionContributor for source page contributor - * of multi page editor. - * - * Note that this class is still valid for single page editor. - */ -public class ActionContributorHTML extends ActionContributorXML { - private static final String[] EDITOR_IDS = {"org.eclipse.wst.html.core.htmlsource.source", "org.eclipse.wst.sse.ui.StructuredTextEditor"}; //$NON-NLS-1$ //$NON-NLS-2$ - - - protected String[] getExtensionIDs() { - return EDITOR_IDS; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupActionHTMLDelegate.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupActionHTMLDelegate.java deleted file mode 100644 index 6d8fd56fb0..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupActionHTMLDelegate.java +++ /dev/null @@ -1,162 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ - -package org.eclipse.wst.html.ui.internal.edit.ui; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.widgets.Event; -import org.eclipse.ui.IActionDelegate2; -import org.eclipse.ui.IEditorActionDelegate; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.ui.internal.SSEUIMessages; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; - -/** - * Cleanup action delegate for HTML editor - */ -public class CleanupActionHTMLDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate { - private IEditorPart fEditor; - private IStructuredCleanupProcessor fCleanupProcessor; - - public void setActiveEditor(IAction action, IEditorPart targetEditor) { - fEditor = targetEditor; - } - - public void dispose() { - // nulling out just in case - fEditor = null; - fCleanupProcessor = null; - } - - public void init(IAction action) { - if (action != null) { - action.setText(HTMLUIMessages.CleanupDocument_label); - action.setToolTipText(HTMLUIMessages.CleanupDocument_tooltip); - action.setDescription(HTMLUIMessages.CleanupDocument_description); - } - } - - public void runWithEvent(IAction action, Event event) { - run(action); - } - - public void init(IViewPart view) { - // do nothing - } - - public void run(IAction action) { - if (fEditor instanceof ITextEditor) { - final ITextEditor editor = (ITextEditor) fEditor; - CleanupDialogHTML cleanupDialog = new CleanupDialogHTML(editor.getSite().getShell()); - cleanupDialog.setisXHTMLType(isXHTML()); - if (cleanupDialog.open() == Window.OK) { - // setup runnable - Runnable runnable = new Runnable() { - public void run() { - IStructuredCleanupProcessor cleanupProcessor = getCleanupProcessor(); - if (cleanupProcessor != null) { - IStructuredModel model = null; - try { - model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput())); - if (model != null) - cleanupProcessor.cleanupModel(model); - } - finally { - if (model != null) - model.releaseFromEdit(); - } - } - } - }; - - // TODO: make independent of 'model'. - IStructuredModel model = null; - try { - model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput())); - if (model != null) { - // begin recording - ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection(); - model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength()); //$NON-NLS-1$ //$NON-NLS-2$ - - // tell the model that we are about to make a big - // model change - model.aboutToChangeModel(); - - // run - BusyIndicator.showWhile(fEditor.getEditorSite().getWorkbenchWindow().getShell().getDisplay(), runnable); - } - } - finally { - if (model != null) { - // tell the model that we are done with the big - // model - // change - model.changedModel(); - - // end recording - ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection(); - model.endRecording(this, selection.getOffset(), selection.getLength()); - model.releaseFromEdit(); - } - } - } - } - } - - public void selectionChanged(IAction action, ISelection selection) { - // do nothing - } - - IStructuredCleanupProcessor getCleanupProcessor() { - if (fCleanupProcessor == null) - fCleanupProcessor = new HTMLCleanupProcessorImpl(); - - return fCleanupProcessor; - } - - private boolean isXHTML() { - boolean isxhtml = false; - if (fEditor instanceof ITextEditor) { - ITextEditor textEditor = (ITextEditor) fEditor; - IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); - IStructuredModel model = null; - try { - model = StructuredModelManager.getModelManager().getExistingModelForRead(document); - if (model instanceof IDOMModel) { - IDOMDocument domDocument = ((IDOMModel) model).getDocument(); - if (domDocument != null) - isxhtml = domDocument.isXMLType(); - } - } - finally { - if (model != null) { - model.releaseFromRead(); - } - } - } - return isxhtml; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDialogHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDialogHTML.java deleted file mode 100644 index 97642105ff..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDialogHTML.java +++ /dev/null @@ -1,333 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.edit.ui; - -import org.eclipse.core.runtime.Preferences; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.xml.ui.internal.XMLUIMessages; - -public class CleanupDialogHTML extends Dialog implements SelectionListener { - - protected Button fRadioButtonTagNameCaseAsis; - protected Button fRadioButtonTagNameCaseLower; - protected Button fRadioButtonTagNameCaseUpper; - protected Button fRadioButtonAttrNameCaseAsis; - protected Button fRadioButtonAttrNameCaseLower; - protected Button fRadioButtonAttrNameCaseUpper; - protected Button fCheckBoxCompressEmptyElementTags; - protected Button fCheckBoxInsertRequiredAttrs; - protected Button fCheckBoxInsertMissingTags; - protected Button fCheckBoxQuoteAttrValues; - protected Button fCheckBoxFormatSource; - protected Button fCheckBoxConvertEOLCodes; - protected Button fRadioButtonConvertEOLWindows; - protected Button fRadioButtonConvertEOLUnix; - protected Button fRadioButtonConvertEOLMac; - protected Preferences fPreferences = null; - private boolean fIsXHTML = false; - private Group fTagNameCase; - private Group fAttrNameCase; - - public CleanupDialogHTML(Shell shell) { - super(shell); - } - - protected Control createDialogArea(Composite parent) { - getShell().setText(HTMLUIMessages.Cleanup_UI_); - Composite composite = new Composite(parent, SWT.NULL); - - createDialogAreaInComposite(composite); - initializeOptions(); - - return composite; - } - - protected Control createButtonBar(Composite parent) { - Control c = super.createButtonBar(parent); - okButtonEnablement(); - return c; - } - - protected void createDialogAreaInCompositeForHTML(Composite composite) { - // Convert tag name case - // d257064 need to associate group w/ radio buttons so radio buttons - // header can be read - fTagNameCase = new Group(composite, SWT.NONE); - fTagNameCase.setText(HTMLUIMessages.Tag_name_case_for_HTML_UI_); - GridLayout hLayout = new GridLayout(); - hLayout.numColumns = 3; - fTagNameCase.setLayout(hLayout); - fRadioButtonTagNameCaseAsis = new Button(fTagNameCase, SWT.RADIO); - fRadioButtonTagNameCaseAsis.setText(HTMLUIMessages.Tag_name_case_As_is_UI_); - fRadioButtonTagNameCaseAsis.addSelectionListener(this); - fRadioButtonTagNameCaseLower = new Button(fTagNameCase, SWT.RADIO); - fRadioButtonTagNameCaseLower.setText(HTMLUIMessages.Tag_name_case_Lower_UI_); - fRadioButtonTagNameCaseLower.addSelectionListener(this); - fRadioButtonTagNameCaseUpper = new Button(fTagNameCase, SWT.RADIO); - fRadioButtonTagNameCaseUpper.setText(HTMLUIMessages.Tag_name_case_Upper_UI_); - fRadioButtonTagNameCaseUpper.addSelectionListener(this); - - // Convert attr name case - // d257064 need to associate group w/ radio buttons so radio buttons - // header can be read - fAttrNameCase = new Group(composite, SWT.NONE); - fAttrNameCase.setText(HTMLUIMessages.Attribute_name_case_for_HTML_UI_); - fAttrNameCase.setLayout(hLayout); - fRadioButtonAttrNameCaseAsis = new Button(fAttrNameCase, SWT.RADIO); - fRadioButtonAttrNameCaseAsis.setText(HTMLUIMessages.Attribute_name_case_As_is_UI_); - fRadioButtonAttrNameCaseAsis.addSelectionListener(this); - fRadioButtonAttrNameCaseLower = new Button(fAttrNameCase, SWT.RADIO); - fRadioButtonAttrNameCaseLower.setText(HTMLUIMessages.Attribute_name_case_Lower_UI_); - fRadioButtonAttrNameCaseLower.addSelectionListener(this); - fRadioButtonAttrNameCaseUpper = new Button(fAttrNameCase, SWT.RADIO); - fRadioButtonAttrNameCaseUpper.setText(HTMLUIMessages.Attribute_name_case_Upper_UI_); - fRadioButtonAttrNameCaseUpper.addSelectionListener(this); - } - - protected void createDialogAreaInComposite(Composite composite) { - createDialogAreaInCompositeForHTML(composite); - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.CLEANUP_HTML_HELPID); // use - // HTML - // specific - // help - - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - layout.makeColumnsEqualWidth = true; - composite.setLayout(layout); - - // Compress empty element tags - fCheckBoxCompressEmptyElementTags = new Button(composite, SWT.CHECK); - fCheckBoxCompressEmptyElementTags.setText(XMLUIMessages.Compress_empty_element_tags_UI_); - fCheckBoxCompressEmptyElementTags.addSelectionListener(this); - - // Insert missing required attrs - fCheckBoxInsertRequiredAttrs = new Button(composite, SWT.CHECK); - fCheckBoxInsertRequiredAttrs.setText(HTMLUIMessages.Insert_required_attributes_UI_); - fCheckBoxInsertRequiredAttrs.addSelectionListener(this); - - // Insert missing begin/end tags - fCheckBoxInsertMissingTags = new Button(composite, SWT.CHECK); - fCheckBoxInsertMissingTags.setText(HTMLUIMessages.Insert_missing_tags_UI_); - fCheckBoxInsertMissingTags.addSelectionListener(this); - - // Quote attribute values - fCheckBoxQuoteAttrValues = new Button(composite, SWT.CHECK); - fCheckBoxQuoteAttrValues.setText(HTMLUIMessages.Quote_attribute_values_UI_); - fCheckBoxQuoteAttrValues.addSelectionListener(this); - - // Format source - fCheckBoxFormatSource = new Button(composite, SWT.CHECK); - fCheckBoxFormatSource.setText(HTMLUIMessages.Format_source_UI_); - fCheckBoxFormatSource.addSelectionListener(this); - - // Convert EOL code - fCheckBoxConvertEOLCodes = new Button(composite, SWT.CHECK); - fCheckBoxConvertEOLCodes.setText(HTMLUIMessages.Convert_EOL_codes_UI_); - fCheckBoxConvertEOLCodes.addSelectionListener(this); - Composite EOLCodes = new Composite(composite, SWT.NULL); - GridLayout hLayout = new GridLayout(); - hLayout.numColumns = 3; - EOLCodes.setLayout(hLayout); - fRadioButtonConvertEOLWindows = new Button(EOLCodes, SWT.RADIO); - fRadioButtonConvertEOLWindows.setText(HTMLUIMessages.EOL_Windows_UI); - fRadioButtonConvertEOLWindows.addSelectionListener(this); - fRadioButtonConvertEOLUnix = new Button(EOLCodes, SWT.RADIO); - fRadioButtonConvertEOLUnix.setText(HTMLUIMessages.EOL_Unix_UI); - fRadioButtonConvertEOLUnix.addSelectionListener(this); - fRadioButtonConvertEOLMac = new Button(EOLCodes, SWT.RADIO); - fRadioButtonConvertEOLMac.setText(HTMLUIMessages.EOL_Mac_UI); - fRadioButtonConvertEOLMac.addSelectionListener(this); - } - - protected void okPressed() { - storeOptions(); - - super.okPressed(); - } - - protected void initializeOptionsForHTML() { - boolean caseSensitive = isXHTMLType(); - - if (caseSensitive) { - fRadioButtonTagNameCaseLower.setSelection(true); - } else { - int tagNameCase = getModelPreferences().getInt(HTMLCorePreferenceNames.CLEANUP_TAG_NAME_CASE); - if (tagNameCase == HTMLCorePreferenceNames.UPPER) { - fRadioButtonTagNameCaseUpper.setSelection(true); - } else if (tagNameCase == HTMLCorePreferenceNames.LOWER) - fRadioButtonTagNameCaseLower.setSelection(true); - else - fRadioButtonTagNameCaseAsis.setSelection(true); - } - - if (caseSensitive) { - fRadioButtonAttrNameCaseLower.setSelection(true); - } else { - int attrNameCase = getModelPreferences().getInt(HTMLCorePreferenceNames.CLEANUP_ATTR_NAME_CASE); - if (attrNameCase == HTMLCorePreferenceNames.UPPER) { - fRadioButtonAttrNameCaseUpper.setSelection(true); - } else if (attrNameCase == HTMLCorePreferenceNames.LOWER) - fRadioButtonAttrNameCaseLower.setSelection(true); - else - fRadioButtonAttrNameCaseAsis.setSelection(true); - } - - enableCaseControls(!caseSensitive); - } - - protected void initializeOptions() { - initializeOptionsForHTML(); - - fCheckBoxCompressEmptyElementTags.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS)); - fCheckBoxInsertRequiredAttrs.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.INSERT_REQUIRED_ATTRS)); - fCheckBoxInsertMissingTags.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.INSERT_MISSING_TAGS)); - fCheckBoxQuoteAttrValues.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.QUOTE_ATTR_VALUES)); - fCheckBoxFormatSource.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.FORMAT_SOURCE)); - fCheckBoxConvertEOLCodes.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.CONVERT_EOL_CODES)); - if (fCheckBoxConvertEOLCodes.getSelection()) { - String EOLCode = getModelPreferences().getString(HTMLCorePreferenceNames.CLEANUP_EOL_CODE); - if (EOLCode == CommonEncodingPreferenceNames.LF) - fRadioButtonConvertEOLUnix.setSelection(true); - else if (EOLCode == CommonEncodingPreferenceNames.CR) - fRadioButtonConvertEOLMac.setSelection(true); - else - fRadioButtonConvertEOLWindows.setSelection(true); - } - enableEOLCodeRadios(fCheckBoxConvertEOLCodes.getSelection()); - } - - protected void storeOptionsForHTML() { - if (!isXHTMLType() && fRadioButtonTagNameCaseUpper.getSelection()) - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_TAG_NAME_CASE, HTMLCorePreferenceNames.UPPER); - else if (fRadioButtonTagNameCaseLower.getSelection()) - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_TAG_NAME_CASE, HTMLCorePreferenceNames.LOWER); - else - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_TAG_NAME_CASE, HTMLCorePreferenceNames.ASIS); - - if (!isXHTMLType() && fRadioButtonAttrNameCaseUpper.getSelection()) - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_ATTR_NAME_CASE, HTMLCorePreferenceNames.UPPER); - else if (fRadioButtonAttrNameCaseLower.getSelection()) - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_ATTR_NAME_CASE, HTMLCorePreferenceNames.LOWER); - else - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_ATTR_NAME_CASE, HTMLCorePreferenceNames.ASIS); - - // explicitly save plugin preferences so values are stored - HTMLCorePlugin.getDefault().savePluginPreferences(); - } - - protected void storeOptions() { - storeOptionsForHTML(); - - getModelPreferences().setValue(HTMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS, fCheckBoxCompressEmptyElementTags.getSelection()); - getModelPreferences().setValue(HTMLCorePreferenceNames.INSERT_REQUIRED_ATTRS, fCheckBoxInsertRequiredAttrs.getSelection()); - getModelPreferences().setValue(HTMLCorePreferenceNames.INSERT_MISSING_TAGS, fCheckBoxInsertMissingTags.getSelection()); - getModelPreferences().setValue(HTMLCorePreferenceNames.QUOTE_ATTR_VALUES, fCheckBoxQuoteAttrValues.getSelection()); - getModelPreferences().setValue(HTMLCorePreferenceNames.FORMAT_SOURCE, fCheckBoxFormatSource.getSelection()); - getModelPreferences().setValue(HTMLCorePreferenceNames.CONVERT_EOL_CODES, fCheckBoxConvertEOLCodes.getSelection()); - - if (fCheckBoxConvertEOLCodes.getSelection()) { - if (fRadioButtonConvertEOLUnix.getSelection()) { - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_EOL_CODE, CommonEncodingPreferenceNames.LF); - } else if (fRadioButtonConvertEOLMac.getSelection()) { - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_EOL_CODE, CommonEncodingPreferenceNames.CR); - } else { - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEANUP_EOL_CODE, CommonEncodingPreferenceNames.CRLF); - } - } - - // explicitly save plugin preferences so values are stored - HTMLCorePlugin.getDefault().savePluginPreferences(); - } - - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - - public void widgetSelected(SelectionEvent e) { - if (e.widget == fCheckBoxConvertEOLCodes) - enableEOLCodeRadios(fCheckBoxConvertEOLCodes.getSelection()); - - okButtonEnablement(); - } - - protected Preferences getModelPreferences() { - return HTMLCorePlugin.getDefault().getPluginPreferences(); - } - - private boolean isXHTMLType() { - return fIsXHTML; - } - - protected void enableEOLCodeRadios(boolean enable) { - if ((fRadioButtonConvertEOLWindows != null) && (fRadioButtonConvertEOLUnix != null) && (fRadioButtonConvertEOLMac != null)) { - fRadioButtonConvertEOLWindows.setEnabled(enable); - fRadioButtonConvertEOLUnix.setEnabled(enable); - fRadioButtonConvertEOLMac.setEnabled(enable); - - if (!fRadioButtonConvertEOLWindows.getSelection() && !fRadioButtonConvertEOLUnix.getSelection() && !fRadioButtonConvertEOLMac.getSelection()) - fRadioButtonConvertEOLWindows.setSelection(true); - } - } - - /** - * Enables/disables the tag/attr case radio buttons - */ - private void enableCaseControls(boolean enable) { - fTagNameCase.setEnabled(enable); - fRadioButtonTagNameCaseAsis.setEnabled(enable); - fRadioButtonTagNameCaseLower.setEnabled(enable); - fRadioButtonTagNameCaseUpper.setEnabled(enable); - - fAttrNameCase.setEnabled(enable); - fRadioButtonAttrNameCaseAsis.setEnabled(enable); - fRadioButtonAttrNameCaseLower.setEnabled(enable); - fRadioButtonAttrNameCaseUpper.setEnabled(enable); - } - - /** - * Enables/disables OK button - * - */ - private void okButtonEnablement() { - boolean tagNameCaseCheck = ((fRadioButtonTagNameCaseUpper != null && fRadioButtonTagNameCaseUpper.getSelection()) || fRadioButtonTagNameCaseLower.getSelection()); - boolean attrNameCaseCheck = ((fRadioButtonAttrNameCaseUpper != null && fRadioButtonAttrNameCaseUpper.getSelection()) || fRadioButtonAttrNameCaseLower.getSelection()); - boolean eolCheck = fCheckBoxConvertEOLCodes.getSelection() && (fRadioButtonConvertEOLUnix.getSelection() || fRadioButtonConvertEOLMac.getSelection() || fRadioButtonConvertEOLWindows.getSelection()); - boolean buttonEnabled = false; - if (isXHTMLType()){ - buttonEnabled = fCheckBoxInsertRequiredAttrs.getSelection() || fCheckBoxInsertMissingTags.getSelection() || fCheckBoxQuoteAttrValues.getSelection() || fCheckBoxFormatSource.getSelection() || eolCheck; - } - else { - buttonEnabled = tagNameCaseCheck || attrNameCaseCheck || fCheckBoxInsertRequiredAttrs.getSelection() || fCheckBoxInsertMissingTags.getSelection() || fCheckBoxQuoteAttrValues.getSelection() || fCheckBoxFormatSource.getSelection() || eolCheck; - } - getButton(IDialogConstants.OK_ID).setEnabled(buttonEnabled); - } - - void setisXHTMLType(boolean isXHTML) { - fIsXHTML = isXHTML; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDocumentHandler.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDocumentHandler.java deleted file mode 100644 index 75c5267d26..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDocumentHandler.java +++ /dev/null @@ -1,137 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.edit.ui; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.IHandler; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.ui.internal.SSEUIMessages; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; - -public class CleanupDocumentHandler extends AbstractHandler implements IHandler { - private IStructuredCleanupProcessor fCleanupProcessor; - - public void dispose() { - // nulling out just in case - fCleanupProcessor = null; - } - - public Object execute(ExecutionEvent event) throws ExecutionException { - IEditorPart editorPart = HandlerUtil.getActiveEditor(event); - ITextEditor textEditor = null; - if (editorPart instanceof ITextEditor) - textEditor = (ITextEditor) editorPart; - else { - Object o = editorPart.getAdapter(ITextEditor.class); - if (o != null) - textEditor = (ITextEditor) o; - } - if (textEditor != null) { - final ITextEditor editor = textEditor; - CleanupDialogHTML cleanupDialog = new CleanupDialogHTML(editor.getSite().getShell()); - cleanupDialog.setisXHTMLType(isXHTML(editor)); - if (cleanupDialog.open() == Window.OK) { - // setup runnable - Runnable runnable = new Runnable() { - public void run() { - IStructuredCleanupProcessor cleanupProcessor = getCleanupProcessor(); - if (cleanupProcessor != null) { - IStructuredModel model = null; - try { - model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput())); - if (model != null) - cleanupProcessor.cleanupModel(model); - } - finally { - if (model != null) - model.releaseFromEdit(); - } - } - } - }; - - // TODO: make independent of 'model'. - IStructuredModel model = null; - try { - model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput())); - if (model != null) { - // begin recording - ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection(); - model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength()); //$NON-NLS-1$ //$NON-NLS-2$ - - // tell the model that we are about to make a big - // model change - model.aboutToChangeModel(); - - // run - BusyIndicator.showWhile(editor.getEditorSite().getWorkbenchWindow().getShell().getDisplay(), runnable); - } - } - finally { - if (model != null) { - // tell the model that we are done with the big - // model - // change - model.changedModel(); - - // end recording - ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection(); - model.endRecording(this, selection.getOffset(), selection.getLength()); - model.releaseFromEdit(); - } - } - } - } - return null; - } - - IStructuredCleanupProcessor getCleanupProcessor() { - if (fCleanupProcessor == null) - fCleanupProcessor = new HTMLCleanupProcessorImpl(); - - return fCleanupProcessor; - } - - private boolean isXHTML(ITextEditor editor) { - boolean isxhtml = false; - if (editor != null) { - IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput()); - IStructuredModel model = null; - try { - model = StructuredModelManager.getModelManager().getExistingModelForRead(document); - if (model instanceof IDOMModel) { - IDOMDocument domDocument = ((IDOMModel) model).getDocument(); - if (domDocument != null) - isxhtml = domDocument.isXMLType(); - } - } - finally { - if (model != null) { - model.releaseFromRead(); - } - } - } - return isxhtml; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/HTMLEditorPluginImageHelper.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/HTMLEditorPluginImageHelper.java deleted file mode 100644 index ab6450af50..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/HTMLEditorPluginImageHelper.java +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.editor; - -import java.util.HashMap; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; - - -/** - * Helper class to handle images provided by this plug-in. - */ -public class HTMLEditorPluginImageHelper { - private final String PLUGINID = HTMLUIPlugin.ID; - private static HTMLEditorPluginImageHelper instance = null; - - // save a descriptor for each image - private HashMap fImageDescRegistry = null; - - /** - * Gets the instance. - * - * @return Returns a HTMLEditorPluginImageHelper - */ - public synchronized static HTMLEditorPluginImageHelper getInstance() { - if (instance == null) - instance = new HTMLEditorPluginImageHelper(); - return instance; - } - - /** - * Retrieves the image associated with resource from the image registry. - * If the image cannot be retrieved, attempt to find and load the image at - * the location specified in resource. - * - * @param resource - * the image to retrieve - * @return Image the image associated with resource or null if one could - * not be found - */ - public Image getImage(String resource) { - Image image = getImageRegistry().get(resource); - if (image == null) { - // create an image - image = createImage(resource); - } - return image; - } - - /** - * Retrieves the image descriptor associated with resource from the image - * descriptor registry. If the image descriptor cannot be retrieved, - * attempt to find and load the image descriptor at the location specified - * in resource. - * - * @param resource - * the image descriptor to retrieve - * @return ImageDescriptor the image descriptor assocated with resource or - * the default "missing" image descriptor if one could not be - * found - */ - public ImageDescriptor getImageDescriptor(String resource) { - ImageDescriptor imageDescriptor = null; - Object o = getImageDescriptorRegistry().get(resource); - if (o == null) { - //create a descriptor - imageDescriptor = createImageDescriptor(resource); - } - else { - imageDescriptor = (ImageDescriptor) o; - } - return imageDescriptor; - } - - /** - * Returns the image descriptor registry for this plugin. - * - * @return HashMap - image descriptor registry for this plugin - */ - private HashMap getImageDescriptorRegistry() { - if (fImageDescRegistry == null) - fImageDescRegistry = new HashMap(); - return fImageDescRegistry; - } - - /** - * Returns the image registry for this plugin. - * - * @return ImageRegistry - image registry for this plugin - */ - private ImageRegistry getImageRegistry() { - return HTMLUIPlugin.getInstance().getImageRegistry(); - } - - /** - * Creates an image from the given resource and adds the image to the - * image registry. - * - * @param resource - * @return Image - */ - private Image createImage(String resource) { - ImageDescriptor desc = getImageDescriptor(resource); - Image image = null; - - if (desc != null) { - image = desc.createImage(); - // dont add the missing image descriptor image to the image registry - if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) - getImageRegistry().put(resource, image); - } - return image; - } - - /** - * Creates an image descriptor from the given imageFilePath and adds the - * image descriptor to the image descriptor registry. If an image - * descriptor could not be created, the default "missing" image descriptor - * is returned but not added to the image descriptor registry. - * - * @param imageFilePath - * @return ImageDescriptor image descriptor for imageFilePath or default - * "missing" image descriptor if resource could not be found - */ - private ImageDescriptor createImageDescriptor(String imageFilePath) { - ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGINID, imageFilePath); - if (imageDescriptor != null) { - getImageDescriptorRegistry().put(imageFilePath, imageDescriptor); - } - else { - imageDescriptor = ImageDescriptor.getMissingImageDescriptor(); - } - - return imageDescriptor; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/HTMLEditorPluginImages.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/HTMLEditorPluginImages.java deleted file mode 100644 index 1fa0f242e7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/HTMLEditorPluginImages.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.editor; - -/** - * Bundle of most images used by the HTML Editor plug-in. - */ -public class HTMLEditorPluginImages { - public static final String IMG_OBJ_TABLE = "icons/full/obj16/table.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_ANCHOR = "icons/full/obj16/tag-anchor.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_BODY = "icons/full/obj16/tag-body.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_BUTTON = "icons/full/obj16/tag-button.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_FONT = "icons/full/obj16/tag-font.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_FORM = "icons/full/obj16/tag-form.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_GENERIC = "icons/full/obj16/tag-generic.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_HTML = "icons/full/obj16/tag-html.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_IMAGE_MAP = "icons/full/obj16/tag-image-map.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_IMAGE = "icons/full/obj16/tag-image.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_JSP = "icons/full/obj16/tag-jsp.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_TEMPLATE = "icons/full/obj16/tag-template.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG_TITLE = "icons/full/obj16/tag-title.gif"; //$NON-NLS-1$ - public static final String IMG_OBJ_TAG = "icons/full/obj16/tag.gif"; //$NON-NLS-1$ - public static final String IMG_WIZBAN_NEWHTMLFILE = "icons/full/wizban/newhfile_wiz.png"; //$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/IHelpContextIds.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/IHelpContextIds.java deleted file mode 100644 index 569b7240a3..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/editor/IHelpContextIds.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.editor; - -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; - -/** - * Help context ids for the HTML Source Editor. - * <p> - * This interface contains constants only; it is not intended to be implemented. - * </p> - * - */ -public interface IHelpContextIds { - // org.eclipse.wst.html.ui. - public static final String PREFIX = HTMLUIPlugin.ID + "."; //$NON-NLS-1$ - - // // figured out on the fly - // // HTML Source page editor - // public static final String HTML_SOURCEVIEW_HELPID = - // ContentTypeIdForHTML.ContentTypeID_HTML +"_source_HelpId"; - // //$NON-NLS-1$ - - // HTML Files Preference page - public static final String HTML_PREFWEBX_FILES_HELPID = PREFIX + "webx0030"; //$NON-NLS-1$ - // HTML Source Preference page - public static final String HTML_PREFWEBX_SOURCE_HELPID = PREFIX + "webx0031"; //$NON-NLS-1$ - // HTML Styles Preference page - public static final String HTML_PREFWEBX_STYLES_HELPID = PREFIX + "webx0032"; //$NON-NLS-1$ - // HTML Templates Preference page - public static final String HTML_PREFWEBX_TEMPLATES_HELPID = PREFIX + "webx0033"; //$NON-NLS-1$ - - // HTML Cleanup dialog - public static final String CLEANUP_HTML_HELPID = PREFIX + "xmlm1100"; //$NON-NLS-1$ - - // HTML Content Settings - public static final String WEB_CONTENT_SETTINGS_HELPID = PREFIX + "misc0170"; //$NON-NLS-1$ - - // HTML New File Wizard - Template Page - public static final String HTML_NEWWIZARD_TEMPLATE_HELPID = PREFIX + "htmlw0010"; //$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/handlers/HTMLFindOccurrencesHandler.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/handlers/HTMLFindOccurrencesHandler.java deleted file mode 100644 index 68cc317bfc..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/handlers/HTMLFindOccurrencesHandler.java +++ /dev/null @@ -1,154 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.handlers; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.IHandler; -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IFileEditorInput; -import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.wst.html.ui.internal.search.HTMLFindOccurrencesProcessor; -import org.eclipse.wst.sse.ui.StructuredTextEditor; -import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder; -import org.eclipse.wst.sse.ui.internal.SSEUIMessages; -import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor; -import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil; - -public class HTMLFindOccurrencesHandler extends AbstractHandler implements IHandler { - private List fProcessors; - - - public Object execute(ExecutionEvent event) throws ExecutionException { - IEditorPart editor = HandlerUtil.getActiveEditor(event); - ITextEditor textEditor = null; - boolean okay = false; - - if (editor instanceof ITextEditor) - textEditor = (ITextEditor) editor; - else { - Object o = editor.getAdapter(ITextEditor.class); - if (o != null) - textEditor = (ITextEditor) o; - } - - if (textEditor != null) { - IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); - if (document != null) { - ITextSelection textSelection = getTextSelection(textEditor); - FindOccurrencesProcessor findOccurrenceProcessor = getProcessorForCurrentSelection(document, textSelection); - if (findOccurrenceProcessor != null) { - if (textEditor.getEditorInput() instanceof IFileEditorInput) { - IFile file = ((IFileEditorInput) textEditor.getEditorInput()).getFile(); - okay = findOccurrenceProcessor.findOccurrences(document, textSelection, file); - } - } - } - } - if (okay) { - // clear status message - PlatformStatusLineUtil.clearStatusLine(); - } - else { - String errorMessage = SSEUIMessages.FindOccurrencesActionProvider_0; //$NON-NLS-1$ - if (textEditor instanceof StructuredTextEditor) { - PlatformStatusLineUtil.displayTemporaryErrorMessage(((StructuredTextEditor) textEditor).getTextViewer(), errorMessage); - } - else { - PlatformStatusLineUtil.displayErrorMessage(errorMessage); - PlatformStatusLineUtil.addOneTimeClearListener(); - } - } - return null; - } - - /** - * Get the appropriate find occurrences processor - * - * @param document - - * assumes not null - * @param textSelection - * @return - */ - private FindOccurrencesProcessor getProcessorForCurrentSelection(IDocument document, ITextSelection textSelection) { - // check if we have an action that's enabled on the current partition - ITypedRegion tr = getPartition(document, textSelection); - String partition = tr != null ? tr.getType() : ""; //$NON-NLS-1$ - - Iterator it = getProcessors().iterator(); - FindOccurrencesProcessor processor = null; - while (it.hasNext()) { - processor = (FindOccurrencesProcessor) it.next(); - // we just choose the first action that can handle the partition - if (processor.enabledForParitition(partition)) - return processor; - } - - List extendedFindOccurrencesProcessors = ExtendedConfigurationBuilder.getInstance().getConfigurations(FindOccurrencesProcessor.class.getName(), partition); - for (int i = 0; i < extendedFindOccurrencesProcessors.size(); i++) { - Object o = extendedFindOccurrencesProcessors.get(i); - if (o instanceof FindOccurrencesProcessor) { - /* - * We just choose the first registered processor that - * explicitly says it can handle the partition - */ - processor = (FindOccurrencesProcessor) o; - if (processor.enabledForParitition(partition)) - return processor; - } - } - return null; - } - - private ITypedRegion getPartition(IDocument document, ITextSelection textSelection) { - ITypedRegion region = null; - if (textSelection != null) { - try { - region = document.getPartition(textSelection.getOffset()); - } - catch (BadLocationException e) { - region = null; - } - } - return region; - } - - private ITextSelection getTextSelection(ITextEditor textEditor) { - ITextSelection textSelection = null; - ISelection selection = textEditor.getSelectionProvider().getSelection(); - if (selection instanceof ITextSelection && !selection.isEmpty()) { - textSelection = (ITextSelection) selection; - } - return textSelection; - } - - protected List getProcessors() { - if (fProcessors == null) { - fProcessors = new ArrayList(); - HTMLFindOccurrencesProcessor htmlProcessor = new HTMLFindOccurrencesProcessor(); - fProcessors.add(htmlProcessor); - } - return fProcessors; - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/hyperlink/AnchorHyperlinkDetector.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/hyperlink/AnchorHyperlinkDetector.java deleted file mode 100644 index e48f0deb28..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/hyperlink/AnchorHyperlinkDetector.java +++ /dev/null @@ -1,525 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.html.ui.internal.hyperlink;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.ITextViewerExtension5;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.internal.validate.ModuleCoreSupport;
-import org.eclipse.wst.html.ui.internal.HTMLUIMessages;
-import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
-import org.eclipse.wst.html.ui.internal.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class AnchorHyperlinkDetector extends AbstractHyperlinkDetector {
- static class ExternalElementHyperlink implements IHyperlink {
- private String fAnchorName = null;
- private Element fBaseElement = null;
- private Display fDisplay = null;
- private IRegion fHyperlinkRegion = null;
-
- /**
- * @param hyperlinkRegion
- * @param anchorName
- */
- public ExternalElementHyperlink(Display display, IRegion hyperlinkRegion, String anchorName, Element baseElement) {
- super();
- fDisplay = display;
- fHyperlinkRegion = hyperlinkRegion;
- fAnchorName = anchorName;
- fBaseElement = baseElement;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
- */
- IStatus _open() {
- if (fBaseElement instanceof IDOMNode) {
- StringTokenizer tokenizer = new StringTokenizer(fAnchorName, "#"); //$NON-NLS-1$
- String filename = null;
- String anchorName = null;
- if (tokenizer.hasMoreTokens()) {
- try {
- filename = tokenizer.nextToken();
- anchorName = tokenizer.nextToken();
- }
- catch (NoSuchElementException e) {
- // poorly formed value
- }
- }
- if (filename != null && anchorName != null) {
- // System.out.println(filename + ":" + anchorName + "-" +
- // fBaseElement);
-
- IPath basePath = new Path(((IDOMNode) fBaseElement).getModel().getBaseLocation());
- if (basePath.segmentCount() > 1) {
- IPath resolved = ModuleCoreSupport.resolve(basePath, filename);
- IFile targetFile = ResourcesPlugin.getWorkspace().getRoot().getFile(resolved);
- if (targetFile.isAccessible()) {
- IStructuredModel model = null;
- int start = -1;
- int end = -1;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(targetFile);
- if (model instanceof IDOMModel) {
- NodeList anchors = ((IDOMModel) model).getDocument().getElementsByTagNameNS("*", HTML40Namespace.ElementName.A); //$NON-NLS-1$
- for (int i = 0; i < anchors.getLength() && start < 0; i++) {
- Node item = anchors.item(i);
- Node nameNode = item.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_NAME);
- if (nameNode == null)
- nameNode = item.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_ID);
- if (nameNode != null) {
- String name = nameNode.getNodeValue();
- if (anchorName.equals(name) && nameNode instanceof IndexedRegion) {
- start = ((IndexedRegion) nameNode).getStartOffset();
- end = ((IndexedRegion) nameNode).getEndOffset();
- }
- }
- }
- anchors = ((IDOMModel) model).getDocument().getElementsByTagName(HTML40Namespace.ElementName.A);
- for (int i = 0; i < anchors.getLength() && start < 0; i++) {
- Node item = anchors.item(i);
- Node nameNode = item.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_NAME);
- if (nameNode == null)
- nameNode = item.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_ID);
- if (nameNode != null) {
- String name = nameNode.getNodeValue();
- if (anchorName.equals(name) && nameNode instanceof IndexedRegion) {
- start = ((IndexedRegion) nameNode).getStartOffset();
- end = ((IndexedRegion) nameNode).getEndOffset();
- }
- }
- }
-
- anchors = ((IDOMModel) model).getDocument().getElementsByTagName("*"); //$NON-NLS-1$
- for (int i = 0; i < anchors.getLength() && start < 0; i++) {
- Node item = anchors.item(i);
- Node nameNode = item.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_NAME);
- if (nameNode == null)
- nameNode = item.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_ID);
- if (nameNode != null) {
- String name = nameNode.getNodeValue();
- if (anchorName.equals(name) && nameNode instanceof IndexedRegion) {
- start = ((IndexedRegion) nameNode).getStartOffset();
- end = ((IndexedRegion) nameNode).getEndOffset();
- }
- }
- }
-
- }
- return open(basePath.toString(), targetFile, start, end);
- }
- catch (Exception e) {
- Logger.logException(e);
- return new Status(IStatus.ERROR, HTMLUIPlugin.ID, e.getMessage());
-
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
- */
- public IRegion getHyperlinkRegion() {
- return fHyperlinkRegion;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
- */
- public String getHyperlinkText() {
- return NLS.bind(HTMLUIMessages.Open, fAnchorName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
- */
- public String getTypeLabel() {
- return null;
- }
-
- public void open() {
- scheduleOpen();
- }
-
- /**
- * @param targetFile
- * @param start
- * @param end
- */
- private IStatus open(String base, IFile targetFile, int start, int end) throws CoreException, PartInitException {
- IMarker temporaryMarker = null;
- try {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
- IEditorPart editor = IDE.openEditor(page, targetFile);
-
- if (0 <= start && start <= end) {
- temporaryMarker = targetFile.createMarker(IMarker.BOOKMARK);
- temporaryMarker.setAttribute(IMarker.MESSAGE, base);
- temporaryMarker.setAttribute(IMarker.CHAR_START, start);
- temporaryMarker.setAttribute(IMarker.CHAR_END, end);
- IDE.gotoMarker(editor, temporaryMarker);
- }
- return Status.OK_STATUS;
- }
- finally {
- if (temporaryMarker != null)
- try {
- temporaryMarker.delete();
- }
- catch (CoreException e) {
- Logger.logException(e);
- }
- }
- }
-
- void scheduleOpen() {
- Job opener = new UIJob(fDisplay, fAnchorName) {
- public IStatus runInUIThread(IProgressMonitor monitor) {
- return _open();
- }
-
- };
- opener.setSystem(true);
- opener.setUser(false);
- opener.schedule();
- }
- }
-
- /**
- * Links to the given target node within the text viewer. The target node
- * is expected to implement IndexedNode and appear in that text viewer
- * (i.e. same editor).
- *
- */
- static class InternalElementHyperlink implements IHyperlink {
- private IRegion fHyperlinkRegion;
- private Node fTarget = null;
- private ITextViewer fViewer = null;
-
- /**
- *
- */
- public InternalElementHyperlink(ITextViewer textViewer, IRegion hyperlinkRegion, Node targetNode) {
- fHyperlinkRegion = hyperlinkRegion;
- fTarget = targetNode;
- fViewer = textViewer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
- */
- public IRegion getHyperlinkRegion() {
- return fHyperlinkRegion;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
- */
- public String getHyperlinkText() {
- if (fTarget instanceof IndexedRegion) {
- try {
- int line = fViewer.getDocument().getLineOfOffset(((IndexedRegion) fTarget).getStartOffset()) + 1;
- return NLS.bind(HTMLUIMessages.Hyperlink_line, new String[]{fTarget.getNodeName(), fTarget.getNodeValue(), String.valueOf(line)});
- }
- catch (BadLocationException e) {
- Logger.logException(e);
- }
- }
- return NLS.bind(HTMLUIMessages.Open, fTarget.getNodeName());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
- */
- public String getTypeLabel() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
- */
- public void open() {
- if (fTarget instanceof IndexedRegion) {
- int offset = ((IndexedRegion) fTarget).getStartOffset();
- if (fViewer instanceof ITextViewerExtension5) {
- offset = ((ITextViewerExtension5) fViewer).modelOffset2WidgetOffset(offset);
- }
- fViewer.getSelectionProvider().setSelection(new TextSelection(offset, 0));
- fViewer.revealRange(offset, 0);
- }
- }
- }
-
- public AnchorHyperlinkDetector() {
- super();
- }
-
- private void addHyperLinkForHref(ITextViewer textViewer, IRegion linkRegion, Element element, String hrefValue, List links, Node anchor) {
- Node nameNode = anchor.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_HREF);
- if (nameNode != null) {
- String name = nameNode.getNodeValue();
- if (hrefValue.equals(name) && nameNode instanceof IndexedRegion) {
- links.add(new InternalElementHyperlink(textViewer, linkRegion, nameNode));
- }
- }
- }
-
- private void addHyperLinkForName(ITextViewer textViewer, IRegion linkRegion, Element element, String anchorName, List links, Node anchor) {
- Node nameNode = anchor.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_NAME);
- if (nameNode != null) {
- String name = nameNode.getNodeValue();
- if (anchorName.equals(name) && nameNode instanceof IndexedRegion) {
- links.add(new InternalElementHyperlink(textViewer, linkRegion, nameNode));
- }
- }
- nameNode = anchor.getAttributes().getNamedItem(HTML40Namespace.ATTR_NAME_ID);
- if (nameNode != null) {
- String name = nameNode.getNodeValue();
- if (anchorName.equals(name) && nameNode instanceof IndexedRegion) {
- links.add(new InternalElementHyperlink(textViewer, linkRegion, nameNode));
- }
- }
- }
-
- /**
- * @param documentRegion
- * @param valueRegion
- * @return
- */
- private IRegion createHyperlinkRegion(IStructuredDocumentRegion documentRegion, ITextRegion valueRegion) {
- return new Region(documentRegion.getStartOffset(valueRegion), valueRegion.getTextLength());
- }
-
- // link to anchors with the given name (value includes the '#')
- IHyperlink[] createHyperlinksToAnchorNamed(ITextViewer textViewer, IRegion hyperlinkRegion, Element element, String anchorName, boolean canShowMultipleHyperlinks) {
- List links = new ArrayList(1);
- // >1 guards the substring-ing
- if (anchorName.length() > 1 && anchorName.startsWith("#")) { //$NON-NLS-1$
- // an anchor in this document
- NodeList anchors = null;//element.getOwnerDocument().getElementsByTagNameNS("*", HTML40Namespace.ElementName.A); //$NON-NLS-1$
- String internalAnchorName = anchorName.substring(1);
-// for (int i = 0; i < anchors.getLength(); i++) {
-// addHyperLinkForName(textViewer, hyperlinkRegion, element, internalAnchorName, links, anchors.item(i));
-// }
-// anchors = element.getOwnerDocument().getElementsByTagName(HTML40Namespace.ElementName.A);
-// for (int i = 0; i < anchors.getLength(); i++) {
-// addHyperLinkForName(textViewer, hyperlinkRegion, element, internalAnchorName, links, anchors.item(i));
-// }
- anchors = element.getOwnerDocument().getElementsByTagName("*"); //$NON-NLS-1$
- for (int i = 0; i < anchors.getLength(); i++) {
- addHyperLinkForName(textViewer, hyperlinkRegion, element, internalAnchorName, links, anchors.item(i));
- }
- }
- else {
- // another file, possibly very slow to compute ahead of time
- links.add(new ExternalElementHyperlink(textViewer.getTextWidget().getDisplay(), hyperlinkRegion, anchorName, element));
- }
- if (!links.isEmpty()) {
- return (IHyperlink[]) links.toArray(new IHyperlink[links.size()]);
- }
- return null;
- }
-
- // link to anchors that link to this target
- IHyperlink[] createReferrerHyperlinks(ITextViewer textViewer, IRegion hyperlinkRegion, Element element, String nameValue, boolean canShowMultipleHyperlinks) {
- List links = new ArrayList(1);
- if (nameValue.length() > 0) {
- String target = "#" + nameValue; //$NON-NLS-1$
- NodeList anchors = null;//element.getOwnerDocument().getElementsByTagNameNS("*", HTML40Namespace.ElementName.A); //$NON-NLS-1$
-// for (int i = 0; i < anchors.getLength(); i++) {
-// addHyperLinkForHref(textViewer, hyperlinkRegion, element, target, links, anchors.item(i));
-// }
-// anchors = element.getOwnerDocument().getElementsByTagName(HTML40Namespace.ElementName.A);
-// for (int i = 0; i < anchors.getLength(); i++) {
-// addHyperLinkForHref(textViewer, hyperlinkRegion, element, target, links, anchors.item(i));
-// }
- anchors = element.getOwnerDocument().getElementsByTagName("*"); //$NON-NLS-1$
- for (int i = 0; i < anchors.getLength(); i++) {
- addHyperLinkForHref(textViewer, hyperlinkRegion, element, target, links, anchors.item(i));
- }
- }
- if (!links.isEmpty()) {
- return (IHyperlink[]) links.toArray(new IHyperlink[links.size()]);
- }
- return null;
- }
-
- public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
- if (textViewer != null && region != null) {
- IDocument document = textViewer.getDocument();
- if (document != null) {
- Node currentNode = getCurrentNode(document, region.getOffset());
- if (currentNode != null && currentNode.getNodeType() == Node.ELEMENT_NODE) {
- Element element = (Element) currentNode;
- IStructuredDocumentRegion documentRegion = ((IStructuredDocument) document).getRegionAtCharacterOffset(region.getOffset());
- ITextRegion textRegion = documentRegion.getRegionAtCharacterOffset(region.getOffset());
- ITextRegion nameRegion = null;
- ITextRegion valueRegion = null;
- String name = null;
- String value = null;
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(textRegion.getType())) {
- ITextRegionList regions = documentRegion.getRegions();
- /*
- * Could use 2, but there needs to be the tag open
- * and name regions
- */
- int index = regions.indexOf(textRegion);
- if (index >= 4) {
- nameRegion = regions.get(index - 2);
- valueRegion = textRegion;
- name = documentRegion.getText(nameRegion);
- value = StringUtils.strip(documentRegion.getText(valueRegion));
- }
- }
- else if (DOMRegionContext.XML_TAG_ATTRIBUTE_NAME.equals(textRegion.getType())) {
- ITextRegionList regions = documentRegion.getRegions();
- int index = regions.indexOf(textRegion);
- // minus 3 to leave equal and value regions
- if (index <= regions.size() - 3) {
- nameRegion = textRegion;
- valueRegion = regions.get(index + 2);
- name = documentRegion.getText(nameRegion);
- value = StringUtils.strip(documentRegion.getText(valueRegion));
- }
- }
- if (name != null && value != null) {
- int idx = -1;
- if (HTML40Namespace.ATTR_NAME_HREF.equalsIgnoreCase(name) && (idx = value.indexOf("#")) >= 0) { //$NON-NLS-1$
- String filename = value.substring(0, idx);
- final String anchorName = idx < value.length() - 1? value.substring(idx + 1) : null;
- if (anchorName != null) {
- final IPath basePath = new Path(((IDOMNode) element).getModel().getBaseLocation());
- if (basePath.segmentCount() > 1) {
- if (filename.length() == 0) {
- filename = basePath.lastSegment();
- }
- final IPath resolved = ModuleCoreSupport.resolve(basePath, filename);
- final IFile targetFile = ResourcesPlugin.getWorkspace().getRoot().getFile(resolved);
- if (targetFile.isAccessible())
- return createHyperlinksToAnchorNamed(textViewer, createHyperlinkRegion(documentRegion, valueRegion), element, value, canShowMultipleHyperlinks);
- }
- }
- }
- if (HTML40Namespace.ATTR_NAME_NAME.equalsIgnoreCase(name)||HTML40Namespace.ATTR_NAME_ID.equalsIgnoreCase(name)) {
- return createReferrerHyperlinks(textViewer, createHyperlinkRegion(documentRegion, valueRegion), element, value, canShowMultipleHyperlinks);
- }
- }
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the node the cursor is currently on in the document. null if no
- * node is selected
- *
- * @param offset
- * @return Node either element, doctype, text, or null
- */
- private Node getCurrentNode(IDocument document, int offset) {
- // get the current node at the offset (returns either: element,
- // doctype, text)
- IndexedRegion inode = null;
- IStructuredModel sModel = null;
- try {
- sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
- if (sModel != null) {
- inode = sModel.getIndexedRegion(offset);
- if (inode == null) {
- inode = sModel.getIndexedRegion(offset - 1);
- }
- }
- }
- finally {
- if (sModel != null)
- sModel.releaseFromRead();
- }
-
- if (inode instanceof Node) {
- return (Node) inode;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLCompletionProposalCategoriesConfiguration.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLCompletionProposalCategoriesConfiguration.java deleted file mode 100644 index 11cb1d09d4..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLCompletionProposalCategoriesConfiguration.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 20109 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.sse.ui.preferences.AbstractCompletionProposalCategoriesConfiguration; - -/** - * <p>The readable and writable completion proposal categories configuration - * for the HTML content type</p> - */ -public class HTMLCompletionProposalCategoriesConfiguration extends AbstractCompletionProposalCategoriesConfiguration { - - /** the ID of the preference page where users can change the preferences */ - private static final String PREFERENCES_PAGE_ID = "org.eclipse.wst.html.ui.preferences.contentassist"; //$NON-NLS-1$ - - /** - * <p>Creates the configuration</p> - */ - public HTMLCompletionProposalCategoriesConfiguration() { - //nothing to do. - } - - /** - * @see org.eclipse.wst.sse.ui.preferences.AbstractCompletionProposalCategoriesConfiguration#getPreferenceStore() - */ - protected IPreferenceStore getPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - - /** - * @see org.eclipse.wst.sse.ui.preferences.ICompletionProposalCategoriesConfigurationWriter#hasAssociatedPropertiesPage() - */ - public boolean hasAssociatedPropertiesPage() { - return true; - } - - /** - * @see org.eclipse.wst.sse.ui.preferences.ICompletionProposalCategoriesConfigurationWriter#getPropertiesPageID() - */ - public String getPropertiesPageID() { - return PREFERENCES_PAGE_ID; - } - - /** - * @see org.eclipse.wst.sse.ui.preferences.AbstractCompletionProposalCategoriesConfiguration#getShouldNotDisplayOnDefaultPagePrefKey() - */ - protected String getShouldNotDisplayOnDefaultPagePrefKey() { - return HTMLUIPreferenceNames.CONTENT_ASSIST_DO_NOT_DISPLAY_ON_DEFAULT_PAGE; - } - - /** - * @see org.eclipse.wst.sse.ui.preferences.AbstractCompletionProposalCategoriesConfiguration#getShouldNotDisplayOnOwnPagePrefKey() - */ - protected String getShouldNotDisplayOnOwnPagePrefKey() { - return HTMLUIPreferenceNames.CONTENT_ASSIST_DO_NOT_DISPLAY_ON_OWN_PAGE; - } - - /** - * @see org.eclipse.wst.sse.ui.preferences.AbstractCompletionProposalCategoriesConfiguration#getPageSortOrderPrefKey() - */ - protected String getPageSortOrderPrefKey() { - return HTMLUIPreferenceNames.CONTENT_ASSIST_OWN_PAGE_SORT_ORDER; - } - - /** - * @see org.eclipse.wst.sse.ui.preferences.AbstractCompletionProposalCategoriesConfiguration#getDefaultPageSortOrderPrefKey() - */ - protected String getDefaultPageSortOrderPrefKey() { - return HTMLUIPreferenceNames.CONTENT_ASSIST_DEFAULT_PAGE_SORT_ORDER; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceInitializer.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceInitializer.java deleted file mode 100644 index bc91ec69a7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceInitializer.java +++ /dev/null @@ -1,129 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences; - -import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.resource.ColorRegistry; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.style.IStyleConstantsHTML; -import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper; -import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML; - -/** - * Sets default values for HTML UI preferences - */ -public class HTMLUIPreferenceInitializer extends AbstractPreferenceInitializer { - - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() - */ - public void initializeDefaultPreferences() { - IPreferenceStore store = HTMLUIPlugin.getDefault().getPreferenceStore(); - ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(); - - store.setDefault(HTMLUIPreferenceNames.AUTO_PROPOSE, true); - store.setDefault(HTMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<=");//$NON-NLS-1$ - store.setDefault(HTMLUIPreferenceNames.AUTO_PROPOSE_DELAY, 500); - // HTML Style Preferences - String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$ - String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$ - String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_NAME, 127, 0, 127) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, 42, 0, 255) + JUSTITALIC; - store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, styleValue); - - styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$ - store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS, styleValue); // specified value is black; leaving as widget default - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_BORDER, 63, 95, 191) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.COMMENT_BORDER, styleValue); - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_TEXT, 63, 95, 191) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.COMMENT_TEXT, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DECL_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.DECL_BORDER, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_NAME, 0, 0, 128) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.DOCTYPE_NAME, styleValue); - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, 0, 0, 128) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, 128, 128, 128) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, 63, 127, 95) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, styleValue); - - styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$ - store.setDefault(IStyleConstantsXML.XML_CONTENT, styleValue); // specified value is black; leaving as widget default - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.TAG_BORDER, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_NAME, 63, 127, 127) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.TAG_NAME, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.PI_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.PI_BORDER, styleValue); - - styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$ - store.setDefault(IStyleConstantsXML.PI_CONTENT, styleValue); // specified value is black; leaving as widget default - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.CDATA_BORDER, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_TEXT, 0, 0, 0) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.CDATA_TEXT, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsHTML.SCRIPT_AREA_BORDER, 191, 95, 63) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsHTML.SCRIPT_AREA_BORDER, styleValue); - - styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.ENTITY_REFERENCE, 42, 0, 255) + NOBACKGROUNDBOLD; - store.setDefault(IStyleConstantsXML.ENTITY_REFERENCE, styleValue); - - // set default new html file template to use in new file wizard - /* - * Need to find template name that goes with default template id (name - * may change for different language) - */ - store.setDefault(HTMLUIPreferenceNames.NEW_FILE_TEMPLATE_ID, "org.eclipse.wst.html.ui.templates.html"); //$NON-NLS-1$ - - // Defaults for the Typing preference page - store.setDefault(HTMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS, true); - store.setDefault(HTMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS, true); - store.setDefault(HTMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS, true); - store.setDefault(HTMLUIPreferenceNames.TYPING_REMOVE_END_TAGS, true); - store.setDefault(HTMLUIPreferenceNames.TYPING_CLOSE_STRINGS, true); - store.setDefault(HTMLUIPreferenceNames.TYPING_CLOSE_BRACKETS, true); - - // Defaults for Content Assist preference page - store.setDefault(HTMLUIPreferenceNames.CONTENT_ASSIST_DO_NOT_DISPLAY_ON_DEFAULT_PAGE, ""); - store.setDefault(HTMLUIPreferenceNames.CONTENT_ASSIST_DO_NOT_DISPLAY_ON_OWN_PAGE, ""); - store.setDefault(HTMLUIPreferenceNames.CONTENT_ASSIST_DEFAULT_PAGE_SORT_ORDER, - "org.eclipse.wst.html.ui.proposalCategory.htmlTags\0" + - "org.eclipse.wst.css.ui.proposalCategory.css\0" + - "org.eclipse.wst.html.ui.proposalCategory.htmlTemplates\0" + - "org.eclipse.wst.css.ui.proposalCategory.cssTemplates"); - store.setDefault(HTMLUIPreferenceNames.CONTENT_ASSIST_OWN_PAGE_SORT_ORDER, - "org.eclipse.wst.html.ui.proposalCategory.htmlTemplates\0"+ - "org.eclipse.wst.css.ui.proposalCategory.cssTemplates\0" + - "org.eclipse.wst.html.ui.proposalCategory.htmlTags\0" + - "org.eclipse.wst.css.ui.proposalCategory.css"); - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceNames.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceNames.java deleted file mode 100644 index 5a060963ab..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/HTMLUIPreferenceNames.java +++ /dev/null @@ -1,170 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences; - -/** - * Preference keys for HTML UI - */ -public class HTMLUIPreferenceNames { - - /** - * A named preference that controls time before code assist gets auto activated. - * <p> - * Value is of type <code>String</code>. - * </p> - */ - public static final String AUTO_PROPOSE_DELAY = "autoProposeDelay";//$NON-NLS-1$ - - /** - * A named preference that controls if code assist gets auto activated. - * <p> - * Value is of type <code>Boolean</code>. - * </p> - */ - public static final String AUTO_PROPOSE = getAutoProposeKey(); - - private static String getAutoProposeKey() { - return "autoPropose";//$NON-NLS-1$ - } - - /** - * A named preference that holds the characters that auto activate code - * assist. - * <p> - * Value is of type <code>String</code>. All characters that trigger - * auto code assist. - * </p> - */ - public static final String AUTO_PROPOSE_CODE = getAutoProposeCodeKey(); - - private static String getAutoProposeCodeKey() { - return "autoProposeCode";//$NON-NLS-1$ - } - - /** - * The key to store customized templates. - * <p> - * Value is of type <code>String</code>. - * </p> - */ - public static final String TEMPLATES_KEY = getTemplatesKey(); - - private static String getTemplatesKey() { - return "org.eclipse.wst.sse.ui.custom_templates"; //$NON-NLS-1$ - } - - /** - * The key to store the last template name used in new HTML file wizard. - * Template name is stored instead of template id because user-created - * templates do not have template ids. - * <p> - * Value is of type <code>String</code>. - * </p> - */ - public static final String NEW_FILE_TEMPLATE_NAME = "newFileTemplateName"; //$NON-NLS-1$ - - /** - * The initial template ID to be used in the new HTML file wizard. In the absence - * of {@link NEW_FILE_TEMPLATE_NAME}, this ID is used to find a template name - */ - public static final String NEW_FILE_TEMPLATE_ID = "newFileTemplateId"; //$NON-NLS-1$ - - /** - * The key to store the option for auto-completing comments while - * typing. - * <p> - * Value is of type <code>boolean</code>. - * </p> - */ - public static final String TYPING_COMPLETE_COMMENTS = "completeComments"; //$NON-NLS-1$ - - /** - * The key to store the option for auto-completing end-tags after entering - * <code></</code> - * <p> - * Value is of type <code>boolean</code>. - * </p> - */ - public static final String TYPING_COMPLETE_END_TAGS = "completeEndTags"; //$NON-NLS-1$ - - /** - * The key to store the option for auto-completing the element after entering - * <code>></code> - * <p> - * Value is of type <code>boolean</code>. - * </p> - */ - public static final String TYPING_COMPLETE_ELEMENTS = "completeElements"; //$NON-NLS-1$ - - /** - * The key to store the option for removing an end-tag if the start tag is - * converted to an empty-tag. - * <p> - * Value is of type <code>boolean</code>. - * </p> - */ - public static final String TYPING_REMOVE_END_TAGS = "removeEndTags"; //$NON-NLS-1$ - - /** - * The key to store the option for auto-completing strings (" and ') while - * typing. - * <p> - * Value is of type <code>boolean</code>. - * </p> - */ - public static final String TYPING_CLOSE_STRINGS = "closeStrings"; //$NON-NLS-1$ - - /** - * The key to store the option for auto-completing brackets ([ and () while - * typing. - * <p> - * Value is of type <code>boolean</code>. - * </p> - */ - public static final String TYPING_CLOSE_BRACKETS = "closeBrackets"; //$NON-NLS-1$ - - /** - * <p>preference key used for saving which categories should not display on the default page</p> - * - * <p>Value is of type {@link String} consisting of - * <tt>org.eclipse.wst.sse.ui.completionProposal/proposalCategory/@id</tt>s separated by the null - * character (<tt>\0</tt>), ordered is ignored</p> - */ - public static final String CONTENT_ASSIST_DO_NOT_DISPLAY_ON_DEFAULT_PAGE = "html_content_assist_display_on_default_page"; //$NON-NLS-1$ - - /** - * <p>preference key used for saving which categories should not display on their own page</p> - * - * <p>Value is of type {@link String} consisting of - * <tt>org.eclipse.wst.sse.ui.completionProposal/proposalCategory/@id</tt>s separated by the null - * character (<tt>\0</tt>), order is ignored</p> - */ - public static final String CONTENT_ASSIST_DO_NOT_DISPLAY_ON_OWN_PAGE = "html_content_assist_display_on_own_page"; //$NON-NLS-1$ - - /** - * <p>preference key for saving the sort order of the categories when displaying them on their own page</p> - * - * <p>Value is of type {@link String} consisting of - * <tt>org.eclipse.wst.sse.ui.completionProposal/proposalCategory/@id</tt>s separated by the null - * character (<tt>\0</tt>) in the desired sort order.</p> - */ - public static final String CONTENT_ASSIST_OWN_PAGE_SORT_ORDER= "html_content_assist_own_page_sort_order"; //$NON-NLS-1$ - - /** - * <p>preference key for saving the sort order of the categories when displaying them on the default page</p> - * - * <p>Value is of type {@link String} consisting of - * <tt>org.eclipse.wst.sse.ui.completionProposal/proposalCategory/@id</tt>s separated by the null - * character (<tt>\0</tt>) in the desired sort order.</p> - */ - public static final String CONTENT_ASSIST_DEFAULT_PAGE_SORT_ORDER= "html_content_assist_default_page_sort_order"; //$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/EmptyFilePreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/EmptyFilePreferencePage.java deleted file mode 100644 index cc3ca1b388..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/EmptyFilePreferencePage.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.ScrolledComposite; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; - -public class EmptyFilePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - - private Composite createComposite(Composite parent, int numColumns) { - noDefaultAndApplyButton(); - - Composite composite = new Composite(parent, SWT.NULL); - - // GridLayout - GridLayout layout = new GridLayout(); - layout.numColumns = numColumns; - composite.setLayout(layout); - - // GridData - GridData data = new GridData(GridData.FILL); - data.horizontalIndent = 0; - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - - return composite; - } - - protected Control createContents(Composite parent) { - Composite composite = createScrolledComposite(parent); - - String description = HTMLUIMessages.EmptyFilePreferencePage_0; - Text text = new Text(composite, SWT.READ_ONLY); - // some themes on GTK have different background colors for Text and Labels - text.setBackground(composite.getBackground()); - text.setText(description); - - setSize(composite); - return composite; - } - - private Composite createScrolledComposite(Composite parent) { - // create scrollbars for this parent when needed - final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL); - sc1.setLayoutData(new GridData(GridData.FILL_BOTH)); - Composite composite = createComposite(sc1, 1); - sc1.setContent(composite); - - // not calling setSize for composite will result in a blank composite, - // so calling it here initially - // setSize actually needs to be called after all controls are created, - // so scrolledComposite - // has correct minSize - setSize(composite); - return composite; - } - - public void init(IWorkbench workbench) { - } - - private void setSize(Composite composite) { - if (composite != null) { - // Note: The font is set here in anticipation that the class inheriting - // this base class may add widgets to the dialog. setSize - // is assumed to be called just before we go live. - applyDialogFont(composite); - Point minSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT); - composite.setSize(minSize); - // set scrollbar composite's min size so page is expandable but - // has scrollbars when needed - if (composite.getParent() instanceof ScrolledComposite) { - ScrolledComposite sc1 = (ScrolledComposite) composite.getParent(); - sc1.setMinSize(minSize); - sc1.setExpandHorizontal(true); - sc1.setExpandVertical(true); - } - } - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLColorPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLColorPage.java deleted file mode 100644 index c299dacce8..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLColorPage.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004,2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import java.util.ArrayList; -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.Iterator; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore; -import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey; -import org.eclipse.wst.sse.ui.internal.preferences.ui.StyledTextColorPicker; -import org.eclipse.wst.xml.ui.internal.preferences.XMLColorPage; - -/** - * @deprecated - */ -public class HTMLColorPage extends XMLColorPage { - - /** - * Set up all the style preference keys in the overlay store - */ - protected OverlayKey[] createOverlayStoreKeys() { - ArrayList overlayKeys = new ArrayList(); - - ArrayList styleList = new ArrayList(); - initStyleList(styleList); - Iterator i = styleList.iterator(); - while (i.hasNext()) { - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String)i.next())); - } - - OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()]; - overlayKeys.toArray(keys); - return keys; - } - - public String getSampleText() { - return HTMLUIMessages.Sample_HTML_doc; - - } - - protected void initContextStyleMap(Dictionary contextStyleMap) { - - initCommonContextStyleMap(contextStyleMap); - initDocTypeContextStyleMap(contextStyleMap); - // FIXME: these were "brute forced" commented out when moving XMLJSPRegionContexts - // effect is unknown, but thought just to effect preference page - //contextStyleMap.put(XMLJSPRegionContexts.JSP_DIRECTIVE_NAME, IStyleConstantsXML.TAG_NAME); - //contextStyleMap.put(XMLJSPRegionContexts.JSP_COMMENT_OPEN, IStyleConstantsXML.COMMENT_BORDER); - //contextStyleMap.put(XMLJSPRegionContexts.JSP_COMMENT_TEXT, IStyleConstantsXML.COMMENT_TEXT); - //contextStyleMap.put(XMLJSPRegionContexts.JSP_COMMENT_CLOSE, IStyleConstantsXML.COMMENT_BORDER); - } - - protected void initDescriptions(Dictionary descriptions) { - - initCommonDescriptions(descriptions); - initDocTypeDescriptions(descriptions); - } - - protected void initStyleList(ArrayList list) { - initCommonStyleList(list); - initDocTypeStyleList(list); - // list.add(HTMLColorManager.SCRIPT_AREA_BORDER); - - } - - protected void setupPicker(StyledTextColorPicker picker) { - IModelManager mmanager = StructuredModelManager.getModelManager(); - picker.setParser(mmanager.createStructuredDocumentFor(ContentTypeIdForHTML.ContentTypeID_HTML).getParser()); - - // create descriptions for hilighting types - Dictionary descriptions = new Hashtable(); - initDescriptions(descriptions); - - // map region types to hilighting types - Dictionary contextStyleMap = new Hashtable(); - initContextStyleMap(contextStyleMap); - - ArrayList styleList = new ArrayList(); - initStyleList(styleList); - - picker.setContextStyleMap(contextStyleMap); - picker.setDescriptions(descriptions); - picker.setStyleList(styleList); - - // updatePickerFont(picker); - } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - protected Control createContents(Composite parent) { - Control c = super.createContents(parent); - PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IHelpContextIds.HTML_PREFWEBX_STYLES_HELPID); - return c; - } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore() - */ - protected IPreferenceStore doGetPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - /* (non-Javadoc) - * @see org.eclipse.wst.sse.ui.preferences.ui.AbstractColorPage#savePreferences() - */ - protected void savePreferences() { - HTMLUIPlugin.getDefault().savePluginPreferences(); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLContentAssistPreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLContentAssistPreferencePage.java deleted file mode 100644 index bd2c0c58e4..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLContentAssistPreferencePage.java +++ /dev/null @@ -1,248 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames; -import org.eclipse.wst.sse.ui.internal.Logger; -import org.eclipse.wst.sse.ui.internal.contentassist.CompletionProposoalCatigoriesConfigurationRegistry; -import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage; -import org.eclipse.wst.sse.ui.preferences.CodeAssistCyclingConfigurationBlock; -import org.eclipse.wst.sse.ui.preferences.ICompletionProposalCategoriesConfigurationWriter; -import org.eclipse.wst.xml.ui.internal.XMLUIMessages; - -/** - * <p>Defines the preference page for allowing the user to change the content - * assist preferences</p> - */ -public class HTMLContentAssistPreferencePage extends AbstractPreferencePage implements - IWorkbenchPreferencePage { - - private static final String HTML_CONTENT_TYPE_ID = "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$ - - // Auto Activation - private Button fAutoPropose; - private Label fAutoProposeDelayLabel; - private Text fAutoProposeDelay; - private Label fAutoProposeLabel; - private Text fAutoProposeText; - - /** configuration block for changing preference having to do with the content assist categories */ - private CodeAssistCyclingConfigurationBlock fConfigurationBlock; - - /** - * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - protected Control createContents(Composite parent) { - final Composite composite = super.createComposite(parent, 1); - - createContentsForAutoActivationGroup(composite); - createContentsForCyclingGroup(composite); - - setSize(composite); - loadPreferences(); - - return composite; - } - - /** - * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage#performDefaults() - */ - protected void performDefaults() { - performDefaultsForAutoActivationGroup(); - performDefaultsForCyclingGroup(); - - validateValues(); - enableValues(); - - super.performDefaults(); - } - - /** - * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage#initializeValues() - */ - protected void initializeValues() { - initializeValuesForAutoActivationGroup(); - initializeValuesForCyclingGroup(); - } - - /** - * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage#storeValues() - */ - protected void storeValues() { - storeValuesForAutoActivationGroup(); - storeValuesForCyclingGroup(); - } - - /** - * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage#enableValues() - */ - protected void enableValues() { - if (fAutoPropose != null) { - if (fAutoPropose.getSelection()) { - fAutoProposeDelayLabel.setEnabled(true); - fAutoProposeDelay.setEnabled(true); - fAutoProposeLabel.setEnabled(true); - fAutoProposeText.setEnabled(true); - } - else { - fAutoProposeDelayLabel.setEnabled(false); - fAutoProposeDelay.setEnabled(false); - fAutoProposeLabel.setEnabled(false); - fAutoProposeText.setEnabled(false); - } - } - } - - /** - * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore() - */ - protected IPreferenceStore doGetPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - - /** - * <p>Create contents for the auto activation preference group</p> - * @param parent {@link Composite} parent of the group - */ - private void createContentsForAutoActivationGroup(Composite parent) { - Group contentAssistGroup = createGroup(parent, 2); - contentAssistGroup.setText(HTMLUIMessages.Auto_Activation_UI_); - - fAutoPropose = createCheckBox(contentAssistGroup, HTMLUIMessages.Automatically_make_suggest_UI_); - ((GridData) fAutoPropose.getLayoutData()).horizontalSpan = 2; - fAutoPropose.addSelectionListener(this); - - fAutoProposeDelayLabel = createLabel(contentAssistGroup, HTMLUIMessages.Auto_Activation_Delay); - fAutoProposeDelay = createTextField(contentAssistGroup); - fAutoProposeDelay.setTextLimit(4); - fAutoProposeDelay.addModifyListener(new ModifyListener() { - - public void modifyText(ModifyEvent e) { - verifyDelay(); - } - }); - - fAutoProposeLabel = createLabel(contentAssistGroup, HTMLUIMessages.Prompt_when_these_characte_UI_); - fAutoProposeText = createTextField(contentAssistGroup); - } - - private void verifyDelay() { - final String text = fAutoProposeDelay.getText(); - boolean valid = true; - try { - final int delay = Integer.parseInt(text); - if (delay < 0) { - valid = false; - } - } - catch (NumberFormatException e) { - valid = false; - } - if (!valid) { - if (text.trim().length() > 0) - setErrorMessage(NLS.bind(XMLUIMessages.Not_an_integer, text)); - else - setErrorMessage(XMLUIMessages.Missing_integer); - setValid(false); - } - else { - setErrorMessage(null); - setValid(true); - } - } - - /** - * <p>Create the contents for the content assist cycling preference group</p> - * @param parent {@link Composite} parent of the group - */ - private void createContentsForCyclingGroup(Composite parent) { - ICompletionProposalCategoriesConfigurationWriter configurationWriter = CompletionProposoalCatigoriesConfigurationRegistry.getDefault().getWritableConfiguration(HTML_CONTENT_TYPE_ID); - - if(configurationWriter != null) { - fConfigurationBlock = new CodeAssistCyclingConfigurationBlock(HTML_CONTENT_TYPE_ID, configurationWriter); - fConfigurationBlock.createContents(parent, HTMLUIMessages.Cycling_UI_); - } else { - Logger.log(Logger.ERROR, "There should be an ICompletionProposalCategoriesConfigurationWriter" + //$NON-NLS-1$ - " specified for the HTML content type, but can't fine it, thus can't create user" + //$NON-NLS-1$ - " preference block for editing proposal categories preferences."); //$NON-NLS-1$ - } - } - - /** - * <p>Store the values for the auto activation group</p> - */ - private void storeValuesForAutoActivationGroup() { - getPreferenceStore().setValue(HTMLUIPreferenceNames.AUTO_PROPOSE, fAutoPropose.getSelection()); - getPreferenceStore().setValue(HTMLUIPreferenceNames.AUTO_PROPOSE_CODE, fAutoProposeText.getText()); - getPreferenceStore().setValue(HTMLUIPreferenceNames.AUTO_PROPOSE_DELAY, Integer.parseInt(fAutoProposeDelay.getText())); - } - - /** - * <p>Store the values for the cycling group</p> - */ - private void storeValuesForCyclingGroup() { - if (fConfigurationBlock != null) { - fConfigurationBlock.storeValues(); - } - } - - /** - * <p>Initialize the values for the auto activation group</p> - */ - private void initializeValuesForAutoActivationGroup() { - // Content Assist - fAutoPropose.setSelection(getPreferenceStore().getBoolean(HTMLUIPreferenceNames.AUTO_PROPOSE)); - fAutoProposeText.setText(getPreferenceStore().getString(HTMLUIPreferenceNames.AUTO_PROPOSE_CODE)); - fAutoProposeDelay.setText(Integer.toString(getPreferenceStore().getInt(HTMLUIPreferenceNames.AUTO_PROPOSE_DELAY))); - } - - /** - * <p>Initialize the values for the cycling group</p> - */ - private void initializeValuesForCyclingGroup() { - if(fConfigurationBlock != null) { - fConfigurationBlock.initializeValues(); - } - } - - /** - * <p>Load the defaults for the auto activation group</p> - */ - private void performDefaultsForAutoActivationGroup() { - // Content Assist - fAutoPropose.setSelection(getPreferenceStore().getDefaultBoolean(HTMLUIPreferenceNames.AUTO_PROPOSE)); - fAutoProposeText.setText(getPreferenceStore().getDefaultString(HTMLUIPreferenceNames.AUTO_PROPOSE_CODE)); - fAutoProposeDelay.setText(Integer.toString(getPreferenceStore().getDefaultInt(HTMLUIPreferenceNames.AUTO_PROPOSE_DELAY))); - } - - /** - * <p>Load the defaults of the cycling group</p> - */ - private void performDefaultsForCyclingGroup() { - if(fConfigurationBlock != null) { - fConfigurationBlock.performDefaults(); - } - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLFilesPreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLFilesPreferencePage.java deleted file mode 100644 index 1aa3304872..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLFilesPreferencePage.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.xml.ui.internal.preferences.WorkbenchDefaultEncodingSettings; -import org.eclipse.wst.xml.ui.internal.preferences.XMLFilesPreferencePage; - -public class HTMLFilesPreferencePage extends XMLFilesPreferencePage { - private WorkbenchDefaultEncodingSettings fInputEncodingSettings = null; - - protected Preferences getModelPreferences() { - return HTMLCorePlugin.getDefault().getPluginPreferences(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore() - */ - protected IPreferenceStore doGetPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - - protected void doSavePreferenceStore() { - HTMLCorePlugin.getDefault().savePluginPreferences(); // model - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - protected Control createContents(Composite parent) { - Composite scrolledComposite = createScrolledComposite(parent); - createContentsForCreatingGroup(scrolledComposite); - createContentsForLoadingGroup(scrolledComposite); - - PlatformUI.getWorkbench().getHelpSystem().setHelp(scrolledComposite, IHelpContextIds.HTML_PREFWEBX_FILES_HELPID); - - setSize(scrolledComposite); - loadPreferences(); - - return scrolledComposite; - } - - protected void createContentsForLoadingGroup(Composite parent) { - Group group = createGroup(parent, 1); - group.setText(HTMLUIMessages.HTMLFilesPreferencePage_0); - - fInputEncodingSettings = new WorkbenchDefaultEncodingSettings(group); - } - - protected IContentType getContentType() { - return Platform.getContentTypeManager().getContentType(ContentTypeIdForHTML.ContentTypeID_HTML); - } - - protected void initializeValues() { - super.initializeValues(); - initializeValuesForLoadingGroup(); - } - - protected void initializeValuesForLoadingGroup() { - String encoding = getModelPreferences().getString(CommonEncodingPreferenceNames.INPUT_CODESET); - - fInputEncodingSettings.setIANATag(encoding); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.preference.PreferencePage#performDefaults() - */ - protected void performDefaults() { - super.performDefaults(); - performDefaultsForLoadingGroup(); - } - - protected void performDefaultsForLoadingGroup() { - String encoding = getModelPreferences().getDefaultString(CommonEncodingPreferenceNames.INPUT_CODESET); - - fInputEncodingSettings.setIANATag(encoding); - } - - protected void storeValues() { - super.storeValues(); - storeValuesForLoadingGroup(); - } - - protected void storeValuesForLoadingGroup() { - getModelPreferences().setValue(CommonEncodingPreferenceNames.INPUT_CODESET, fInputEncodingSettings.getIANATag()); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java deleted file mode 100644 index 8c63e1bf23..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java +++ /dev/null @@ -1,518 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Spinner; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.ui.dialogs.PreferenceLinkArea; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory; -import org.eclipse.wst.html.core.internal.format.HTMLFormattingUtil; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage; -import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; -import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; -import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; - -import com.ibm.icu.text.Collator; - -public class HTMLSourcePreferencePage extends AbstractPreferencePage { - private Button fTagNameUpper = null; - private Button fTagNameLower = null; - private Button fAttrNameUpper = null; - private Button fAttrNameLower = null; - - private final int MIN_INDENTATION_SIZE = 0; - private final int MAX_INDENTATION_SIZE = 16; - - private Button fClearAllBlankLines; - - // Formatting - private Text fLineWidthText; - private Button fSplitMultiAttrs; - private Button fAlignEndBracket; - private Button fIndentUsingTabs; - private Button fIndentUsingSpaces; - private Spinner fIndentationSize; - - private Button fAddButton; - private Button fRemoveButton; - - private TableViewer fViewer; - - private ContentProvider fContentProvider; - - private Composite createContentsForPreferredCaseGroup(Composite parent, int columnSpan) { - Group caseGroup = createGroup(parent, columnSpan); - caseGroup.setText(HTMLUIMessages.Preferred_markup_case_UI_); - - // d257064 need to associate group w/ radio buttons so radio buttons - // header can be read - Group tagNameGroup = createGroup(caseGroup, 1); - tagNameGroup.setText(HTMLUIMessages.Tag_names__UI_); - fTagNameUpper = createRadioButton(tagNameGroup, HTMLUIMessages.Tag_names_Upper_case_UI_); - fTagNameLower = createRadioButton(tagNameGroup, HTMLUIMessages.Tag_names_Lower_case_UI_); - - // d257064 need to associate group w/ radio buttons so radio buttons - // header can be read - Group attrNameGroup = createGroup(caseGroup, 1); - attrNameGroup.setText(HTMLUIMessages.Attribute_names__UI_); - fAttrNameUpper = createRadioButton(attrNameGroup, HTMLUIMessages.Attribute_names_Upper_case_UI_); - fAttrNameLower = createRadioButton(attrNameGroup, HTMLUIMessages.Attribute_names_Lower_case_UI_); - - return parent; - - } - - private void createContentsForFormattingGroup(Composite parent) { - Group formattingGroup = createGroup(parent, 2); - formattingGroup.setText(HTMLUIMessages.Formatting_UI_); - - createLabel(formattingGroup, HTMLUIMessages.Line_width__UI_); - fLineWidthText = new Text(formattingGroup, SWT.SINGLE | SWT.BORDER); - GridData gData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.BEGINNING); - gData.widthHint = 25; - fLineWidthText.setLayoutData(gData); - fLineWidthText.addModifyListener(this); - - fSplitMultiAttrs = createCheckBox(formattingGroup, HTMLUIMessages.Split_multiple_attributes); - ((GridData) fSplitMultiAttrs.getLayoutData()).horizontalSpan = 2; - fAlignEndBracket = createCheckBox(formattingGroup, HTMLUIMessages.Align_final_bracket); - ((GridData) fAlignEndBracket.getLayoutData()).horizontalSpan = 2; - fClearAllBlankLines = createCheckBox(formattingGroup, HTMLUIMessages.Clear_all_blank_lines_UI_); - ((GridData) fClearAllBlankLines.getLayoutData()).horizontalSpan = 2; - - // [269224] - Place the indent controls in their own composite for proper tab ordering - Composite indentComposite = createComposite(formattingGroup, 1); - ((GridData) indentComposite.getLayoutData()).horizontalSpan = 2; - ((GridLayout) indentComposite.getLayout()).marginWidth = 0; - ((GridLayout) indentComposite.getLayout()).marginHeight = 0; - - fIndentUsingTabs = createRadioButton(indentComposite, HTMLUIMessages.Indent_using_tabs); - ((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1; - - fIndentUsingSpaces = createRadioButton(indentComposite, HTMLUIMessages.Indent_using_spaces); - ((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1; - - createLabel(formattingGroup, HTMLUIMessages.Indentation_size); - fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY | SWT.BORDER); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - fIndentationSize.setLayoutData(gd); - fIndentationSize.setToolTipText(HTMLUIMessages.Indentation_size_tip); - fIndentationSize.setMinimum(MIN_INDENTATION_SIZE); - fIndentationSize.setMaximum(MAX_INDENTATION_SIZE); - fIndentationSize.setIncrement(1); - fIndentationSize.setPageIncrement(4); - fIndentationSize.addModifyListener(this); - - GridData data; - - - Composite inlineGroup = new Composite(formattingGroup, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginWidth = 0; - layout.marginHeight = 0; - inlineGroup.setLayout(layout); - - data = new GridData(GridData.FILL_BOTH); - data.horizontalSpan = 2; - inlineGroup.setLayoutData(data); - - Label label = createLabel(inlineGroup, HTMLUIMessages.Inline_elements_table_label); - data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 2; - label.setLayoutData(data); - - final TableViewer viewer = new TableViewer(inlineGroup, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION); - data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 1; - data.verticalAlignment = SWT.BEGINNING; - data.heightHint = convertHeightInCharsToPixels(10); - viewer.getTable().setLayoutData(data); - - Composite buttonContainer = new Composite(inlineGroup, SWT.NONE); - data = new GridData(GridData.FILL_VERTICAL); - buttonContainer.setLayoutData(data); - layout = new GridLayout(); - layout.numColumns = 1; - layout.marginHeight = 0; - layout.marginWidth = 0; - buttonContainer.setLayout(layout); - - fAddButton = new Button(buttonContainer, SWT.PUSH); - fAddButton.setText(HTMLUIMessages.Add_inline); - fAddButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - HTMLElementDialog dialog = new HTMLElementDialog(getShell()); - dialog.setMessage(HTMLUIMessages.Elements_Dialog_message); - dialog.setTitle(HTMLUIMessages.Elements_Dialog_title); - dialog.setMultipleSelection(true); - dialog.setAllowDuplicates(false); - dialog.open(); - Object[] result = dialog.getResult(); - if (result != null) { - for (int i = 0; i < result.length; i++) { - fContentProvider.addElement(result[i].toString()); - } - fViewer.refresh(); - } - } - }); - data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - data.widthHint = Math.max(widthHint, fAddButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); - data.horizontalSpan = 1; - fAddButton.setLayoutData(data); - - fRemoveButton = new Button(buttonContainer, SWT.PUSH); - fRemoveButton.setText(HTMLUIMessages.Remove_inline); - fRemoveButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - ISelection selection = viewer.getSelection(); - if (selection != null && !selection.isEmpty() && selection instanceof StructuredSelection) { - Object[] remove = ((StructuredSelection) selection).toArray(); - for (int i = 0; i < remove.length; i++) { - fContentProvider.removeElement(remove[i].toString()); - } - if (remove.length > 0) { - fViewer.refresh(); - } - } - } - }); - data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); - data.horizontalSpan = 1; - fRemoveButton.setLayoutData(data); - - fViewer = viewer; - fContentProvider = new ContentProvider(); - viewer.setContentProvider(fContentProvider); - viewer.setInput(this); - viewer.setComparator(new ViewerComparator(Collator.getInstance())); - } - - protected void performDefaults() { - fTagNameUpper.setSelection(getModelPreferences().getDefaultInt(HTMLCorePreferenceNames.TAG_NAME_CASE) == HTMLCorePreferenceNames.UPPER); - fTagNameLower.setSelection(getModelPreferences().getDefaultInt(HTMLCorePreferenceNames.TAG_NAME_CASE) == HTMLCorePreferenceNames.LOWER); - fAttrNameUpper.setSelection(getModelPreferences().getDefaultInt(HTMLCorePreferenceNames.ATTR_NAME_CASE) == HTMLCorePreferenceNames.UPPER); - fAttrNameLower.setSelection(getModelPreferences().getDefaultInt(HTMLCorePreferenceNames.ATTR_NAME_CASE) == HTMLCorePreferenceNames.LOWER); - - performDefaultsForFormattingGroup(); - - validateValues(); - enableValues(); - - super.performDefaults(); - } - - private void performDefaultsForFormattingGroup() { - // Formatting - fLineWidthText.setText(getModelPreferences().getDefaultString(HTMLCorePreferenceNames.LINE_WIDTH)); - fSplitMultiAttrs.setSelection(getModelPreferences().getDefaultBoolean(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS)); - fAlignEndBracket.setSelection(getModelPreferences().getDefaultBoolean(HTMLCorePreferenceNames.ALIGN_END_BRACKET)); - fClearAllBlankLines.setSelection(getModelPreferences().getDefaultBoolean(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES)); - - if (HTMLCorePreferenceNames.TAB.equals(getModelPreferences().getDefaultString(HTMLCorePreferenceNames.INDENTATION_CHAR))) { - fIndentUsingTabs.setSelection(true); - fIndentUsingSpaces.setSelection(false); - } - else { - fIndentUsingSpaces.setSelection(true); - fIndentUsingTabs.setSelection(false); - } - fIndentationSize.setSelection(getModelPreferences().getDefaultInt(HTMLCorePreferenceNames.INDENTATION_SIZE)); - - // Inline elements - fContentProvider.restoreDefaults(); - fViewer.refresh(); - } - - protected void initializeValues() { - fTagNameUpper.setSelection(getModelPreferences().getInt(HTMLCorePreferenceNames.TAG_NAME_CASE) == HTMLCorePreferenceNames.UPPER); - fTagNameLower.setSelection(getModelPreferences().getInt(HTMLCorePreferenceNames.TAG_NAME_CASE) == HTMLCorePreferenceNames.LOWER); - fAttrNameUpper.setSelection(getModelPreferences().getInt(HTMLCorePreferenceNames.ATTR_NAME_CASE) == HTMLCorePreferenceNames.UPPER); - fAttrNameLower.setSelection(getModelPreferences().getInt(HTMLCorePreferenceNames.ATTR_NAME_CASE) == HTMLCorePreferenceNames.LOWER); - - initializeValuesForFormattingGroup(); - } - - private void initializeValuesForFormattingGroup() { - // Formatting - fLineWidthText.setText(getModelPreferences().getString(HTMLCorePreferenceNames.LINE_WIDTH)); - fSplitMultiAttrs.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS)); - fAlignEndBracket.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.ALIGN_END_BRACKET)); - fClearAllBlankLines.setSelection(getModelPreferences().getBoolean(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES)); - - if (HTMLCorePreferenceNames.TAB.equals(getModelPreferences().getString(HTMLCorePreferenceNames.INDENTATION_CHAR))) { - fIndentUsingTabs.setSelection(true); - fIndentUsingSpaces.setSelection(false); - } - else { - fIndentUsingSpaces.setSelection(true); - fIndentUsingTabs.setSelection(false); - } - - fIndentationSize.setSelection(getModelPreferences().getInt(HTMLCorePreferenceNames.INDENTATION_SIZE)); - } - - protected void storeValues() { - if (fTagNameUpper.getSelection()) - getModelPreferences().setValue(HTMLCorePreferenceNames.TAG_NAME_CASE, HTMLCorePreferenceNames.UPPER); - else - getModelPreferences().setValue(HTMLCorePreferenceNames.TAG_NAME_CASE, HTMLCorePreferenceNames.LOWER); - if (fAttrNameUpper.getSelection()) - getModelPreferences().setValue(HTMLCorePreferenceNames.ATTR_NAME_CASE, HTMLCorePreferenceNames.UPPER); - else - getModelPreferences().setValue(HTMLCorePreferenceNames.ATTR_NAME_CASE, HTMLCorePreferenceNames.LOWER); - - storeValuesForFormattingGroup(); - } - - private void storeValuesForFormattingGroup() { - // Formatting - getModelPreferences().setValue(HTMLCorePreferenceNames.LINE_WIDTH, fLineWidthText.getText()); - getModelPreferences().setValue(HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS, fSplitMultiAttrs.getSelection()); - getModelPreferences().setValue(HTMLCorePreferenceNames.ALIGN_END_BRACKET, fAlignEndBracket.getSelection()); - getModelPreferences().setValue(HTMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fClearAllBlankLines.getSelection()); - - if (fIndentUsingTabs.getSelection()) { - getModelPreferences().setValue(HTMLCorePreferenceNames.INDENTATION_CHAR, HTMLCorePreferenceNames.TAB); - } - else { - getModelPreferences().setValue(HTMLCorePreferenceNames.INDENTATION_CHAR, HTMLCorePreferenceNames.SPACE); - } - getModelPreferences().setValue(HTMLCorePreferenceNames.INDENTATION_SIZE, fIndentationSize.getSelection()); - } - - public boolean performOk() { - boolean result = super.performOk(); - - doSavePreferenceStore(); - - // Save values from inline elements - HTMLFormattingUtil.exportToPreferences(fContentProvider.fElements.toArray()); - - return result; - } - - protected Preferences getModelPreferences() { - return HTMLCorePlugin.getDefault().getPluginPreferences(); - } - - protected IPreferenceStore doGetPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - - private void doSavePreferenceStore() { - HTMLUIPlugin.getDefault().savePluginPreferences(); // UI - HTMLCorePlugin.getDefault().savePluginPreferences(); // model - } - - protected Control createContents(Composite parent) { - final Composite composite = super.createComposite(parent, 1); - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.HTML_PREFWEBX_SOURCE_HELPID); - - new PreferenceLinkArea(composite, SWT.WRAP | SWT.MULTI, "org.eclipse.wst.sse.ui.preferences.editor", HTMLUIMessages._UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK,//$NON-NLS-1$ - (IWorkbenchPreferenceContainer) getContainer(), null).getControl().setLayoutData(GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).create()); - new Label(composite, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().create()); - - createContentsForFormattingGroup(composite); - createContentsForPreferredCaseGroup(composite, 2); - setSize(composite); - loadPreferences(); - - return composite; - } - - protected void validateValues() { - boolean isError = false; - String widthText = null; - - if (fLineWidthText != null) { - try { - widthText = fLineWidthText.getText(); - int formattingLineWidth = Integer.parseInt(widthText); - if ((formattingLineWidth < WIDTH_VALIDATION_LOWER_LIMIT) || (formattingLineWidth > WIDTH_VALIDATION_UPPER_LIMIT)) { - throw new NumberFormatException(); - } - } - catch (NumberFormatException nfexc) { - setInvalidInputMessage(widthText); - setValid(false); - isError = true; - } - } - - int indentSize = 0; - if (fIndentationSize != null) { - try { - indentSize = fIndentationSize.getSelection(); - if ((indentSize < MIN_INDENTATION_SIZE) || (indentSize > MAX_INDENTATION_SIZE)) { - throw new NumberFormatException(); - } - } - catch (NumberFormatException nfexc) { - setInvalidInputMessage(Integer.toString(indentSize)); - setValid(false); - isError = true; - } - } - - if (!isError) { - setErrorMessage(null); - setValid(true); - } - } - - private static class HTMLElementDialog extends ElementListSelectionDialog { - public HTMLElementDialog(Shell parent) { - super(parent, new ILabelProvider() { - - public void removeListener(ILabelProviderListener listener) { - } - - public boolean isLabelProperty(Object element, String property) { - return false; - } - - public void dispose() { - } - - public void addListener(ILabelProviderListener listener) { - } - - public String getText(Object element) { - return element.toString(); - } - - public Image getImage(Object element) { - return null; - } - }); - } - - public int open() { - final List list = new ArrayList(); - IRunnableContext context = PlatformUI.getWorkbench().getProgressService(); - IRunnableWithProgress runnable= new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - if (monitor == null) { - monitor = new NullProgressMonitor(); - } - monitor.beginTask("Searching for known elements", 1); //$NON-NLS-1$ - try { - if (monitor.isCanceled()) { - throw new InterruptedException(); - } - CMNamedNodeMap map = HTMLCMDocumentFactory.getCMDocument(CMDocType.HTML5_DOC_TYPE).getElements(); - Iterator it = map.iterator(); - while (it.hasNext()) { - CMNode node = (CMNode) it.next(); - if (!node.getNodeName().startsWith("SSI:")) { //$NON-NLS-1$ - list.add(node.getNodeName().toLowerCase(Locale.US)); - } - monitor.worked(1); - } - } - finally { - monitor.done(); - } - } - }; - try { - context.run(true, true, runnable); - } - catch (InvocationTargetException e) { - return CANCEL; - } - catch (InterruptedException e) { - return CANCEL; - } - setElements(list.toArray()); - return super.open(); - } - } - - private class ContentProvider implements IStructuredContentProvider { - - private List fElements; - - public ContentProvider() { - fElements = new ArrayList(Arrays.asList(HTMLFormattingUtil.getInlineElements())); - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - - public void addElement(String name) { - if (!fElements.contains(name)) - fElements.add(name); - } - - public void removeElement(String name) { - fElements.remove(name); - } - - public Object[] getElements(Object inputElement) { - return fElements.toArray(); - } - - public void restoreDefaults() { - fElements = new ArrayList(Arrays.asList(HTMLFormattingUtil.getDefaultInlineElements())); - } - - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSyntaxColoringPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSyntaxColoringPage.java deleted file mode 100644 index eb532d7364..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSyntaxColoringPage.java +++ /dev/null @@ -1,895 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.jface.preference.ColorSelector; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.text.TextAttribute; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.ListViewer; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.swt.SWT; -import org.eclipse.swt.accessibility.ACC; -import org.eclipse.swt.accessibility.AccessibleAdapter; -import org.eclipse.swt.accessibility.AccessibleEvent; -import org.eclipse.swt.custom.SashForm; -import org.eclipse.swt.custom.StyleRange; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.KeyListener; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.events.TraverseEvent; -import org.eclipse.swt.events.TraverseListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Link; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; -import org.eclipse.wst.sse.ui.internal.SSEUIMessages; -import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; -import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore; -import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey; -import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractSyntaxColoringPage; -import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper; -import org.eclipse.wst.sse.ui.internal.util.EditorUtility; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; -import org.eclipse.wst.xml.ui.internal.XMLUIMessages; -import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML; - -import com.ibm.icu.text.Collator; - -/** - * A preference page to configure our XML syntax color. It resembles the JDT - * and CDT pages far more than our original color page while retaining the - * extra "click-to-find" functionality. - */ -public final class HTMLSyntaxColoringPage extends AbstractSyntaxColoringPage implements IWorkbenchPreferencePage { - - private Button fBold; - private Label fForegroundLabel; - private Label fBackgroundLabel; - private Button fClearStyle; - private Map fContextToStyleMap; - private Color fDefaultForeground = null; - private Color fDefaultBackground = null; - private IStructuredDocument fDocument; - private ColorSelector fForegroundColorEditor; - private ColorSelector fBackgroundColorEditor; - private Button fItalic; - private OverlayPreferenceStore fOverlayStore; - private Button fStrike; - private Collection fStylePreferenceKeys; - private StructuredViewer fStylesViewer = null; - private Map fStyleToDescriptionMap; - private StyledText fText; - private Button fUnderline; - private ISourceViewer fPreviewViewer; - - // activate controls based on the given local color type - private void activate(String namedStyle) { - Color foreground = fDefaultForeground; - Color background = fDefaultBackground; - if (namedStyle == null) { - fClearStyle.setEnabled(false); - fBold.setEnabled(false); - fItalic.setEnabled(false); - fStrike.setEnabled(false); - fUnderline.setEnabled(false); - fForegroundLabel.setEnabled(false); - fBackgroundLabel.setEnabled(false); - fForegroundColorEditor.setEnabled(false); - fBackgroundColorEditor.setEnabled(false); - fBold.setSelection(false); - fItalic.setSelection(false); - fStrike.setSelection(false); - fUnderline.setSelection(false); - } - else { - TextAttribute attribute = getAttributeFor(namedStyle); - fClearStyle.setEnabled(true); - fBold.setEnabled(true); - fItalic.setEnabled(true); - fStrike.setEnabled(true); - fUnderline.setEnabled(true); - fForegroundLabel.setEnabled(true); - fBackgroundLabel.setEnabled(true); - fForegroundColorEditor.setEnabled(true); - fBackgroundColorEditor.setEnabled(true); - fBold.setSelection((attribute.getStyle() & SWT.BOLD) != 0); - fItalic.setSelection((attribute.getStyle() & SWT.ITALIC) != 0); - fStrike.setSelection((attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0); - fUnderline.setSelection((attribute.getStyle() & TextAttribute.UNDERLINE) != 0); - if (attribute.getForeground() != null) { - foreground = attribute.getForeground(); - } - if (attribute.getBackground() != null) { - background = attribute.getBackground(); - } - } - - fForegroundColorEditor.setColorValue(foreground.getRGB()); - fBackgroundColorEditor.setColorValue(background.getRGB()); - } - - /** - * Color the text in the sample area according to the current preferences - */ - void applyStyles() { - if (fText == null || fText.isDisposed()) - return; - IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion(); - while (documentRegion != null) { - ITextRegionList regions = documentRegion.getRegions(); - for (int i = 0; i < regions.size(); i++) { - ITextRegion currentRegion = regions.get(i); - // lookup the local coloring type and apply it - String namedStyle = (String) fContextToStyleMap.get(currentRegion.getType()); - if (namedStyle == null) - continue; - TextAttribute attribute = getAttributeFor(namedStyle); - if (attribute == null) - continue; - StyleRange style = new StyleRange(documentRegion.getStartOffset(currentRegion), currentRegion.getTextLength(), attribute.getForeground(), attribute.getBackground(), attribute.getStyle()); - style.strikeout = (attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0; - style.underline = (attribute.getStyle() & TextAttribute.UNDERLINE) != 0; - fText.setStyleRange(style); - } - documentRegion = documentRegion.getNext(); - } - } - - Button createCheckbox(Composite parent, String label) { - Button button = new Button(parent, SWT.CHECK); - button.setText(label); - button.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - return button; - } - - /** - * Creates composite control and sets the default layout data. - */ - private Composite createComposite(Composite parent, int numColumns) { - Composite composite = new Composite(parent, SWT.NULL); - - // GridLayout - GridLayout layout = new GridLayout(); - layout.numColumns = numColumns; - layout.makeColumnsEqualWidth = false; - layout.marginHeight = 0; - layout.marginWidth = 0; - composite.setLayout(layout); - - // GridData - GridData data = new GridData(SWT.FILL, SWT.FILL, true, false); - composite.setLayoutData(data); - return composite; - } - - protected Control createContents(final Composite parent) { - initializeDialogUnits(parent); - - fDefaultForeground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND); - fDefaultBackground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND); - Composite pageComponent = createComposite(parent, 2); - PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.HTML_PREFWEBX_STYLES_HELPID); - - Link link = new Link(pageComponent, SWT.WRAP); - link.setText(SSEUIMessages.SyntaxColoring_Link); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - PreferencesUtil.createPreferenceDialogOn(parent.getShell(), e.text, null, null); - } - }); - - GridData linkData= new GridData(SWT.FILL, SWT.BEGINNING, true, false, 2, 1); - linkData.widthHint= 150; // only expand further if anyone else requires it - link.setLayoutData(linkData); - - new Label(pageComponent, SWT.NONE).setLayoutData(new GridData()); - new Label(pageComponent, SWT.NONE).setLayoutData(new GridData()); - - SashForm editor = new SashForm(pageComponent, SWT.VERTICAL); - GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, true); - gridData2.horizontalSpan = 2; - editor.setLayoutData(gridData2); - SashForm top = new SashForm(editor, SWT.HORIZONTAL); - Composite styleEditor = createComposite(top, 1); - ((GridLayout) styleEditor.getLayout()).marginRight = 5; - ((GridLayout) styleEditor.getLayout()).marginLeft = 0; - createLabel(styleEditor, HTMLUIMessages.SyntaxColoringPage_0); - fStylesViewer = createStylesViewer(styleEditor); - GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true); - gridData.horizontalIndent = 0; - Iterator iterator = fStyleToDescriptionMap.values().iterator(); - while (iterator.hasNext()) { - gridData.widthHint = Math.max(gridData.widthHint, convertWidthInCharsToPixels(iterator.next().toString().length())); - } - gridData.heightHint = convertHeightInCharsToPixels(5); - fStylesViewer.getControl().setLayoutData(gridData); - - Composite editingComposite = createComposite(top, 1); - ((GridLayout) styleEditor.getLayout()).marginLeft = 5; - createLabel(editingComposite, ""); //$NON-NLS-1$ - Button enabler = createCheckbox(editingComposite, HTMLUIMessages.SyntaxColoringPage_2); - enabler.setEnabled(false); - enabler.setSelection(true); - Composite editControls = createComposite(editingComposite, 2); - ((GridLayout) editControls.getLayout()).marginLeft = 20; - - fForegroundLabel = createLabel(editControls, SSEUIMessages.Foreground_UI_); - ((GridData) fForegroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER; - fForegroundLabel.setEnabled(false); - - fForegroundColorEditor = new ColorSelector(editControls); - Button fForegroundColor = fForegroundColorEditor.getButton(); - GridData gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false); - fForegroundColor.setLayoutData(gd); - fForegroundColorEditor.setEnabled(false); - fForegroundColorEditor.getButton().getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName (final AccessibleEvent e) { - e.result = SSEUIMessages.Foreground_Color_Selector_Button; - } - }); - - fBackgroundLabel = createLabel(editControls, SSEUIMessages.Background_UI_); - ((GridData) fBackgroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER; - fBackgroundLabel.setEnabled(false); - - fBackgroundColorEditor = new ColorSelector(editControls); - Button fBackgroundColor = fBackgroundColorEditor.getButton(); - gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false); - fBackgroundColor.setLayoutData(gd); - fBackgroundColorEditor.setEnabled(false); - fBackgroundColorEditor.getButton().getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName (final AccessibleEvent e) { - e.result = SSEUIMessages.Background_Color_Selector_Button; - } - }); - - - fBold = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_3); - fBold.setEnabled(false); - ((GridData) fBold.getLayoutData()).horizontalSpan = 2; - fItalic = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_4); - fItalic.setEnabled(false); - ((GridData) fItalic.getLayoutData()).horizontalSpan = 2; - fStrike = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_5); - fStrike.setEnabled(false); - ((GridData) fStrike.getLayoutData()).horizontalSpan = 2; - fUnderline = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_6); - fUnderline.setEnabled(false); - ((GridData) fUnderline.getLayoutData()).horizontalSpan = 2; - fClearStyle = new Button(editingComposite, SWT.PUSH); - fClearStyle.setText(SSEUIMessages.Restore_Default_UI_); //$NON-NLS-1$ = "Restore Default" - fClearStyle.setLayoutData(new GridData(SWT.BEGINNING)); - ((GridData)fClearStyle.getLayoutData()).horizontalIndent = 20; - fClearStyle.setEnabled(false); - - Composite sampleArea = createComposite(editor, 1); - - ((GridLayout) sampleArea.getLayout()).marginLeft = 5; - ((GridLayout) sampleArea.getLayout()).marginTop = 5; - createLabel(sampleArea, SSEUIMessages.Sample_text__UI_); //$NON-NLS-1$ = "&Sample text:" - fPreviewViewer = new SourceViewer(sampleArea, null, SWT.BORDER | SWT.LEFT_TO_RIGHT | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY); - fText = fPreviewViewer.getTextWidget(); - GridData gridData3 = new GridData(SWT.FILL, SWT.FILL, true, true); - gridData3.widthHint = convertWidthInCharsToPixels(20); - gridData3.heightHint = convertHeightInCharsToPixels(5); - gridData3.horizontalSpan = 2; - fText.setLayoutData(gridData3); - fText.setEditable(false); - fText.setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$ - fText.addKeyListener(getTextKeyListener()); - fText.addSelectionListener(getTextSelectionListener()); - fText.addMouseListener(getTextMouseListener()); - fText.addTraverseListener(getTraverseListener()); - setAccessible(fText, SSEUIMessages.Sample_text__UI_); - fDocument = StructuredModelManager.getModelManager().createStructuredDocumentFor(ContentTypeIdForHTML.ContentTypeID_HTML); - fDocument.set(getExampleText()); - initializeSourcePreviewColors(fPreviewViewer); - fPreviewViewer.setDocument(fDocument); - - top.setWeights(new int[]{1, 1}); - editor.setWeights(new int[]{1, 1}); - PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.HTML_PREFWEBX_STYLES_HELPID); - - fStylesViewer.setInput(getStylePreferenceKeys()); - - applyStyles(); - - fStylesViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - if (!event.getSelection().isEmpty()) { - Object o = ((IStructuredSelection) event.getSelection()).getFirstElement(); - String namedStyle = o.toString(); - activate(namedStyle); - if (namedStyle == null) - return; - } - } - }); - - fForegroundColorEditor.addListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) { - Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement(); - String namedStyle = o.toString(); - String prefString = getOverlayStore().getString(namedStyle); - String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString); - if (stylePrefs != null) { - String oldValue = stylePrefs[0]; - // open color dialog to get new color - String newValue = ColorHelper.toRGBString(fForegroundColorEditor.getColorValue()); - - if (!newValue.equals(oldValue)) { - stylePrefs[0] = newValue; - String newPrefString = ColorHelper.packStylePreferences(stylePrefs); - getOverlayStore().setValue(namedStyle, newPrefString); - applyStyles(); - fText.redraw(); - } - } - } - } - }); - - fBackgroundColorEditor.addListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) { - Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement(); - String namedStyle = o.toString(); - String prefString = getOverlayStore().getString(namedStyle); - String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString); - if (stylePrefs != null) { - String oldValue = stylePrefs[1]; - // open color dialog to get new color - String newValue = ColorHelper.toRGBString(fBackgroundColorEditor.getColorValue()); - - if (!newValue.equals(oldValue)) { - stylePrefs[1] = newValue; - String newPrefString = ColorHelper.packStylePreferences(stylePrefs); - getOverlayStore().setValue(namedStyle, newPrefString); - applyStyles(); - fText.redraw(); - activate(namedStyle); - } - } - } - } - }); - - fBold.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - super.widgetSelected(e); - // get current (newly old) style - Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement(); - String namedStyle = o.toString(); - String prefString = getOverlayStore().getString(namedStyle); - String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString); - if (stylePrefs != null) { - String oldValue = stylePrefs[2]; - String newValue = String.valueOf(fBold.getSelection()); - if (!newValue.equals(oldValue)) { - stylePrefs[2] = newValue; - String newPrefString = ColorHelper.packStylePreferences(stylePrefs); - getOverlayStore().setValue(namedStyle, newPrefString); - applyStyles(); - fText.redraw(); - } - } - } - }); - - fItalic.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - super.widgetSelected(e); - // get current (newly old) style - Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement(); - String namedStyle = o.toString(); - String prefString = getOverlayStore().getString(namedStyle); - String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString); - if (stylePrefs != null) { - String oldValue = stylePrefs[3]; - String newValue = String.valueOf(fItalic.getSelection()); - if (!newValue.equals(oldValue)) { - stylePrefs[3] = newValue; - String newPrefString = ColorHelper.packStylePreferences(stylePrefs); - getOverlayStore().setValue(namedStyle, newPrefString); - applyStyles(); - fText.redraw(); - } - } - } - }); - - fStrike.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - super.widgetSelected(e); - // get current (newly old) style - Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement(); - String namedStyle = o.toString(); - String prefString = getOverlayStore().getString(namedStyle); - String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString); - if (stylePrefs != null) { - String oldValue = stylePrefs[4]; - String newValue = String.valueOf(fStrike.getSelection()); - if (!newValue.equals(oldValue)) { - stylePrefs[4] = newValue; - String newPrefString = ColorHelper.packStylePreferences(stylePrefs); - getOverlayStore().setValue(namedStyle, newPrefString); - applyStyles(); - fText.redraw(); - } - } - } - }); - - fUnderline.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - super.widgetSelected(e); - // get current (newly old) style - Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement(); - String namedStyle = o.toString(); - String prefString = getOverlayStore().getString(namedStyle); - String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString); - if (stylePrefs != null) { - String oldValue = stylePrefs[5]; - String newValue = String.valueOf(fUnderline.getSelection()); - if (!newValue.equals(oldValue)) { - stylePrefs[5] = newValue; - String newPrefString = ColorHelper.packStylePreferences(stylePrefs); - getOverlayStore().setValue(namedStyle, newPrefString); - applyStyles(); - fText.redraw(); - } - } - } - }); - - fClearStyle.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - if (fStylesViewer.getSelection().isEmpty()) - return; - String namedStyle = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement().toString(); - getOverlayStore().setToDefault(namedStyle); - applyStyles(); - fText.redraw(); - activate(namedStyle); - } - }); - - return pageComponent; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractSyntaxColoringPage#getSourcePreviewViewer() - */ - protected ISourceViewer getSourcePreviewViewer() { - return fPreviewViewer; - } - - private Label createLabel(Composite parent, String text) { - Label label = new Label(parent, SWT.WRAP); - label.setText(text); - GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); - label.setLayoutData(data); - label.setBackground(parent.getBackground()); - return label; - } - - // protected Label createDescriptionLabel(Composite parent) { - // return null; - // } - - /** - * Set up all the style preference keys in the overlay store - */ - private OverlayKey[] createOverlayStoreKeys() { - List overlayKeys = new ArrayList(); - - Iterator i = getStylePreferenceKeys().iterator(); - while (i.hasNext()) { - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String) i.next())); - } - - OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()]; - overlayKeys.toArray(keys); - return keys; - } - - /** - * Creates the List viewer where we see the various syntax element display - * names--would it ever be a Tree like JDT's? - * - * @param parent - * @return - */ - private StructuredViewer createStylesViewer(Composite parent) { - StructuredViewer stylesViewer = new ListViewer(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER); - stylesViewer.setComparator(new ViewerComparator(Collator.getInstance())); - stylesViewer.setLabelProvider(new LabelProvider() { - public String getText(Object element) { - Object description = fStyleToDescriptionMap.get(element); - if (description != null) - return description.toString(); - return super.getText(element); - } - }); - stylesViewer.setContentProvider(new ITreeContentProvider() { - public void dispose() { - } - - public Object[] getChildren(Object parentElement) { - return getStylePreferenceKeys().toArray(); - } - - public Object[] getElements(Object inputElement) { - return getChildren(inputElement); - } - - public Object getParent(Object element) { - return getStylePreferenceKeys(); - } - - public boolean hasChildren(Object element) { - return false; - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - }); - return stylesViewer; - } - - public void dispose() { - if (fOverlayStore != null) { - fOverlayStore.stop(); - } - super.dispose(); - } - - protected IPreferenceStore doGetPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - - private TextAttribute getAttributeFor(String namedStyle) { - TextAttribute ta = new TextAttribute(fDefaultForeground, fDefaultBackground, SWT.NORMAL); - - if (namedStyle != null && fOverlayStore != null) { - // note: "namedStyle" *is* the preference key - String prefString = getOverlayStore().getString(namedStyle); - String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString); - if (stylePrefs != null) { - RGB foreground = ColorHelper.toRGB(stylePrefs[0]); - RGB background = ColorHelper.toRGB(stylePrefs[1]); - - int fontModifier = SWT.NORMAL; - - if (stylePrefs.length > 2) { - boolean on = Boolean.valueOf(stylePrefs[2]).booleanValue(); - if (on) - fontModifier = fontModifier | SWT.BOLD; - } - if (stylePrefs.length > 3) { - boolean on = Boolean.valueOf(stylePrefs[3]).booleanValue(); - if (on) - fontModifier = fontModifier | SWT.ITALIC; - } - if (stylePrefs.length > 4) { - boolean on = Boolean.valueOf(stylePrefs[4]).booleanValue(); - if (on) - fontModifier = fontModifier | TextAttribute.STRIKETHROUGH; - } - if (stylePrefs.length > 5) { - boolean on = Boolean.valueOf(stylePrefs[5]).booleanValue(); - if (on) - fontModifier = fontModifier | TextAttribute.UNDERLINE; - } - - ta = new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, fontModifier); - } - } - return ta; - } - - private String getExampleText() { - return HTMLUIMessages.Sample_HTML_doc; - } - - private String getNamedStyleAtOffset(int offset) { - // ensure the offset is clean - if (offset >= fDocument.getLength()) - return getNamedStyleAtOffset(fDocument.getLength() - 1); - else if (offset < 0) - return getNamedStyleAtOffset(0); - IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion(); - while (documentRegion != null && !documentRegion.containsOffset(offset)) { - documentRegion = documentRegion.getNext(); - } - if (documentRegion != null) { - // find the ITextRegion's Context at this offset - ITextRegion interest = documentRegion.getRegionAtCharacterOffset(offset); - if (interest == null) - return null; - if (offset > documentRegion.getTextEndOffset(interest)) - return null; - String regionContext = interest.getType(); - if (regionContext == null) - return null; - // find the named style (internal/selectable name) for that - // context - String namedStyle = (String) fContextToStyleMap.get(regionContext); - if (namedStyle != null) { - return namedStyle; - } - } - return null; - } - - private OverlayPreferenceStore getOverlayStore() { - return fOverlayStore; - } - - private Collection getStylePreferenceKeys() { - if (fStylePreferenceKeys == null) { - List styles = new ArrayList(); - styles.add(IStyleConstantsXML.ENTITY_REFERENCE); - styles.add(IStyleConstantsXML.TAG_BORDER); - styles.add(IStyleConstantsXML.TAG_NAME); - styles.add(IStyleConstantsXML.TAG_ATTRIBUTE_NAME); - styles.add(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS); - styles.add(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE); - styles.add(IStyleConstantsXML.COMMENT_BORDER); - styles.add(IStyleConstantsXML.COMMENT_TEXT); - styles.add(IStyleConstantsXML.DECL_BORDER); - styles.add(IStyleConstantsXML.XML_CONTENT); - styles.add(IStyleConstantsXML.DOCTYPE_NAME); - styles.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); - styles.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF); - styles.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF); -// styles.add(IStyleConstantsXML.CDATA_BORDER); -// styles.add(IStyleConstantsXML.CDATA_TEXT); -// styles.add(IStyleConstantsXML.PI_BORDER); -// styles.add(IStyleConstantsXML.PI_CONTENT); - fStylePreferenceKeys = styles; - } - return fStylePreferenceKeys; - } - - private KeyListener getTextKeyListener() { - return new KeyListener() { - public void keyPressed(KeyEvent e) { - if (e.widget instanceof StyledText) { - int x = ((StyledText) e.widget).getCaretOffset(); - selectColorAtOffset(x); - } - } - - public void keyReleased(KeyEvent e) { - if (e.widget instanceof StyledText) { - int x = ((StyledText) e.widget).getCaretOffset(); - selectColorAtOffset(x); - } - } - }; - } - - private MouseListener getTextMouseListener() { - return new MouseListener() { - public void mouseDoubleClick(MouseEvent e) { - } - - public void mouseDown(MouseEvent e) { - } - - public void mouseUp(MouseEvent e) { - if (e.widget instanceof StyledText) { - int x = ((StyledText) e.widget).getCaretOffset(); - selectColorAtOffset(x); - } - } - }; - } - - private SelectionListener getTextSelectionListener() { - return new SelectionListener() { - public void widgetDefaultSelected(SelectionEvent e) { - selectColorAtOffset(e.x); - if (e.widget instanceof StyledText) { - ((StyledText) e.widget).setSelection(e.x); - } - } - - public void widgetSelected(SelectionEvent e) { - selectColorAtOffset(e.x); - if (e.widget instanceof StyledText) { - ((StyledText) e.widget).setSelection(e.x); - } - } - }; - } - - private TraverseListener getTraverseListener() { - return new TraverseListener() { - /** - * @see org.eclipse.swt.events.TraverseListener#keyTraversed(TraverseEvent) - */ - public void keyTraversed(TraverseEvent e) { - if (e.widget instanceof StyledText) { - if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)) - e.doit = true; - } - } - }; - } - - public void init(IWorkbench workbench) { - setDescription(SSEUIMessages.SyntaxColoring_Description); - - fStyleToDescriptionMap = new HashMap(); - fContextToStyleMap = new HashMap(); - - initStyleToDescriptionMap(); - initRegionContextToStyleMap(); - - fOverlayStore = new OverlayPreferenceStore(getPreferenceStore(), createOverlayStoreKeys()); - fOverlayStore.load(); - fOverlayStore.start(); - } - - private void initRegionContextToStyleMap() { - fContextToStyleMap.put(DOMRegionContext.XML_COMMENT_OPEN, IStyleConstantsXML.COMMENT_BORDER); - fContextToStyleMap.put(DOMRegionContext.XML_COMMENT_TEXT, IStyleConstantsXML.COMMENT_TEXT); - fContextToStyleMap.put(DOMRegionContext.XML_COMMENT_CLOSE, IStyleConstantsXML.COMMENT_BORDER); - - fContextToStyleMap.put(DOMRegionContext.XML_TAG_OPEN, IStyleConstantsXML.TAG_BORDER); - fContextToStyleMap.put(DOMRegionContext.XML_END_TAG_OPEN, IStyleConstantsXML.TAG_BORDER); - fContextToStyleMap.put(DOMRegionContext.XML_TAG_NAME, IStyleConstantsXML.TAG_NAME); - fContextToStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, IStyleConstantsXML.TAG_ATTRIBUTE_NAME); - fContextToStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS); - fContextToStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE); - fContextToStyleMap.put(DOMRegionContext.XML_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER); - fContextToStyleMap.put(DOMRegionContext.XML_EMPTY_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER); - - fContextToStyleMap.put(DOMRegionContext.XML_DECLARATION_OPEN, IStyleConstantsXML.DECL_BORDER); - fContextToStyleMap.put(DOMRegionContext.XML_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER); - fContextToStyleMap.put(DOMRegionContext.XML_ELEMENT_DECLARATION, IStyleConstantsXML.DECL_BORDER); - fContextToStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_CLOSE, IStyleConstantsXML.DECL_BORDER); - - fContextToStyleMap.put(DOMRegionContext.XML_CHAR_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE); - fContextToStyleMap.put(DOMRegionContext.XML_ENTITY_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE); - fContextToStyleMap.put(DOMRegionContext.XML_PE_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE); - - fContextToStyleMap.put(DOMRegionContext.XML_CONTENT, IStyleConstantsXML.XML_CONTENT); - - fContextToStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_NAME, IStyleConstantsXML.DOCTYPE_NAME); - fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION, IStyleConstantsXML.TAG_NAME); - fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER); - - fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_NAME, IStyleConstantsXML.DOCTYPE_NAME); - fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); - fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF); - fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); - fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF); - -// fContextToStyleMap.put(DOMRegionContext.XML_PI_OPEN, IStyleConstantsXML.PI_BORDER); -// fContextToStyleMap.put(DOMRegionContext.XML_PI_CONTENT, IStyleConstantsXML.PI_CONTENT); -// fContextToStyleMap.put(DOMRegionContext.XML_CDATA_OPEN, IStyleConstantsXML.CDATA_BORDER); -// fContextToStyleMap.put(DOMRegionContext.XML_CDATA_TEXT, IStyleConstantsXML.CDATA_TEXT); -// fContextToStyleMap.put(DOMRegionContext.XML_CDATA_CLOSE, IStyleConstantsXML.CDATA_BORDER); - } - - private void initStyleToDescriptionMap() { - fStyleToDescriptionMap.put(IStyleConstantsXML.COMMENT_BORDER, XMLUIMessages.Comment_Delimiters_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.COMMENT_TEXT, XMLUIMessages.Comment_Content_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_BORDER, XMLUIMessages.Tag_Delimiters_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_NAME, XMLUIMessages.Tag_Names_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, XMLUIMessages.Attribute_Names_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS, XMLUIMessages.Attribute_Equals_UI_); - fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, XMLUIMessages.Attribute_Values_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.DECL_BORDER, XMLUIMessages.Declaration_Delimiters_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.XML_CONTENT, XMLUIMessages.Content_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.ENTITY_REFERENCE, XMLUIMessages.Entity_Reference_UI_); //$NON-NLS-1$ = "Entity References" - fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_NAME, XMLUIMessages.DOCTYPE_Name_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, XMLUIMessages.DOCTYPE_SYSTEM_PUBLIC_Keyw_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, XMLUIMessages.DOCTYPE_Public_Reference_UI_); // = - fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, XMLUIMessages.DOCTYPE_System_Reference_UI_); // = -// fStyleToDescriptionMap.put(IStyleConstantsXML.PI_BORDER, XMLUIMessages.Processing_Instruction_Del_UI_); -// fStyleToDescriptionMap.put(IStyleConstantsXML.PI_CONTENT, XMLUIMessages.Processing_Instruction_Con_UI__UI_); -// fStyleToDescriptionMap.put(IStyleConstantsXML.CDATA_BORDER, XMLUIMessages.CDATA_Delimiters_UI_); -// fStyleToDescriptionMap.put(IStyleConstantsXML.CDATA_TEXT, XMLUIMessages.CDATA_Content_UI_); -} - - protected void performDefaults() { - super.performDefaults(); - getOverlayStore().loadDefaults(); - applyStyles(); - fStylesViewer.setSelection(StructuredSelection.EMPTY); - activate(null); - fText.redraw(); - } - - public boolean performOk() { - getOverlayStore().propagate(); - - HTMLUIPlugin.getDefault().savePluginPreferences(); - SSEUIPlugin.getDefault().savePluginPreferences(); - return true; - } - - private void selectColorAtOffset(int offset) { - String namedStyle = getNamedStyleAtOffset(offset); - if (namedStyle != null) { - fStylesViewer.setSelection(new StructuredSelection(namedStyle)); - fStylesViewer.reveal(namedStyle); - } - else { - fStylesViewer.setSelection(StructuredSelection.EMPTY); - } - activate(namedStyle); - } - - /** - * Specifically set the reporting name of a control for accessibility - */ - private void setAccessible(Control control, String name) { - if (control == null) - return; - final String n = name; - control.getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName(AccessibleEvent e) { - if (e.childID == ACC.CHILDID_SELF) - e.result = n; - } - }); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLTemplatePreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLTemplatePreferencePage.java deleted file mode 100644 index 0700d82417..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLTemplatePreferencePage.java +++ /dev/null @@ -1,157 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.contentassist.ContentAssistant; -import org.eclipse.jface.text.contentassist.IContentAssistant; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.jface.text.source.SourceViewerConfiguration; -import org.eclipse.jface.text.templates.ContextTypeRegistry; -import org.eclipse.jface.text.templates.Template; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.texteditor.templates.TemplatePreferencePage; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; -import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; -import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; - - -/** - * Preference page for HTML templates - */ -public class HTMLTemplatePreferencePage extends TemplatePreferencePage { - class HTMLEditTemplateDialog extends EditTemplateDialog { - public HTMLEditTemplateDialog(Shell parent, Template template, boolean edit, boolean isNameModifiable, ContextTypeRegistry registry) { - super(parent, template, edit, isNameModifiable, registry); - } - - protected SourceViewer createViewer(Composite parent) { - SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() { - StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationHTML(); - - public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { - return baseConfiguration.getConfiguredContentTypes(sourceViewer); - } - - public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) { - return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType); - } - - public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { - ContentAssistant assistant = new ContentAssistant(); - assistant.enableAutoActivation(true); - assistant.enableAutoInsert(true); - assistant.setContentAssistProcessor(getTemplateProcessor(), IDocument.DEFAULT_CONTENT_TYPE); - return assistant; - } - }; - return doCreateViewer(parent, sourceViewerConfiguration); - } - } - - public HTMLTemplatePreferencePage() { - HTMLUIPlugin htmlEditorPlugin = HTMLUIPlugin.getDefault(); - - setPreferenceStore(htmlEditorPlugin.getPreferenceStore()); - setTemplateStore(htmlEditorPlugin.getTemplateStore()); - setContextTypeRegistry(htmlEditorPlugin.getTemplateContextRegistry()); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.IPreferencePage#performOk() - */ - public boolean performOk() { - boolean ok = super.performOk(); - HTMLUIPlugin.getDefault().savePluginPreferences(); - return ok; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#isShowFormatterSetting() - */ - protected boolean isShowFormatterSetting() { - // template formatting has not been implemented - return false; - } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - protected Control createContents(Composite ancestor) { - Control c = super.createContents(ancestor); - PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IHelpContextIds.HTML_PREFWEBX_TEMPLATES_HELPID); - return c; - } - /* - * (non-Javadoc) - * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite) - */ - protected SourceViewer createViewer(Composite parent) { - SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() { - StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationHTML(); - - public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { - return baseConfiguration.getConfiguredContentTypes(sourceViewer); - } - - public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) { - return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType); - } - }; - return doCreateViewer(parent, sourceViewerConfiguration); - } - - SourceViewer doCreateViewer(Composite parent, SourceViewerConfiguration viewerConfiguration) { - SourceViewer viewer = null; - String contentTypeID = ContentTypeIdForHTML.ContentTypeID_HTML; - viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); - viewer.getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$ - IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID); - IDocument document = scratchModel.getStructuredDocument(); - viewer.configure(viewerConfiguration); - viewer.setDocument(document); - return viewer; - } - - /** - * Creates the edit dialog. Subclasses may override this method to provide - * a custom dialog. - * - * @param template - * the template being edited - * @param edit - * whether the dialog should be editable - * @param isNameModifiable - * whether the template name may be modified - * @return the created or modified template, or <code>null</code> if the - * edition failed - * @since 3.1 - */ - protected Template editTemplate(Template template, boolean edit, boolean isNameModifiable) { - EditTemplateDialog dialog = new HTMLEditTemplateDialog(getShell(), template, edit, isNameModifiable, getContextTypeRegistry()); - if (dialog.open() == Window.OK) { - return dialog.getTemplate(); - } - return null; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLTypingPreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLTypingPreferencePage.java deleted file mode 100644 index 8942dfeefc..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLTypingPreferencePage.java +++ /dev/null @@ -1,130 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames; -import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage; -import org.eclipse.wst.xml.ui.internal.XMLUIMessages; - -public class HTMLTypingPreferencePage extends AbstractPreferencePage { - - private Button fCloseComment; - private Button fCloseEndTag; - private Button fRemoveEndTag; - private Button fCloseElement; - private Button fCloseStrings; - private Button fCloseBrackets; - - protected Control createContents(Composite parent) { - Composite composite = super.createComposite(parent, 1); - - createStartTagGroup(composite); - createEndTagGroup(composite); - createAutoComplete(composite); - createAutoRemove(composite); - - setSize(composite); - loadPreferences(); - - return composite; - } - - private void createStartTagGroup(Composite parent) { - Group group = createGroup(parent, 2); - - group.setText(XMLUIMessages.XMLTyping_Start_Tag); - - fCloseElement = createCheckBox(group, XMLUIMessages.XMLTyping_Complete_Elements); - ((GridData) fCloseElement.getLayoutData()).horizontalSpan = 2; - } - - private void createEndTagGroup(Composite parent) { - Group group = createGroup(parent, 2); - - group.setText(XMLUIMessages.XMLTyping_End_Tag); - - fCloseEndTag = createCheckBox(group, XMLUIMessages.XMLTyping_Complete_End_Tags); - ((GridData) fCloseEndTag.getLayoutData()).horizontalSpan = 2; - } - - private void createAutoComplete(Composite parent) { - Group group = createGroup(parent, 2); - - group.setText(HTMLUIMessages.HTMLTyping_Auto_Complete); - - fCloseComment = createCheckBox(group, HTMLUIMessages.HTMLTyping_Complete_Comments); - ((GridData) fCloseComment.getLayoutData()).horizontalSpan = 2; - - fCloseStrings = createCheckBox(group, HTMLUIMessages.HTMLTyping_Close_Strings); - ((GridData) fCloseStrings.getLayoutData()).horizontalSpan = 2; - - fCloseBrackets = createCheckBox(group, HTMLUIMessages.HTMLTyping_Close_Brackets); - ((GridData) fCloseBrackets.getLayoutData()).horizontalSpan = 2; - } - - private void createAutoRemove(Composite parent) { - Group group = createGroup(parent, 2); - - group.setText(HTMLUIMessages.HTMLTyping_Auto_Remove); - - fRemoveEndTag = createCheckBox(group, HTMLUIMessages.HTMLTyping_Remove_End_Tags); - ((GridData) fRemoveEndTag.getLayoutData()).horizontalSpan = 2; - } - - public boolean performOk() { - boolean result = super.performOk(); - - HTMLUIPlugin.getDefault().savePluginPreferences(); - - return result; - } - - protected void initializeValues() { - initCheckbox(fCloseComment, HTMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS); - initCheckbox(fCloseEndTag, HTMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS); - initCheckbox(fCloseElement, HTMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS); - initCheckbox(fRemoveEndTag, HTMLUIPreferenceNames.TYPING_REMOVE_END_TAGS); - initCheckbox(fCloseStrings, HTMLUIPreferenceNames.TYPING_CLOSE_STRINGS); - initCheckbox(fCloseBrackets, HTMLUIPreferenceNames.TYPING_CLOSE_BRACKETS); - } - - protected void performDefaults() { - defaultCheckbox(fCloseComment, HTMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS); - defaultCheckbox(fCloseEndTag, HTMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS); - defaultCheckbox(fCloseElement, HTMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS); - defaultCheckbox(fRemoveEndTag, HTMLUIPreferenceNames.TYPING_REMOVE_END_TAGS); - defaultCheckbox(fCloseStrings, HTMLUIPreferenceNames.TYPING_CLOSE_STRINGS); - defaultCheckbox(fCloseBrackets, HTMLUIPreferenceNames.TYPING_CLOSE_BRACKETS); - } - - protected void storeValues() { - getPreferenceStore().setValue(HTMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS, (fCloseComment != null) ? fCloseComment.getSelection() : false); - getPreferenceStore().setValue(HTMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS, (fCloseEndTag != null) ? fCloseEndTag.getSelection() : false); - getPreferenceStore().setValue(HTMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS, (fCloseElement != null) ? fCloseElement.getSelection() : false); - getPreferenceStore().setValue(HTMLUIPreferenceNames.TYPING_REMOVE_END_TAGS, (fRemoveEndTag != null) ? fRemoveEndTag.getSelection() : false); - getPreferenceStore().setValue(HTMLUIPreferenceNames.TYPING_CLOSE_STRINGS, (fCloseStrings != null) ? fCloseStrings.getSelection() : false); - getPreferenceStore().setValue(HTMLUIPreferenceNames.TYPING_CLOSE_BRACKETS, (fCloseBrackets != null) ? fCloseBrackets.getSelection() : false); - } - - protected IPreferenceStore doGetPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLValidationPreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLValidationPreferencePage.java deleted file mode 100644 index 9186ccee4f..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLValidationPreferencePage.java +++ /dev/null @@ -1,334 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.preferences.ui; - -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.layout.PixelConverter; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.sse.core.internal.validate.ValidationMessage; -import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractValidationSettingsPage; -import org.eclipse.wst.sse.ui.internal.preferences.ui.ScrolledPageContent; - -public class HTMLValidationPreferencePage extends AbstractValidationSettingsPage { - - private static final int[] SEVERITIES = {ValidationMessage.ERROR, ValidationMessage.WARNING, ValidationMessage.IGNORE}; - - private static final String SETTINGS_SECTION_NAME = "HTMLValidationSeverities";//$NON-NLS-1$ - - public HTMLValidationPreferencePage() { - super(); - } - - private PixelConverter fPixelConverter; - - protected Control createCommonContents(Composite parent) { - final Composite page = new Composite(parent, SWT.NULL); - - //GridLayout - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - page.setLayout(layout); - - fPixelConverter = new PixelConverter(parent); - - final Composite content = createValidationSection(page); - - GridData gridData= new GridData(GridData.FILL, GridData.FILL, true, true); - gridData.heightHint = fPixelConverter.convertHeightInCharsToPixels(20); - content.setLayoutData(gridData); - - return page; - } - - private Composite createValidationSection(Composite page) { - int nColumns = 3; - - final ScrolledPageContent spContent = new ScrolledPageContent(page); - - Composite composite = spContent.getBody(); - - GridLayout layout= new GridLayout(nColumns, false); - layout.marginHeight= 0; - layout.marginWidth= 0; - composite.setLayout(layout); - - Label description = new Label(composite, SWT.NONE); - description.setText(HTMLUIMessages.Validation_description); - description.setFont(page.getFont()); - - - ExpandableComposite ec; - Composite inner; - String label; - - String[] errorWarningIgnoreLabel = new String[] { HTMLUIMessages.Validation_Error, HTMLUIMessages.Validation_Warning, HTMLUIMessages.Validation_Ignore }; - - // Element section - - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_elements, nColumns); - - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_8; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_UNKNOWN_NAME, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_9; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_INVALID_NAME, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_10; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_START_INVALID_CASE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_11; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_END_INVALID_CASE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_12; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_MISSING_START, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_13; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_MISSING_END, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_14; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_UNNECESSARY_END, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_15; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_INVALID_DIRECTIVE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_16; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_INVALID_CONTENT, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_17; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_DUPLICATE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_18; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_COEXISTENCE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_19; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_UNCLOSED_START_TAG, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_20; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_UNCLOSED_END_TAG, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_21; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_INVALID_EMPTY_TAG, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_36; - addComboBox(inner, label, HTMLCorePreferenceNames.ELEM_INVALID_TEXT, SEVERITIES, errorWarningIgnoreLabel, 0); - - // End Element Section - - // The Attribute validation section - - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_attributes, nColumns); - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_0; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_UNDEFINED_NAME, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_1; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_UNDEFINED_VALUE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_2; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_NAME_MISMATCH, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_3; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_INVALID_NAME, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_4; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_INVALID_VALUE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_5; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_DUPLICATE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_6; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_VALUE_MISMATCH, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_7; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_VALUE_UNCLOSED, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_37; - addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_VALUE_EQUALS_MISSING, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_35; - // TODO: validate resources? - // addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_VALUE_RESOURCE_NOT_FOUND, SEVERITIES, errorWarningIgnoreLabel, 0); - - // End Attribute section - - - // Document Type - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_document_type, nColumns); - - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_22; - addComboBox(inner, label, HTMLCorePreferenceNames.DOC_DUPLICATE, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_23; - addComboBox(inner, label, HTMLCorePreferenceNames.DOC_INVALID_CONTENT, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_24; - addComboBox(inner, label, HTMLCorePreferenceNames.DOC_DOCTYPE_UNCLOSED, SEVERITIES, errorWarningIgnoreLabel, 0); - - // End Document Type - - // Comments - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_comment, nColumns); - - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_27; - addComboBox(inner, label, HTMLCorePreferenceNames.COMMENT_INVALID_CONTENT, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_28; - addComboBox(inner, label, HTMLCorePreferenceNames.COMMENT_UNCLOSED, SEVERITIES, errorWarningIgnoreLabel, 0); - - // End Comments - - - // CDATA Sections - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_cdata, nColumns); - - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_29; - addComboBox(inner, label, HTMLCorePreferenceNames.CDATA_INVALID_CONTENT, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_30; - addComboBox(inner, label, HTMLCorePreferenceNames.CDATA_UNCLOSED, SEVERITIES, errorWarningIgnoreLabel, 0); - - // End CDATA Sections - - // Processing Instructions - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_pi, nColumns); - - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_31; - addComboBox(inner, label, HTMLCorePreferenceNames.PI_INVALID_CONTENT, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_32; - addComboBox(inner, label, HTMLCorePreferenceNames.PI_UNCLOSED, SEVERITIES, errorWarningIgnoreLabel, 0); - - // End Processing Instructions - - // Entity References - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_entity_ref, nColumns); - - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_33; - addComboBox(inner, label, HTMLCorePreferenceNames.REF_INVALID_CONTENT, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_34; - addComboBox(inner, label, HTMLCorePreferenceNames.REF_UNDEFINED, SEVERITIES, errorWarningIgnoreLabel, 0); - - - // End Entity References - - - // Text Content - ec = createStyleSection(composite, HTMLUIMessages.Expandable_label_text, nColumns); - - inner = new Composite(ec, SWT.NONE); - inner.setFont(composite.getFont()); - inner.setLayout(new GridLayout(nColumns, false)); - ec.setClient(inner); - - label = HTMLUIMessages.HTMLValidationPreferencePage_25; - addComboBox(inner, label, HTMLCorePreferenceNames.TEXT_INVALID_CONTENT, SEVERITIES, errorWarningIgnoreLabel, 0); - - label = HTMLUIMessages.HTMLValidationPreferencePage_26; - addComboBox(inner, label, HTMLCorePreferenceNames.TEXT_INVALID_CHAR, SEVERITIES, errorWarningIgnoreLabel, 0); - - // End Text Content - - restoreSectionExpansionStates(getDialogSettings().getSection(SETTINGS_SECTION_NAME)); - - return spContent; - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performDefaults() - */ - protected void performDefaults() { - resetSeverities(); - super.performDefaults(); - } - - protected IDialogSettings getDialogSettings() { - return HTMLUIPlugin.getDefault().getDialogSettings(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.DialogPage#dispose() - */ - public void dispose() { - storeSectionExpansionStates(getDialogSettings().addNewSection(SETTINGS_SECTION_NAME)); - super.dispose(); - } - - protected String getQualifier() { - return HTMLCorePlugin.getDefault().getBundle().getSymbolicName(); - } - - protected String getPreferenceNodeQualifier() { - return HTMLCorePlugin.getDefault().getBundle().getSymbolicName(); - } - - protected String getPreferencePageID() { - return "org.eclipse.wst.html.ui.preferences.validation";//$NON-NLS-1$ - } - - protected String getProjectSettingsKey() { - return HTMLCorePreferenceNames.USE_PROJECT_SETTINGS; - } - - protected String getPropertyPageID() { - return "org.eclipse.wst.html.ui.propertyPage.project.validation";//$NON-NLS-1$ - } - - public void init(IWorkbench workbench) { - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java deleted file mode 100644 index 145ab9afef..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.registry; - -import org.eclipse.wst.html.core.internal.modelhandler.ModelHandlerForHTML; -import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterFactoryForHTML; -import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; -import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; -import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; -import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider; -import org.eclipse.wst.sse.ui.internal.util.Assert; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; - - -public class AdapterFactoryProviderForHTML implements AdapterFactoryProvider { - - - public void addAdapterFactories(IStructuredModel structuredModel) { - - // these are the normal edit side content based factories - addContentBasedFactories(structuredModel); - // Must update/add to propagating adapter here too - if (structuredModel instanceof IDOMModel) { - addPropagatingAdapters(structuredModel); - } - } - - protected void addContentBasedFactories(IStructuredModel structuredModel) { - - FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry(); - Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$ - INodeAdapterFactory factory = null; - - factory = factoryRegistry.getFactoryFor(IJFaceNodeAdapter.class); - if (factory == null) { - factory = new JFaceNodeAdapterFactoryForHTML(); - factoryRegistry.addFactory(factory); - } - } - - protected void addPropagatingAdapters(IStructuredModel structuredModel) { - // no propagating to add - } - - /* - * @see AdapterFactoryProvider#isFor(ContentTypeDescription) - */ - public boolean isFor(IDocumentTypeHandler contentTypeDescription) { - return (contentTypeDescription instanceof ModelHandlerForHTML); - } - - public void reinitializeFactories(IStructuredModel structuredModel) { - // nothing to do, since no embedded type - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesActionDelegate.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesActionDelegate.java deleted file mode 100644 index 23c2c49085..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesActionDelegate.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ - -package org.eclipse.wst.html.ui.internal.search; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesActionDelegate; - -/** - * Sets up FindOccurrencesActionDelegate for html find occurrences processors - */ -public class HTMLFindOccurrencesActionDelegate extends FindOccurrencesActionDelegate { - private List fProcessors; - - protected List getProcessors() { - if (fProcessors == null) { - fProcessors = new ArrayList(); - HTMLFindOccurrencesProcessor htmlProcessor = new HTMLFindOccurrencesProcessor(); - fProcessors.add(htmlProcessor); - } - return fProcessors; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesProcessor.java deleted file mode 100644 index c20efa168c..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesProcessor.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ - -package org.eclipse.wst.html.ui.internal.search; - -import org.eclipse.wst.html.core.text.IHTMLPartitions; -import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; -import org.eclipse.wst.xml.core.text.IXMLPartitions; - -/** - * Configures a FindOccurrencesProcessor with HTML partitions and regions - */ -public class HTMLFindOccurrencesProcessor extends FindOccurrencesProcessor { - - protected String[] getPartitionTypes() { - return new String[]{IHTMLPartitions.HTML_DEFAULT, IXMLPartitions.XML_DEFAULT}; - } - - protected String[] getRegionTypes() { - return new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE}; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/style/IStyleConstantsHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/style/IStyleConstantsHTML.java deleted file mode 100644 index 81f765c1a4..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/style/IStyleConstantsHTML.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.style; - -import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML; - -/** - * Contains the symbolic name of styles used by LineStyleProvider, ColorManager, and - * any others who may be interested - */ -public interface IStyleConstantsHTML extends IStyleConstantsXML { - public static final String SCRIPT_AREA_BORDER = "SCRIPT_AREA_BORDER";//$NON-NLS-1$ - public static final String SCRIPT_AREA = "SCRIPT_AREA";//$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/style/LineStyleProviderForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/style/LineStyleProviderForHTML.java deleted file mode 100644 index 4db6f6400b..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/style/LineStyleProviderForHTML.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.style; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.TextAttribute; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; -import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML; -import org.eclipse.wst.xml.ui.internal.style.LineStyleProviderForXML; - -public class LineStyleProviderForHTML extends LineStyleProviderForXML implements LineStyleProvider { - - public LineStyleProviderForHTML() { - super(); - } - - /** - * a method to centralize all the "format rules" for regions - * specifically associated for how to "open" the region. - */ - // NOTE: this method was just copied down form LineStyleProviderForXML - public TextAttribute getAttributeFor(ITextRegion region) { - // not sure why this is coming through null, but just to catch it - if (region == null) { - return (TextAttribute)getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); - } - String type = region.getType(); - if (type == DOMRegionContext.BLOCK_TEXT) { - return (TextAttribute)getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); - } - // workaround: make PI edges the same color as tag edges - else if ((type == DOMRegionContext.XML_PI_OPEN) || (type == DOMRegionContext.XML_PI_CLOSE)) { - return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_BORDER); - } - // first try "standard" tag attributes from super class - return super.getAttributeFor(region); - } - - protected void loadColors() { - super.loadColors(); - - addTextAttribute(IStyleConstantsHTML.SCRIPT_AREA_BORDER); - } - - - protected void handlePropertyChange(PropertyChangeEvent event) { - if (event != null) { - String prefKey = event.getProperty(); - // check if preference changed is a style preference - if (IStyleConstantsHTML.SCRIPT_AREA_BORDER.equals(prefKey)) { - addTextAttribute(IStyleConstantsHTML.SCRIPT_AREA_BORDER); - - // this is what AbstractLineStyleProvider.propertyChange() does - getHighlighter().refreshDisplay(); - } else { - super.handlePropertyChange(event); - } - } else { - super.handlePropertyChange(event); - } - } - /* (non-Javadoc) - * @see org.eclipse.wst.sse.ui.style.AbstractLineStyleProvider#getColorPreferences() - */ - protected IPreferenceStore getColorPreferences() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/taginfo/HTMLInformationProvider.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/taginfo/HTMLInformationProvider.java deleted file mode 100644 index 5f859c7c56..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/taginfo/HTMLInformationProvider.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.taginfo; - - - -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextHover; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.information.IInformationProvider; -import org.eclipse.jface.text.information.IInformationProviderExtension; -import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; - -/** - * Provides context information for HTML tags (Shows tooltip description) - * - * @deprecated StructuredTextViewerConfiguration creates the appropriate - * information provider - */ -public class HTMLInformationProvider implements IInformationProvider, IInformationProviderExtension { - - private ITextHover fTextHover = null; - - public HTMLInformationProvider() { - fTextHover = SSEUIPlugin.getDefault().getTextHoverManager().createBestMatchHover(new HTMLTagInfoHoverProcessor()); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.text.information.IInformationProvider#getSubject(org.eclipse.jface.text.ITextViewer, - * int) - */ - public IRegion getSubject(ITextViewer textViewer, int offset) { - return fTextHover.getHoverRegion(textViewer, offset); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.text.information.IInformationProvider#getInformation(org.eclipse.jface.text.ITextViewer, - * org.eclipse.jface.text.IRegion) - */ - public String getInformation(ITextViewer textViewer, IRegion subject) { - return (String) getInformation2(textViewer, subject); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.text.information.IInformationProviderExtension#getInformation2(org.eclipse.jface.text.ITextViewer, - * org.eclipse.jface.text.IRegion) - */ - public Object getInformation2(ITextViewer textViewer, IRegion subject) { - return fTextHover.getHoverInfo(textViewer, subject); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/taginfo/HTMLTagInfoHoverProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/taginfo/HTMLTagInfoHoverProcessor.java deleted file mode 100644 index a99186ab1a..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/taginfo/HTMLTagInfoHoverProcessor.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.taginfo; - - - -import org.eclipse.wst.xml.ui.internal.taginfo.XMLTagInfoHoverProcessor; - -/** - * Provides hover help documentation for HTML tags - * - * @author amywu - */ -public class HTMLTagInfoHoverProcessor extends XMLTagInfoHoverProcessor { - // currently empty because XMLTagInfoHoverProcessor handles all cases relevant to HTML - public HTMLTagInfoHoverProcessor() { - super(); - } - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/EncodingTemplateVariableResolverHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/EncodingTemplateVariableResolverHTML.java deleted file mode 100644 index aca7d175e7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/EncodingTemplateVariableResolverHTML.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.templates; - -import org.eclipse.jface.text.templates.SimpleTemplateVariableResolver; -import org.eclipse.jface.text.templates.TemplateContext; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; - - -public class EncodingTemplateVariableResolverHTML extends SimpleTemplateVariableResolver { - private static final String ENCODING_TYPE = getEncodingType(); - - private static String getEncodingType() { - return "encoding"; //$NON-NLS-1$ - } - - /** - * Creates a new encoding variable - */ - public EncodingTemplateVariableResolverHTML() { - super(ENCODING_TYPE, HTMLUIMessages.Creating_files_encoding); - } - - protected String resolve(TemplateContext context) { - return HTMLCorePlugin.getDefault().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/TemplateContextTypeHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/TemplateContextTypeHTML.java deleted file mode 100644 index 2a18055243..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/TemplateContextTypeHTML.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.templates; - -import org.eclipse.jface.text.templates.GlobalTemplateVariables; -import org.eclipse.jface.text.templates.TemplateContextType; - -/** - * Base class for HTML template context types. Templates of this context type - * apply to any place within HTML content type. - */ -public class TemplateContextTypeHTML extends TemplateContextType { - - public TemplateContextTypeHTML() { - super(); - addResolver(new GlobalTemplateVariables.Cursor()); - addResolver(new GlobalTemplateVariables.Date()); - addResolver(new GlobalTemplateVariables.Dollar()); - addResolver(new GlobalTemplateVariables.LineSelection()); - addResolver(new GlobalTemplateVariables.Time()); - addResolver(new GlobalTemplateVariables.User()); - addResolver(new GlobalTemplateVariables.WordSelection()); - addResolver(new GlobalTemplateVariables.Year()); - addResolver(new EncodingTemplateVariableResolverHTML()); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/TemplateContextTypeIdsHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/TemplateContextTypeIdsHTML.java deleted file mode 100644 index 794b13db36..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/templates/TemplateContextTypeIdsHTML.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.templates; - - -public class TemplateContextTypeIdsHTML { - - public static final String ALL = getAll(); - - public static final String ATTRIBUTE = getAttribute(); - - public static final String ATTRIBUTE_VALUE = getAttributeValue(); - - public static final String NEW = getNew(); - - public static final String TAG = getTag(); - - private static String getAll() { - return getPrefix() + "_all"; //$NON-NLS-1$ - } - - private static String getAttribute() { - return getPrefix() + "_attribute"; //$NON-NLS-1$ - } - - private static String getAttributeValue() { - return getPrefix() + "_attribute_value"; //$NON-NLS-1$ - } - - private static String getNew() { - return getPrefix() + "_new"; //$NON-NLS-1$ - } - - private static String getTag() { - return getPrefix() + "_tag"; //$NON-NLS-1$ - } - - private static String getPrefix() { - return "html"; //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/CharacterPairInserter.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/CharacterPairInserter.java deleted file mode 100644 index 597d9a91b0..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/CharacterPairInserter.java +++ /dev/null @@ -1,118 +0,0 @@ -/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.ui.internal.text;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
-import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.typing.AbstractCharacterPairInserter;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class CharacterPairInserter extends AbstractCharacterPairInserter implements IPropertyChangeListener {
-
- // preferences
- private boolean fCloseStrings = true;
- private boolean fCloseBrackets = true;
-
- protected boolean shouldPair(ISourceViewer viewer, char c) {
- switch (c) {
- case '\'':
- case '"':
- return fCloseStrings ? checkRegion(viewer, c) : false;
- default:
- return fCloseBrackets;
- }
- }
-
- /**
- * Checks if the region should support paired quotes
- * @param viewer the viewer
- * @return true if the region is not in an XML attribute value
- */
- private boolean checkRegion(ISourceViewer viewer, char c) {
- IDocument doc = viewer.getDocument();
- final Point selection= viewer.getSelectedRange();
- final int offset= selection.x;
-
- if (doc instanceof IStructuredDocument) {
- IStructuredDocumentRegion[] regions = ((IStructuredDocument) doc).getStructuredDocumentRegions(offset, 0);
- if (regions != null && regions.length > 0) {
- ITextRegion region = regions[0].getRegionAtCharacterOffset(offset);
- if (region != null) {
- final String type = region.getType();
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS.equals(type))
- return true;
- else if (DOMRegionContext.XML_TAG_CLOSE.equals(type) || DOMRegionContext.XML_EMPTY_TAG_CLOSE.equals(type)) {
- if (regions[0].containsOffset(offset - 1)) {
- region = regions[0].getRegionAtCharacterOffset(offset - 1);
- if (region != null && DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS.equals(region.getType()))
- return true;
- }
- }
- return c != '\'' && DOMRegionContext.XML_CONTENT.equals(type);
- }
- }
- }
- return true;
- }
-
- public boolean hasPair(char c) {
- switch (c) {
- case '"':
- case '\'':
- case '[':
- case '(':
- return true;
- default:
- return false;
- }
- }
-
- protected char getPair(char c) {
- switch (c) {
- case '\'':
- case '"':
- return c;
- case '(':
- return ')';
- case '[':
- return ']';
- default:
- throw new IllegalArgumentException();
- }
- }
-
- public void initialize() {
- IPreferenceStore store = HTMLUIPlugin.getInstance().getPreferenceStore();
- fCloseStrings = store.getBoolean(HTMLUIPreferenceNames.TYPING_CLOSE_STRINGS);
- fCloseBrackets = store.getBoolean(HTMLUIPreferenceNames.TYPING_CLOSE_BRACKETS);
- store.addPropertyChangeListener(this);
- }
-
- public void dispose() {
- HTMLUIPlugin.getInstance().getPreferenceStore().removePropertyChangeListener(this);
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- if (HTMLUIPreferenceNames.TYPING_CLOSE_BRACKETS.equals(event.getProperty()))
- fCloseBrackets = ((Boolean) event.getNewValue()).booleanValue();
- else if (HTMLUIPreferenceNames.TYPING_CLOSE_STRINGS.equals(event.getProperty()))
- fCloseStrings = ((Boolean) event.getNewValue()).booleanValue();
- }
-}
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/HTMLDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/HTMLDocumentRegionEdgeMatcher.java deleted file mode 100644 index aa75cdbfb4..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/HTMLDocumentRegionEdgeMatcher.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.text; - -import org.eclipse.wst.sse.ui.internal.text.DocumentRegionEdgeMatcher; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; - -public class HTMLDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher { - - protected final static char[] BRACKETS = {'{', '}', '(', ')', '[', ']','"','"','\'','\''}; - /** - * @param validContexts - * @param nextMatcher - */ - public HTMLDocumentRegionEdgeMatcher() { - super(new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_PI_CONTENT}, new JavaPairMatcher(BRACKETS)); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/IJavaPartitions.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/IJavaPartitions.java deleted file mode 100644 index b9d8561a47..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/IJavaPartitions.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.text; - -// taken from package org.eclipse.jdt.ui.text; - -/** - * Definition of Java partitioning and its partitions. - * - * @see Eclipse 3.1 - */ -interface IJavaPartitions { - - /** - * The identifier of the Java partitioning. - */ - String JAVA_PARTITIONING = "___java_partitioning"; //$NON-NLS-1$ - - /** - * The identifier of the single-line (JLS2: EndOfLineComment) end comment - * partition content type. - */ - String JAVA_SINGLE_LINE_COMMENT = "__java_singleline_comment"; //$NON-NLS-1$ - - /** - * The identifier multi-line (JLS2: TraditionalComment) comment partition - * content type. - */ - String JAVA_MULTI_LINE_COMMENT = "__java_multiline_comment"; //$NON-NLS-1$ - - /** - * The identifier of the Javadoc (JLS2: DocumentationComment) partition - * content type. - */ - String JAVA_DOC = "__java_javadoc"; //$NON-NLS-1$ - - /** - * The identifier of the Java string partition content type. - */ - String JAVA_STRING = "__java_string"; //$NON-NLS-1$ - - /** - * The identifier of the Java character partition content type. - */ - String JAVA_CHARACTER = "__java_character"; //$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaCodeReader.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaCodeReader.java deleted file mode 100644 index e3cace3005..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaCodeReader.java +++ /dev/null @@ -1,244 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.text; - -// taken from package org.eclipse.jdt.ui.text; - -import java.io.IOException; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.wst.html.ui.internal.derived.SingleCharReader; - -/** - * Reads from a document either forwards or backwards. May be configured to - * skip comments and strings. - */ -class JavaCodeReader extends SingleCharReader { - - /** The EOF character */ - public static final int EOF = -1; - - private boolean fSkipComments = false; - private boolean fSkipStrings = false; - private boolean fForward = false; - - private IDocument fDocument; - private int fOffset; - - private int fEnd = -1; - private int fCachedLineNumber = -1; - private int fCachedLineOffset = -1; - - - public JavaCodeReader() { - } - - /** - * Returns the offset of the last read character. Should only be called - * after read has been called. - */ - public int getOffset() { - return fForward ? fOffset - 1 : fOffset; - } - - public void configureForwardReader(IDocument document, int offset, int length, boolean skipComments, boolean skipStrings) throws IOException { - fDocument = document; - fOffset = offset; - fSkipComments = skipComments; - fSkipStrings = skipStrings; - - fForward = true; - fEnd = Math.min(fDocument.getLength(), fOffset + length); - } - - public void configureBackwardReader(IDocument document, int offset, boolean skipComments, boolean skipStrings) throws IOException { - fDocument = document; - fOffset = offset; - fSkipComments = skipComments; - fSkipStrings = skipStrings; - - fForward = false; - try { - fCachedLineNumber = fDocument.getLineOfOffset(fOffset); - } - catch (BadLocationException x) { - throw new IOException(x.getMessage()); - } - } - - /* - * @see Reader#close() - */ - public void close() throws IOException { - fDocument = null; - } - - /* - * @see SingleCharReader#read() - */ - public int read() throws IOException { - try { - return fForward ? readForwards() : readBackwards(); - } - catch (BadLocationException x) { - throw new IOException(x.getMessage()); - } - } - - private void gotoCommentEnd() throws BadLocationException { - while (fOffset < fEnd) { - char current = fDocument.getChar(fOffset++); - if (current == '*') { - if (fOffset < fEnd && fDocument.getChar(fOffset) == '/') { - ++fOffset; - return; - } - } - } - } - - private void gotoStringEnd(char delimiter) throws BadLocationException { - while (fOffset < fEnd) { - char current = fDocument.getChar(fOffset++); - if (current == '\\') { - // ignore escaped characters - ++fOffset; - } - else if (current == delimiter) { - return; - } - } - } - - private void gotoLineEnd() throws BadLocationException { - int line = fDocument.getLineOfOffset(fOffset); - fOffset = fDocument.getLineOffset(line + 1); - } - - private int readForwards() throws BadLocationException { - while (fOffset < fEnd) { - char current = fDocument.getChar(fOffset++); - - switch (current) { - case '/' : - - if (fSkipComments && fOffset < fEnd) { - char next = fDocument.getChar(fOffset); - if (next == '*') { - // a comment starts, advance to the comment end - ++fOffset; - gotoCommentEnd(); - continue; - } - else if (next == '/') { - // '//'-comment starts, advance to the line end - gotoLineEnd(); - continue; - } - } - - return current; - - case '"' : - case '\'' : - - if (fSkipStrings) { - gotoStringEnd(current); - continue; - } - - return current; - } - - return current; - } - - return EOF; - } - - private void handleSingleLineComment() throws BadLocationException { - int line = fDocument.getLineOfOffset(fOffset); - if (line < fCachedLineNumber) { - fCachedLineNumber = line; - fCachedLineOffset = fDocument.getLineOffset(line); - int offset = fOffset; - while (fCachedLineOffset < offset) { - char current = fDocument.getChar(offset--); - if (current == '/' && fCachedLineOffset <= offset && fDocument.getChar(offset) == '/') { - fOffset = offset; - return; - } - } - } - } - - private void gotoCommentStart() throws BadLocationException { - while (0 < fOffset) { - char current = fDocument.getChar(fOffset--); - if (current == '*' && 0 <= fOffset && fDocument.getChar(fOffset) == '/') - return; - } - } - - private void gotoStringStart(char delimiter) throws BadLocationException { - while (0 < fOffset) { - char current = fDocument.getChar(fOffset); - if (current == delimiter) { - if (!(0 <= fOffset && fDocument.getChar(fOffset - 1) == '\\')) - return; - } - --fOffset; - } - } - - private int readBackwards() throws BadLocationException { - - while (0 < fOffset) { - --fOffset; - - handleSingleLineComment(); - - char current = fDocument.getChar(fOffset); - switch (current) { - case '/' : - - if (fSkipComments && fOffset > 1) { - char next = fDocument.getChar(fOffset - 1); - if (next == '*') { - // a comment ends, advance to the comment start - fOffset -= 2; - gotoCommentStart(); - continue; - } - } - - return current; - - case '"' : - case '\'' : - - if (fSkipStrings) { - --fOffset; - gotoStringStart(current); - continue; - } - - return current; - } - - return current; - } - - return EOF; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaHeuristicScanner.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaHeuristicScanner.java deleted file mode 100644 index 01602a291e..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaHeuristicScanner.java +++ /dev/null @@ -1,986 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.text; - -// taken from package org.eclipse.jdt.internal.ui.text; - -import java.util.Arrays; - -import org.eclipse.jface.text.Assert; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.jface.text.TypedRegion; - -/** - * Utility methods for heuristic based Java manipulations in an incomplete - * Java source file. - * - * <p> - * An instance holds some internal position in the document and is therefore - * not threadsafe. - * </p> - * - * @see Eclipse 3.0 - */ -final class JavaHeuristicScanner implements Symbols { - /** - * Returned by all methods when the requested position could not be found, - * or if a {@link BadLocationException} was thrown while scanning. - */ - public static final int NOT_FOUND = -1; - - /** - * Special bound parameter that means either -1 (backward scanning) or - * <code>fDocument.getLength()</code> (forward scanning). - */ - public static final int UNBOUND = -2; - - - /* character constants */ - private static final char LBRACE = '{'; - private static final char RBRACE = '}'; - private static final char LPAREN = '('; - private static final char RPAREN = ')'; - private static final char SEMICOLON = ';'; - private static final char COLON = ':'; - private static final char COMMA = ','; - private static final char LBRACKET = '['; - private static final char RBRACKET = ']'; - private static final char QUESTIONMARK = '?'; - private static final char EQUAL = '='; - private static final char LANGLE = '<'; - private static final char RANGLE = '>'; - - /** - * Specifies the stop condition, upon which the <code>scanXXX</code> - * methods will decide whether to keep scanning or not. This interface may - * implemented by clients. - */ - private static abstract class StopCondition { - /** - * Instructs the scanner to return the current position. - * - * @param ch - * the char at the current position - * @param position - * the current position - * @param forward - * the iteration direction - * @return <code>true</code> if the stop condition is met. - */ - public abstract boolean stop(char ch, int position, boolean forward); - - /** - * Asks the condition to return the next position to query. The - * default is to return the next/previous position. - * - * @return the next position to scan - */ - public int nextPosition(int position, boolean forward) { - return forward ? position + 1 : position - 1; - } - } - - /** - * Stops upon a non-whitespace (as defined by - * {@link Character#isWhitespace(char)}) character. - */ - private static class NonWhitespace extends StopCondition { - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#stop(char) - */ - public boolean stop(char ch, int position, boolean forward) { - return !Character.isWhitespace(ch); - } - } - - /** - * Stops upon a non-whitespace character in the default partition. - * - * @see NonWhitespace - */ - private final class NonWhitespaceDefaultPartition extends NonWhitespace { - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#stop(char) - */ - public boolean stop(char ch, int position, boolean forward) { - return super.stop(ch, position, true) && isDefaultPartition(position); - } - - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#nextPosition(int, - * boolean) - */ - public int nextPosition(int position, boolean forward) { - ITypedRegion partition = getPartition(position); - if (fPartition.equals(partition.getType())) - return super.nextPosition(position, forward); - - if (forward) { - int end = partition.getOffset() + partition.getLength(); - if (position < end) - return end; - } - else { - int offset = partition.getOffset(); - if (position > offset) - return offset - 1; - } - return super.nextPosition(position, forward); - } - } - - /** - * Stops upon a non-java identifier (as defined by - * {@link Character#isJavaIdentifierPart(char)}) character. - */ - private static class NonJavaIdentifierPart extends StopCondition { - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#stop(char) - */ - public boolean stop(char ch, int position, boolean forward) { - return !Character.isJavaIdentifierPart(ch); - } - } - - /** - * Stops upon a non-java identifier character in the default partition. - * - * @see NonJavaIdentifierPart - */ - private final class NonJavaIdentifierPartDefaultPartition extends NonJavaIdentifierPart { - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#stop(char) - */ - public boolean stop(char ch, int position, boolean forward) { - return super.stop(ch, position, true) || !isDefaultPartition(position); - } - - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#nextPosition(int, - * boolean) - */ - public int nextPosition(int position, boolean forward) { - ITypedRegion partition = getPartition(position); - if (fPartition.equals(partition.getType())) - return super.nextPosition(position, forward); - - if (forward) { - int end = partition.getOffset() + partition.getLength(); - if (position < end) - return end; - } - else { - int offset = partition.getOffset(); - if (position > offset) - return offset - 1; - } - return super.nextPosition(position, forward); - } - } - - /** - * Stops upon a character in the default partition that matches the given - * character list. - */ - private final class CharacterMatch extends StopCondition { - private final char[] fChars; - - /** - * Creates a new instance. - * - * @param ch - * the single character to match - */ - public CharacterMatch(char ch) { - this(new char[]{ch}); - } - - /** - * Creates a new instance. - * - * @param chars - * the chars to match. - */ - public CharacterMatch(char[] chars) { - Assert.isNotNull(chars); - Assert.isTrue(chars.length > 0); - fChars = chars; - Arrays.sort(chars); - } - - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#stop(char, - * int) - */ - public boolean stop(char ch, int position, boolean forward) { - return Arrays.binarySearch(fChars, ch) >= 0 && isDefaultPartition(position); - } - - /* - * @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#nextPosition(int, - * boolean) - */ - public int nextPosition(int position, boolean forward) { - ITypedRegion partition = getPartition(position); - if (fPartition.equals(partition.getType())) - return super.nextPosition(position, forward); - - if (forward) { - int end = partition.getOffset() + partition.getLength(); - if (position < end) - return end; - } - else { - int offset = partition.getOffset(); - if (position > offset) - return offset - 1; - } - return super.nextPosition(position, forward); - } - } - - /** The document being scanned. */ - private IDocument fDocument; - /** The partitioning being used for scanning. */ - private String fPartitioning; - /** The partition to scan in. */ - private String fPartition; - - /* internal scan state */ - - /** the most recently read character. */ - private char fChar; - /** the most recently read position. */ - private int fPos; - - /* preset stop conditions */ - private final StopCondition fNonWSDefaultPart = new NonWhitespaceDefaultPartition(); - private final static StopCondition fNonWS = new NonWhitespace(); - private final StopCondition fNonIdent = new NonJavaIdentifierPartDefaultPartition(); - - /** - * Creates a new instance. - * - * @param document - * the document to scan - * @param partitioning - * the partitioning to use for scanning - * @param partition - * the partition to scan in - */ - public JavaHeuristicScanner(IDocument document, String partitioning, String partition) { - Assert.isNotNull(document); - Assert.isNotNull(partitioning); - Assert.isNotNull(partition); - fDocument = document; - fPartitioning = partitioning; - fPartition = partition; - } - - /** - * Calls - * <code>this(document, IJavaPartitions.JAVA_PARTITIONING, IDocument.DEFAULT_CONTENT_TYPE)</code>. - * - * @param document - * the document to scan. - */ - public JavaHeuristicScanner(IDocument document) { - this(document, IJavaPartitions.JAVA_PARTITIONING, IDocument.DEFAULT_CONTENT_TYPE); - } - - /** - * Returns the most recent internal scan position. - * - * @return the most recent internal scan position. - */ - public int getPosition() { - return fPos; - } - - /** - * Returns the next token in forward direction, starting at - * <code>start</code>, and not extending further than - * <code>bound</code>. The return value is one of the constants defined - * in {@link Symbols}. After a call, {@link #getPosition()} will return - * the position just after the scanned token (i.e. the next position that - * will be scanned). - * - * @param start - * the first character position in the document to consider - * @param bound - * the first position not to consider any more - * @return a constant from {@link Symbols} describing the next token - */ - public int nextToken(int start, int bound) { - int pos = scanForward(start, bound, fNonWSDefaultPart); - if (pos == NOT_FOUND) - return TokenEOF; - - fPos++; - - switch (fChar) { - case LBRACE : - return TokenLBRACE; - case RBRACE : - return TokenRBRACE; - case LBRACKET : - return TokenLBRACKET; - case RBRACKET : - return TokenRBRACKET; - case LPAREN : - return TokenLPAREN; - case RPAREN : - return TokenRPAREN; - case SEMICOLON : - return TokenSEMICOLON; - case COMMA : - return TokenCOMMA; - case QUESTIONMARK : - return TokenQUESTIONMARK; - case EQUAL : - return TokenEQUAL; - case LANGLE : - return TokenLESSTHAN; - case RANGLE : - return TokenGREATERTHAN; - } - - // else - if (Character.isJavaIdentifierPart(fChar)) { - // assume an ident or keyword - int from = pos, to; - pos = scanForward(pos + 1, bound, fNonIdent); - if (pos == NOT_FOUND) - to = bound == UNBOUND ? fDocument.getLength() : bound; - else - to = pos; - - String identOrKeyword; - try { - identOrKeyword = fDocument.get(from, to - from); - } - catch (BadLocationException e) { - return TokenEOF; - } - - return getToken(identOrKeyword); - - - } - else { - // operators, number literals etc - return TokenOTHER; - } - } - - /** - * Returns the next token in backward direction, starting at - * <code>start</code>, and not extending further than - * <code>bound</code>. The return value is one of the constants defined - * in {@link Symbols}. After a call, {@link #getPosition()} will return - * the position just before the scanned token starts (i.e. the next - * position that will be scanned). - * - * @param start - * the first character position in the document to consider - * @param bound - * the first position not to consider any more - * @return a constant from {@link Symbols} describing the previous token - */ - public int previousToken(int start, int bound) { - int pos = scanBackward(start, bound, fNonWSDefaultPart); - if (pos == NOT_FOUND) - return TokenEOF; - - fPos--; - - switch (fChar) { - case LBRACE : - return TokenLBRACE; - case RBRACE : - return TokenRBRACE; - case LBRACKET : - return TokenLBRACKET; - case RBRACKET : - return TokenRBRACKET; - case LPAREN : - return TokenLPAREN; - case RPAREN : - return TokenRPAREN; - case SEMICOLON : - return TokenSEMICOLON; - case COLON : - return TokenCOLON; - case COMMA : - return TokenCOMMA; - case QUESTIONMARK : - return TokenQUESTIONMARK; - case EQUAL : - return TokenEQUAL; - case LANGLE : - return TokenLESSTHAN; - case RANGLE : - return TokenGREATERTHAN; - } - - // else - if (Character.isJavaIdentifierPart(fChar)) { - // assume an ident or keyword - int from, to = pos + 1; - pos = scanBackward(pos - 1, bound, fNonIdent); - if (pos == NOT_FOUND) - from = bound == UNBOUND ? 0 : bound + 1; - else - from = pos + 1; - - String identOrKeyword; - try { - identOrKeyword = fDocument.get(from, to - from); - } - catch (BadLocationException e) { - return TokenEOF; - } - - return getToken(identOrKeyword); - - - } - else { - // operators, number literals etc - return TokenOTHER; - } - - } - - /** - * Returns one of the keyword constants or <code>TokenIDENT</code> for a - * scanned identifier. - * - * @param s - * a scanned identifier - * @return one of the constants defined in {@link Symbols} - */ - private int getToken(String s) { - Assert.isNotNull(s); - - switch (s.length()) { - case 2 : - if ("if".equals(s)) //$NON-NLS-1$ - return TokenIF; - if ("do".equals(s)) //$NON-NLS-1$ - return TokenDO; - break; - case 3 : - if ("for".equals(s)) //$NON-NLS-1$ - return TokenFOR; - if ("try".equals(s)) //$NON-NLS-1$ - return TokenTRY; - if ("new".equals(s)) //$NON-NLS-1$ - return TokenNEW; - break; - case 4 : - if ("case".equals(s)) //$NON-NLS-1$ - return TokenCASE; - if ("else".equals(s)) //$NON-NLS-1$ - return TokenELSE; - if ("enum".equals(s)) //$NON-NLS-1$ - return TokenENUM; - if ("goto".equals(s)) //$NON-NLS-1$ - return TokenGOTO; - break; - case 5 : - if ("break".equals(s)) //$NON-NLS-1$ - return TokenBREAK; - if ("catch".equals(s)) //$NON-NLS-1$ - return TokenCATCH; - if ("class".equals(s)) //$NON-NLS-1$ - return TokenCLASS; - if ("while".equals(s)) //$NON-NLS-1$ - return TokenWHILE; - break; - case 6 : - if ("return".equals(s)) //$NON-NLS-1$ - return TokenRETURN; - if ("static".equals(s)) //$NON-NLS-1$ - return TokenSTATIC; - if ("switch".equals(s)) //$NON-NLS-1$ - return TokenSWITCH; - break; - case 7 : - if ("default".equals(s)) //$NON-NLS-1$ - return TokenDEFAULT; - if ("finally".equals(s)) //$NON-NLS-1$ - return TokenFINALLY; - break; - case 9 : - if ("interface".equals(s)) //$NON-NLS-1$ - return TokenINTERFACE; - break; - case 12 : - if ("synchronized".equals(s)) //$NON-NLS-1$ - return TokenSYNCHRONIZED; - break; - } - return TokenIDENT; - } - - /** - * Returns the position of the closing peer character (forward search). - * Any scopes introduced by opening peers are skipped. All peers accounted - * for must reside in the default partition. - * - * <p> - * Note that <code>start</code> must not point to the opening peer, but - * to the first character being searched. - * </p> - * - * @param start - * the start position - * @param openingPeer - * the opening peer character (e.g. '{') - * @param closingPeer - * the closing peer character (e.g. '}') - * @return the matching peer character position, or <code>NOT_FOUND</code> - */ - public int findClosingPeer(int start, final char openingPeer, final char closingPeer) { - Assert.isNotNull(fDocument); - Assert.isTrue(start >= 0); - - try { - int depth = 1; - start -= 1; - while (true) { - start = scanForward(start + 1, UNBOUND, new CharacterMatch(new char[]{openingPeer, closingPeer})); - if (start == NOT_FOUND) - return NOT_FOUND; - - if (fDocument.getChar(start) == openingPeer) - depth++; - else - depth--; - - if (depth == 0) - return start; - } - - } - catch (BadLocationException e) { - return NOT_FOUND; - } - } - - /** - * Returns the position of the opening peer character (backward search). - * Any scopes introduced by closing peers are skipped. All peers accounted - * for must reside in the default partition. - * - * <p> - * Note that <code>start</code> must not point to the closing peer, but - * to the first character being searched. - * </p> - * - * @param start - * the start position - * @param openingPeer - * the opening peer character (e.g. '{') - * @param closingPeer - * the closing peer character (e.g. '}') - * @return the matching peer character position, or <code>NOT_FOUND</code> - */ - public int findOpeningPeer(int start, char openingPeer, char closingPeer) { - Assert.isTrue(start < fDocument.getLength()); - - try { - int depth = 1; - start += 1; - while (true) { - start = scanBackward(start - 1, UNBOUND, new CharacterMatch(new char[]{openingPeer, closingPeer})); - if (start == NOT_FOUND) - return NOT_FOUND; - - if (fDocument.getChar(start) == closingPeer) - depth++; - else - depth--; - - if (depth == 0) - return start; - } - - } - catch (BadLocationException e) { - return NOT_FOUND; - } - } - - /** - * Computes the surrounding block around <code>offset</code>. The - * search is started at the beginning of <code>offset</code>, i.e. an - * opening brace at <code>offset</code> will not be part of the - * surrounding block, but a closing brace will. - * - * @param offset - * the offset for which the surrounding block is computed - * @return a region describing the surrounding block, or <code>null</code> - * if none can be found - */ - public IRegion findSurroundingBlock(int offset) { - if (offset < 1 || offset >= fDocument.getLength()) - return null; - - int begin = findOpeningPeer(offset - 1, LBRACE, RBRACE); - int end = findClosingPeer(offset, LBRACE, RBRACE); - if (begin == NOT_FOUND || end == NOT_FOUND) - return null; - return new Region(begin, end + 1 - begin); - } - - /** - * Finds the smallest position in <code>fDocument</code> such that the - * position is >= <code>position</code> and < <code>bound</code> - * and <code>Character.isWhitespace(fDocument.getChar(pos))</code> - * evaluates to <code>false</code> and the position is in the default - * partition. - * - * @param position - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> > - * <code>position</code>, or <code>UNBOUND</code> - * @return the smallest position of a non-whitespace character in [<code>position</code>, - * <code>bound</code>) that resides in a Java partition, or - * <code>NOT_FOUND</code> if none can be found - */ - public int findNonWhitespaceForward(int position, int bound) { - return scanForward(position, bound, fNonWSDefaultPart); - } - - /** - * Finds the smallest position in <code>fDocument</code> such that the - * position is >= <code>position</code> and < <code>bound</code> - * and <code>Character.isWhitespace(fDocument.getChar(pos))</code> - * evaluates to <code>false</code>. - * - * @param position - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> > - * <code>position</code>, or <code>UNBOUND</code> - * @return the smallest position of a non-whitespace character in [<code>position</code>, - * <code>bound</code>), or <code>NOT_FOUND</code> if none can - * be found - */ - public int findNonWhitespaceForwardInAnyPartition(int position, int bound) { - return scanForward(position, bound, fNonWS); - } - - /** - * Finds the highest position in <code>fDocument</code> such that the - * position is <= <code>position</code> and > <code>bound</code> - * and <code>Character.isWhitespace(fDocument.getChar(pos))</code> - * evaluates to <code>false</code> and the position is in the default - * partition. - * - * @param position - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> < - * <code>position</code>, or <code>UNBOUND</code> - * @return the highest position of a non-whitespace character in (<code>bound</code>, - * <code>position</code>] that resides in a Java partition, or - * <code>NOT_FOUND</code> if none can be found - */ - public int findNonWhitespaceBackward(int position, int bound) { - return scanBackward(position, bound, fNonWSDefaultPart); - } - - /** - * Finds the lowest position <code>p</code> in <code>fDocument</code> - * such that <code>start</code> <= p < <code>bound</code> and - * <code>condition.stop(fDocument.getChar(p), p)</code> evaluates to - * <code>true</code>. - * - * @param start - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> > - * <code>start</code>, or <code>UNBOUND</code> - * @param condition - * the <code>StopCondition</code> to check - * @return the lowest position in [<code>start</code>, - * <code>bound</code>) for which <code>condition</code> - * holds, or <code>NOT_FOUND</code> if none can be found - */ - public int scanForward(int start, int bound, StopCondition condition) { - Assert.isTrue(start >= 0); - - if (bound == UNBOUND) - bound = fDocument.getLength(); - - Assert.isTrue(bound <= fDocument.getLength()); - - try { - fPos = start; - while (fPos < bound) { - - fChar = fDocument.getChar(fPos); - if (condition.stop(fChar, fPos, true)) - return fPos; - - fPos = condition.nextPosition(fPos, true); - } - } - catch (BadLocationException e) { - } - return NOT_FOUND; - } - - - /** - * Finds the lowest position in <code>fDocument</code> such that the - * position is >= <code>position</code> and < <code>bound</code> - * and <code>fDocument.getChar(position) == ch</code> evaluates to - * <code>true</code> and the position is in the default partition. - * - * @param position - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> > - * <code>position</code>, or <code>UNBOUND</code> - * @param ch - * the <code>char</code> to search for - * @return the lowest position of <code>ch</code> in (<code>bound</code>, - * <code>position</code>] that resides in a Java partition, or - * <code>NOT_FOUND</code> if none can be found - */ - public int scanForward(int position, int bound, char ch) { - return scanForward(position, bound, new CharacterMatch(ch)); - } - - /** - * Finds the lowest position in <code>fDocument</code> such that the - * position is >= <code>position</code> and < <code>bound</code> - * and <code>fDocument.getChar(position) == ch</code> evaluates to - * <code>true</code> for at least one ch in <code>chars</code> and the - * position is in the default partition. - * - * @param position - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> > - * <code>position</code>, or <code>UNBOUND</code> - * @param chars - * an array of <code>char</code> to search for - * @return the lowest position of a non-whitespace character in [<code>position</code>, - * <code>bound</code>) that resides in a Java partition, or - * <code>NOT_FOUND</code> if none can be found - */ - public int scanForward(int position, int bound, char[] chars) { - return scanForward(position, bound, new CharacterMatch(chars)); - } - - /** - * Finds the highest position <code>p</code> in <code>fDocument</code> - * such that <code>bound</code> < <code>p</code> <= - * <code>start</code> and - * <code>condition.stop(fDocument.getChar(p), p)</code> evaluates to - * <code>true</code>. - * - * @param start - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> < - * <code>start</code>, or <code>UNBOUND</code> - * @param condition - * the <code>StopCondition</code> to check - * @return the highest position in (<code>bound</code>, - * <code>start</code> for which <code>condition</code> holds, - * or <code>NOT_FOUND</code> if none can be found - */ - public int scanBackward(int start, int bound, StopCondition condition) { - if (bound == UNBOUND) - bound = -1; - - Assert.isTrue(bound >= -1); - Assert.isTrue(start < fDocument.getLength()); - - try { - fPos = start; - while (fPos > bound) { - - fChar = fDocument.getChar(fPos); - if (condition.stop(fChar, fPos, false)) - return fPos; - - fPos = condition.nextPosition(fPos, false); - } - } - catch (BadLocationException e) { - } - return NOT_FOUND; - } - - /** - * Finds the highest position in <code>fDocument</code> such that the - * position is <= <code>position</code> and > <code>bound</code> - * and <code>fDocument.getChar(position) == ch</code> evaluates to - * <code>true</code> for at least one ch in <code>chars</code> and the - * position is in the default partition. - * - * @param position - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> < - * <code>position</code>, or <code>UNBOUND</code> - * @param ch - * the <code>char</code> to search for - * @return the highest position of one element in <code>chars</code> in (<code>bound</code>, - * <code>position</code>] that resides in a Java partition, or - * <code>NOT_FOUND</code> if none can be found - */ - public int scanBackward(int position, int bound, char ch) { - return scanBackward(position, bound, new CharacterMatch(ch)); - } - - /** - * Finds the highest position in <code>fDocument</code> such that the - * position is <= <code>position</code> and > <code>bound</code> - * and <code>fDocument.getChar(position) == ch</code> evaluates to - * <code>true</code> for at least one ch in <code>chars</code> and the - * position is in the default partition. - * - * @param position - * the first character position in <code>fDocument</code> to - * be considered - * @param bound - * the first position in <code>fDocument</code> to not - * consider any more, with <code>bound</code> < - * <code>position</code>, or <code>UNBOUND</code> - * @param chars - * an array of <code>char</code> to search for - * @return the highest position of one element in <code>chars</code> in (<code>bound</code>, - * <code>position</code>] that resides in a Java partition, or - * <code>NOT_FOUND</code> if none can be found - */ - public int scanBackward(int position, int bound, char[] chars) { - return scanBackward(position, bound, new CharacterMatch(chars)); - } - - /** - * Checks whether <code>position</code> resides in a default (Java) - * partition of <code>fDocument</code>. - * - * @param position - * the position to be checked - * @return <code>true</code> if <code>position</code> is in the - * default partition of <code>fDocument</code>, - * <code>false</code> otherwise - */ - public boolean isDefaultPartition(int position) { - Assert.isTrue(position >= 0); - Assert.isTrue(position <= fDocument.getLength()); - - try { - return fPartition.equals(TextUtilities.getContentType(fDocument, fPartitioning, position, false)); - } - catch (BadLocationException e) { - return false; - } - } - - /** - * Returns the partition at <code>position</code>. - * - * @param position - * the position to get the partition for - * @return the partition at <code>position</code> or a dummy zero-length - * partition if accessing the document fails - */ - private ITypedRegion getPartition(int position) { - Assert.isTrue(position >= 0); - Assert.isTrue(position <= fDocument.getLength()); - - try { - return TextUtilities.getPartition(fDocument, fPartitioning, position, false); - } - catch (BadLocationException e) { - return new TypedRegion(position, 0, "__no_partition_at_all"); //$NON-NLS-1$ - } - - } - - /** - * Checks if the line seems to be an open condition not followed by a - * block (i.e. an if, while, or for statement with just one following - * statement, see example below). - * - * <pre> - * if (condition) - * doStuff(); - * </pre> - * - * <p> - * Algorithm: if the last non-WS, non-Comment code on the line is an if - * (condition), while (condition), for( expression), do, else, and there - * is no statement after that - * </p> - * - * @param position - * the insert position of the new character - * @param bound - * the lowest position to consider - * @return <code>true</code> if the code is a conditional statement or - * loop without a block, <code>false</code> otherwise - */ - public boolean isBracelessBlockStart(int position, int bound) { - if (position < 1) - return false; - - switch (previousToken(position, bound)) { - case TokenDO : - case TokenELSE : - return true; - case TokenRPAREN : - position = findOpeningPeer(fPos, LPAREN, RPAREN); - if (position > 0) { - switch (previousToken(position - 1, bound)) { - case TokenIF : - case TokenFOR : - case TokenWHILE : - return true; - } - } - } - - return false; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaPairMatcher.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaPairMatcher.java deleted file mode 100644 index 020769fb6b..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/JavaPairMatcher.java +++ /dev/null @@ -1,277 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.text; - -// taken from package org.eclipse.jdt.ui.text; - -import java.io.IOException; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.source.ICharacterPairMatcher; - -class JavaPairMatcher implements ICharacterPairMatcher { - - protected char[] fPairs; - protected IDocument fDocument; - protected int fOffset; - - protected int fStartPos; - protected int fEndPos; - protected int fAnchor; - - protected JavaCodeReader fReader = new JavaCodeReader(); - /** - * Stores the source version state. - * - * @see Eclipse 3.1 - */ - private boolean fHighlightAngularBrackets = false; - - - public JavaPairMatcher(char[] pairs) { - fPairs = pairs; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.text.source.ICharacterPairMatcher#match(org.eclipse.jface.text.IDocument, - * int) - */ - public IRegion match(IDocument document, int offset) { - fOffset = offset; - - if(offset < 0 || offset >= document.getLength()) - return null; - - fDocument = document; - - if (fDocument != null && matchPairsAt() && fStartPos != fEndPos) - return new Region(fStartPos, fEndPos - fStartPos + 1); - - return null; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.text.source.ICharacterPairMatcher#getAnchor() - */ - public int getAnchor() { - return fAnchor; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.text.source.ICharacterPairMatcher#dispose() - */ - public void dispose() { - clear(); - fDocument = null; - fReader = null; - } - - /* - * @see org.eclipse.jface.text.source.ICharacterPairMatcher#clear() - */ - public void clear() { - if (fReader != null) { - try { - fReader.close(); - } - catch (IOException x) { - // ignore - } - } - } - - protected boolean matchPairsAt() { - - int i; - int pairIndex1 = fPairs.length; - int pairIndex2 = fPairs.length; - - fStartPos = -1; - fEndPos = -1; - - // get the chars preceding and following the start position - try { - - char prevChar = fDocument.getChar(Math.max(fOffset - 1, 0)); - // modified behavior for - // http://dev.eclipse.org/bugs/show_bug.cgi?id=16879 - // char nextChar= fDocument.getChar(fOffset); - - // search for opening peer character next to the activation point - for (i = 0; i < fPairs.length; i = i + 2) { - // if (nextChar == fPairs[i]) { - // fStartPos= fOffset; - // pairIndex1= i; - // } else - if (prevChar == fPairs[i]) { - fStartPos = fOffset - 1; - pairIndex1 = i; - } - } - - // search for closing peer character next to the activation point - for (i = 1; i < fPairs.length; i = i + 2) { - if (prevChar == fPairs[i]) { - fEndPos = fOffset - 1; - pairIndex2 = i; - } - // else if (nextChar == fPairs[i]) { - // fEndPos= fOffset; - // pairIndex2= i; - // } - } - - if (fEndPos > -1) { - fAnchor = RIGHT; - fStartPos = searchForOpeningPeer(fEndPos, fPairs[pairIndex2 - 1], fPairs[pairIndex2], fDocument); - if (fStartPos > -1) - return true; - else - fEndPos = -1; - } - else if (fStartPos > -1) { - fAnchor = LEFT; - fEndPos = searchForClosingPeer(fStartPos, fPairs[pairIndex1], fPairs[pairIndex1 + 1], fDocument); - if (fEndPos > -1) - return true; - else - fStartPos = -1; - } - - } - catch (BadLocationException x) { - } - catch (IOException x) { - } - - return false; - } - - protected int searchForClosingPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException { - if (openingPeer == '<' && !(fHighlightAngularBrackets && isTypeParameterBracket(offset, document))) - return -1; - - fReader.configureForwardReader(document, offset + 1, document.getLength(), true, true); - - int stack = 1; - int c = fReader.read(); - while (c != JavaCodeReader.EOF) { - if (c == openingPeer && c != closingPeer) - stack++; - else if (c == closingPeer) - stack--; - - if (stack == 0) - return fReader.getOffset(); - - c = fReader.read(); - } - - return -1; - } - - - protected int searchForOpeningPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException { - if (openingPeer == '<' && !fHighlightAngularBrackets) - return -1; - - fReader.configureBackwardReader(document, offset, true, true); - - int stack = 1; - int c = fReader.read(); - while (c != JavaCodeReader.EOF) { - if (c == closingPeer && c != openingPeer) - stack++; - else if (c == openingPeer) - stack--; - - if (stack == 0) { - if (closingPeer == '>' && !isTypeParameterBracket(fReader.getOffset(), document)) - return -1; - return fReader.getOffset(); - } - - c = fReader.read(); - } - - return -1; - } - - /** - * Checks if the angular bracket at <code>offset</code> is a type - * parameter bracket. - * - * @param offset - * the offset of the opening bracket - * @param document - * the document - * @return <code>true</code> if the bracket is part of a type parameter, - * <code>false</code> otherwise - * @see Eclipse 3.1 - */ - private boolean isTypeParameterBracket(int offset, IDocument document) { - /* - * type parameter come after braces (closing or opening), semicolons, - * or after a Type name (heuristic: starts with capital character, or - * after a modifier keyword in a method declaration (visibility, - * static, synchronized, final) - */ - - try { - IRegion line = document.getLineInformationOfOffset(offset); - - JavaHeuristicScanner scanner = new JavaHeuristicScanner(document); - int prevToken = scanner.previousToken(offset - 1, line.getOffset()); - int prevTokenOffset = scanner.getPosition() + 1; - String previous = prevToken == Symbols.TokenEOF ? null : document.get(prevTokenOffset, offset - prevTokenOffset).trim(); - - if (prevToken == Symbols.TokenLBRACE || prevToken == Symbols.TokenRBRACE || prevToken == Symbols.TokenSEMICOLON || prevToken == Symbols.TokenSYNCHRONIZED || prevToken == Symbols.TokenSTATIC || (prevToken == Symbols.TokenIDENT && isTypeParameterIntroducer(previous)) || prevToken == Symbols.TokenEOF) - return true; - } - catch (BadLocationException e) { - return false; - } - - return false; - } - - /** - * Returns <code>true</code> if <code>identifier</code> is an - * identifier that could come right before a type parameter list. It uses - * a heuristic: if the identifier starts with an upper case, it is assumed - * a type name. Also, if <code>identifier</code> is a method modifier, - * it is assumed that the angular bracket is part of the generic type - * parameter of a method. - * - * @param identifier - * the identifier to check - * @return <code>true</code> if the identifier could introduce a type - * parameter list - * @see Eclipse 3.1 - */ - private boolean isTypeParameterIntroducer(String identifier) { - return identifier.length() > 0 && (Character.isUpperCase(identifier.charAt(0)) || identifier.startsWith("final") //$NON-NLS-1$ - || identifier.startsWith("public") //$NON-NLS-1$ - || identifier.startsWith("public") //$NON-NLS-1$ - || identifier.startsWith("protected") //$NON-NLS-1$ - || identifier.startsWith("private")); //$NON-NLS-1$ - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/Symbols.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/Symbols.java deleted file mode 100644 index 1b203e3ac9..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/Symbols.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.text; - -// taken from package org.eclipse.jdt.ui.text; - -/** - * Symbols for the heuristic java scanner. - * - * @see Eclipse 3.0 - */ -interface Symbols { - int TokenEOF = -1; - int TokenLBRACE = 1; - int TokenRBRACE = 2; - int TokenLBRACKET = 3; - int TokenRBRACKET = 4; - int TokenLPAREN = 5; - int TokenRPAREN = 6; - int TokenSEMICOLON = 7; - int TokenOTHER = 8; - int TokenCOLON = 9; - int TokenQUESTIONMARK = 10; - int TokenCOMMA = 11; - int TokenEQUAL = 12; - int TokenLESSTHAN = 13; - int TokenGREATERTHAN = 14; - int TokenIF = 109; - int TokenDO = 1010; - int TokenFOR = 1011; - int TokenTRY = 1012; - int TokenCASE = 1013; - int TokenELSE = 1014; - int TokenBREAK = 1015; - int TokenCATCH = 1016; - int TokenWHILE = 1017; - int TokenRETURN = 1018; - int TokenSTATIC = 1019; - int TokenSWITCH = 1020; - int TokenFINALLY = 1021; - int TokenSYNCHRONIZED = 1022; - int TokenGOTO = 1023; - int TokenDEFAULT = 1024; - int TokenNEW = 1025; - int TokenCLASS = 1026; - int TokenINTERFACE = 1027; - int TokenENUM = 1028; - int TokenIDENT = 2000; -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/FacetModuleCoreSupport.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/FacetModuleCoreSupport.java deleted file mode 100644 index fa1ab95f8a..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/FacetModuleCoreSupport.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.wizard; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; - -/** - * This class encapsulates any used Module Core and Facets APIs along with - * fallbacks for use on non-compliant projects and when those services are not - * available at runtime. - * - * Because ModuleCore API calls can result in locks needing to be acquired, - * none of these methods should be called while other thread locks have - * already been acquired. - */ -final class FacetModuleCoreSupport { - static final boolean _dump_NCDFE = false; - - /** - * @param project - * @return the IPath to the "root" of the web contents - */ - public static IPath getWebContentRootPath(IProject project) { - if (project == null) - return null; - IPath path = null; - try { - path = FacetModuleCoreSupportDelegate.getWebContentRootPath(project); - } - catch (NoClassDefFoundError e) { - if (_dump_NCDFE) - e.printStackTrace(); - } - return path; - } - - /** - * @param project - * @return - * @throws org.eclipse.core.runtime.CoreException - */ - public static boolean isWebProject(IProject project) { - if (project == null) - return false; - try { - return FacetModuleCoreSupportDelegate.isWebProject(project); - } - catch (NoClassDefFoundError e) { - if (_dump_NCDFE) - e.printStackTrace(); - } - return true; - } - - -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/FacetModuleCoreSupportDelegate.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/FacetModuleCoreSupportDelegate.java deleted file mode 100644 index ab5484edbb..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/FacetModuleCoreSupportDelegate.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.wizard; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.html.ui.internal.Logger; - -/** - * Wrapper class for all Facet-related calls. If the Facet or ModuleCore - * bundles are not available, this class will not load, or if it does, its - * methods will cause NoClassDefFoundErrors. This allows us to - * compartmentalize the dependencies. - * - */ -final class FacetModuleCoreSupportDelegate { - /** - * Copied to avoid unneeded extra dependency (plus it's unclear why the - * value is in that plug-in). - * - * @see org.eclipse.wst.common.componentcore.internal.util.IModuleConstants.JST_WEB_MODULE - */ - private final static String JST_WEB_MODULE = "jst.web"; //$NON-NLS-1$ - - private final static String WST_WEB_MODULE = "wst.web"; //$NON-NLS-1$ - - /** - * @param project - * @return the IPath to the "root" of the web contents - */ - static IPath getWebContentRootPath(IProject project) { - if (!ModuleCoreNature.isFlexibleProject(project)) - return project.getFullPath(); - - IPath path = null; - IVirtualComponent component = ComponentCore.createComponent(project); - if (component != null && component.exists()) { - path = component.getRootFolder().getWorkspaceRelativePath(); - } - else { - path = project.getFullPath(); - } - return path; - } - - /** - * @param project - * @return - * @throws CoreException - */ - static boolean isWebProject(IProject project) { - boolean is = false; - try { - IFacetedProject faceted = ProjectFacetsManager.create(project); - if (ProjectFacetsManager.isProjectFacetDefined(JST_WEB_MODULE)) { - IProjectFacet facet = ProjectFacetsManager.getProjectFacet(JST_WEB_MODULE); - is = is || (faceted != null && faceted.hasProjectFacet(facet)); - } - if (ProjectFacetsManager.isProjectFacetDefined(WST_WEB_MODULE)) { - IProjectFacet facet = ProjectFacetsManager.getProjectFacet(WST_WEB_MODULE); - is = is || (faceted != null && faceted.hasProjectFacet(facet)); - } - } - catch (CoreException e) { - Logger.logException(e); - } - return is; - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLFileWizardPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLFileWizardPage.java deleted file mode 100644 index 80e542d9d7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLFileWizardPage.java +++ /dev/null @@ -1,252 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.wizard; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.dialogs.WizardNewFileCreationPage; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; - -class NewHTMLFileWizardPage extends WizardNewFileCreationPage { - - private static final String defaultName = "NewFile"; //$NON-NLS-1$ - private IContentType fContentType; - private List fValidExtensions = null; - - public NewHTMLFileWizardPage(String pageName, IStructuredSelection selection) { - super(pageName, selection); - } - - public void createControl(Composite parent) { - // inherit default container and name specification widgets - super.createControl(parent); - setFileName(computeDefaultFileName()); - setPageComplete(validatePage()); - } - - protected String computeDefaultFileName() { - int count = 0; - String fileName = addDefaultExtension(defaultName); - IPath containerFullPath = getContainerFullPath(); - if (containerFullPath != null) { - while (true) { - IPath path = containerFullPath.append(fileName); - if (ResourcesPlugin.getWorkspace().getRoot().exists(path)) { - count++; - fileName = addDefaultExtension(defaultName + count); - } - else { - break; - } - } - } - return fileName; - } - - /** - * This method is overriden to set the selected folder to web contents - * folder if the current selection is outside the web contents folder. - */ - protected void initialPopulateContainerNameField() { - super.initialPopulateContainerNameField(); - - IPath fullPath = getContainerFullPath(); - IProject project = getProjectFromPath(fullPath); - IPath webContentPath = getWebContentPath(project); - - if (webContentPath != null && !webContentPath.isPrefixOf(fullPath)) { - setContainerFullPath(webContentPath); - } - } - - /** - * This method is overriden to set additional validation specific to - * html files. - */ - protected boolean validatePage() { - setMessage(null); - setErrorMessage(null); - - if (!super.validatePage()) { - return false; - } - - String fileName = getFileName(); - IPath fullPath = getContainerFullPath(); - if ((fullPath != null) && (fullPath.isEmpty() == false) && (fileName != null)) { - // check that filename does not contain invalid extension - if (!extensionValidForContentType(fileName)) { - setErrorMessage(NLS.bind(HTMLUIMessages._ERROR_FILENAME_MUST_END_HTML, getValidExtensions().toString())); - return false; - } - // no file extension specified so check adding default - // extension doesn't equal a file that already exists - if (fileName.lastIndexOf('.') == -1) { - String newFileName = addDefaultExtension(fileName); - IPath resourcePath = fullPath.append(newFileName); - - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IStatus result = workspace.validatePath(resourcePath.toString(), IResource.FOLDER); - if (!result.isOK()) { - // path invalid - setErrorMessage(result.getMessage()); - return false; - } - - if ((workspace.getRoot().getFolder(resourcePath).exists() || workspace.getRoot().getFile(resourcePath).exists())) { - setErrorMessage(HTMLUIMessages.ResourceGroup_nameExists); - return false; - } - } - - // get the IProject for the selection path - IProject project = getProjectFromPath(fullPath); - // if inside web project, check if inside webContent folder - if (project != null && isWebProject(project)) { - // check that the path is inside the webContent folder - IPath webContentPath = getWebContentPath(project); - if (!webContentPath.isPrefixOf(fullPath)) { - setMessage(HTMLUIMessages._WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT, WARNING); - } - } - } - - return true; - } - - /** - * Get content type associated with this new file wizard - * - * @return IContentType - */ - private IContentType getContentType() { - if (fContentType == null) - fContentType = Platform.getContentTypeManager().getContentType(ContentTypeIdForHTML.ContentTypeID_HTML); - return fContentType; - } - - /** - * Get list of valid extensions for HTML Content type - * - * @return - */ - private List getValidExtensions() { - if (fValidExtensions == null) { - IContentType type = getContentType(); - fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC))); - } - return fValidExtensions; - } - - /** - * Verifies if fileName is valid name for content type. Takes base content - * type into consideration. - * - * @param fileName - * @return true if extension is valid for this content type - */ - private boolean extensionValidForContentType(String fileName) { - boolean valid = false; - - IContentType type = getContentType(); - // there is currently an extension - if (fileName.lastIndexOf('.') != -1) { - // check what content types are associated with current extension - IContentType[] types = Platform.getContentTypeManager().findContentTypesFor(fileName); - int i = 0; - while (i < types.length && !valid) { - valid = types[i].isKindOf(type); - ++i; - } - } - else - valid = true; // no extension so valid - return valid; - } - - /** - * Adds default extension to the filename - * - * @param filename - * @return - */ - String addDefaultExtension(String filename) { - StringBuffer newFileName = new StringBuffer(filename); - - Preferences preference = HTMLCorePlugin.getDefault().getPluginPreferences(); - String ext = preference.getString(HTMLCorePreferenceNames.DEFAULT_EXTENSION); - - newFileName.append("."); //$NON-NLS-1$ - newFileName.append(ext); - - return newFileName.toString(); - } - - /** - * Returns the project that contains the specified path - * - * @param path the path which project is needed - * @return IProject object. If path is <code>null</code> the return value - * is also <code>null</code>. - */ - private IProject getProjectFromPath(IPath path) { - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IProject project = null; - - if (path != null) { - if (workspace.validatePath(path.toString(), IResource.PROJECT).isOK()) { - project = workspace.getRoot().getProject(path.toString()); - } else { - project = workspace.getRoot().getFile(path).getProject(); - } - } - - return project; - } - - /** - * Checks if the specified project is a web project. - * - * @param project project to be checked - * @return true if the project is web project, otherwise false - */ - private boolean isWebProject(IProject project) { - return FacetModuleCoreSupport.isWebProject(project); - } - - /** - * Returns the web contents folder of the specified project - * - * @param project the project which web contents path is needed - * @return IPath of the web contents folder - */ - private IPath getWebContentPath(IProject project) { - return FacetModuleCoreSupport.getWebContentRootPath(project); - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLTemplatesWizardPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLTemplatesWizardPage.java deleted file mode 100644 index 115042e374..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLTemplatesWizardPage.java +++ /dev/null @@ -1,521 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.wizard; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.preference.PreferenceDialog; -import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.jface.text.source.SourceViewerConfiguration; -import org.eclipse.jface.text.templates.DocumentTemplateContext; -import org.eclipse.jface.text.templates.Template; -import org.eclipse.jface.text.templates.TemplateBuffer; -import org.eclipse.jface.text.templates.TemplateContext; -import org.eclipse.jface.text.templates.TemplateContextType; -import org.eclipse.jface.text.templates.persistence.TemplateStore; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ControlAdapter; -import org.eclipse.swt.events.ControlEvent; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Link; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.Logger; -import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames; -import org.eclipse.wst.html.ui.internal.templates.TemplateContextTypeIdsHTML; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; -import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; -import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; - -/** - * Templates page in new file wizard. Allows users to select a new file - * template to be applied in new file. - * - */ -public class NewHTMLTemplatesWizardPage extends WizardPage { - - /** - * Content provider for templates - */ - private class TemplateContentProvider implements IStructuredContentProvider { - /** The template store. */ - private TemplateStore fStore; - - /* - * @see IContentProvider#dispose() - */ - public void dispose() { - fStore = null; - } - - /* - * @see IStructuredContentProvider#getElements(Object) - */ - public Object[] getElements(Object input) { - return fStore.getTemplates(TemplateContextTypeIdsHTML.NEW); - } - - /* - * @see IContentProvider#inputChanged(Viewer, Object, Object) - */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - fStore = (TemplateStore) newInput; - } - } - - /** - * Label provider for templates. - */ - private class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider { - - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, - * int) - */ - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - /* - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, - * int) - */ - public String getColumnText(Object element, int columnIndex) { - Template template = (Template) element; - - switch (columnIndex) { - case 0 : - return template.getName(); - case 1 : - return template.getDescription(); - default : - return ""; //$NON-NLS-1$ - } - } - } - - /** Last selected template name */ - private String fLastSelectedTemplateName; - /** The viewer displays the pattern of selected template. */ - private SourceViewer fPatternViewer; - /** The table presenting the templates. */ - private TableViewer fTableViewer; - /** Template store used by this wizard page */ - private TemplateStore fTemplateStore; - /** Checkbox for using templates. */ - private Button fUseTemplateButton; - - public NewHTMLTemplatesWizardPage() { - super("NewHTMLTemplatesWizardPage", HTMLUIMessages.NewHTMLTemplatesWizardPage_0, null); //$NON-NLS-1$ - setDescription(HTMLUIMessages.NewHTMLTemplatesWizardPage_1); - } - - /** - * Correctly resizes the table so no phantom columns appear - * - * @param parent - * the parent control - * @param buttons - * the buttons - * @param table - * the table - * @param column1 - * the first column - * @param column2 - * the second column - * @param column3 - * the third column - */ - private void configureTableResizing(final Composite parent, final Table table, final TableColumn column1, final TableColumn column2) { - parent.addControlListener(new ControlAdapter() { - public void controlResized(ControlEvent e) { - Rectangle area = parent.getClientArea(); - Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT); - int width = area.width - 2 * table.getBorderWidth(); - if (preferredSize.y > area.height) { - // Subtract the scrollbar width from the total column - // width - // if a vertical scrollbar will be required - Point vBarSize = table.getVerticalBar().getSize(); - width -= vBarSize.x; - } - - Point oldSize = table.getSize(); - if (oldSize.x > width) { - // table is getting smaller so make the columns - // smaller first and then resize the table to - // match the client area width - column1.setWidth(width / 2); - column2.setWidth(width / 2); - table.setSize(width, area.height); - } - else { - // table is getting bigger so make the table - // bigger first and then make the columns wider - // to match the client area width - table.setSize(width, area.height); - column1.setWidth(width / 2); - column2.setWidth(width / 2); - } - } - }); - } - - public void createControl(Composite ancestor) { - Composite parent = new Composite(ancestor, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - parent.setLayout(layout); - - // create checkbox for user to use HTML Template - fUseTemplateButton = new Button(parent, SWT.CHECK); - fUseTemplateButton.setText(HTMLUIMessages.NewHTMLTemplatesWizardPage_4); - GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1); - fUseTemplateButton.setLayoutData(data); - fUseTemplateButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - enableTemplates(); - } - }); - - // create composite for Templates table - Composite innerParent = new Composite(parent, SWT.NONE); - GridLayout innerLayout = new GridLayout(); - innerLayout.numColumns = 2; - innerLayout.marginHeight = 0; - innerLayout.marginWidth = 0; - innerParent.setLayout(innerLayout); - GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1); - innerParent.setLayoutData(gd); - - Label label = new Label(innerParent, SWT.NONE); - label.setText(HTMLUIMessages.NewHTMLTemplatesWizardPage_7); - data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1); - label.setLayoutData(data); - - // create table that displays templates - Table table = new Table(innerParent, SWT.BORDER | SWT.FULL_SELECTION); - - data = new GridData(GridData.FILL_BOTH); - data.widthHint = convertWidthInCharsToPixels(2); - data.heightHint = convertHeightInCharsToPixels(10); - data.horizontalSpan = 2; - table.setLayoutData(data); - table.setHeaderVisible(true); - table.setLinesVisible(true); - TableLayout tableLayout = new TableLayout(); - table.setLayout(tableLayout); - - TableColumn column1 = new TableColumn(table, SWT.NONE); - column1.setText(HTMLUIMessages.NewHTMLTemplatesWizardPage_2); - - TableColumn column2 = new TableColumn(table, SWT.NONE); - column2.setText(HTMLUIMessages.NewHTMLTemplatesWizardPage_3); - - fTableViewer = new TableViewer(table); - fTableViewer.setLabelProvider(new TemplateLabelProvider()); - fTableViewer.setContentProvider(new TemplateContentProvider()); - - fTableViewer.setSorter(new ViewerSorter() { - public int compare(Viewer viewer, Object object1, Object object2) { - if ((object1 instanceof Template) && (object2 instanceof Template)) { - Template left = (Template) object1; - Template right = (Template) object2; - int result = left.getName().compareToIgnoreCase(right.getName()); - if (result != 0) - return result; - return left.getDescription().compareToIgnoreCase(right.getDescription()); - } - return super.compare(viewer, object1, object2); - } - - public boolean isSorterProperty(Object element, String property) { - return true; - } - }); - - fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent e) { - updateViewerInput(); - } - }); - - // create viewer that displays currently selected template's contents - fPatternViewer = doCreateViewer(parent); - - fTemplateStore = HTMLUIPlugin.getDefault().getTemplateStore(); - fTableViewer.setInput(fTemplateStore); - - // Create linked text to just to templates preference page - Link link = new Link(parent, SWT.NONE); - link.setText(HTMLUIMessages.NewHTMLTemplatesWizardPage_6); - data = new GridData(SWT.END, SWT.FILL, true, false, 2, 1); - link.setLayoutData(data); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - linkClicked(); - } - }); - - configureTableResizing(innerParent, table, column1, column2); - loadLastSavedPreferences(); - - PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.HTML_NEWWIZARD_TEMPLATE_HELPID); - Dialog.applyDialogFont(parent); - setControl(parent); - } - - /** - * Creates, configures and returns a source viewer to present the template - * pattern on the preference page. Clients may override to provide a - * custom source viewer featuring e.g. syntax coloring. - * - * @param parent - * the parent control - * @return a configured source viewer - */ - private SourceViewer createViewer(Composite parent) { - SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() { - StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationHTML(); - - public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { - return baseConfiguration.getConfiguredContentTypes(sourceViewer); - } - - public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) { - return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType); - } - }; - SourceViewer viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); - viewer.getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$ - IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML); - IDocument document = scratchModel.getStructuredDocument(); - viewer.configure(sourceViewerConfiguration); - viewer.setDocument(document); - return viewer; - } - - private SourceViewer doCreateViewer(Composite parent) { - Label label = new Label(parent, SWT.NONE); - label.setText(HTMLUIMessages.NewHTMLTemplatesWizardPage_5); - GridData data = new GridData(); - data.horizontalSpan = 2; - label.setLayoutData(data); - - SourceViewer viewer = createViewer(parent); - viewer.setEditable(false); - - Control control = viewer.getControl(); - data = new GridData(GridData.FILL_BOTH); - data.horizontalSpan = 2; - data.heightHint = convertHeightInCharsToPixels(5); - // [261274] - source viewer was growing to fit the max line width of the template - data.widthHint = convertWidthInCharsToPixels(2); - control.setLayoutData(data); - - return viewer; - } - - /** - * Enable/disable controls in page based on fUseTemplateButton's current - * state. - */ - void enableTemplates() { - boolean enabled = fUseTemplateButton.getSelection(); - - if (!enabled) { - // save last selected template - Template template = getSelectedTemplate(); - if (template != null) - fLastSelectedTemplateName = template.getName(); - else - fLastSelectedTemplateName = ""; //$NON-NLS-1$ - - fTableViewer.setSelection(null); - } - else { - setSelectedTemplate(fLastSelectedTemplateName); - } - - fTableViewer.getControl().setEnabled(enabled); - fPatternViewer.getControl().setEnabled(enabled); - } - - /** - * Return the template preference page id - * - * @return - */ - private String getPreferencePageId() { - return "org.eclipse.wst.html.ui.preferences.templates"; //$NON-NLS-1$ - } - - /** - * Get the currently selected template. - * - * @return - */ - private Template getSelectedTemplate() { - Template template = null; - IStructuredSelection selection = (IStructuredSelection) fTableViewer.getSelection(); - - if (selection.size() == 1) { - template = (Template) selection.getFirstElement(); - } - return template; - } - - /** - * Returns template string to insert. - * - * @return String to insert or null if none is to be inserted - */ - String getTemplateString() { - String templateString = null; - - Template template = getSelectedTemplate(); - if (template != null) { - TemplateContextType contextType = HTMLUIPlugin.getDefault().getTemplateContextRegistry().getContextType(TemplateContextTypeIdsHTML.NEW); - IDocument document = new Document(); - TemplateContext context = new DocumentTemplateContext(contextType, document, 0, 0); - try { - TemplateBuffer buffer = context.evaluate(template); - templateString = buffer.getString(); - } - catch (Exception e) { - Logger.log(Logger.WARNING_DEBUG, "Could not create template for new html", e); //$NON-NLS-1$ - } - } - - return templateString; - } - - void linkClicked() { - String pageId = getPreferencePageId(); - PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(), pageId, new String[]{pageId}, null); - dialog.open(); - fTableViewer.refresh(); - } - - /** - * Load the last template name used in New HTML File wizard. - */ - private void loadLastSavedPreferences() { - fLastSelectedTemplateName = ""; //$NON-NLS-1$ - boolean setSelection = false; - String templateName = HTMLUIPlugin.getDefault().getPreferenceStore().getString(HTMLUIPreferenceNames.NEW_FILE_TEMPLATE_NAME); - if (templateName == null || templateName.length() == 0) { - templateName = HTMLUIPlugin.getDefault().getPreferenceStore().getString(HTMLUIPreferenceNames.NEW_FILE_TEMPLATE_ID); - if (templateName != null && templateName.length() > 0) { - Template template = fTemplateStore.findTemplateById(templateName); - if (template != null) { - fLastSelectedTemplateName = template.getName(); - setSelection = true; - } - } - } - else { - fLastSelectedTemplateName = templateName; - setSelection = true; - } - fUseTemplateButton.setSelection(setSelection); - enableTemplates(); - } - - /** - * Save template name used for next call to New HTML File wizard. - */ - void saveLastSavedPreferences() { - String templateName = ""; //$NON-NLS-1$ - - Template template = getSelectedTemplate(); - if (template != null) { - templateName = template.getName(); - } - - HTMLUIPlugin.getDefault().getPreferenceStore().setValue(HTMLUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName); - HTMLUIPlugin.getDefault().savePluginPreferences(); - } - - /** - * Select a template in the table viewer given the template name. If - * template name cannot be found or templateName is null, just select - * first item in table. If no items in table select nothing. - * - * @param templateName - */ - private void setSelectedTemplate(String templateName) { - Object template = null; - - if (templateName != null && templateName.length() > 0) { - // pick the last used template - template = fTemplateStore.findTemplate(templateName, TemplateContextTypeIdsHTML.NEW); - } - - // no record of last used template so just pick first element - if (template == null) { - // just pick first element - template = fTableViewer.getElementAt(0); - } - - if (template != null) { - IStructuredSelection selection = new StructuredSelection(template); - fTableViewer.setSelection(selection, true); - } - } - - /** - * Updates the pattern viewer. - */ - void updateViewerInput() { - Template template = getSelectedTemplate(); - if (template != null) { - fPatternViewer.getDocument().set(template.getPattern()); - } - else { - fPatternViewer.getDocument().set(""); //$NON-NLS-1$ - } - } -} diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLWizard.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLWizard.java deleted file mode 100644 index 77c52f1d51..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/wizard/NewHTMLWizard.java +++ /dev/null @@ -1,145 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.wizard; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.OutputStreamWriter; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.ProjectScope; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.core.runtime.preferences.InstanceScope; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.eclipse.wst.html.core.internal.HTMLCorePlugin; -import org.eclipse.wst.html.ui.internal.HTMLUIMessages; -import org.eclipse.wst.html.ui.internal.Logger; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImageHelper; -import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImages; -import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.sse.core.utils.StringUtils; - -public class NewHTMLWizard extends Wizard implements INewWizard { - - private NewHTMLFileWizardPage fNewFilePage; - private NewHTMLTemplatesWizardPage fNewFileTemplatesPage; - private IStructuredSelection fSelection; - - public void addPages() { - fNewFilePage = new NewHTMLFileWizardPage("HTMLWizardNewFileCreationPage", new StructuredSelection(IDE.computeSelectedResources(fSelection))); //$NON-NLS-1$ - fNewFilePage.setTitle(HTMLUIMessages._UI_WIZARD_NEW_HEADING); - fNewFilePage.setDescription(HTMLUIMessages._UI_WIZARD_NEW_DESCRIPTION); - addPage(fNewFilePage); - - fNewFileTemplatesPage = new NewHTMLTemplatesWizardPage(); - addPage(fNewFileTemplatesPage); - } - - private String applyLineDelimiter(IFile file, String text) { - String lineDelimiter = Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, System.getProperty("line.separator"), new IScopeContext[] {new ProjectScope(file.getProject()), new InstanceScope() });//$NON-NLS-1$ - String convertedText = StringUtils.replace(text, "\r\n", "\n"); - convertedText = StringUtils.replace(convertedText, "\r", "\n"); - convertedText = StringUtils.replace(convertedText, "\n", lineDelimiter); - return convertedText; - } - - public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) { - fSelection = aSelection; - setWindowTitle(HTMLUIMessages._UI_WIZARD_NEW_TITLE); - - ImageDescriptor descriptor = HTMLEditorPluginImageHelper.getInstance().getImageDescriptor(HTMLEditorPluginImages.IMG_WIZBAN_NEWHTMLFILE); - setDefaultPageImageDescriptor(descriptor); - } - - private void openEditor(final IFile file) { - if (file != null) { - getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - try { - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - IDE.openEditor(page, file, true); - } - catch (PartInitException e) { - Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e); - } - } - }); - } - } - - public boolean performFinish() { - boolean performedOK = false; - // save user options for next use - fNewFileTemplatesPage.saveLastSavedPreferences(); - - // no file extension specified so add default extension - String fileName = fNewFilePage.getFileName(); - if (fileName.lastIndexOf('.') == -1) { - String newFileName = fNewFilePage.addDefaultExtension(fileName); - fNewFilePage.setFileName(newFileName); - } - - // create a new empty file - IFile file = fNewFilePage.createNewFile(); - - // if there was problem with creating file, it will be null, so make - // sure to check - if (file != null) { - // put template contents into file - String templateString = fNewFileTemplatesPage.getTemplateString(); - if (templateString != null) { - templateString = applyLineDelimiter(file, templateString); - // determine the encoding for the new file - Preferences preference = HTMLCorePlugin.getDefault().getPluginPreferences(); - String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET); - - try { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - OutputStreamWriter outputStreamWriter = null; - if (charSet == null || charSet.trim().equals("")) { //$NON-NLS-1$ - // just use default encoding - outputStreamWriter = new OutputStreamWriter(outputStream); - } - else { - outputStreamWriter = new OutputStreamWriter(outputStream, charSet); - } - outputStreamWriter.write(templateString); - outputStreamWriter.flush(); - outputStreamWriter.close(); - ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray()); - file.setContents(inputStream, true, false, null); - inputStream.close(); - } - catch (Exception e) { - Logger.log(Logger.WARNING_DEBUG, "Could not create contents for new HTML file", e); //$NON-NLS-1$ - } - } - - // open the file in editor - openEditor(file); - - // everything's fine - performedOK = true; - } - return performedOK; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLContentOutlineConfiguration.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLContentOutlineConfiguration.java deleted file mode 100644 index dbb3cf3e17..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLContentOutlineConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.views.contentoutline; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; -import org.eclipse.wst.html.ui.internal.contentoutline.HTMLNodeActionManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager; -import org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration; - -/** - * Configuration for outline view page which shows HTML content. - * - * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration - * @since 1.0 - */ -public class HTMLContentOutlineConfiguration extends XMLContentOutlineConfiguration { - private static final String OUTLINE_FILTER_PREF = "org.eclipse.wst.html.ui.OutlinePage"; //$NON-NLS-1$ - /** - * Create new instance of HTMLContentOutlineConfiguration - */ - public HTMLContentOutlineConfiguration() { - // Must have empty constructor to createExecutableExtension - super(); - } - - protected XMLNodeActionManager createNodeActionManager(TreeViewer treeViewer) { - return new HTMLNodeActionManager((IStructuredModel) treeViewer.getInput(), treeViewer); - } - - protected IPreferenceStore getPreferenceStore() { - return HTMLUIPlugin.getDefault().getPreferenceStore(); - } - - protected String getOutlineFilterTarget(){ - return OUTLINE_FILTER_PREF ; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/templates/htmldefault-templates.properties b/bundles/org.eclipse.wst.html.ui/templates/htmldefault-templates.properties deleted file mode 100644 index cfa1c621e7..0000000000 --- a/bundles/org.eclipse.wst.html.ui/templates/htmldefault-templates.properties +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################### -# Copyright (c) 2004, 2010 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Benjamin Muskalla, b.muskalla@gmx.net - [156040] no new html template for xhtml 1.0 strict -############################################################################### -Templates.comment.name=comment -Templates.comment.desc=comment -Templates.ul.name=ul -Templates.ul.desc=unordered list -Templates.ul.content=<ul>\n <li> Item one </li>\n <li> Item two </li>\n</ul>\n -Templates.dl.name=dl -Templates.dl.desc=definition list -Templates.dl.content=<dl>\n <dt> First definition</dt> <dd> First explanation</dd>\n <dt> Second definition</dt> <dd> Second explanation</dd>\n</dl>\n -Templates.table.name=table -Templates.table.desc=table -Templates.table.content=<table>\n <tr>\n <th>Column 1 Heading</th>\n <th>Column 2 Heading</th>\n </tr>\n <tr>\n <td>Row 1: Col 1</td>\n <td>Row 1: Col 2</td>\n </tr>\n</table>\n -Templates.ol.name=ol -Templates.ol.desc=ordered list -Templates.ol.content=<ol>\n <li> Item one </li>\n <li> Item two </li>\n</ol>\n -Templates.html.name=New HTML File (4.01 transitional) -Templates.html.desc=html 4.01 transitional -Templates.html.content=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\n<html>\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=${encoding}">\n<title>Insert title here</title>\n</head>\n<body>\n${cursor}\n</body>\n</html> -Templates.htmlframeset.name=New HTML File (4.01 frameset) -Templates.htmlframeset.desc=html 4.01 frameset -Templates.htmlframeset.content=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">\n<html>\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=${encoding}">\n<title>Insert title here</title>\n</head>\n<frameset>\n <frame>\n <frame>\n <noframes>\n <body>\n <p>This page uses frames. The current browser you are using does not support frames.</p>\n </body>\n </noframes>\n</frameset>\n</html> -Templates.htmlstrict.name=New HTML File (4.01 strict) -Templates.htmlstrict.desc=html 4.01 strict -Templates.htmlstrict.content=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd">\n<html>\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=${encoding}">\n<title>Insert title here</title>\n</head>\n<body>\n${cursor}\n</body>\n</html> -Templates.xhtml.name=New XHTML File (1.0 transitional) -Templates.xhtml.desc=xhtml 1.0 transitional -Templates.xhtml.content=<?xml version="1.0" encoding="${encoding}" ?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml">\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=${encoding}" />\n<title>Insert title here</title>\n</head>\n<body>\n${cursor}\n</body>\n</html> -Templates.xhtmlframeset.name=New XHTML File (1.0 frameset) -Templates.xhtmlframeset.desc=xhtml 1.0 frameset -Templates.xhtmlframeset.content=<?xml version="1.0" encoding="${encoding}" ?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml">\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=${encoding}" />\n<title>Insert title here</title>\n</head>\n<frameset>\n <frame />\n <frame />\n <noframes>\n <body>\n <p>This page uses frames. The current browser you are using does not support frames.</p>\n </body>\n </noframes>\n</frameset>\n</html> -Templates.xhtmlstrict.name=New XHTML File (1.0 strict) -Templates.xhtmlstrict.desc=xhtml 1.0 strict -Templates.xhtmlstrict.content=<?xml version="1.0" encoding="${encoding}" ?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml">\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=${encoding}" />\n<title>Insert title here</title>\n</head>\n<body>\n${cursor}\n</body>\n</html> -Templates.script.name=script -Templates.script.desc=script (commented) -Templates.script.content=<script type=\"${cursor}text/javascript\">\n<!--\n\n//-->\n</script> -Templates.style.name=style -Templates.style.desc=style (commented) -Templates.style.content=<style>\n<!--\n${cursor}\n-->\n</style> -Templates.imgmap.name=img -Templates.imgmap.desc=img (map) -Templates.html5.name=New HTML File (5) -Templates.html5.desc=html 5 -Templates.html5.content=<!DOCTYPE html>\n<html>\n<head>\n<meta charset="${encoding}">\n<title>Insert title here</title>\n</head>\n<body>\n${cursor}\n</body>\n</html>
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/templates/htmldefault-templates.xml b/bundles/org.eclipse.wst.html.ui/templates/htmldefault-templates.xml deleted file mode 100644 index c600c08b51..0000000000 --- a/bundles/org.eclipse.wst.html.ui/templates/htmldefault-templates.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Benjamin Muskalla, b.muskalla@gmx.net - [156040] no new html template for xhtml 1.0 strict - * - *******************************************************************************/ - --> -<templates> - -<template name="%Templates.comment.name" description="%Templates.comment.desc" id="org.eclipse.wst.html.ui.templates.comment" context="html_tag" enabled="true"><!-- ${cursor} --></template> - -<template name="%Templates.imgmap.name" description="%Templates.imgmap.desc" id="org.eclipse.wst.html.ui.templates.imgmap" context="html_tag" enabled="true"><img ismap></template> - -<template name="%Templates.ul.name" description="%Templates.ul.desc" id="org.eclipse.wst.html.ui.templates.ul" context="html_tag" enabled="true">%Templates.ul.content</template> - -<template name="%Templates.dl.name" description="%Templates.dl.desc" id="org.eclipse.wst.html.ui.templates.dl" context="html_tag" enabled="true">%Templates.dl.content</template> - -<template name="%Templates.table.name" description="%Templates.table.desc" id="org.eclipse.wst.html.ui.templates.table" context="html_tag" enabled="true">%Templates.table.content</template> - -<template name="%Templates.ol.name" description="%Templates.ol.desc" id="org.eclipse.wst.html.ui.templates.ol" context="html_tag" enabled="true">%Templates.ol.content</template> - -<template name="%Templates.html.name" description="%Templates.html.desc" id="org.eclipse.wst.html.ui.templates.html" context="html_new" enabled="true">%Templates.html.content</template> - -<template name="%Templates.htmlframeset.name" description="%Templates.htmlframeset.desc" id="org.eclipse.wst.html.ui.templates.htmlframeset" context="html_new" enabled="true">%Templates.htmlframeset.content</template> - -<template name="%Templates.htmlstrict.name" description="%Templates.htmlstrict.desc" id="org.eclipse.wst.html.ui.templates.htmlstrict" context="html_new" enabled="true">%Templates.htmlstrict.content</template> - -<template name="%Templates.xhtml.name" description="%Templates.xhtml.desc" id="org.eclipse.wst.html.ui.templates.xhtml" context="html_new" enabled="true">%Templates.xhtml.content</template> - -<template name="%Templates.xhtmlframeset.name" description="%Templates.xhtmlframeset.desc" id="org.eclipse.wst.html.ui.templates.xhtmlframeset" context="html_new" enabled="true">%Templates.xhtmlframeset.content</template> - -<template name="%Templates.xhtmlstrict.name" description="%Templates.xhtmlstrict.desc" id="org.eclipse.wst.html.ui.templates.xhtmlstrict" context="html_new" enabled="true">%Templates.xhtmlstrict.content</template> - -<template name="%Templates.script.name" description="%Templates.script.desc" id="org.eclipse.wst.html.ui.templates.script" context="html_tag" enabled="true">%Templates.script.content</template> - -<template name="%Templates.style.name" description="%Templates.style.desc" id="org.eclipse.wst.html.ui.templates.style" context="html_tag" enabled="true">%Templates.style.content</template> - -<template name="%Templates.html5.name" description="%Templates.html5.desc" id="org.eclipse.wst.html.ui.templates.html5" context="html_new" enabled="true">%Templates.html5.content</template> - -</templates> |
